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"
57 50b0790e 2020-09-11 stsp #include "got_gotconfig.h"
59 5c860e29 2018-03-12 stsp #ifndef nitems
60 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
64 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
67 99437157 2018-11-11 stsp catch_sigint(int signo)
69 99437157 2018-11-11 stsp sigint_received = 1;
73 99437157 2018-11-11 stsp catch_sigpipe(int signo)
75 99437157 2018-11-11 stsp sigpipe_received = 1;
79 8cfb4057 2019-07-09 stsp struct got_cmd {
80 820059fa 2020-09-25 stsp const char *cmd_name;
81 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
82 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
83 97b3a7be 2019-07-09 stsp const char *cmd_alias;
86 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
87 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
88 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
89 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
90 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
91 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
92 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
93 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
94 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
95 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
96 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
97 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
98 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
99 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
100 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
101 d00136be 2019-03-26 stsp __dead static void usage_add(void);
102 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
103 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
104 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
105 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
106 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
107 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
108 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
109 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
110 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
111 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
112 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
113 b2118c49 2020-07-28 stsp __dead static void usage_info(void);
115 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
116 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
117 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
118 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
119 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
120 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
121 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
122 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
123 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
124 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
125 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
126 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
127 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
128 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
129 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
130 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
131 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
132 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
133 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
134 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
135 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
136 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
137 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
138 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
139 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
140 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
141 b2118c49 2020-07-28 stsp static const struct got_error* cmd_info(int, char *[]);
143 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
144 b2118c49 2020-07-28 stsp { "init", cmd_init, usage_init, "" },
145 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
146 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
147 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
148 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
149 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
150 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
151 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
152 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
153 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
154 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
155 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
156 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
157 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
158 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
159 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
160 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
161 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
162 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
163 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
164 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
165 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
166 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
167 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
168 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
169 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
170 b2118c49 2020-07-28 stsp { "info", cmd_info, usage_info, "" },
173 ce5b7c56 2019-07-09 stsp static void
174 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
178 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
179 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
180 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
181 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->cmd_name);
183 6879ba42 2020-10-01 naddy fputc('\n', fp);
186 ff69268e 2020-12-13 stsp __dead static void
187 ff69268e 2020-12-13 stsp option_conflict(char a, char b)
189 ff69268e 2020-12-13 stsp errx(1, "-%c and -%c options are mutually exclusive", a, b);
193 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
195 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
198 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
199 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
200 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
201 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0 }
204 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
206 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
207 5c860e29 2018-03-12 stsp switch (ch) {
215 6879ba42 2020-10-01 naddy usage(hflag, 1);
216 5c860e29 2018-03-12 stsp /* NOTREACHED */
220 5c860e29 2018-03-12 stsp argc -= optind;
221 5c860e29 2018-03-12 stsp argv += optind;
222 9814e6a3 2020-09-27 naddy optind = 1;
223 9814e6a3 2020-09-27 naddy optreset = 1;
225 53ccebc2 2019-07-30 stsp if (Vflag) {
226 53ccebc2 2019-07-30 stsp got_version_print_str();
230 5c860e29 2018-03-12 stsp if (argc <= 0)
231 6879ba42 2020-10-01 naddy usage(hflag, hflag ? 0 : 1);
233 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
234 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
236 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
237 d7d4f210 2018-03-12 stsp const struct got_error *error;
239 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
241 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
242 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
246 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
248 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
249 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
250 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
251 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
252 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
253 70015d7a 2019-11-08 stsp !(sigint_received &&
254 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
255 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
262 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
263 6879ba42 2020-10-01 naddy list_commands(stderr);
267 4ed7e80c 2018-05-20 stsp __dead static void
268 6879ba42 2020-10-01 naddy usage(int hflag, int status)
270 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
272 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
273 53ccebc2 2019-07-30 stsp getprogname());
275 6879ba42 2020-10-01 naddy list_commands(fp);
276 6879ba42 2020-10-01 naddy exit(status);
279 0266afb7 2019-01-04 stsp static const struct got_error *
280 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
282 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
283 e2ba3d07 2019-05-13 stsp const char *editor;
285 8920fa04 2019-08-18 stsp *abspath = NULL;
287 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
288 e2ba3d07 2019-05-13 stsp if (editor == NULL)
289 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
291 0ee7065d 2019-05-13 stsp if (editor) {
292 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
294 0ee7065d 2019-05-13 stsp return err;
297 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
298 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
299 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
300 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
303 e2ba3d07 2019-05-13 stsp return NULL;
306 e2ba3d07 2019-05-13 stsp static const struct got_error *
307 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
308 c530dc23 2019-07-23 stsp const char *worktree_path)
310 163ce85a 2019-05-13 stsp const struct got_error *err;
312 37c06ea4 2019-07-15 stsp #ifdef PROFILE
313 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
314 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
316 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
317 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
319 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
320 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
322 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
323 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
325 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
326 163ce85a 2019-05-13 stsp if (err != NULL)
327 163ce85a 2019-05-13 stsp return err;
329 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
330 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
332 0266afb7 2019-01-04 stsp return NULL;
335 2c7829a4 2019-06-17 stsp __dead static void
336 2c7829a4 2019-06-17 stsp usage_init(void)
338 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
342 2c7829a4 2019-06-17 stsp static const struct got_error *
343 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
345 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
346 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
349 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
350 2c7829a4 2019-06-17 stsp switch (ch) {
352 2c7829a4 2019-06-17 stsp usage_init();
353 2c7829a4 2019-06-17 stsp /* NOTREACHED */
357 2c7829a4 2019-06-17 stsp argc -= optind;
358 2c7829a4 2019-06-17 stsp argv += optind;
360 2c7829a4 2019-06-17 stsp #ifndef PROFILE
361 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
362 2c7829a4 2019-06-17 stsp err(1, "pledge");
364 2c7829a4 2019-06-17 stsp if (argc != 1)
365 bc20e173 2019-06-17 stsp usage_init();
367 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
368 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
369 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
371 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
373 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
374 2c7829a4 2019-06-17 stsp if (error &&
375 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
378 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
382 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
384 3ce1b845 2019-07-15 stsp free(repo_path);
385 3ce1b845 2019-07-15 stsp return error;
388 3ce1b845 2019-07-15 stsp __dead static void
389 3ce1b845 2019-07-15 stsp usage_import(void)
391 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
392 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
397 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
400 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
401 3ce1b845 2019-07-15 stsp int st = -1;
403 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
404 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
405 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
407 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
409 3ce1b845 2019-07-15 stsp goto doneediting;
411 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
412 3ce1b845 2019-07-15 stsp _exit(127);
415 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
416 3ce1b845 2019-07-15 stsp if (errno != EINTR)
419 3ce1b845 2019-07-15 stsp doneediting:
420 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
421 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
422 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
424 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
425 3ce1b845 2019-07-15 stsp errno = EINTR;
429 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
432 3ce1b845 2019-07-15 stsp static const struct got_error *
433 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
434 0d5bb276 2020-12-15 stsp const char *initial_content, size_t initial_content_len, int check_comments)
436 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
437 bfa12d5e 2020-09-26 stsp char *line = NULL;
438 bfa12d5e 2020-09-26 stsp size_t linesize = 0;
439 bfa12d5e 2020-09-26 stsp ssize_t linelen;
440 3ce1b845 2019-07-15 stsp struct stat st, st2;
441 bfa12d5e 2020-09-26 stsp FILE *fp = NULL;
442 bfa12d5e 2020-09-26 stsp size_t len, logmsg_len;
443 bfa12d5e 2020-09-26 stsp char *initial_content_stripped = NULL, *buf = NULL, *s;
445 3ce1b845 2019-07-15 stsp *logmsg = NULL;
447 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
448 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
450 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
451 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
453 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
454 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
456 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
457 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
458 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
461 bfa12d5e 2020-09-26 stsp * Set up a stripped version of the initial content without comments
462 bfa12d5e 2020-09-26 stsp * and blank lines. We need this in order to check if the message
463 bfa12d5e 2020-09-26 stsp * has in fact been edited.
465 bfa12d5e 2020-09-26 stsp initial_content_stripped = malloc(initial_content_len + 1);
466 bfa12d5e 2020-09-26 stsp if (initial_content_stripped == NULL)
467 bfa12d5e 2020-09-26 stsp return got_error_from_errno("malloc");
468 bfa12d5e 2020-09-26 stsp initial_content_stripped[0] = '\0';
470 bfa12d5e 2020-09-26 stsp buf = strdup(initial_content);
471 bfa12d5e 2020-09-26 stsp if (buf == NULL) {
472 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("strdup");
477 bfa12d5e 2020-09-26 stsp while ((line = strsep(&s, "\n")) != NULL) {
478 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
479 bfa12d5e 2020-09-26 stsp continue; /* remove comments and leading empty lines */
480 bfa12d5e 2020-09-26 stsp len = strlcat(initial_content_stripped, line,
481 bfa12d5e 2020-09-26 stsp initial_content_len + 1);
482 bfa12d5e 2020-09-26 stsp if (len >= initial_content_len + 1) {
483 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
487 bfa12d5e 2020-09-26 stsp while (len > 0 && initial_content_stripped[len - 1] == '\n') {
488 bfa12d5e 2020-09-26 stsp initial_content_stripped[len - 1] = '\0';
492 bfa12d5e 2020-09-26 stsp logmsg_len = st2.st_size;
493 bfa12d5e 2020-09-26 stsp *logmsg = malloc(logmsg_len + 1);
494 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
495 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
496 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
498 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
499 3ce1b845 2019-07-15 stsp if (fp == NULL) {
500 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
505 bfa12d5e 2020-09-26 stsp while ((linelen = getline(&line, &linesize, fp)) != -1) {
506 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
507 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
508 bfa12d5e 2020-09-26 stsp len = strlcat(*logmsg, line, logmsg_len + 1);
509 bfa12d5e 2020-09-26 stsp if (len >= logmsg_len + 1) {
510 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
514 bfa12d5e 2020-09-26 stsp free(line);
515 bfa12d5e 2020-09-26 stsp if (ferror(fp)) {
516 bfa12d5e 2020-09-26 stsp err = got_ferror(fp, GOT_ERR_IO);
519 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
520 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
524 bfa12d5e 2020-09-26 stsp if (len == 0) {
525 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
526 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
529 0d5bb276 2020-12-15 stsp if (check_comments && strcmp(*logmsg, initial_content_stripped) == 0)
530 bfa12d5e 2020-09-26 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
531 bfa12d5e 2020-09-26 stsp "no changes made to commit message, aborting");
533 bfa12d5e 2020-09-26 stsp free(initial_content_stripped);
535 bfa12d5e 2020-09-26 stsp if (fp && fclose(fp) == EOF && err == NULL)
536 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("fclose");
538 3ce1b845 2019-07-15 stsp free(*logmsg);
539 3ce1b845 2019-07-15 stsp *logmsg = NULL;
541 3ce1b845 2019-07-15 stsp return err;
544 3ce1b845 2019-07-15 stsp static const struct got_error *
545 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
546 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
548 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
549 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
550 1601cb9f 2020-09-11 naddy int initial_content_len;
551 97972933 2020-09-11 stsp int fd = -1;
553 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
554 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
555 1601cb9f 2020-09-11 naddy branch_name);
556 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
557 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
559 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
560 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
564 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
565 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *logmsg_path);
569 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
570 0d5bb276 2020-12-15 stsp initial_content_len, 1);
572 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
573 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *logmsg_path);
574 3ce1b845 2019-07-15 stsp free(initial_content);
576 59f86c76 2020-09-11 stsp free(*logmsg_path);
577 59f86c76 2020-09-11 stsp *logmsg_path = NULL;
579 3ce1b845 2019-07-15 stsp return err;
582 3ce1b845 2019-07-15 stsp static const struct got_error *
583 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
585 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
586 3ce1b845 2019-07-15 stsp return NULL;
589 3ce1b845 2019-07-15 stsp static const struct got_error *
590 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
591 50b0790e 2020-09-11 stsp struct got_worktree *worktree)
593 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
594 50b0790e 2020-09-11 stsp const char *got_author = NULL, *name, *email;
595 50b0790e 2020-09-11 stsp const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
597 84792843 2019-08-09 stsp *author = NULL;
599 50b0790e 2020-09-11 stsp if (worktree)
600 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
601 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
604 50b0790e 2020-09-11 stsp * Priority of potential author information sources, from most
605 50b0790e 2020-09-11 stsp * significant to least significant:
606 50b0790e 2020-09-11 stsp * 1) work tree's .got/got.conf file
607 50b0790e 2020-09-11 stsp * 2) repository's got.conf file
608 50b0790e 2020-09-11 stsp * 3) repository's git config file
609 50b0790e 2020-09-11 stsp * 4) environment variables
610 50b0790e 2020-09-11 stsp * 5) global git config files (in user's home directory or /etc)
613 50b0790e 2020-09-11 stsp if (worktree_conf)
614 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(worktree_conf);
615 50b0790e 2020-09-11 stsp if (got_author == NULL)
616 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(repo_conf);
617 84792843 2019-08-09 stsp if (got_author == NULL) {
618 257add31 2020-09-09 stsp name = got_repo_get_gitconfig_author_name(repo);
619 257add31 2020-09-09 stsp email = got_repo_get_gitconfig_author_email(repo);
620 c9956ddf 2019-09-08 stsp if (name && email) {
621 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
622 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
623 c9956ddf 2019-09-08 stsp return NULL;
626 257add31 2020-09-09 stsp got_author = getenv("GOT_AUTHOR");
627 257add31 2020-09-09 stsp if (got_author == NULL) {
628 257add31 2020-09-09 stsp name = got_repo_get_global_gitconfig_author_name(repo);
629 257add31 2020-09-09 stsp email = got_repo_get_global_gitconfig_author_email(
631 257add31 2020-09-09 stsp if (name && email) {
632 257add31 2020-09-09 stsp if (asprintf(author, "%s <%s>", name, email)
634 257add31 2020-09-09 stsp return got_error_from_errno("asprintf");
635 257add31 2020-09-09 stsp return NULL;
637 257add31 2020-09-09 stsp /* TODO: Look up user in password database? */
638 257add31 2020-09-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
642 aba9c984 2019-09-08 stsp *author = strdup(got_author);
643 aba9c984 2019-09-08 stsp if (*author == NULL)
644 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
647 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
648 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
650 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
651 84792843 2019-08-09 stsp got_author++;
652 aba9c984 2019-09-08 stsp if (*got_author != '<') {
653 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
656 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
657 84792843 2019-08-09 stsp got_author++;
658 aba9c984 2019-09-08 stsp if (*got_author != '@') {
659 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
662 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
663 84792843 2019-08-09 stsp got_author++;
664 84792843 2019-08-09 stsp if (*got_author != '>')
665 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
668 aba9c984 2019-09-08 stsp free(*author);
669 aba9c984 2019-09-08 stsp *author = NULL;
671 aba9c984 2019-09-08 stsp return err;
674 c9956ddf 2019-09-08 stsp static const struct got_error *
675 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
677 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
679 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
680 c9956ddf 2019-09-08 stsp if (homedir) {
681 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
682 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
685 c9956ddf 2019-09-08 stsp return NULL;
688 84792843 2019-08-09 stsp static const struct got_error *
689 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
691 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
692 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
693 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
694 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
695 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
696 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
697 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
698 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
700 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
701 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
702 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
704 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
706 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
707 3ce1b845 2019-07-15 stsp switch (ch) {
709 3ce1b845 2019-07-15 stsp branch_name = optarg;
712 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
713 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
714 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
719 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
720 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
721 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
727 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
729 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
735 b2b65d18 2019-08-22 stsp usage_import();
736 3ce1b845 2019-07-15 stsp /* NOTREACHED */
740 3ce1b845 2019-07-15 stsp argc -= optind;
741 3ce1b845 2019-07-15 stsp argv += optind;
743 3ce1b845 2019-07-15 stsp #ifndef PROFILE
744 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
746 3ce1b845 2019-07-15 stsp NULL) == -1)
747 3ce1b845 2019-07-15 stsp err(1, "pledge");
749 3ce1b845 2019-07-15 stsp if (argc != 1)
750 3ce1b845 2019-07-15 stsp usage_import();
752 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
753 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
754 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
755 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
757 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
758 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
761 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
765 50b0790e 2020-09-11 stsp error = get_author(&author, repo, NULL);
767 aba9c984 2019-09-08 stsp return error;
770 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
771 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
772 e560b7e0 2019-11-28 stsp * an unintended typo.
774 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
775 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
777 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
778 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
782 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
783 3ce1b845 2019-07-15 stsp if (error) {
784 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
787 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
788 3ce1b845 2019-07-15 stsp "import target branch already exists");
792 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
793 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
794 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
797 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
800 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
801 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
803 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
804 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
807 8e158b01 2019-09-22 stsp free(logmsg);
808 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
809 ef293bdd 2019-10-21 stsp path_dir, refname);
810 ef293bdd 2019-10-21 stsp if (error) {
811 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
812 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
813 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
818 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
819 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
820 ef293bdd 2019-10-21 stsp if (logmsg_path)
821 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
825 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
826 ef293bdd 2019-10-21 stsp if (error) {
827 ef293bdd 2019-10-21 stsp if (logmsg_path)
828 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
832 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
833 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
834 ef293bdd 2019-10-21 stsp if (error) {
835 ef293bdd 2019-10-21 stsp if (logmsg_path)
836 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
840 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
841 ef293bdd 2019-10-21 stsp if (error) {
842 ef293bdd 2019-10-21 stsp if (logmsg_path)
843 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
847 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
848 ef293bdd 2019-10-21 stsp if (error) {
849 ef293bdd 2019-10-21 stsp if (logmsg_path)
850 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
854 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
855 ef293bdd 2019-10-21 stsp if (error) {
856 ef293bdd 2019-10-21 stsp if (logmsg_path)
857 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
861 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
862 3ce1b845 2019-07-15 stsp if (error) {
863 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
864 ef293bdd 2019-10-21 stsp if (logmsg_path)
865 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
869 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
870 3ce1b845 2019-07-15 stsp branch_ref);
871 ef293bdd 2019-10-21 stsp if (error) {
872 ef293bdd 2019-10-21 stsp if (logmsg_path)
873 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
877 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
878 ef293bdd 2019-10-21 stsp if (error) {
879 ef293bdd 2019-10-21 stsp if (logmsg_path)
880 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
885 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
886 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
888 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
889 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
890 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
891 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
892 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
893 8e158b01 2019-09-22 stsp free(logmsg);
894 ef293bdd 2019-10-21 stsp free(logmsg_path);
895 2c7829a4 2019-06-17 stsp free(repo_path);
896 3ce1b845 2019-07-15 stsp free(editor);
897 3ce1b845 2019-07-15 stsp free(refname);
898 3ce1b845 2019-07-15 stsp free(new_commit_id);
899 3ce1b845 2019-07-15 stsp free(id_str);
900 aba9c984 2019-09-08 stsp free(author);
901 c9956ddf 2019-09-08 stsp free(gitconfig_path);
902 3ce1b845 2019-07-15 stsp if (branch_ref)
903 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
904 3ce1b845 2019-07-15 stsp if (head_ref)
905 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
906 2c7829a4 2019-06-17 stsp return error;
909 93658fb9 2020-03-18 stsp __dead static void
910 93658fb9 2020-03-18 stsp usage_clone(void)
912 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
913 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
917 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
918 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
919 892ac3b6 2020-03-18 stsp int last_p_indexed;
920 892ac3b6 2020-03-18 stsp int last_p_resolved;
921 68999b92 2020-03-18 stsp int verbosity;
923 04d9a9ec 2020-09-24 stsp struct got_repository *repo;
925 04d9a9ec 2020-09-24 stsp int create_configs;
926 04d9a9ec 2020-09-24 stsp int configs_created;
928 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *symrefs;
929 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches;
930 04d9a9ec 2020-09-24 stsp const char *proto;
931 04d9a9ec 2020-09-24 stsp const char *host;
932 04d9a9ec 2020-09-24 stsp const char *port;
933 04d9a9ec 2020-09-24 stsp const char *remote_repo_path;
934 04d9a9ec 2020-09-24 stsp const char *git_url;
935 04d9a9ec 2020-09-24 stsp int fetch_all_branches;
936 04d9a9ec 2020-09-24 stsp int mirror_references;
937 04d9a9ec 2020-09-24 stsp } config_info;
940 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
941 93658fb9 2020-03-18 stsp static const struct got_error *
942 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
943 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
944 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
945 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches, struct got_repository *repo);
947 04d9a9ec 2020-09-24 stsp static const struct got_error *
948 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
949 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
951 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
952 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
953 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
954 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
955 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
958 04d9a9ec 2020-09-24 stsp * In order to allow a failed clone to be resumed with 'got fetch'
959 04d9a9ec 2020-09-24 stsp * we try to create configuration files as soon as possible.
960 04d9a9ec 2020-09-24 stsp * Once the server has sent information about its default branch
961 04d9a9ec 2020-09-24 stsp * we have all required information.
963 04d9a9ec 2020-09-24 stsp if (a->create_configs && !a->configs_created &&
964 04d9a9ec 2020-09-24 stsp !TAILQ_EMPTY(a->config_info.symrefs)) {
965 04d9a9ec 2020-09-24 stsp err = create_config_files(a->config_info.proto,
966 62d463ca 2020-10-20 naddy a->config_info.host, a->config_info.port,
967 62d463ca 2020-10-20 naddy a->config_info.remote_repo_path,
968 62d463ca 2020-10-20 naddy a->config_info.git_url,
969 62d463ca 2020-10-20 naddy a->config_info.fetch_all_branches,
970 62d463ca 2020-10-20 naddy a->config_info.mirror_references,
971 62d463ca 2020-10-20 naddy a->config_info.symrefs,
972 62d463ca 2020-10-20 naddy a->config_info.wanted_branches, a->repo);
974 04d9a9ec 2020-09-24 stsp return err;
975 04d9a9ec 2020-09-24 stsp a->configs_created = 1;
978 68999b92 2020-03-18 stsp if (a->verbosity < 0)
979 68999b92 2020-03-18 stsp return NULL;
981 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
982 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
983 892ac3b6 2020-03-18 stsp fflush(stdout);
984 12d1281e 2020-03-19 stsp return NULL;
987 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
988 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
989 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
990 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
991 892ac3b6 2020-03-18 stsp print_size = 1;
992 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
993 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
994 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
996 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
997 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
998 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
999 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
1000 892ac3b6 2020-03-18 stsp print_indexed = 1;
1001 892ac3b6 2020-03-18 stsp print_size = 1;
1004 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
1005 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1006 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1007 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1008 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1009 892ac3b6 2020-03-18 stsp print_resolved = 1;
1010 892ac3b6 2020-03-18 stsp print_indexed = 1;
1011 892ac3b6 2020-03-18 stsp print_size = 1;
1016 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1017 892ac3b6 2020-03-18 stsp printf("\r");
1018 892ac3b6 2020-03-18 stsp if (print_size)
1019 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1020 d715f13e 2020-03-19 stsp if (print_indexed)
1021 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1022 d715f13e 2020-03-19 stsp if (print_resolved)
1023 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1024 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1025 892ac3b6 2020-03-18 stsp fflush(stdout);
1027 531c3985 2020-03-18 stsp return NULL;
1030 531c3985 2020-03-18 stsp static const struct got_error *
1031 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
1032 04d9a9ec 2020-09-24 stsp int verbosity, struct got_repository *repo)
1034 4ba14133 2020-03-20 stsp const struct got_error *err;
1035 04d9a9ec 2020-09-24 stsp struct got_reference *head_symref;
1037 04d9a9ec 2020-09-24 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1039 4ba14133 2020-03-20 stsp return err;
1041 04d9a9ec 2020-09-24 stsp err = got_ref_write(head_symref, repo);
1042 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
1043 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
1044 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
1046 04d9a9ec 2020-09-24 stsp got_ref_close(head_symref);
1047 4ba14133 2020-03-20 stsp return err;
1050 4ba14133 2020-03-20 stsp static const struct got_error *
1051 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
1052 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
1054 41b0de12 2020-03-21 stsp const struct got_error *err;
1055 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
1057 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1058 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1059 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
1061 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
1064 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
1065 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1066 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
1067 41b0de12 2020-03-21 stsp char *id_str;
1069 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1071 41b0de12 2020-03-21 stsp return err;
1072 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
1073 41b0de12 2020-03-21 stsp free(id_str);
1076 41b0de12 2020-03-21 stsp return NULL;
1079 6338a6a1 2020-03-21 stsp static const struct got_error *
1080 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
1081 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
1083 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
1084 6338a6a1 2020-03-21 stsp struct got_reference *ref;
1085 6338a6a1 2020-03-21 stsp char *id_str;
1087 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1089 6338a6a1 2020-03-21 stsp return err;
1091 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
1093 6338a6a1 2020-03-21 stsp goto done;
1095 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1096 6338a6a1 2020-03-21 stsp got_ref_close(ref);
1098 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
1099 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
1101 6338a6a1 2020-03-21 stsp free(id_str);
1102 6338a6a1 2020-03-21 stsp return err;
1105 0e4002ca 2020-03-21 stsp static int
1106 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
1108 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
1110 0e4002ca 2020-03-21 stsp refname += 5;
1113 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
1114 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
1116 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
1118 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
1121 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
1122 0e4002ca 2020-03-21 stsp wanted_ref += 5;
1124 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
1125 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1128 0e4002ca 2020-03-21 stsp /* Allow exact match. */
1129 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
1132 0e4002ca 2020-03-21 stsp static int
1133 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1135 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
1137 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1138 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1145 41b0de12 2020-03-21 stsp static const struct got_error *
1146 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1147 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1149 0e4002ca 2020-03-21 stsp const struct got_error *err;
1150 0e4002ca 2020-03-21 stsp char *remote_refname;
1152 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1153 0e4002ca 2020-03-21 stsp refname += 5;
1155 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1156 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1157 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1159 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1160 0e4002ca 2020-03-21 stsp free(remote_refname);
1161 7c0b7f42 2020-09-24 stsp return err;
1164 7c0b7f42 2020-09-24 stsp static const struct got_error *
1165 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
1166 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, int fetch_all_branches, int mirror_references,
1167 7c0b7f42 2020-09-24 stsp struct got_repository *repo)
1169 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1170 7c0b7f42 2020-09-24 stsp char *gotconfig_path = NULL;
1171 7c0b7f42 2020-09-24 stsp char *gotconfig = NULL;
1172 7c0b7f42 2020-09-24 stsp FILE *gotconfig_file = NULL;
1173 7c0b7f42 2020-09-24 stsp ssize_t n;
1175 7c0b7f42 2020-09-24 stsp /* Create got.conf(5). */
1176 7c0b7f42 2020-09-24 stsp gotconfig_path = got_repo_get_path_gotconfig(repo);
1177 7c0b7f42 2020-09-24 stsp if (gotconfig_path == NULL) {
1178 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gotconfig");
1179 7c0b7f42 2020-09-24 stsp goto done;
1181 7c0b7f42 2020-09-24 stsp gotconfig_file = fopen(gotconfig_path, "a");
1182 7c0b7f42 2020-09-24 stsp if (gotconfig_file == NULL) {
1183 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gotconfig_path);
1184 7c0b7f42 2020-09-24 stsp goto done;
1186 7c0b7f42 2020-09-24 stsp if (asprintf(&gotconfig,
1187 7c0b7f42 2020-09-24 stsp "remote \"%s\" {\n"
1188 7c0b7f42 2020-09-24 stsp "\tserver %s\n"
1189 7c0b7f42 2020-09-24 stsp "\tprotocol %s\n"
1191 7c0b7f42 2020-09-24 stsp "\trepository \"%s\"\n"
1194 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1195 7c0b7f42 2020-09-24 stsp port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1196 7c0b7f42 2020-09-24 stsp remote_repo_path,
1197 7c0b7f42 2020-09-24 stsp mirror_references ? "\tmirror-references yes\n" : "") == -1) {
1198 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1199 7c0b7f42 2020-09-24 stsp goto done;
1201 7c0b7f42 2020-09-24 stsp n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1202 7c0b7f42 2020-09-24 stsp if (n != strlen(gotconfig)) {
1203 7c0b7f42 2020-09-24 stsp err = got_ferror(gotconfig_file, GOT_ERR_IO);
1204 7c0b7f42 2020-09-24 stsp goto done;
1208 7c0b7f42 2020-09-24 stsp if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1209 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gotconfig_path);
1210 7c0b7f42 2020-09-24 stsp free(gotconfig_path);
1211 7c0b7f42 2020-09-24 stsp return err;
1214 7c0b7f42 2020-09-24 stsp static const struct got_error *
1215 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
1216 7c0b7f42 2020-09-24 stsp int fetch_all_branches, int mirror_references, struct got_repository *repo)
1218 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1219 7c0b7f42 2020-09-24 stsp char *gitconfig_path = NULL;
1220 7c0b7f42 2020-09-24 stsp char *gitconfig = NULL;
1221 7c0b7f42 2020-09-24 stsp FILE *gitconfig_file = NULL;
1222 7c0b7f42 2020-09-24 stsp ssize_t n;
1224 7c0b7f42 2020-09-24 stsp /* Create a config file Git can understand. */
1225 7c0b7f42 2020-09-24 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1226 7c0b7f42 2020-09-24 stsp if (gitconfig_path == NULL) {
1227 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gitconfig");
1228 7c0b7f42 2020-09-24 stsp goto done;
1230 7c0b7f42 2020-09-24 stsp gitconfig_file = fopen(gitconfig_path, "a");
1231 7c0b7f42 2020-09-24 stsp if (gitconfig_file == NULL) {
1232 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gitconfig_path);
1233 7c0b7f42 2020-09-24 stsp goto done;
1235 7c0b7f42 2020-09-24 stsp if (mirror_references) {
1236 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1237 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1238 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1239 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/*:refs/*\n"
1240 7c0b7f42 2020-09-24 stsp "\tmirror = true\n",
1241 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1242 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1243 7c0b7f42 2020-09-24 stsp goto done;
1245 7c0b7f42 2020-09-24 stsp } else if (fetch_all_branches) {
1246 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1247 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1248 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1249 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1250 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1251 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1252 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1253 7c0b7f42 2020-09-24 stsp goto done;
1256 7c0b7f42 2020-09-24 stsp const char *branchname;
1259 7c0b7f42 2020-09-24 stsp * If the server specified a default branch, use just that one.
1260 7c0b7f42 2020-09-24 stsp * Otherwise fall back to fetching all branches on next fetch.
1262 04d9a9ec 2020-09-24 stsp if (default_branch) {
1263 04d9a9ec 2020-09-24 stsp branchname = default_branch;
1264 7c0b7f42 2020-09-24 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1265 7c0b7f42 2020-09-24 stsp branchname += 11;
1267 7c0b7f42 2020-09-24 stsp branchname = "*"; /* fall back to all branches */
1268 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1269 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1270 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1271 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1272 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1273 7c0b7f42 2020-09-24 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1274 7c0b7f42 2020-09-24 stsp branchname) == -1) {
1275 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1276 7c0b7f42 2020-09-24 stsp goto done;
1279 7c0b7f42 2020-09-24 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1280 7c0b7f42 2020-09-24 stsp if (n != strlen(gitconfig)) {
1281 7c0b7f42 2020-09-24 stsp err = got_ferror(gitconfig_file, GOT_ERR_IO);
1282 7c0b7f42 2020-09-24 stsp goto done;
1285 7c0b7f42 2020-09-24 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1286 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gitconfig_path);
1287 7c0b7f42 2020-09-24 stsp free(gitconfig_path);
1288 0e4002ca 2020-03-21 stsp return err;
1291 0e4002ca 2020-03-21 stsp static const struct got_error *
1292 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
1293 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1294 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
1295 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches, struct got_repository *repo)
1297 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
1298 04d9a9ec 2020-09-24 stsp const char *default_branch = NULL;
1299 04d9a9ec 2020-09-24 stsp struct got_pathlist_entry *pe;
1302 04d9a9ec 2020-09-24 stsp * If we asked for a set of wanted branches then use the first
1303 04d9a9ec 2020-09-24 stsp * one of those.
1305 62d463ca 2020-10-20 naddy if (!TAILQ_EMPTY(wanted_branches)) {
1306 04d9a9ec 2020-09-24 stsp pe = TAILQ_FIRST(wanted_branches);
1307 04d9a9ec 2020-09-24 stsp default_branch = pe->path;
1309 04d9a9ec 2020-09-24 stsp /* First HEAD ref listed by server is the default branch. */
1310 04d9a9ec 2020-09-24 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1311 04d9a9ec 2020-09-24 stsp const char *refname = pe->path;
1312 04d9a9ec 2020-09-24 stsp const char *target = pe->data;
1314 04d9a9ec 2020-09-24 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1317 04d9a9ec 2020-09-24 stsp default_branch = target;
1322 04d9a9ec 2020-09-24 stsp /* Create got.conf(5). */
1323 04d9a9ec 2020-09-24 stsp err = create_gotconfig(proto, host, port, remote_repo_path,
1324 04d9a9ec 2020-09-24 stsp fetch_all_branches, mirror_references, repo);
1326 04d9a9ec 2020-09-24 stsp return err;
1328 04d9a9ec 2020-09-24 stsp /* Create a config file Git can understand. */
1329 04d9a9ec 2020-09-24 stsp return create_gitconfig(git_url, default_branch, fetch_all_branches,
1330 04d9a9ec 2020-09-24 stsp mirror_references, repo);
1333 04d9a9ec 2020-09-24 stsp static const struct got_error *
1334 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1336 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1337 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1338 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1339 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1340 a9c2d4c2 2020-09-24 stsp const char *repo_path;
1341 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1342 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1343 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1344 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1345 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1346 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1347 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1348 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1349 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1350 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1352 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1353 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1354 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1355 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1357 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1358 93658fb9 2020-03-18 stsp switch (ch) {
1360 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1363 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1364 4ba14133 2020-03-20 stsp optarg, NULL);
1365 4ba14133 2020-03-20 stsp if (error)
1366 4ba14133 2020-03-20 stsp return error;
1369 41b0de12 2020-03-21 stsp list_refs_only = 1;
1372 469dd726 2020-03-20 stsp mirror_references = 1;
1375 68999b92 2020-03-18 stsp if (verbosity < 0)
1376 68999b92 2020-03-18 stsp verbosity = 0;
1377 68999b92 2020-03-18 stsp else if (verbosity < 3)
1378 68999b92 2020-03-18 stsp verbosity++;
1381 68999b92 2020-03-18 stsp verbosity = -1;
1384 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1385 0e4002ca 2020-03-21 stsp optarg, NULL);
1386 0e4002ca 2020-03-21 stsp if (error)
1387 0e4002ca 2020-03-21 stsp return error;
1390 93658fb9 2020-03-18 stsp usage_clone();
1394 93658fb9 2020-03-18 stsp argc -= optind;
1395 93658fb9 2020-03-18 stsp argv += optind;
1397 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1398 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
1399 41b0de12 2020-03-21 stsp if (list_refs_only) {
1400 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1401 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
1402 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1403 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
1404 41b0de12 2020-03-21 stsp if (mirror_references)
1405 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
1406 41b0de12 2020-03-21 stsp if (verbosity == -1)
1407 ff69268e 2020-12-13 stsp option_conflict('l', 'q');
1408 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1409 ff69268e 2020-12-13 stsp option_conflict('l', 'R');
1412 93658fb9 2020-03-18 stsp uri = argv[0];
1414 9df6f38b 2020-03-18 stsp if (argc == 1)
1415 93658fb9 2020-03-18 stsp dirname = NULL;
1416 9df6f38b 2020-03-18 stsp else if (argc == 2)
1417 93658fb9 2020-03-18 stsp dirname = argv[1];
1419 93658fb9 2020-03-18 stsp usage_clone();
1421 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1422 4dbec0a8 2020-08-27 stsp &repo_name, uri);
1423 39c64a6a 2020-03-18 stsp if (error)
1424 09f63084 2020-03-20 stsp goto done;
1426 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1427 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1428 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1429 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1430 09838ffc 2020-03-18 stsp goto done;
1433 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1434 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1435 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1436 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1437 39c64a6a 2020-03-18 stsp err(1, "pledge");
1439 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1440 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1441 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1442 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1443 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1444 39c64a6a 2020-03-18 stsp err(1, "pledge");
1446 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1447 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1448 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1449 39c64a6a 2020-03-18 stsp goto done;
1451 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1452 39c64a6a 2020-03-18 stsp goto done;
1454 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1455 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1456 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1457 bb64b798 2020-03-18 stsp goto done;
1459 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1461 bb64b798 2020-03-18 stsp repo_path = dirname;
1463 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1464 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1465 2751fe64 2020-09-24 stsp if (error &&
1466 2751fe64 2020-09-24 stsp (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1467 2751fe64 2020-09-24 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1468 41b0de12 2020-03-21 stsp goto done;
1469 2751fe64 2020-09-24 stsp if (!got_path_dir_is_empty(repo_path)) {
1470 2751fe64 2020-09-24 stsp error = got_error_path(repo_path,
1471 2751fe64 2020-09-24 stsp GOT_ERR_DIR_NOT_EMPTY);
1472 41b0de12 2020-03-21 stsp goto done;
1476 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1477 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1478 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1479 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1480 ee448f5f 2020-03-18 stsp goto done;
1483 f535bcd4 2020-09-30 stsp error = apply_unveil(repo_path, 0, NULL);
1484 ee448f5f 2020-03-18 stsp if (error)
1485 ee448f5f 2020-03-18 stsp goto done;
1487 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1488 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1489 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1491 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1492 9c52365f 2020-03-21 stsp server_path, verbosity);
1493 39c64a6a 2020-03-18 stsp if (error)
1494 bb64b798 2020-03-18 stsp goto done;
1496 2751fe64 2020-09-24 stsp if (!list_refs_only) {
1497 2751fe64 2020-09-24 stsp error = got_repo_init(repo_path);
1498 2751fe64 2020-09-24 stsp if (error)
1499 2751fe64 2020-09-24 stsp goto done;
1500 2751fe64 2020-09-24 stsp error = got_repo_open(&repo, repo_path, NULL);
1501 2751fe64 2020-09-24 stsp if (error)
1502 2751fe64 2020-09-24 stsp goto done;
1505 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1506 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1507 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1508 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1509 04d9a9ec 2020-09-24 stsp fpa.create_configs = 1;
1510 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
1511 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
1512 04d9a9ec 2020-09-24 stsp fpa.config_info.symrefs = &symrefs;
1513 04d9a9ec 2020-09-24 stsp fpa.config_info.wanted_branches = &wanted_branches;
1514 04d9a9ec 2020-09-24 stsp fpa.config_info.proto = proto;
1515 04d9a9ec 2020-09-24 stsp fpa.config_info.host = host;
1516 04d9a9ec 2020-09-24 stsp fpa.config_info.port = port;
1517 04d9a9ec 2020-09-24 stsp fpa.config_info.remote_repo_path = server_path;
1518 04d9a9ec 2020-09-24 stsp fpa.config_info.git_url = git_url;
1519 04d9a9ec 2020-09-24 stsp fpa.config_info.fetch_all_branches = fetch_all_branches;
1520 04d9a9ec 2020-09-24 stsp fpa.config_info.mirror_references = mirror_references;
1521 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1522 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1523 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1524 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1525 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1526 39c64a6a 2020-03-18 stsp if (error)
1527 d9b4d0c0 2020-03-18 stsp goto done;
1529 41b0de12 2020-03-21 stsp if (list_refs_only) {
1530 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1531 41b0de12 2020-03-21 stsp goto done;
1534 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1535 39c64a6a 2020-03-18 stsp if (error)
1536 d9b4d0c0 2020-03-18 stsp goto done;
1537 68999b92 2020-03-18 stsp if (verbosity >= 0)
1538 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1539 d9b4d0c0 2020-03-18 stsp free(id_str);
1541 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1542 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1543 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1544 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1545 7ebc0570 2020-03-18 stsp char *remote_refname;
1547 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1548 0e4002ca 2020-03-21 stsp !mirror_references) {
1549 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1550 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1551 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1552 0e4002ca 2020-03-21 stsp if (error)
1553 0e4002ca 2020-03-21 stsp goto done;
1557 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1558 39c64a6a 2020-03-18 stsp if (error)
1559 d9b4d0c0 2020-03-18 stsp goto done;
1561 469dd726 2020-03-20 stsp if (mirror_references)
1564 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1567 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1568 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1569 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1570 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1571 7ebc0570 2020-03-18 stsp goto done;
1573 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1574 f298ae0f 2020-03-25 stsp free(remote_refname);
1575 39c64a6a 2020-03-18 stsp if (error)
1576 d9b4d0c0 2020-03-18 stsp goto done;
1579 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1580 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1581 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1582 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1583 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1584 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1586 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1589 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1590 39c64a6a 2020-03-18 stsp if (error) {
1591 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1592 55330abe 2020-03-20 stsp error = NULL;
1595 d9b4d0c0 2020-03-18 stsp goto done;
1598 04d9a9ec 2020-09-24 stsp error = create_symref(refname, target_ref, verbosity, repo);
1599 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1600 f298ae0f 2020-03-25 stsp if (error)
1601 f298ae0f 2020-03-25 stsp goto done;
1603 f298ae0f 2020-03-25 stsp if (mirror_references)
1606 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1609 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1610 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1611 f298ae0f 2020-03-25 stsp refname) == -1) {
1612 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1613 f298ae0f 2020-03-25 stsp goto done;
1615 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1616 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1617 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1618 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1619 f298ae0f 2020-03-25 stsp free(remote_refname);
1620 f298ae0f 2020-03-25 stsp goto done;
1622 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1623 f298ae0f 2020-03-25 stsp if (error) {
1624 f298ae0f 2020-03-25 stsp free(remote_refname);
1625 f298ae0f 2020-03-25 stsp free(remote_target);
1626 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1627 f298ae0f 2020-03-25 stsp error = NULL;
1630 f298ae0f 2020-03-25 stsp goto done;
1632 04d9a9ec 2020-09-24 stsp error = create_symref(remote_refname, target_ref,
1633 04d9a9ec 2020-09-24 stsp verbosity - 1, repo);
1634 f298ae0f 2020-03-25 stsp free(remote_refname);
1635 f298ae0f 2020-03-25 stsp free(remote_target);
1636 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1637 39c64a6a 2020-03-18 stsp if (error)
1638 d9b4d0c0 2020-03-18 stsp goto done;
1640 4ba14133 2020-03-20 stsp if (pe == NULL) {
1642 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1643 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1644 4ba14133 2020-03-20 stsp * which could be fetched instead.
1646 62d463ca 2020-10-20 naddy TAILQ_FOREACH(pe, &wanted_branches, entry) {
1647 4ba14133 2020-03-20 stsp const char *target = pe->path;
1648 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1650 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1651 4ba14133 2020-03-20 stsp if (error) {
1652 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1653 4ba14133 2020-03-20 stsp error = NULL;
1656 4ba14133 2020-03-20 stsp goto done;
1659 04d9a9ec 2020-09-24 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1660 04d9a9ec 2020-09-24 stsp verbosity, repo);
1661 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1662 4ba14133 2020-03-20 stsp if (error)
1663 4ba14133 2020-03-20 stsp goto done;
1668 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1669 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1670 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1672 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1673 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1674 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1675 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1676 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1678 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1679 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1681 bb64b798 2020-03-18 stsp got_repo_close(repo);
1682 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1683 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1684 d9b4d0c0 2020-03-18 stsp free(pe->data);
1686 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1687 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1688 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1689 d9b4d0c0 2020-03-18 stsp free(pe->data);
1691 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1692 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1693 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1694 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1695 09838ffc 2020-03-18 stsp free(proto);
1696 09838ffc 2020-03-18 stsp free(host);
1697 09838ffc 2020-03-18 stsp free(port);
1698 09838ffc 2020-03-18 stsp free(server_path);
1699 09838ffc 2020-03-18 stsp free(repo_name);
1700 bb64b798 2020-03-18 stsp free(default_destdir);
1701 b46f3e71 2020-03-18 stsp free(git_url);
1702 39c64a6a 2020-03-18 stsp return error;
1705 7848a0e1 2020-03-19 stsp static const struct got_error *
1706 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1707 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1709 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1710 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1711 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1713 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1715 7848a0e1 2020-03-19 stsp goto done;
1717 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1718 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1719 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1721 88609724 2020-03-21 stsp goto done;
1722 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1723 88609724 2020-03-21 stsp goto done;
1724 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1725 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1726 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1728 db6d8ad8 2020-03-21 stsp goto done;
1731 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1732 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1733 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1734 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1735 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1737 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1739 7848a0e1 2020-03-19 stsp goto done;
1740 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1742 e8a967e0 2020-03-21 stsp goto done;
1744 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1746 7848a0e1 2020-03-19 stsp goto done;
1747 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1748 6338a6a1 2020-03-21 stsp goto done;
1750 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1752 6338a6a1 2020-03-21 stsp goto done;
1753 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1755 6338a6a1 2020-03-21 stsp goto done;
1758 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1759 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1760 6338a6a1 2020-03-21 stsp new_id_str);
1762 7848a0e1 2020-03-19 stsp free(old_id);
1763 7848a0e1 2020-03-19 stsp free(new_id_str);
1764 7848a0e1 2020-03-19 stsp return err;
1767 f1bcca34 2020-03-25 stsp static const struct got_error *
1768 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1769 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1771 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1772 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1773 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1775 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1776 bcf34b0e 2020-03-26 stsp if (err) {
1777 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1778 bcf34b0e 2020-03-26 stsp return err;
1779 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1781 bcf34b0e 2020-03-26 stsp goto done;
1783 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1785 bcf34b0e 2020-03-26 stsp goto done;
1787 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1788 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1789 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1790 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1792 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1794 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1795 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1796 bcf34b0e 2020-03-26 stsp goto done;
1798 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1799 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1801 bcf34b0e 2020-03-26 stsp goto done;
1803 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1805 bcf34b0e 2020-03-26 stsp goto done;
1807 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1808 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1809 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1813 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1814 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1815 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1816 bcf34b0e 2020-03-26 stsp err = unlock_err;
1818 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1819 f1bcca34 2020-03-25 stsp return err;
1822 2ab43947 2020-03-18 stsp __dead static void
1823 7848a0e1 2020-03-19 stsp usage_fetch(void)
1825 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1826 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1827 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1828 13f12b09 2020-03-21 stsp getprogname());
1832 7848a0e1 2020-03-19 stsp static const struct got_error *
1833 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1834 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1836 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1837 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1838 3789fd73 2020-03-26 stsp char *id_str = NULL;
1840 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1841 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1843 3789fd73 2020-03-26 stsp return err;
1844 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1845 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1846 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1847 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1850 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1852 3789fd73 2020-03-26 stsp return err;
1853 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1855 3789fd73 2020-03-26 stsp goto done;
1857 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1859 3789fd73 2020-03-26 stsp goto done;
1860 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1861 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1862 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1867 3789fd73 2020-03-26 stsp free(id_str);
1868 3789fd73 2020-03-26 stsp return NULL;
1871 3789fd73 2020-03-26 stsp static const struct got_error *
1872 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1873 50b0790e 2020-09-11 stsp struct got_pathlist_head *their_symrefs,
1874 50b0790e 2020-09-11 stsp const struct got_remote_repo *remote,
1875 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1877 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
1878 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1879 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1880 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1881 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
1882 3789fd73 2020-03-26 stsp char *local_refname = NULL;
1884 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&my_refs);
1886 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1888 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
1890 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1892 3789fd73 2020-03-26 stsp goto done;
1894 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &my_refs, entry) {
1895 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1897 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
1898 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
1899 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
1900 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
1901 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
1903 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
1904 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
1905 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
1906 3789fd73 2020-03-26 stsp goto done;
1908 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
1912 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1913 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1916 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1919 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
1920 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1923 3789fd73 2020-03-26 stsp if (pe != NULL)
1926 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
1930 3789fd73 2020-03-26 stsp if (local_refname) {
1931 3789fd73 2020-03-26 stsp struct got_reference *ref;
1932 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
1933 3789fd73 2020-03-26 stsp if (err) {
1934 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1936 3789fd73 2020-03-26 stsp free(local_refname);
1937 3789fd73 2020-03-26 stsp local_refname = NULL;
1940 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
1943 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
1944 3789fd73 2020-03-26 stsp got_ref_close(ref);
1945 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
1946 3789fd73 2020-03-26 stsp err = unlock_err;
1950 3789fd73 2020-03-26 stsp free(local_refname);
1951 3789fd73 2020-03-26 stsp local_refname = NULL;
1955 3789fd73 2020-03-26 stsp free(remote_namespace);
1956 3789fd73 2020-03-26 stsp free(local_refname);
1957 0e4002ca 2020-03-21 stsp return err;
1960 0e4002ca 2020-03-21 stsp static const struct got_error *
1961 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1962 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1964 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1965 0e4002ca 2020-03-21 stsp char *remote_refname;
1966 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1968 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1969 0e4002ca 2020-03-21 stsp refname += 5;
1971 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1972 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1973 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1975 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1976 0e4002ca 2020-03-21 stsp if (err) {
1977 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1978 0e4002ca 2020-03-21 stsp goto done;
1979 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1981 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1982 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1983 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1984 9f142382 2020-03-21 stsp err = unlock_err;
1985 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1988 0e4002ca 2020-03-21 stsp free(remote_refname);
1989 f21ec2f0 2020-03-21 stsp return err;
1992 f21ec2f0 2020-03-21 stsp static const struct got_error *
1993 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1995 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1996 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1997 7848a0e1 2020-03-19 stsp const char *remote_name;
1998 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1999 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
2000 50b0790e 2020-09-11 stsp const struct got_remote_repo *remotes, *remote = NULL;
2001 7848a0e1 2020-03-19 stsp int nremotes;
2002 7848a0e1 2020-03-19 stsp char *id_str = NULL;
2003 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
2004 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
2005 50b0790e 2020-09-11 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2006 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2007 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
2008 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
2009 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
2010 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
2011 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
2012 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2013 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
2015 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
2016 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
2017 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
2018 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
2020 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2021 7848a0e1 2020-03-19 stsp switch (ch) {
2023 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
2026 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
2027 4ba14133 2020-03-20 stsp optarg, NULL);
2028 4ba14133 2020-03-20 stsp if (error)
2029 4ba14133 2020-03-20 stsp return error;
2032 f21ec2f0 2020-03-21 stsp delete_refs = 1;
2035 41b0de12 2020-03-21 stsp list_refs_only = 1;
2038 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
2039 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2040 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
2042 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
2045 db6d8ad8 2020-03-21 stsp replace_tags = 1;
2048 7848a0e1 2020-03-19 stsp if (verbosity < 0)
2049 7848a0e1 2020-03-19 stsp verbosity = 0;
2050 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
2051 7848a0e1 2020-03-19 stsp verbosity++;
2054 7848a0e1 2020-03-19 stsp verbosity = -1;
2057 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
2058 0e4002ca 2020-03-21 stsp optarg, NULL);
2059 0e4002ca 2020-03-21 stsp if (error)
2060 0e4002ca 2020-03-21 stsp return error;
2063 7848a0e1 2020-03-19 stsp usage_fetch();
2067 7848a0e1 2020-03-19 stsp argc -= optind;
2068 7848a0e1 2020-03-19 stsp argv += optind;
2070 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2071 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
2072 41b0de12 2020-03-21 stsp if (list_refs_only) {
2073 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
2074 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
2075 ff69268e 2020-12-13 stsp if (fetch_all_branches)
2076 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
2077 f21ec2f0 2020-03-21 stsp if (delete_refs)
2078 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
2079 41b0de12 2020-03-21 stsp if (verbosity == -1)
2080 ff69268e 2020-12-13 stsp option_conflict('l', 'q');
2083 7848a0e1 2020-03-19 stsp if (argc == 0)
2084 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2085 7848a0e1 2020-03-19 stsp else if (argc == 1)
2086 7848a0e1 2020-03-19 stsp remote_name = argv[0];
2088 7848a0e1 2020-03-19 stsp usage_fetch();
2090 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
2091 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
2092 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
2093 7848a0e1 2020-03-19 stsp goto done;
2096 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2097 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
2098 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2099 7848a0e1 2020-03-19 stsp goto done;
2101 7848a0e1 2020-03-19 stsp error = NULL;
2102 7848a0e1 2020-03-19 stsp if (worktree) {
2103 7848a0e1 2020-03-19 stsp repo_path =
2104 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
2105 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2106 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2107 7848a0e1 2020-03-19 stsp if (error)
2108 7848a0e1 2020-03-19 stsp goto done;
2110 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
2111 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2112 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2113 7848a0e1 2020-03-19 stsp goto done;
2118 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
2119 7848a0e1 2020-03-19 stsp if (error)
2120 7848a0e1 2020-03-19 stsp goto done;
2122 50b0790e 2020-09-11 stsp if (worktree) {
2123 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
2124 50b0790e 2020-09-11 stsp if (worktree_conf) {
2125 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2126 50b0790e 2020-09-11 stsp worktree_conf);
2127 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2128 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2129 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2135 50b0790e 2020-09-11 stsp if (remote == NULL) {
2136 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
2137 50b0790e 2020-09-11 stsp if (repo_conf) {
2138 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2139 50b0790e 2020-09-11 stsp repo_conf);
2140 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2141 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2142 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2148 50b0790e 2020-09-11 stsp if (remote == NULL) {
2149 257add31 2020-09-09 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2150 257add31 2020-09-09 stsp for (i = 0; i < nremotes; i++) {
2151 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2152 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2157 50b0790e 2020-09-11 stsp if (remote == NULL) {
2158 50b0790e 2020-09-11 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2159 50b0790e 2020-09-11 stsp goto done;
2162 b8adfa55 2020-09-25 stsp if (TAILQ_EMPTY(&wanted_branches) && remote->nbranches > 0) {
2163 b8adfa55 2020-09-25 stsp for (i = 0; i < remote->nbranches; i++) {
2164 b8adfa55 2020-09-25 stsp got_pathlist_append(&wanted_branches,
2165 b8adfa55 2020-09-25 stsp remote->branches[i], NULL);
2170 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2171 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
2172 7848a0e1 2020-03-19 stsp if (error)
2173 7848a0e1 2020-03-19 stsp goto done;
2175 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
2176 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2177 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2178 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
2179 7848a0e1 2020-03-19 stsp err(1, "pledge");
2181 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
2182 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
2183 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2184 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2185 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
2186 7848a0e1 2020-03-19 stsp err(1, "pledge");
2188 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
2189 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
2190 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2191 7848a0e1 2020-03-19 stsp goto done;
2193 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2194 7848a0e1 2020-03-19 stsp goto done;
2197 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2198 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2199 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
2200 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
2201 7848a0e1 2020-03-19 stsp goto done;
2204 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2205 7848a0e1 2020-03-19 stsp if (error)
2206 7848a0e1 2020-03-19 stsp goto done;
2208 f79e6490 2020-04-19 stsp if (verbosity >= 0)
2209 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2210 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
2212 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2213 9c52365f 2020-03-21 stsp server_path, verbosity);
2214 7848a0e1 2020-03-19 stsp if (error)
2215 7848a0e1 2020-03-19 stsp goto done;
2217 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
2218 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
2219 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
2220 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
2221 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
2222 04d9a9ec 2020-09-24 stsp fpa.create_configs = 0;
2223 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
2224 04d9a9ec 2020-09-24 stsp memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2225 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2226 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
2227 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2228 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
2229 7848a0e1 2020-03-19 stsp if (error)
2230 7848a0e1 2020-03-19 stsp goto done;
2232 41b0de12 2020-03-21 stsp if (list_refs_only) {
2233 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
2234 41b0de12 2020-03-21 stsp goto done;
2237 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
2238 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
2239 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
2240 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
2241 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
2242 984065c8 2020-03-19 stsp if (error)
2243 984065c8 2020-03-19 stsp goto done;
2244 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
2245 984065c8 2020-03-19 stsp free(id_str);
2246 984065c8 2020-03-19 stsp id_str = NULL;
2249 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
2250 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2251 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
2252 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
2253 7848a0e1 2020-03-19 stsp struct got_reference *ref;
2254 7848a0e1 2020-03-19 stsp char *remote_refname;
2256 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
2257 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
2258 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
2259 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
2260 0e4002ca 2020-03-21 stsp if (error)
2261 0e4002ca 2020-03-21 stsp goto done;
2265 1510c839 2020-03-20 stsp if (remote->mirror_references ||
2266 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
2267 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2268 7848a0e1 2020-03-19 stsp if (error) {
2269 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2270 7848a0e1 2020-03-19 stsp goto done;
2271 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2273 7848a0e1 2020-03-19 stsp if (error)
2274 7848a0e1 2020-03-19 stsp goto done;
2276 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2277 db6d8ad8 2020-03-21 stsp verbosity, repo);
2278 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2279 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2280 9f142382 2020-03-21 stsp error = unlock_err;
2281 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2282 7848a0e1 2020-03-19 stsp if (error)
2283 7848a0e1 2020-03-19 stsp goto done;
2285 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
2286 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2287 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
2288 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
2289 7848a0e1 2020-03-19 stsp goto done;
2292 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
2293 7848a0e1 2020-03-19 stsp if (error) {
2294 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2295 7848a0e1 2020-03-19 stsp goto done;
2296 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
2297 688f11b3 2020-03-21 stsp verbosity, repo);
2298 7848a0e1 2020-03-19 stsp if (error)
2299 7848a0e1 2020-03-19 stsp goto done;
2301 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2302 db6d8ad8 2020-03-21 stsp verbosity, repo);
2303 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2304 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2305 9f142382 2020-03-21 stsp error = unlock_err;
2306 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2307 7848a0e1 2020-03-19 stsp if (error)
2308 7848a0e1 2020-03-19 stsp goto done;
2311 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2312 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2313 2ec30c80 2020-03-20 stsp if (error) {
2314 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2315 2ec30c80 2020-03-20 stsp goto done;
2316 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2318 2ec30c80 2020-03-20 stsp if (error)
2319 2ec30c80 2020-03-20 stsp goto done;
2321 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2322 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2323 9f142382 2020-03-21 stsp error = unlock_err;
2324 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2328 f1bcca34 2020-03-25 stsp if (delete_refs) {
2329 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2330 3789fd73 2020-03-26 stsp verbosity, repo);
2331 f1bcca34 2020-03-25 stsp if (error)
2332 f1bcca34 2020-03-25 stsp goto done;
2335 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2336 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2337 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2338 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2339 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2340 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2341 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2343 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2346 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2349 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2350 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2351 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2352 f1bcca34 2020-03-25 stsp goto done;
2354 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2355 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2356 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2357 f1bcca34 2020-03-25 stsp free(remote_refname);
2358 f1bcca34 2020-03-25 stsp goto done;
2361 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2363 f1bcca34 2020-03-25 stsp if (error) {
2364 f1bcca34 2020-03-25 stsp free(remote_refname);
2365 f1bcca34 2020-03-25 stsp free(remote_target);
2366 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2367 f1bcca34 2020-03-25 stsp error = NULL;
2370 f1bcca34 2020-03-25 stsp goto done;
2372 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2373 f1bcca34 2020-03-25 stsp verbosity, repo);
2374 f1bcca34 2020-03-25 stsp free(remote_refname);
2375 f1bcca34 2020-03-25 stsp free(remote_target);
2376 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2377 f1bcca34 2020-03-25 stsp if (error)
2378 f1bcca34 2020-03-25 stsp goto done;
2382 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2383 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2384 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2385 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2386 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2388 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2389 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2391 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2392 7848a0e1 2020-03-19 stsp if (worktree)
2393 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2394 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2395 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2396 7848a0e1 2020-03-19 stsp free(pe->data);
2398 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2399 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2400 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2401 7848a0e1 2020-03-19 stsp free(pe->data);
2403 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2404 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2405 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2406 7848a0e1 2020-03-19 stsp free(id_str);
2407 7848a0e1 2020-03-19 stsp free(cwd);
2408 7848a0e1 2020-03-19 stsp free(repo_path);
2409 7848a0e1 2020-03-19 stsp free(pack_hash);
2410 7848a0e1 2020-03-19 stsp free(proto);
2411 7848a0e1 2020-03-19 stsp free(host);
2412 7848a0e1 2020-03-19 stsp free(port);
2413 7848a0e1 2020-03-19 stsp free(server_path);
2414 7848a0e1 2020-03-19 stsp free(repo_name);
2415 7848a0e1 2020-03-19 stsp return error;
2419 7848a0e1 2020-03-19 stsp __dead static void
2420 2ab43947 2020-03-18 stsp usage_checkout(void)
2422 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2423 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2427 2ab43947 2020-03-18 stsp static void
2428 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2430 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2431 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2432 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2433 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2434 2ab43947 2020-03-18 stsp getprogname());
2437 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2438 2ab43947 2020-03-18 stsp const char *worktree_path;
2439 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2442 2ab43947 2020-03-18 stsp static const struct got_error *
2443 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2445 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2447 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2448 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2449 2ab43947 2020-03-18 stsp return NULL;
2451 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2452 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2453 2ab43947 2020-03-18 stsp return NULL;
2456 2ab43947 2020-03-18 stsp while (path[0] == '/')
2459 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2460 2ab43947 2020-03-18 stsp return NULL;
2463 2ab43947 2020-03-18 stsp static const struct got_error *
2464 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2466 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2467 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2468 2ab43947 2020-03-18 stsp return NULL;
2471 2ab43947 2020-03-18 stsp static const struct got_error *
2472 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2473 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2474 2ab43947 2020-03-18 stsp struct got_repository *repo)
2476 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2477 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2479 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2480 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2482 2ab43947 2020-03-18 stsp return err;
2484 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2485 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2488 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2489 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2491 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2493 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2501 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2502 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2503 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2505 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2506 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2507 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2508 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2509 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2510 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2512 2ab43947 2020-03-18 stsp free(yca_id);
2513 2ab43947 2020-03-18 stsp return NULL;
2516 2ab43947 2020-03-18 stsp static const struct got_error *
2517 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2518 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2519 2ab43947 2020-03-18 stsp struct got_repository *repo)
2521 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2522 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2523 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2524 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2526 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2528 2ab43947 2020-03-18 stsp goto done;
2530 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2531 2ab43947 2020-03-18 stsp is_same_branch = 1;
2532 2ab43947 2020-03-18 stsp goto done;
2534 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2535 2ab43947 2020-03-18 stsp is_same_branch = 1;
2536 2ab43947 2020-03-18 stsp goto done;
2539 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2541 2ab43947 2020-03-18 stsp goto done;
2543 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2544 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2546 2ab43947 2020-03-18 stsp goto done;
2548 2ab43947 2020-03-18 stsp for (;;) {
2549 2ab43947 2020-03-18 stsp struct got_object_id *id;
2550 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2551 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2552 2ab43947 2020-03-18 stsp if (err) {
2553 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2554 2ab43947 2020-03-18 stsp err = NULL;
2559 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2561 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2562 2ab43947 2020-03-18 stsp is_same_branch = 1;
2568 2ab43947 2020-03-18 stsp if (graph)
2569 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2570 2ab43947 2020-03-18 stsp free(head_commit_id);
2571 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2572 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2573 2ab43947 2020-03-18 stsp return err;
2576 4ed7e80c 2018-05-20 stsp static const struct got_error *
2577 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2579 4b6c9460 2020-03-05 stsp static char msg[512];
2580 4b6c9460 2020-03-05 stsp const char *branch_name;
2582 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2583 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2585 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2587 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2588 4b6c9460 2020-03-05 stsp branch_name += 11;
2590 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2591 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2592 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2593 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2594 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2595 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2597 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2600 4b6c9460 2020-03-05 stsp static const struct got_error *
2601 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2603 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2604 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2605 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2606 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2607 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2608 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2609 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2610 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2611 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2612 f0207f6a 2020-10-19 stsp char *cwd = NULL;
2613 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2614 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2615 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2617 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2619 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2620 0bb8a95e 2018-03-12 stsp switch (ch) {
2622 08573d5b 2019-05-14 stsp branch_name = optarg;
2625 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2626 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2627 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2630 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2633 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2636 2deda0b9 2019-03-07 stsp usage_checkout();
2637 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2641 0bb8a95e 2018-03-12 stsp argc -= optind;
2642 0bb8a95e 2018-03-12 stsp argv += optind;
2644 6715a751 2018-03-16 stsp #ifndef PROFILE
2645 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2646 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2647 c09a553d 2018-03-12 stsp err(1, "pledge");
2649 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2650 c47340da 2020-09-20 stsp char *base, *dotgit;
2651 f0207f6a 2020-10-19 stsp const char *path;
2652 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2653 76089277 2018-04-01 stsp if (repo_path == NULL)
2654 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2655 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2656 76089277 2018-04-01 stsp if (cwd == NULL) {
2657 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2658 76089277 2018-04-01 stsp goto done;
2660 c47340da 2020-09-20 stsp if (path_prefix[0])
2661 f0207f6a 2020-10-19 stsp path = path_prefix;
2663 f0207f6a 2020-10-19 stsp path = repo_path;
2664 f0207f6a 2020-10-19 stsp error = got_path_basename(&base, path);
2665 f0207f6a 2020-10-19 stsp if (error)
2666 c47340da 2020-09-20 stsp goto done;
2667 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2668 c09a553d 2018-03-12 stsp if (dotgit)
2669 c09a553d 2018-03-12 stsp *dotgit = '\0';
2670 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2671 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2672 f0207f6a 2020-10-19 stsp free(base);
2673 76089277 2018-04-01 stsp goto done;
2675 f0207f6a 2020-10-19 stsp free(base);
2676 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2677 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2678 76089277 2018-04-01 stsp if (repo_path == NULL) {
2679 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2680 76089277 2018-04-01 stsp goto done;
2682 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2683 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2684 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2685 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2687 b4b3a7dd 2019-07-22 stsp goto done;
2689 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2690 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2691 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2692 b4b3a7dd 2019-07-22 stsp goto done;
2696 c09a553d 2018-03-12 stsp usage_checkout();
2698 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2699 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2701 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2702 c09a553d 2018-03-12 stsp if (error != NULL)
2703 c02c541e 2019-03-29 stsp goto done;
2705 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2706 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2707 c530dc23 2019-07-23 stsp if (error) {
2708 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2709 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2710 c530dc23 2019-07-23 stsp goto done;
2711 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2712 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2713 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2714 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2715 c530dc23 2019-07-23 stsp goto done;
2719 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2720 c02c541e 2019-03-29 stsp if (error)
2721 c09a553d 2018-03-12 stsp goto done;
2723 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2724 c09a553d 2018-03-12 stsp if (error != NULL)
2725 c09a553d 2018-03-12 stsp goto done;
2727 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2728 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2729 c09a553d 2018-03-12 stsp goto done;
2731 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2732 c09a553d 2018-03-12 stsp if (error != NULL)
2733 c09a553d 2018-03-12 stsp goto done;
2735 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2736 e5dc7198 2018-12-29 stsp path_prefix);
2737 e5dc7198 2018-12-29 stsp if (error != NULL)
2738 e5dc7198 2018-12-29 stsp goto done;
2739 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2740 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2741 49520a32 2018-12-29 stsp goto done;
2744 8069f636 2019-01-12 stsp if (commit_id_str) {
2745 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2746 84de9106 2020-12-26 stsp struct got_reflist_head refs;
2747 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
2748 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2750 84de9106 2020-12-26 stsp if (error)
2751 84de9106 2020-12-26 stsp goto done;
2752 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2753 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2754 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
2755 30837e32 2019-07-25 stsp if (error)
2756 8069f636 2019-01-12 stsp goto done;
2757 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2758 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2759 8069f636 2019-01-12 stsp if (error != NULL) {
2760 8069f636 2019-01-12 stsp free(commit_id);
2761 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2762 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2763 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2765 8069f636 2019-01-12 stsp goto done;
2767 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2768 4b6c9460 2020-03-05 stsp if (error) {
2769 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2770 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2771 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2773 45d344f6 2019-05-14 stsp goto done;
2775 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2776 8069f636 2019-01-12 stsp commit_id);
2777 8069f636 2019-01-12 stsp free(commit_id);
2778 8069f636 2019-01-12 stsp if (error)
2779 8069f636 2019-01-12 stsp goto done;
2782 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2783 f2ea84fa 2019-07-27 stsp if (error)
2784 f2ea84fa 2019-07-27 stsp goto done;
2785 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2786 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2787 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2788 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2789 c09a553d 2018-03-12 stsp if (error != NULL)
2790 c09a553d 2018-03-12 stsp goto done;
2792 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2793 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2794 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2796 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2797 8069f636 2019-01-12 stsp free(commit_id_str);
2798 76089277 2018-04-01 stsp free(repo_path);
2799 507dc3bb 2018-12-29 stsp free(worktree_path);
2800 c47340da 2020-09-20 stsp free(cwd);
2801 507dc3bb 2018-12-29 stsp return error;
2804 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2805 9627c110 2020-04-18 stsp int did_something;
2806 9627c110 2020-04-18 stsp int conflicts;
2807 9627c110 2020-04-18 stsp int obstructed;
2808 9627c110 2020-04-18 stsp int not_updated;
2812 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2814 9627c110 2020-04-18 stsp if (!upa->did_something)
2817 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2818 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2819 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2820 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2821 9627c110 2020-04-18 stsp upa->obstructed);
2822 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2823 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2824 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2827 507dc3bb 2018-12-29 stsp __dead static void
2828 507dc3bb 2018-12-29 stsp usage_update(void)
2830 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2831 507dc3bb 2018-12-29 stsp getprogname());
2835 1ee397ad 2019-07-12 stsp static const struct got_error *
2836 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2838 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2840 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2841 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2842 1ee397ad 2019-07-12 stsp return NULL;
2844 9627c110 2020-04-18 stsp upa->did_something = 1;
2846 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2847 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2848 1ee397ad 2019-07-12 stsp return NULL;
2850 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2851 9627c110 2020-04-18 stsp upa->conflicts++;
2852 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2853 9627c110 2020-04-18 stsp upa->obstructed++;
2854 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2855 9627c110 2020-04-18 stsp upa->not_updated++;
2857 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2859 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2860 1ee397ad 2019-07-12 stsp return NULL;
2863 be7061eb 2018-12-30 stsp static const struct got_error *
2864 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2865 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2866 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2868 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2869 a1fb16d8 2019-05-24 stsp char *base_id_str;
2870 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2872 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2873 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2874 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2875 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2876 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2877 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2878 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2881 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2882 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2883 a1fb16d8 2019-05-24 stsp if (err) {
2884 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2885 a1fb16d8 2019-05-24 stsp return err;
2886 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2888 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2889 a1fb16d8 2019-05-24 stsp return NULL;
2891 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2892 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2893 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2895 a1fb16d8 2019-05-24 stsp return err;
2896 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2897 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2898 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2899 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2900 0ebf8283 2019-07-24 stsp return NULL;
2903 0ebf8283 2019-07-24 stsp static const struct got_error *
2904 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2906 0ebf8283 2019-07-24 stsp const struct got_error *err;
2907 0ebf8283 2019-07-24 stsp int in_progress;
2909 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2911 0ebf8283 2019-07-24 stsp return err;
2912 0ebf8283 2019-07-24 stsp if (in_progress)
2913 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2915 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2917 0ebf8283 2019-07-24 stsp return err;
2918 0ebf8283 2019-07-24 stsp if (in_progress)
2919 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2921 a1fb16d8 2019-05-24 stsp return NULL;
2924 a5edda0a 2019-07-27 stsp static const struct got_error *
2925 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2926 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2928 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2929 a5edda0a 2019-07-27 stsp char *path;
2932 a5edda0a 2019-07-27 stsp if (argc == 0) {
2933 a5edda0a 2019-07-27 stsp path = strdup("");
2934 a5edda0a 2019-07-27 stsp if (path == NULL)
2935 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2936 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2939 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2940 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2943 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2944 a5edda0a 2019-07-27 stsp if (err) {
2945 a5edda0a 2019-07-27 stsp free(path);
2950 a5edda0a 2019-07-27 stsp return err;
2953 a1fb16d8 2019-05-24 stsp static const struct got_error *
2954 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2955 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2957 fa51e947 2020-03-27 stsp const struct got_error *err;
2958 fa51e947 2020-03-27 stsp struct got_repository *repo;
2959 fa51e947 2020-03-27 stsp static char msg[512];
2961 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2963 fa51e947 2020-03-27 stsp return orig_err;
2965 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2966 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2967 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2968 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2969 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2970 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2971 fa51e947 2020-03-27 stsp got_repo_close(repo);
2972 fa51e947 2020-03-27 stsp return err;
2975 fa51e947 2020-03-27 stsp static const struct got_error *
2976 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2978 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2979 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2980 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2981 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2982 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2983 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2984 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2985 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2986 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2987 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2989 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
2991 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2993 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2994 507dc3bb 2018-12-29 stsp switch (ch) {
2996 024e9686 2019-05-14 stsp branch_name = optarg;
2999 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
3000 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
3001 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3004 2deda0b9 2019-03-07 stsp usage_update();
3005 507dc3bb 2018-12-29 stsp /* NOTREACHED */
3009 507dc3bb 2018-12-29 stsp argc -= optind;
3010 507dc3bb 2018-12-29 stsp argv += optind;
3012 507dc3bb 2018-12-29 stsp #ifndef PROFILE
3013 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3014 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
3015 507dc3bb 2018-12-29 stsp err(1, "pledge");
3017 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
3018 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
3019 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3020 c4cdcb68 2019-04-03 stsp goto done;
3022 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
3023 fa51e947 2020-03-27 stsp if (error) {
3024 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3025 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
3026 fa51e947 2020-03-27 stsp worktree_path);
3027 7d5807f4 2019-07-11 stsp goto done;
3030 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
3031 f2ea84fa 2019-07-27 stsp if (error)
3032 f2ea84fa 2019-07-27 stsp goto done;
3034 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3036 507dc3bb 2018-12-29 stsp if (error != NULL)
3037 507dc3bb 2018-12-29 stsp goto done;
3039 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3040 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3041 087fb88c 2019-08-04 stsp if (error)
3042 087fb88c 2019-08-04 stsp goto done;
3044 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3045 0266afb7 2019-01-04 stsp if (error)
3046 0266afb7 2019-01-04 stsp goto done;
3048 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3049 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
3050 024e9686 2019-05-14 stsp if (error != NULL)
3051 024e9686 2019-05-14 stsp goto done;
3052 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
3053 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3054 9c4b8182 2019-01-02 stsp if (error != NULL)
3055 9c4b8182 2019-01-02 stsp goto done;
3056 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3057 507dc3bb 2018-12-29 stsp if (error != NULL)
3058 507dc3bb 2018-12-29 stsp goto done;
3060 84de9106 2020-12-26 stsp struct got_reflist_head refs;
3061 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3062 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3064 84de9106 2020-12-26 stsp if (error)
3065 84de9106 2020-12-26 stsp goto done;
3066 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3067 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3068 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
3069 04f57cb3 2019-07-25 stsp free(commit_id_str);
3070 bb787f09 2019-07-25 stsp commit_id_str = NULL;
3071 30837e32 2019-07-25 stsp if (error)
3072 a297e751 2019-07-11 stsp goto done;
3073 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
3074 a297e751 2019-07-11 stsp if (error)
3075 507dc3bb 2018-12-29 stsp goto done;
3078 a1fb16d8 2019-05-24 stsp if (branch_name) {
3079 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
3080 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
3081 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
3083 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3084 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
3085 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
3086 024e9686 2019-05-14 stsp goto done;
3088 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
3089 024e9686 2019-05-14 stsp if (error)
3090 024e9686 2019-05-14 stsp goto done;
3091 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
3093 a367ff0f 2019-05-14 stsp free(head_commit_id);
3094 024e9686 2019-05-14 stsp if (error != NULL)
3095 024e9686 2019-05-14 stsp goto done;
3096 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3097 a367ff0f 2019-05-14 stsp if (error)
3098 a367ff0f 2019-05-14 stsp goto done;
3099 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
3100 024e9686 2019-05-14 stsp if (error)
3101 024e9686 2019-05-14 stsp goto done;
3103 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
3104 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3105 a367ff0f 2019-05-14 stsp if (error != NULL) {
3106 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
3107 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
3108 024e9686 2019-05-14 stsp goto done;
3110 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3111 a367ff0f 2019-05-14 stsp if (error)
3112 a367ff0f 2019-05-14 stsp goto done;
3115 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3116 507dc3bb 2018-12-29 stsp commit_id) != 0) {
3117 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3118 507dc3bb 2018-12-29 stsp commit_id);
3119 507dc3bb 2018-12-29 stsp if (error)
3120 507dc3bb 2018-12-29 stsp goto done;
3123 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
3124 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3125 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
3126 507dc3bb 2018-12-29 stsp if (error != NULL)
3127 507dc3bb 2018-12-29 stsp goto done;
3129 9627c110 2020-04-18 stsp if (upa.did_something)
3130 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
3132 784955db 2019-01-12 stsp printf("Already up-to-date\n");
3133 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
3135 c09a553d 2018-03-12 stsp free(worktree_path);
3136 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3137 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
3138 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3139 507dc3bb 2018-12-29 stsp free(commit_id);
3140 9c4b8182 2019-01-02 stsp free(commit_id_str);
3141 c09a553d 2018-03-12 stsp return error;
3144 f42b1b34 2018-03-12 stsp static const struct got_error *
3145 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3146 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3147 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3149 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
3150 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3152 44392932 2019-08-25 stsp if (blob_id1) {
3153 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3155 44392932 2019-08-25 stsp goto done;
3158 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3160 44392932 2019-08-25 stsp goto done;
3162 44392932 2019-08-25 stsp while (path[0] == '/')
3164 fe621944 2020-11-10 stsp err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3165 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, stdout);
3167 44392932 2019-08-25 stsp if (blob1)
3168 44392932 2019-08-25 stsp got_object_blob_close(blob1);
3169 44392932 2019-08-25 stsp got_object_blob_close(blob2);
3170 44392932 2019-08-25 stsp return err;
3173 44392932 2019-08-25 stsp static const struct got_error *
3174 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3175 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3176 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3178 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3179 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3180 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
3182 44392932 2019-08-25 stsp if (tree_id1) {
3183 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3185 44392932 2019-08-25 stsp goto done;
3188 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3190 0f2b3dca 2018-12-22 stsp goto done;
3192 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
3193 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3194 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
3195 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3196 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
3197 fe621944 2020-11-10 stsp arg.nlines = 0;
3198 44392932 2019-08-25 stsp while (path[0] == '/')
3200 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3201 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3203 79109fed 2018-03-27 stsp if (tree1)
3204 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3205 366e0a5f 2019-10-10 stsp if (tree2)
3206 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3207 44392932 2019-08-25 stsp return err;
3210 44392932 2019-08-25 stsp static const struct got_error *
3211 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3212 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3214 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3215 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3216 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3217 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3219 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3220 0208f208 2020-05-05 stsp if (qid != NULL) {
3221 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3222 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3225 0208f208 2020-05-05 stsp return err;
3227 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3228 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3232 0208f208 2020-05-05 stsp if (tree_id1) {
3233 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3235 0208f208 2020-05-05 stsp goto done;
3238 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3239 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3241 0208f208 2020-05-05 stsp goto done;
3243 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3244 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3246 0208f208 2020-05-05 stsp if (tree1)
3247 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3248 0208f208 2020-05-05 stsp if (tree2)
3249 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3250 0208f208 2020-05-05 stsp return err;
3253 0208f208 2020-05-05 stsp static const struct got_error *
3254 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3255 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3257 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3258 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3259 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3260 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3261 44392932 2019-08-25 stsp struct got_object_qid *qid;
3263 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3264 44392932 2019-08-25 stsp if (qid != NULL) {
3265 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3268 44392932 2019-08-25 stsp return err;
3271 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3272 44392932 2019-08-25 stsp int obj_type;
3273 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3275 44392932 2019-08-25 stsp goto done;
3276 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3277 44392932 2019-08-25 stsp if (err) {
3278 44392932 2019-08-25 stsp free(obj_id2);
3279 44392932 2019-08-25 stsp goto done;
3281 44392932 2019-08-25 stsp if (pcommit) {
3282 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3283 44392932 2019-08-25 stsp qid->id, path);
3284 44392932 2019-08-25 stsp if (err) {
3285 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3286 2e8c69d1 2020-05-04 stsp free(obj_id2);
3287 2e8c69d1 2020-05-04 stsp goto done;
3290 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3291 2e8c69d1 2020-05-04 stsp if (err) {
3292 2e8c69d1 2020-05-04 stsp free(obj_id2);
3293 2e8c69d1 2020-05-04 stsp goto done;
3297 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3298 44392932 2019-08-25 stsp if (err) {
3299 44392932 2019-08-25 stsp free(obj_id2);
3300 44392932 2019-08-25 stsp goto done;
3302 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3303 44392932 2019-08-25 stsp switch (obj_type) {
3304 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3305 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3306 64453f7e 2020-11-21 stsp 0, 0, repo);
3308 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3309 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3310 64453f7e 2020-11-21 stsp 0, 0, repo);
3313 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3316 44392932 2019-08-25 stsp free(obj_id1);
3317 44392932 2019-08-25 stsp free(obj_id2);
3319 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3320 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3322 44392932 2019-08-25 stsp goto done;
3323 579bd556 2020-10-24 stsp if (pcommit) {
3324 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3325 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3327 579bd556 2020-10-24 stsp goto done;
3329 64453f7e 2020-11-21 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3331 64453f7e 2020-11-21 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3335 0f2b3dca 2018-12-22 stsp free(id_str1);
3336 0f2b3dca 2018-12-22 stsp free(id_str2);
3337 44392932 2019-08-25 stsp if (pcommit)
3338 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3339 79109fed 2018-03-27 stsp return err;
3342 4bb494d5 2018-06-16 stsp static char *
3343 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3345 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3346 09867e48 2019-08-13 stsp char *p, *s;
3348 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3349 09867e48 2019-08-13 stsp if (tm == NULL)
3350 09867e48 2019-08-13 stsp return NULL;
3351 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3352 09867e48 2019-08-13 stsp if (s == NULL)
3353 09867e48 2019-08-13 stsp return NULL;
3354 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3356 6c281f94 2018-06-11 stsp *p = '\0';
3360 6841bf13 2019-11-29 kn static const struct got_error *
3361 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3362 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3364 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3365 6841bf13 2019-11-29 kn regmatch_t regmatch;
3366 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3368 6841bf13 2019-11-29 kn *have_match = 0;
3370 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3374 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3378 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3379 6841bf13 2019-11-29 kn *have_match = 1;
3381 6841bf13 2019-11-29 kn free(id_str);
3382 6841bf13 2019-11-29 kn free(logmsg);
3386 0208f208 2020-05-05 stsp static void
3387 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3388 0208f208 2020-05-05 stsp regex_t *regex)
3390 0208f208 2020-05-05 stsp regmatch_t regmatch;
3391 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3393 0208f208 2020-05-05 stsp *have_match = 0;
3395 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3396 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3397 0208f208 2020-05-05 stsp *have_match = 1;
3403 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3405 79109fed 2018-03-27 stsp static const struct got_error *
3406 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3407 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path,
3408 0208f208 2020-05-05 stsp struct got_pathlist_head *changed_paths, int show_patch,
3409 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3411 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3412 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3413 6c281f94 2018-06-11 stsp char datebuf[26];
3414 45d799e2 2018-12-23 stsp time_t committer_time;
3415 45d799e2 2018-12-23 stsp const char *author, *committer;
3416 199a4027 2019-02-02 stsp char *refs_str = NULL;
3417 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3419 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
3421 199a4027 2019-02-02 stsp const char *name;
3422 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3423 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3426 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3427 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3429 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3430 199a4027 2019-02-02 stsp name += 5;
3431 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3433 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3434 e34f9ed6 2019-02-02 stsp name += 6;
3435 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3436 141c2bff 2019-02-04 stsp name += 8;
3437 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3438 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3441 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3443 48cae60d 2020-09-22 stsp return err;
3444 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3445 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3446 5d844a1e 2019-08-13 stsp if (err) {
3447 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3448 48cae60d 2020-09-22 stsp free(ref_id);
3449 5d844a1e 2019-08-13 stsp return err;
3451 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3452 5d844a1e 2019-08-13 stsp err = NULL;
3453 5d844a1e 2019-08-13 stsp tag = NULL;
3456 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3457 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3458 48cae60d 2020-09-22 stsp free(ref_id);
3460 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3461 a436ad14 2019-08-13 stsp if (cmp != 0)
3463 199a4027 2019-02-02 stsp s = refs_str;
3464 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3465 199a4027 2019-02-02 stsp name) == -1) {
3466 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3468 34ca4898 2019-08-13 stsp return err;
3472 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3474 8bf5b3c9 2018-03-17 stsp return err;
3476 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3477 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3478 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3479 832c249c 2018-06-10 stsp free(id_str);
3480 d3d493d7 2019-02-21 stsp id_str = NULL;
3481 d3d493d7 2019-02-21 stsp free(refs_str);
3482 d3d493d7 2019-02-21 stsp refs_str = NULL;
3483 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3484 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3485 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3486 09867e48 2019-08-13 stsp if (datestr)
3487 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3488 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3489 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3490 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3491 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3492 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3493 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3494 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3495 3fe1abad 2018-06-10 stsp int n = 1;
3496 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3497 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3498 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3500 a0603db2 2018-06-10 stsp return err;
3501 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3502 a0603db2 2018-06-10 stsp free(id_str);
3506 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3508 5943eee2 2019-08-13 stsp return err;
3510 621015ac 2018-07-23 stsp logmsg = logmsg0;
3512 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3514 832c249c 2018-06-10 stsp printf(" %s\n", line);
3515 832c249c 2018-06-10 stsp } while (line);
3516 621015ac 2018-07-23 stsp free(logmsg0);
3518 0208f208 2020-05-05 stsp if (changed_paths) {
3519 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3520 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3521 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3522 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3524 0208f208 2020-05-05 stsp printf("\n");
3526 971751ac 2018-03-27 stsp if (show_patch) {
3527 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3528 971751ac 2018-03-27 stsp if (err == 0)
3529 971751ac 2018-03-27 stsp printf("\n");
3532 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3533 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3534 07862c20 2018-09-15 stsp return err;
3537 f42b1b34 2018-03-12 stsp static const struct got_error *
3538 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3539 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3540 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3541 0208f208 2020-05-05 stsp int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3543 f42b1b34 2018-03-12 stsp const struct got_error *err;
3544 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3545 6841bf13 2019-11-29 kn regex_t regex;
3546 6841bf13 2019-11-29 kn int have_match;
3547 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3548 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3549 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3550 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3551 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3553 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3554 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3556 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3557 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3558 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3560 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3562 f42b1b34 2018-03-12 stsp return err;
3563 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3564 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3566 fcc85cad 2018-07-22 stsp goto done;
3568 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3570 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3573 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3574 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3575 372ccdbb 2018-06-10 stsp if (err) {
3576 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3577 9ba79e04 2018-06-11 stsp err = NULL;
3580 b43fbaa0 2018-06-11 stsp if (id == NULL)
3583 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3587 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3588 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3593 6841bf13 2019-11-29 kn if (search_pattern) {
3594 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3596 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3599 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3600 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3601 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3602 6841bf13 2019-11-29 kn if (have_match == 0) {
3603 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3604 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3605 0208f208 2020-05-05 stsp free((char *)pe->path);
3606 0208f208 2020-05-05 stsp free(pe->data);
3608 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3613 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3614 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3617 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3618 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3620 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3621 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3622 0208f208 2020-05-05 stsp show_patch, diff_context, refs);
3623 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3627 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3628 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3631 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3632 0208f208 2020-05-05 stsp free((char *)pe->path);
3633 0208f208 2020-05-05 stsp free(pe->data);
3635 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3637 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3638 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3639 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3642 502b9684 2020-07-31 stsp if (show_changed_paths) {
3643 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
3644 502b9684 2020-07-31 stsp commit, repo);
3648 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3649 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3650 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3651 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3654 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3655 502b9684 2020-07-31 stsp free((char *)pe->path);
3656 502b9684 2020-07-31 stsp free(pe->data);
3658 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
3662 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3663 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3664 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3665 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3667 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3668 0208f208 2020-05-05 stsp free((char *)pe->path);
3669 0208f208 2020-05-05 stsp free(pe->data);
3671 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3672 6841bf13 2019-11-29 kn if (search_pattern)
3673 6841bf13 2019-11-29 kn regfree(®ex);
3674 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3675 f42b1b34 2018-03-12 stsp return err;
3678 4ed7e80c 2018-05-20 stsp __dead static void
3679 6f3d1eb0 2018-03-12 stsp usage_log(void)
3681 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3682 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3683 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3687 b1ebc001 2019-08-13 stsp static int
3688 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3690 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3691 b1ebc001 2019-08-13 stsp long long n;
3692 b1ebc001 2019-08-13 stsp const char *errstr;
3694 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3695 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3697 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3698 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3703 4ed7e80c 2018-05-20 stsp static const struct got_error *
3704 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3706 f42b1b34 2018-03-12 stsp const struct got_error *error;
3707 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3708 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3709 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3710 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3711 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3712 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3713 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3714 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3715 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3716 64a96a6d 2018-04-01 stsp const char *errstr;
3717 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3719 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3721 6715a751 2018-03-16 stsp #ifndef PROFILE
3722 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3725 f42b1b34 2018-03-12 stsp err(1, "pledge");
3728 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3730 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3731 79109fed 2018-03-27 stsp switch (ch) {
3733 79109fed 2018-03-27 stsp show_patch = 1;
3736 0208f208 2020-05-05 stsp show_changed_paths = 1;
3739 d142fc45 2018-04-01 stsp start_commit = optarg;
3742 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3744 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3745 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3748 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3749 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3750 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3753 48c8c60d 2020-01-27 stsp log_branches = 1;
3756 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3757 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3758 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3760 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3763 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3766 6841bf13 2019-11-29 kn search_pattern = optarg;
3769 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3772 2deda0b9 2019-03-07 stsp usage_log();
3773 79109fed 2018-03-27 stsp /* NOTREACHED */
3777 79109fed 2018-03-27 stsp argc -= optind;
3778 79109fed 2018-03-27 stsp argv += optind;
3780 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3781 dc1edbfa 2019-11-29 kn diff_context = 3;
3782 dc1edbfa 2019-11-29 kn else if (!show_patch)
3783 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
3785 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3786 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3787 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3788 04ca23f4 2018-07-16 stsp goto done;
3791 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3792 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3793 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3794 50f2fada 2020-04-24 stsp goto done;
3795 50f2fada 2020-04-24 stsp error = NULL;
3798 603cdeb0 2020-10-22 stsp if (argc == 1) {
3799 e7301579 2019-03-18 stsp if (worktree) {
3800 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3802 e7301579 2019-03-18 stsp if (error)
3803 e7301579 2019-03-18 stsp goto done;
3805 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3806 e7301579 2019-03-18 stsp if (path == NULL) {
3807 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3808 e7301579 2019-03-18 stsp goto done;
3811 603cdeb0 2020-10-22 stsp } else if (argc != 0)
3812 cbd1af7a 2019-03-18 stsp usage_log();
3814 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3815 5486daa2 2019-05-11 stsp repo_path = worktree ?
3816 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3818 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3819 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3820 cffc0aa4 2019-02-05 stsp goto done;
3823 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3824 d7d4f210 2018-03-12 stsp if (error != NULL)
3825 04ca23f4 2018-07-16 stsp goto done;
3827 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3828 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3829 c02c541e 2019-03-29 stsp if (error)
3830 c02c541e 2019-03-29 stsp goto done;
3832 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3833 84de9106 2020-12-26 stsp if (error)
3834 84de9106 2020-12-26 stsp goto done;
3836 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3837 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3838 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3839 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3840 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3841 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3842 3235492e 2018-04-01 stsp if (error != NULL)
3843 d1fe46f9 2020-04-18 stsp goto done;
3844 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3845 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3846 3235492e 2018-04-01 stsp if (error != NULL)
3847 d1fe46f9 2020-04-18 stsp goto done;
3848 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3849 d1fe46f9 2020-04-18 stsp start_id);
3850 d1fe46f9 2020-04-18 stsp if (error != NULL)
3851 d1fe46f9 2020-04-18 stsp goto done;
3852 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3854 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&start_id, NULL,
3855 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3856 d1fe46f9 2020-04-18 stsp if (error != NULL)
3857 d1fe46f9 2020-04-18 stsp goto done;
3859 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3860 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&end_id, NULL,
3861 84de9106 2020-12-26 stsp end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3862 d1fe46f9 2020-04-18 stsp if (error != NULL)
3863 d1fe46f9 2020-04-18 stsp goto done;
3866 deeabeae 2019-08-27 stsp if (worktree) {
3868 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
3869 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
3870 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
3872 603cdeb0 2020-10-22 stsp if (path) {
3873 603cdeb0 2020-10-22 stsp const char *prefix;
3874 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
3875 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
3876 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
3877 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
3878 603cdeb0 2020-10-22 stsp goto done;
3882 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
3883 8fa913ec 2020-11-14 stsp path ? path : "");
3884 04ca23f4 2018-07-16 stsp if (error != NULL)
3885 04ca23f4 2018-07-16 stsp goto done;
3886 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3887 04ca23f4 2018-07-16 stsp free(path);
3888 04ca23f4 2018-07-16 stsp path = in_repo_path;
3891 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
3892 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
3893 603cdeb0 2020-10-22 stsp limit, log_branches, reverse_display_order, &refs);
3895 04ca23f4 2018-07-16 stsp free(path);
3896 04ca23f4 2018-07-16 stsp free(repo_path);
3897 04ca23f4 2018-07-16 stsp free(cwd);
3898 cffc0aa4 2019-02-05 stsp if (worktree)
3899 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3900 ad242220 2018-09-08 stsp if (repo) {
3901 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3902 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3903 ad242220 2018-09-08 stsp if (error == NULL)
3904 ad242220 2018-09-08 stsp error = repo_error;
3906 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3907 8bf5b3c9 2018-03-17 stsp return error;
3910 4ed7e80c 2018-05-20 stsp __dead static void
3911 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3913 64453f7e 2020-11-21 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
3914 64453f7e 2020-11-21 stsp "[-s] [-w] [object1 object2 | path]\n", getprogname());
3918 b72f483a 2019-02-05 stsp struct print_diff_arg {
3919 b72f483a 2019-02-05 stsp struct got_repository *repo;
3920 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3921 b72f483a 2019-02-05 stsp int diff_context;
3922 3fc0c068 2019-02-10 stsp const char *id_str;
3923 3fc0c068 2019-02-10 stsp int header_shown;
3924 98eaaa12 2019-08-03 stsp int diff_staged;
3925 63035f9f 2019-10-06 stsp int ignore_whitespace;
3926 64453f7e 2020-11-21 stsp int force_text_diff;
3930 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
3931 39449a05 2020-07-23 stsp * it as content to the diff engine.
3933 39449a05 2020-07-23 stsp static const struct got_error *
3934 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3935 39449a05 2020-07-23 stsp const char *abspath)
3937 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
3938 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
3939 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
3943 39449a05 2020-07-23 stsp if (dirfd != -1) {
3944 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3945 39449a05 2020-07-23 stsp if (target_len == -1)
3946 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
3948 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
3949 39449a05 2020-07-23 stsp if (target_len == -1)
3950 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
3953 39449a05 2020-07-23 stsp *fd = got_opentempfd();
3954 39449a05 2020-07-23 stsp if (*fd == -1)
3955 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
3957 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
3958 39449a05 2020-07-23 stsp if (outlen == -1) {
3959 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
3960 39449a05 2020-07-23 stsp goto done;
3963 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
3964 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
3965 39449a05 2020-07-23 stsp goto done;
3968 39449a05 2020-07-23 stsp if (err) {
3969 39449a05 2020-07-23 stsp close(*fd);
3972 39449a05 2020-07-23 stsp return err;
3975 4ed7e80c 2018-05-20 stsp static const struct got_error *
3976 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3977 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3978 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3979 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3981 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3982 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3983 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3984 12463d8b 2019-12-13 stsp int fd = -1;
3985 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3986 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3987 b72f483a 2019-02-05 stsp struct stat sb;
3989 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3990 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3991 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3992 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3993 98eaaa12 2019-08-03 stsp return NULL;
3995 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3996 98eaaa12 2019-08-03 stsp return NULL;
3997 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3998 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3999 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4000 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
4001 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
4002 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
4003 98eaaa12 2019-08-03 stsp return NULL;
4006 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
4007 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
4008 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
4009 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
4010 3fc0c068 2019-02-10 stsp a->header_shown = 1;
4013 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4014 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
4015 98eaaa12 2019-08-03 stsp switch (staged_status) {
4016 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
4017 98eaaa12 2019-08-03 stsp label1 = path;
4018 98eaaa12 2019-08-03 stsp label2 = path;
4020 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4021 98eaaa12 2019-08-03 stsp label2 = path;
4023 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4024 98eaaa12 2019-08-03 stsp label1 = path;
4027 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4029 fe621944 2020-11-10 stsp return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4030 fe621944 2020-11-10 stsp staged_blob_id, label1, label2, a->diff_context,
4031 64453f7e 2020-11-21 stsp a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4034 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4035 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4036 4ce46740 2019-08-08 stsp char *id_str;
4037 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4040 4ce46740 2019-08-08 stsp goto done;
4041 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4043 4ce46740 2019-08-08 stsp goto done;
4044 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4045 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4046 4ce46740 2019-08-08 stsp free(id_str);
4047 4ce46740 2019-08-08 stsp goto done;
4049 4ce46740 2019-08-08 stsp free(id_str);
4050 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4051 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4053 4ce46740 2019-08-08 stsp goto done;
4056 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4057 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4058 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4059 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4060 2ec1f75b 2019-03-26 stsp goto done;
4063 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4064 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4065 12463d8b 2019-12-13 stsp if (fd == -1) {
4066 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4067 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4069 39449a05 2020-07-23 stsp goto done;
4071 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4072 39449a05 2020-07-23 stsp de_name, abspath);
4074 39449a05 2020-07-23 stsp goto done;
4077 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4078 12463d8b 2019-12-13 stsp if (fd == -1) {
4079 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4080 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4082 39449a05 2020-07-23 stsp goto done;
4084 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4085 39449a05 2020-07-23 stsp de_name, abspath);
4087 39449a05 2020-07-23 stsp goto done;
4090 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4091 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4092 2ec1f75b 2019-03-26 stsp goto done;
4094 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4095 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4096 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4097 2ec1f75b 2019-03-26 stsp goto done;
4101 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4103 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4104 64453f7e 2020-11-21 stsp a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4106 b72f483a 2019-02-05 stsp if (blob1)
4107 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4108 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4109 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4110 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4111 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4112 b72f483a 2019-02-05 stsp free(abspath);
4113 927df6b7 2019-02-10 stsp return err;
4116 927df6b7 2019-02-10 stsp static const struct got_error *
4117 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4119 b00d56cd 2018-04-01 stsp const struct got_error *error;
4120 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4121 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4122 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4123 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4124 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
4125 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
4126 15a94983 2018-12-23 stsp int type1, type2;
4127 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4128 64453f7e 2020-11-21 stsp int force_text_diff = 0;
4129 c0cc5c62 2018-10-18 stsp const char *errstr;
4130 927df6b7 2019-02-10 stsp char *path = NULL;
4131 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4133 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4135 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4136 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4137 25eccc22 2019-01-04 stsp NULL) == -1)
4138 b00d56cd 2018-04-01 stsp err(1, "pledge");
4141 64453f7e 2020-11-21 stsp while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4142 b00d56cd 2018-04-01 stsp switch (ch) {
4144 64453f7e 2020-11-21 stsp force_text_diff = 1;
4147 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4149 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4150 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4153 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4154 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4155 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4157 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4160 98eaaa12 2019-08-03 stsp diff_staged = 1;
4163 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4166 2deda0b9 2019-03-07 stsp usage_diff();
4167 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4171 b00d56cd 2018-04-01 stsp argc -= optind;
4172 b00d56cd 2018-04-01 stsp argv += optind;
4174 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4175 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4176 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4177 b72f483a 2019-02-05 stsp goto done;
4179 927df6b7 2019-02-10 stsp if (argc <= 1) {
4180 b72f483a 2019-02-05 stsp if (repo_path)
4182 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
4183 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4184 fa51e947 2020-03-27 stsp if (error) {
4185 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4186 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
4188 1f03b8da 2020-03-20 stsp goto done;
4190 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
4191 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
4192 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4193 927df6b7 2019-02-10 stsp goto done;
4195 927df6b7 2019-02-10 stsp if (argc == 1) {
4196 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4198 927df6b7 2019-02-10 stsp if (error)
4199 927df6b7 2019-02-10 stsp goto done;
4201 927df6b7 2019-02-10 stsp path = strdup("");
4202 927df6b7 2019-02-10 stsp if (path == NULL) {
4203 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4204 927df6b7 2019-02-10 stsp goto done;
4207 b72f483a 2019-02-05 stsp } else if (argc == 2) {
4208 98eaaa12 2019-08-03 stsp if (diff_staged)
4209 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
4210 98eaaa12 2019-08-03 stsp "objects in repository");
4211 15a94983 2018-12-23 stsp id_str1 = argv[0];
4212 15a94983 2018-12-23 stsp id_str2 = argv[1];
4213 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4214 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4215 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4216 30db809c 2019-06-05 stsp goto done;
4217 1f03b8da 2020-03-20 stsp if (worktree) {
4218 1f03b8da 2020-03-20 stsp repo_path = strdup(
4219 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
4220 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4221 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4222 1f03b8da 2020-03-20 stsp goto done;
4225 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
4226 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4227 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4228 1f03b8da 2020-03-20 stsp goto done;
4233 b00d56cd 2018-04-01 stsp usage_diff();
4235 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4236 76089277 2018-04-01 stsp free(repo_path);
4237 b00d56cd 2018-04-01 stsp if (error != NULL)
4238 b00d56cd 2018-04-01 stsp goto done;
4240 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4241 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4242 c02c541e 2019-03-29 stsp if (error)
4243 c02c541e 2019-03-29 stsp goto done;
4245 30db809c 2019-06-05 stsp if (argc <= 1) {
4246 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4247 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4248 b72f483a 2019-02-05 stsp char *id_str;
4250 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4252 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4253 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4254 b72f483a 2019-02-05 stsp if (error)
4255 b72f483a 2019-02-05 stsp goto done;
4256 b72f483a 2019-02-05 stsp arg.repo = repo;
4257 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4258 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4259 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4260 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4261 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4262 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4263 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
4265 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
4266 72ea6654 2019-07-27 stsp if (error)
4267 72ea6654 2019-07-27 stsp goto done;
4269 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
4270 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
4271 b72f483a 2019-02-05 stsp free(id_str);
4272 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4273 b72f483a 2019-02-05 stsp goto done;
4276 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4277 84de9106 2020-12-26 stsp if (error)
4278 84de9106 2020-12-26 stsp return error;
4280 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4281 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &refs, repo);
4282 0adb7196 2019-08-11 stsp if (error)
4283 0adb7196 2019-08-11 stsp goto done;
4285 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4286 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &refs, repo);
4287 0adb7196 2019-08-11 stsp if (error)
4288 0adb7196 2019-08-11 stsp goto done;
4290 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
4291 15a94983 2018-12-23 stsp if (error)
4292 15a94983 2018-12-23 stsp goto done;
4294 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
4295 15a94983 2018-12-23 stsp if (error)
4296 15a94983 2018-12-23 stsp goto done;
4298 15a94983 2018-12-23 stsp if (type1 != type2) {
4299 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4300 b00d56cd 2018-04-01 stsp goto done;
4303 15a94983 2018-12-23 stsp switch (type1) {
4304 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4305 fe621944 2020-11-10 stsp error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4306 64453f7e 2020-11-21 stsp NULL, NULL, diff_context, ignore_whitespace,
4307 64453f7e 2020-11-21 stsp force_text_diff, repo, stdout);
4309 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4310 fe621944 2020-11-10 stsp error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4311 64453f7e 2020-11-21 stsp "", "", diff_context, ignore_whitespace, force_text_diff,
4312 64453f7e 2020-11-21 stsp repo, stdout);
4314 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4315 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
4316 fe621944 2020-11-10 stsp error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4317 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, repo,
4321 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4324 5e70831e 2019-05-28 stsp free(label1);
4325 5e70831e 2019-05-28 stsp free(label2);
4326 15a94983 2018-12-23 stsp free(id1);
4327 15a94983 2018-12-23 stsp free(id2);
4328 927df6b7 2019-02-10 stsp free(path);
4329 b72f483a 2019-02-05 stsp if (worktree)
4330 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4331 ad242220 2018-09-08 stsp if (repo) {
4332 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4333 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4334 ad242220 2018-09-08 stsp if (error == NULL)
4335 ad242220 2018-09-08 stsp error = repo_error;
4337 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4338 b00d56cd 2018-04-01 stsp return error;
4341 404c43c4 2018-06-21 stsp __dead static void
4342 404c43c4 2018-06-21 stsp usage_blame(void)
4344 9270e621 2019-02-05 stsp fprintf(stderr,
4345 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4346 404c43c4 2018-06-21 stsp getprogname());
4350 28315671 2019-08-14 stsp struct blame_line {
4351 28315671 2019-08-14 stsp int annotated;
4352 28315671 2019-08-14 stsp char *id_str;
4353 82f6abb8 2019-08-14 stsp char *committer;
4354 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4357 28315671 2019-08-14 stsp struct blame_cb_args {
4358 28315671 2019-08-14 stsp struct blame_line *lines;
4359 28315671 2019-08-14 stsp int nlines;
4360 7ef28ff8 2019-08-14 stsp int nlines_prec;
4361 28315671 2019-08-14 stsp int lineno_cur;
4362 28315671 2019-08-14 stsp off_t *line_offsets;
4364 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4367 404c43c4 2018-06-21 stsp static const struct got_error *
4368 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4370 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4371 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4372 28315671 2019-08-14 stsp struct blame_line *bline;
4373 82f6abb8 2019-08-14 stsp char *line = NULL;
4374 28315671 2019-08-14 stsp size_t linesize = 0;
4375 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4376 28315671 2019-08-14 stsp off_t offset;
4377 bcb49d15 2019-08-14 stsp struct tm tm;
4378 bcb49d15 2019-08-14 stsp time_t committer_time;
4380 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4381 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4382 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4384 28315671 2019-08-14 stsp if (sigint_received)
4385 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4387 2839f8b9 2019-08-18 stsp if (lineno == -1)
4388 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4390 28315671 2019-08-14 stsp /* Annotate this line. */
4391 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4392 28315671 2019-08-14 stsp if (bline->annotated)
4393 28315671 2019-08-14 stsp return NULL;
4394 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4396 28315671 2019-08-14 stsp return err;
4398 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4400 82f6abb8 2019-08-14 stsp goto done;
4402 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4403 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4404 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4405 bcb49d15 2019-08-14 stsp goto done;
4408 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4409 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4410 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4411 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4412 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4413 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4414 82f6abb8 2019-08-14 stsp goto done;
4416 28315671 2019-08-14 stsp bline->annotated = 1;
4418 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4419 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4420 28315671 2019-08-14 stsp if (!bline->annotated)
4421 82f6abb8 2019-08-14 stsp goto done;
4423 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4424 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4425 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4426 82f6abb8 2019-08-14 stsp goto done;
4429 28315671 2019-08-14 stsp while (bline->annotated) {
4430 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4431 82f6abb8 2019-08-14 stsp size_t len;
4433 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4434 28315671 2019-08-14 stsp if (ferror(a->f))
4435 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4439 82f6abb8 2019-08-14 stsp committer = bline->committer;
4440 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4441 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4442 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4443 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4445 82f6abb8 2019-08-14 stsp *at = '\0';
4446 82f6abb8 2019-08-14 stsp len = strlen(committer);
4447 82f6abb8 2019-08-14 stsp if (len >= 9)
4448 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4450 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4452 28315671 2019-08-14 stsp *nl = '\0';
4453 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4454 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4456 28315671 2019-08-14 stsp a->lineno_cur++;
4457 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4460 82f6abb8 2019-08-14 stsp if (commit)
4461 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4462 28315671 2019-08-14 stsp free(line);
4463 28315671 2019-08-14 stsp return err;
4466 28315671 2019-08-14 stsp static const struct got_error *
4467 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4469 404c43c4 2018-06-21 stsp const struct got_error *error;
4470 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4471 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4472 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4473 0587e10c 2020-07-23 stsp char *link_target = NULL;
4474 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4475 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4476 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4477 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4478 28315671 2019-08-14 stsp struct blame_cb_args bca;
4479 28315671 2019-08-14 stsp int ch, obj_type, i;
4480 be659d10 2020-11-18 stsp off_t filesize;
4482 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4484 404c43c4 2018-06-21 stsp #ifndef PROFILE
4485 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4486 36e2fb66 2019-01-04 stsp NULL) == -1)
4487 404c43c4 2018-06-21 stsp err(1, "pledge");
4490 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4491 404c43c4 2018-06-21 stsp switch (ch) {
4493 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4496 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4497 66bea077 2018-08-02 stsp if (repo_path == NULL)
4498 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4500 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4503 2deda0b9 2019-03-07 stsp usage_blame();
4504 404c43c4 2018-06-21 stsp /* NOTREACHED */
4508 404c43c4 2018-06-21 stsp argc -= optind;
4509 404c43c4 2018-06-21 stsp argv += optind;
4511 a39318fd 2018-08-02 stsp if (argc == 1)
4512 404c43c4 2018-06-21 stsp path = argv[0];
4514 404c43c4 2018-06-21 stsp usage_blame();
4516 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4517 66bea077 2018-08-02 stsp if (cwd == NULL) {
4518 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4519 66bea077 2018-08-02 stsp goto done;
4521 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4522 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4523 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4524 66bea077 2018-08-02 stsp goto done;
4526 0c06baac 2019-02-05 stsp error = NULL;
4527 0c06baac 2019-02-05 stsp if (worktree) {
4528 0c06baac 2019-02-05 stsp repo_path =
4529 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4530 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4531 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4532 1f03b8da 2020-03-20 stsp if (error)
4533 1f03b8da 2020-03-20 stsp goto done;
4536 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4537 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4538 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4539 0c06baac 2019-02-05 stsp goto done;
4544 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4545 c02c541e 2019-03-29 stsp if (error != NULL)
4546 404c43c4 2018-06-21 stsp goto done;
4548 0c06baac 2019-02-05 stsp if (worktree) {
4549 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4552 01740607 2020-11-04 stsp error = got_worktree_resolve_path(&p, worktree, path);
4553 01740607 2020-11-04 stsp if (error)
4554 01740607 2020-11-04 stsp goto done;
4555 01740607 2020-11-04 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4556 01740607 2020-11-04 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4557 01740607 2020-11-04 stsp p) == -1) {
4558 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4560 0c06baac 2019-02-05 stsp goto done;
4563 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4565 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4566 01740607 2020-11-04 stsp if (error)
4567 01740607 2020-11-04 stsp goto done;
4568 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4570 0c06baac 2019-02-05 stsp if (error)
4571 66bea077 2018-08-02 stsp goto done;
4573 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4574 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4575 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4576 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4577 404c43c4 2018-06-21 stsp if (error != NULL)
4578 66bea077 2018-08-02 stsp goto done;
4579 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4580 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4581 404c43c4 2018-06-21 stsp if (error != NULL)
4582 66bea077 2018-08-02 stsp goto done;
4584 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4585 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4586 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4588 84de9106 2020-12-26 stsp if (error)
4589 84de9106 2020-12-26 stsp goto done;
4590 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4591 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4592 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4593 30837e32 2019-07-25 stsp if (error)
4594 66bea077 2018-08-02 stsp goto done;
4597 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4598 0587e10c 2020-07-23 stsp commit_id, repo);
4599 0587e10c 2020-07-23 stsp if (error)
4600 0587e10c 2020-07-23 stsp goto done;
4602 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
4603 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
4604 28315671 2019-08-14 stsp if (error)
4605 28315671 2019-08-14 stsp goto done;
4607 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4608 28315671 2019-08-14 stsp if (error)
4609 28315671 2019-08-14 stsp goto done;
4611 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4612 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
4613 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
4614 28315671 2019-08-14 stsp goto done;
4617 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4618 28315671 2019-08-14 stsp if (error)
4619 28315671 2019-08-14 stsp goto done;
4620 28315671 2019-08-14 stsp bca.f = got_opentemp();
4621 28315671 2019-08-14 stsp if (bca.f == NULL) {
4622 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4623 28315671 2019-08-14 stsp goto done;
4625 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4626 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4627 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4628 28315671 2019-08-14 stsp goto done;
4630 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4631 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4632 b02560ec 2019-08-19 stsp bca.nlines--;
4634 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4635 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4636 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4637 28315671 2019-08-14 stsp goto done;
4639 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4640 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4641 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4642 7ef28ff8 2019-08-14 stsp while (i > 0) {
4644 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4646 82f6abb8 2019-08-14 stsp bca.repo = repo;
4648 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4649 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
4651 66bea077 2018-08-02 stsp free(in_repo_path);
4652 0587e10c 2020-07-23 stsp free(link_target);
4653 66bea077 2018-08-02 stsp free(repo_path);
4654 66bea077 2018-08-02 stsp free(cwd);
4655 404c43c4 2018-06-21 stsp free(commit_id);
4656 28315671 2019-08-14 stsp free(obj_id);
4658 28315671 2019-08-14 stsp got_object_blob_close(blob);
4659 0c06baac 2019-02-05 stsp if (worktree)
4660 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4661 ad242220 2018-09-08 stsp if (repo) {
4662 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4663 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4664 ad242220 2018-09-08 stsp if (error == NULL)
4665 ad242220 2018-09-08 stsp error = repo_error;
4667 3affba96 2019-09-22 stsp if (bca.lines) {
4668 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4669 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4670 3affba96 2019-09-22 stsp free(bline->id_str);
4671 3affba96 2019-09-22 stsp free(bline->committer);
4673 3affba96 2019-09-22 stsp free(bca.lines);
4675 28315671 2019-08-14 stsp free(bca.line_offsets);
4676 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4677 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4678 404c43c4 2018-06-21 stsp return error;
4681 5de5890b 2018-10-18 stsp __dead static void
4682 5de5890b 2018-10-18 stsp usage_tree(void)
4684 c1669e2e 2019-01-09 stsp fprintf(stderr,
4685 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4686 5de5890b 2018-10-18 stsp getprogname());
4690 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4691 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4692 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4694 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4695 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4696 848d6979 2019-08-12 stsp const char *modestr = "";
4697 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4698 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4700 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4701 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4704 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4705 63c5ca5d 2019-08-24 stsp modestr = "$";
4706 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4709 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4711 0d6c6ee3 2020-05-20 stsp return err;
4712 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4713 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4714 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4717 848d6979 2019-08-12 stsp modestr = "@";
4719 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4720 848d6979 2019-08-12 stsp modestr = "/";
4721 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4722 848d6979 2019-08-12 stsp modestr = "*";
4724 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4725 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4726 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4728 0d6c6ee3 2020-05-20 stsp free(link_target);
4729 0d6c6ee3 2020-05-20 stsp return NULL;
4732 5de5890b 2018-10-18 stsp static const struct got_error *
4733 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4734 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4735 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4737 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4738 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4739 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4740 56e0773d 2019-11-28 stsp int nentries, i;
4742 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4744 5de5890b 2018-10-18 stsp goto done;
4746 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4748 5de5890b 2018-10-18 stsp goto done;
4749 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4750 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4751 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4752 5de5890b 2018-10-18 stsp char *id = NULL;
4754 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4757 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4758 5de5890b 2018-10-18 stsp if (show_ids) {
4759 5de5890b 2018-10-18 stsp char *id_str;
4760 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4761 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4763 5de5890b 2018-10-18 stsp goto done;
4764 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4765 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4766 5de5890b 2018-10-18 stsp free(id_str);
4767 5de5890b 2018-10-18 stsp goto done;
4769 5de5890b 2018-10-18 stsp free(id_str);
4771 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4774 0d6c6ee3 2020-05-20 stsp goto done;
4776 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4777 c1669e2e 2019-01-09 stsp char *child_path;
4778 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4779 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4780 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4781 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4782 c1669e2e 2019-01-09 stsp goto done;
4784 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4785 c1669e2e 2019-01-09 stsp root_path, repo);
4786 c1669e2e 2019-01-09 stsp free(child_path);
4788 c1669e2e 2019-01-09 stsp goto done;
4793 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4794 5de5890b 2018-10-18 stsp free(tree_id);
4795 5de5890b 2018-10-18 stsp return err;
4798 5de5890b 2018-10-18 stsp static const struct got_error *
4799 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4801 5de5890b 2018-10-18 stsp const struct got_error *error;
4802 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4803 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4804 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4805 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4806 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4807 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4808 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4811 5de5890b 2018-10-18 stsp #ifndef PROFILE
4812 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4813 0f8d269b 2019-01-04 stsp NULL) == -1)
4814 5de5890b 2018-10-18 stsp err(1, "pledge");
4817 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4818 5de5890b 2018-10-18 stsp switch (ch) {
4820 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4823 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4824 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4825 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4827 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4830 5de5890b 2018-10-18 stsp show_ids = 1;
4833 c1669e2e 2019-01-09 stsp recurse = 1;
4836 2deda0b9 2019-03-07 stsp usage_tree();
4837 5de5890b 2018-10-18 stsp /* NOTREACHED */
4841 5de5890b 2018-10-18 stsp argc -= optind;
4842 5de5890b 2018-10-18 stsp argv += optind;
4844 5de5890b 2018-10-18 stsp if (argc == 1)
4845 5de5890b 2018-10-18 stsp path = argv[0];
4846 5de5890b 2018-10-18 stsp else if (argc > 1)
4847 5de5890b 2018-10-18 stsp usage_tree();
4849 7a2c19d6 2019-02-05 stsp path = NULL;
4851 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4852 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4853 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4854 9bf7a39b 2019-02-05 stsp goto done;
4856 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4857 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4858 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4859 7a2c19d6 2019-02-05 stsp goto done;
4861 7a2c19d6 2019-02-05 stsp error = NULL;
4862 7a2c19d6 2019-02-05 stsp if (worktree) {
4863 7a2c19d6 2019-02-05 stsp repo_path =
4864 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4865 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4866 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4867 7a2c19d6 2019-02-05 stsp if (error)
4868 7a2c19d6 2019-02-05 stsp goto done;
4870 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4871 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4872 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4873 7a2c19d6 2019-02-05 stsp goto done;
4878 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4879 5de5890b 2018-10-18 stsp if (error != NULL)
4880 c02c541e 2019-03-29 stsp goto done;
4882 4fedbf4c 2020-11-07 stsp if (worktree) {
4883 4fedbf4c 2020-11-07 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4886 4fedbf4c 2020-11-07 stsp if (path == NULL)
4887 4fedbf4c 2020-11-07 stsp path = "";
4888 4fedbf4c 2020-11-07 stsp error = got_worktree_resolve_path(&p, worktree, path);
4889 4fedbf4c 2020-11-07 stsp if (error)
4890 4fedbf4c 2020-11-07 stsp goto done;
4891 4fedbf4c 2020-11-07 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4892 4fedbf4c 2020-11-07 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4893 4fedbf4c 2020-11-07 stsp p) == -1) {
4894 4fedbf4c 2020-11-07 stsp error = got_error_from_errno("asprintf");
4896 4fedbf4c 2020-11-07 stsp goto done;
4899 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4900 4fedbf4c 2020-11-07 stsp if (error)
4901 4fedbf4c 2020-11-07 stsp goto done;
4903 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4904 4fedbf4c 2020-11-07 stsp if (error)
4905 4fedbf4c 2020-11-07 stsp goto done;
4906 4fedbf4c 2020-11-07 stsp if (path == NULL)
4907 9bf7a39b 2019-02-05 stsp path = "/";
4908 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4909 9bf7a39b 2019-02-05 stsp if (error != NULL)
4910 9bf7a39b 2019-02-05 stsp goto done;
4913 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4914 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4915 4e0a20a4 2020-03-23 tracey if (worktree)
4916 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4918 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4919 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4920 5de5890b 2018-10-18 stsp if (error != NULL)
4921 5de5890b 2018-10-18 stsp goto done;
4922 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4923 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4924 5de5890b 2018-10-18 stsp if (error != NULL)
4925 5de5890b 2018-10-18 stsp goto done;
4927 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4928 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4929 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4931 84de9106 2020-12-26 stsp if (error)
4932 84de9106 2020-12-26 stsp goto done;
4933 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4934 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4935 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4936 30837e32 2019-07-25 stsp if (error)
4937 5de5890b 2018-10-18 stsp goto done;
4940 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4941 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4943 5de5890b 2018-10-18 stsp free(in_repo_path);
4944 5de5890b 2018-10-18 stsp free(repo_path);
4945 5de5890b 2018-10-18 stsp free(cwd);
4946 5de5890b 2018-10-18 stsp free(commit_id);
4947 7a2c19d6 2019-02-05 stsp if (worktree)
4948 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4949 5de5890b 2018-10-18 stsp if (repo) {
4950 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4951 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4952 5de5890b 2018-10-18 stsp if (error == NULL)
4953 5de5890b 2018-10-18 stsp error = repo_error;
4955 5de5890b 2018-10-18 stsp return error;
4958 6bad629b 2019-02-04 stsp __dead static void
4959 6bad629b 2019-02-04 stsp usage_status(void)
4961 081470ac 2020-08-13 stsp fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4962 081470ac 2020-08-13 stsp getprogname());
4966 b72f483a 2019-02-05 stsp static const struct got_error *
4967 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4968 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4969 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4970 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4972 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4973 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4974 081470ac 2020-08-13 stsp if (arg) {
4975 081470ac 2020-08-13 stsp char *status_codes = arg;
4976 081470ac 2020-08-13 stsp size_t ncodes = strlen(status_codes);
4978 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4979 081470ac 2020-08-13 stsp if (status == status_codes[i] ||
4980 081470ac 2020-08-13 stsp staged_status == status_codes[i])
4983 081470ac 2020-08-13 stsp if (i == ncodes)
4984 081470ac 2020-08-13 stsp return NULL;
4986 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4987 b72f483a 2019-02-05 stsp return NULL;
4990 6bad629b 2019-02-04 stsp static const struct got_error *
4991 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4993 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4994 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4995 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4996 081470ac 2020-08-13 stsp char *cwd = NULL, *status_codes = NULL;;
4997 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4998 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4999 081470ac 2020-08-13 stsp int ch, i;
5001 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
5003 081470ac 2020-08-13 stsp while ((ch = getopt(argc, argv, "s:")) != -1) {
5004 6bad629b 2019-02-04 stsp switch (ch) {
5006 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
5007 081470ac 2020-08-13 stsp switch (optarg[i]) {
5008 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
5009 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
5010 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
5011 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
5012 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
5013 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
5014 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
5015 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
5016 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
5019 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
5020 081470ac 2020-08-13 stsp optarg[i]);
5023 081470ac 2020-08-13 stsp status_codes = optarg;
5026 2deda0b9 2019-03-07 stsp usage_status();
5027 6bad629b 2019-02-04 stsp /* NOTREACHED */
5031 6bad629b 2019-02-04 stsp argc -= optind;
5032 6bad629b 2019-02-04 stsp argv += optind;
5034 6bad629b 2019-02-04 stsp #ifndef PROFILE
5035 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5036 6bad629b 2019-02-04 stsp NULL) == -1)
5037 6bad629b 2019-02-04 stsp err(1, "pledge");
5039 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
5040 927df6b7 2019-02-10 stsp if (cwd == NULL) {
5041 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5042 927df6b7 2019-02-10 stsp goto done;
5045 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5046 fa51e947 2020-03-27 stsp if (error) {
5047 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5048 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5049 a5edda0a 2019-07-27 stsp goto done;
5052 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5054 6bad629b 2019-02-04 stsp if (error != NULL)
5055 6bad629b 2019-02-04 stsp goto done;
5057 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5058 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5059 087fb88c 2019-08-04 stsp if (error)
5060 087fb88c 2019-08-04 stsp goto done;
5062 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5063 6bad629b 2019-02-04 stsp if (error)
5064 6bad629b 2019-02-04 stsp goto done;
5066 081470ac 2020-08-13 stsp error = got_worktree_status(worktree, &paths, repo, print_status,
5067 081470ac 2020-08-13 stsp status_codes, check_cancelled, NULL);
5069 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5070 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5071 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5072 927df6b7 2019-02-10 stsp free(cwd);
5073 d0eebce4 2019-03-11 stsp return error;
5076 d0eebce4 2019-03-11 stsp __dead static void
5077 d0eebce4 2019-03-11 stsp usage_ref(void)
5079 d0eebce4 2019-03-11 stsp fprintf(stderr,
5080 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5081 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5082 d0eebce4 2019-03-11 stsp getprogname());
5086 d0eebce4 2019-03-11 stsp static const struct got_error *
5087 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5089 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5090 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5091 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5093 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5094 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5096 d0eebce4 2019-03-11 stsp return err;
5098 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5099 d0eebce4 2019-03-11 stsp char *refstr;
5100 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5101 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5102 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5103 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5104 d0eebce4 2019-03-11 stsp free(refstr);
5107 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5108 d0eebce4 2019-03-11 stsp return NULL;
5111 d0eebce4 2019-03-11 stsp static const struct got_error *
5112 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
5114 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5115 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5117 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5119 d0eebce4 2019-03-11 stsp return err;
5121 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
5122 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5123 d0eebce4 2019-03-11 stsp return err;
5126 d0eebce4 2019-03-11 stsp static const struct got_error *
5127 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5129 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5130 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5131 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5134 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5135 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5136 d1644381 2019-07-14 stsp * an unintended typo.
5138 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5139 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5141 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5143 d83d9d5c 2019-05-13 stsp if (err) {
5144 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5146 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5147 d83d9d5c 2019-05-13 stsp return err;
5148 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5150 d83d9d5c 2019-05-13 stsp return err;
5151 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5152 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5154 d83d9d5c 2019-05-13 stsp return err;
5157 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5159 d0eebce4 2019-03-11 stsp goto done;
5161 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5164 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5166 d1c1ae5f 2019-08-12 stsp return err;
5169 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5170 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5172 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5173 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5174 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5177 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5178 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5179 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5181 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5182 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5184 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5186 d1c1ae5f 2019-08-12 stsp return err;
5188 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5190 d1c1ae5f 2019-08-12 stsp goto done;
5192 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5194 d1c1ae5f 2019-08-12 stsp if (target_ref)
5195 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5197 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5198 d0eebce4 2019-03-11 stsp return err;
5201 d0eebce4 2019-03-11 stsp static const struct got_error *
5202 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5204 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5205 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5206 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5207 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5208 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5209 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5210 b2070a3f 2020-03-22 stsp char *refname = NULL;
5212 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5213 d0eebce4 2019-03-11 stsp switch (ch) {
5215 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5218 e31abbf2 2020-03-22 stsp do_delete = 1;
5221 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5222 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5223 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5225 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5228 d0eebce4 2019-03-11 stsp do_list = 1;
5231 e31abbf2 2020-03-22 stsp symref_target = optarg;
5234 d0eebce4 2019-03-11 stsp usage_ref();
5235 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5239 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5240 ff69268e 2020-12-13 stsp option_conflict('c', 'l');
5241 ff69268e 2020-12-13 stsp if (obj_arg && do_delete)
5242 ff69268e 2020-12-13 stsp option_conflict('c', 'd');
5243 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5244 ff69268e 2020-12-13 stsp option_conflict('c', 's');
5245 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5246 ff69268e 2020-12-13 stsp option_conflict('s', 'd');
5247 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5248 ff69268e 2020-12-13 stsp option_conflict('s', 'l');
5249 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5250 ff69268e 2020-12-13 stsp option_conflict('d', 'l');
5252 d0eebce4 2019-03-11 stsp argc -= optind;
5253 d0eebce4 2019-03-11 stsp argv += optind;
5255 e31abbf2 2020-03-22 stsp if (do_list) {
5256 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5257 d0eebce4 2019-03-11 stsp usage_ref();
5258 b2070a3f 2020-03-22 stsp if (argc == 1) {
5259 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5260 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5261 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5262 b2070a3f 2020-03-22 stsp goto done;
5266 e31abbf2 2020-03-22 stsp if (argc != 1)
5267 e31abbf2 2020-03-22 stsp usage_ref();
5268 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5269 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5270 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5271 b2070a3f 2020-03-22 stsp goto done;
5275 b2070a3f 2020-03-22 stsp if (refname)
5276 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5278 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5279 e0b57350 2019-03-12 stsp if (do_list) {
5280 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5281 e0b57350 2019-03-12 stsp NULL) == -1)
5282 e0b57350 2019-03-12 stsp err(1, "pledge");
5284 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5285 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5286 e0b57350 2019-03-12 stsp err(1, "pledge");
5289 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5290 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5291 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5292 d0eebce4 2019-03-11 stsp goto done;
5295 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5296 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5297 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5298 d0eebce4 2019-03-11 stsp goto done;
5300 d0eebce4 2019-03-11 stsp error = NULL;
5301 d0eebce4 2019-03-11 stsp if (worktree) {
5302 d0eebce4 2019-03-11 stsp repo_path =
5303 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5304 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5305 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5306 d0eebce4 2019-03-11 stsp if (error)
5307 d0eebce4 2019-03-11 stsp goto done;
5309 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
5310 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5311 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5312 d0eebce4 2019-03-11 stsp goto done;
5317 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5318 d0eebce4 2019-03-11 stsp if (error != NULL)
5319 d0eebce4 2019-03-11 stsp goto done;
5321 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5322 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5323 c02c541e 2019-03-29 stsp if (error)
5324 c02c541e 2019-03-29 stsp goto done;
5326 d0eebce4 2019-03-11 stsp if (do_list)
5327 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5328 e31abbf2 2020-03-22 stsp else if (do_delete)
5329 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
5330 e31abbf2 2020-03-22 stsp else if (symref_target)
5331 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5333 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5334 e31abbf2 2020-03-22 stsp usage_ref();
5335 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5338 b2070a3f 2020-03-22 stsp free(refname);
5340 4e759de4 2019-06-26 stsp got_repo_close(repo);
5341 4e759de4 2019-06-26 stsp if (worktree)
5342 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5343 4e759de4 2019-06-26 stsp free(cwd);
5344 4e759de4 2019-06-26 stsp free(repo_path);
5345 4e759de4 2019-06-26 stsp return error;
5348 4e759de4 2019-06-26 stsp __dead static void
5349 4e759de4 2019-06-26 stsp usage_branch(void)
5351 4e759de4 2019-06-26 stsp fprintf(stderr,
5352 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5353 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5357 4e759de4 2019-06-26 stsp static const struct got_error *
5358 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5359 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5361 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5362 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5363 4e99b47e 2019-10-04 stsp char *refstr;
5365 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5366 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5367 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5368 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5370 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5372 4e99b47e 2019-10-04 stsp return err;
5373 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5374 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5375 4e99b47e 2019-10-04 stsp marker = "* ";
5377 4e99b47e 2019-10-04 stsp marker = "~ ";
5381 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5382 4e99b47e 2019-10-04 stsp refname += 11;
5383 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5384 4e99b47e 2019-10-04 stsp refname += 18;
5386 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5387 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5388 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5390 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5391 4e99b47e 2019-10-04 stsp free(refstr);
5392 4e99b47e 2019-10-04 stsp return NULL;
5395 4e99b47e 2019-10-04 stsp static const struct got_error *
5396 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5398 ad89fa31 2019-10-04 stsp const char *refname;
5400 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5401 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5403 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5405 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5406 ad89fa31 2019-10-04 stsp refname += 11;
5407 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5408 ad89fa31 2019-10-04 stsp refname += 18;
5410 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5412 ad89fa31 2019-10-04 stsp return NULL;
5415 ad89fa31 2019-10-04 stsp static const struct got_error *
5416 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5418 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5419 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5420 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5421 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5422 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5424 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5426 4e99b47e 2019-10-04 stsp if (worktree) {
5427 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5428 4e99b47e 2019-10-04 stsp worktree);
5430 4e99b47e 2019-10-04 stsp return err;
5432 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5433 4e99b47e 2019-10-04 stsp worktree);
5435 4e99b47e 2019-10-04 stsp return err;
5437 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5438 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5439 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5441 4e99b47e 2019-10-04 stsp return err;
5442 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5443 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5447 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5448 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5450 4e759de4 2019-06-26 stsp return err;
5452 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry)
5453 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5455 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5456 4e759de4 2019-06-26 stsp return NULL;
5459 4e759de4 2019-06-26 stsp static const struct got_error *
5460 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5461 45cd4e47 2019-08-25 stsp const char *branch_name)
5463 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5464 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5465 4e759de4 2019-06-26 stsp char *refname;
5467 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5468 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5470 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5472 4e759de4 2019-06-26 stsp goto done;
5474 45cd4e47 2019-08-25 stsp if (worktree &&
5475 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5476 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5477 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5478 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5479 45cd4e47 2019-08-25 stsp goto done;
5482 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5485 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5486 4e759de4 2019-06-26 stsp free(refname);
5487 4e759de4 2019-06-26 stsp return err;
5490 4e759de4 2019-06-26 stsp static const struct got_error *
5491 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5492 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5494 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5495 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5496 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5499 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5500 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5501 d3f84d51 2019-07-11 stsp * an unintended typo.
5503 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5504 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5506 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5507 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5508 62d463ca 2020-10-20 naddy goto done;
5511 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5512 4e759de4 2019-06-26 stsp if (err == NULL) {
5513 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5514 4e759de4 2019-06-26 stsp goto done;
5515 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5516 4e759de4 2019-06-26 stsp goto done;
5518 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5520 4e759de4 2019-06-26 stsp goto done;
5522 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5525 4e759de4 2019-06-26 stsp got_ref_close(ref);
5526 4e759de4 2019-06-26 stsp free(base_refname);
5527 4e759de4 2019-06-26 stsp free(refname);
5528 4e759de4 2019-06-26 stsp return err;
5531 4e759de4 2019-06-26 stsp static const struct got_error *
5532 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5534 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5535 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5536 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5537 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5538 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5539 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5540 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5541 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5542 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5543 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5544 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5546 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5548 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5549 4e759de4 2019-06-26 stsp switch (ch) {
5551 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5554 4e759de4 2019-06-26 stsp delref = optarg;
5557 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5558 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5559 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5561 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5564 4e759de4 2019-06-26 stsp do_list = 1;
5567 da76fce2 2020-02-24 stsp do_update = 0;
5570 4e759de4 2019-06-26 stsp usage_branch();
5571 4e759de4 2019-06-26 stsp /* NOTREACHED */
5575 4e759de4 2019-06-26 stsp if (do_list && delref)
5576 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
5578 4e759de4 2019-06-26 stsp argc -= optind;
5579 4e759de4 2019-06-26 stsp argv += optind;
5581 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5582 ad89fa31 2019-10-04 stsp do_show = 1;
5584 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5585 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5587 4e759de4 2019-06-26 stsp if (do_list || delref) {
5588 4e759de4 2019-06-26 stsp if (argc > 0)
5589 4e759de4 2019-06-26 stsp usage_branch();
5590 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5591 4e759de4 2019-06-26 stsp usage_branch();
5593 4e759de4 2019-06-26 stsp #ifndef PROFILE
5594 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5595 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5596 4e759de4 2019-06-26 stsp NULL) == -1)
5597 4e759de4 2019-06-26 stsp err(1, "pledge");
5599 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5600 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5601 4e759de4 2019-06-26 stsp err(1, "pledge");
5604 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5605 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5606 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5607 4e759de4 2019-06-26 stsp goto done;
5610 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5611 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5612 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5613 4e759de4 2019-06-26 stsp goto done;
5615 4e759de4 2019-06-26 stsp error = NULL;
5616 4e759de4 2019-06-26 stsp if (worktree) {
5617 4e759de4 2019-06-26 stsp repo_path =
5618 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5619 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5620 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5621 4e759de4 2019-06-26 stsp if (error)
5622 4e759de4 2019-06-26 stsp goto done;
5624 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5625 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5626 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5627 4e759de4 2019-06-26 stsp goto done;
5632 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5633 4e759de4 2019-06-26 stsp if (error != NULL)
5634 4e759de4 2019-06-26 stsp goto done;
5636 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5637 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5638 4e759de4 2019-06-26 stsp if (error)
5639 4e759de4 2019-06-26 stsp goto done;
5641 ad89fa31 2019-10-04 stsp if (do_show)
5642 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5643 ad89fa31 2019-10-04 stsp else if (do_list)
5644 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5645 4e759de4 2019-06-26 stsp else if (delref)
5646 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5648 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5649 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5650 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5652 84de9106 2020-12-26 stsp if (error)
5653 84de9106 2020-12-26 stsp goto done;
5654 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5655 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5656 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5657 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5658 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5659 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5660 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5661 a74f7e83 2019-11-10 stsp if (error)
5662 a74f7e83 2019-11-10 stsp goto done;
5663 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5664 da76fce2 2020-02-24 stsp if (error)
5665 da76fce2 2020-02-24 stsp goto done;
5666 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5667 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5668 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5670 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5671 da76fce2 2020-02-24 stsp if (error)
5672 da76fce2 2020-02-24 stsp goto done;
5673 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5674 da76fce2 2020-02-24 stsp worktree);
5675 da76fce2 2020-02-24 stsp if (error)
5676 da76fce2 2020-02-24 stsp goto done;
5677 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5679 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5680 da76fce2 2020-02-24 stsp goto done;
5682 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5683 da76fce2 2020-02-24 stsp free(branch_refname);
5684 da76fce2 2020-02-24 stsp if (error)
5685 da76fce2 2020-02-24 stsp goto done;
5686 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5688 da76fce2 2020-02-24 stsp if (error)
5689 da76fce2 2020-02-24 stsp goto done;
5690 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5691 da76fce2 2020-02-24 stsp commit_id);
5692 da76fce2 2020-02-24 stsp if (error)
5693 da76fce2 2020-02-24 stsp goto done;
5694 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5695 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5696 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5698 da76fce2 2020-02-24 stsp if (error)
5699 da76fce2 2020-02-24 stsp goto done;
5700 9627c110 2020-04-18 stsp if (upa.did_something)
5701 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5702 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5707 da76fce2 2020-02-24 stsp got_ref_close(ref);
5709 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5710 d0eebce4 2019-03-11 stsp if (worktree)
5711 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5712 d0eebce4 2019-03-11 stsp free(cwd);
5713 d0eebce4 2019-03-11 stsp free(repo_path);
5714 da76fce2 2020-02-24 stsp free(commit_id);
5715 da76fce2 2020-02-24 stsp free(commit_id_str);
5716 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5717 da76fce2 2020-02-24 stsp free((char *)pe->path);
5718 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5719 d00136be 2019-03-26 stsp return error;
5723 d00136be 2019-03-26 stsp __dead static void
5724 8e7bd50a 2019-08-22 stsp usage_tag(void)
5726 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5727 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5728 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5733 b8bad2ba 2019-08-23 stsp static const struct got_error *
5734 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5736 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5737 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5738 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5739 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5740 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5742 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5743 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5744 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5745 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5747 b8bad2ba 2019-08-23 stsp return err;
5748 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5751 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5754 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5755 b8bad2ba 2019-08-23 stsp free(re_id);
5758 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5759 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5762 b8bad2ba 2019-08-23 stsp while (se) {
5763 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5766 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5767 b8bad2ba 2019-08-23 stsp free(se_id);
5770 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5771 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5773 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5774 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5776 b8bad2ba 2019-08-23 stsp return err;
5777 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5780 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5785 b8bad2ba 2019-08-23 stsp return err;
5789 b8bad2ba 2019-08-23 stsp static const struct got_error *
5790 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5792 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5793 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5794 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5796 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5798 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5800 8e7bd50a 2019-08-22 stsp return err;
5802 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5803 8e7bd50a 2019-08-22 stsp const char *refname;
5804 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5805 8e7bd50a 2019-08-22 stsp char datebuf[26];
5806 d4efa91b 2020-01-14 stsp const char *tagger;
5807 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5808 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5809 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5810 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5812 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5813 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5815 8e7bd50a 2019-08-22 stsp refname += 10;
5816 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5817 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5818 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5821 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5822 8e7bd50a 2019-08-22 stsp free(refstr);
5824 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5827 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5828 d4efa91b 2020-01-14 stsp if (err) {
5829 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5833 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5834 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5835 d4efa91b 2020-01-14 stsp if (err) {
5839 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5840 d4efa91b 2020-01-14 stsp tagger_time =
5841 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5842 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5848 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5849 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5850 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5851 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5855 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5856 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5857 2417344c 2019-08-23 stsp if (datestr)
5858 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5859 d4efa91b 2020-01-14 stsp if (commit)
5860 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5862 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5863 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5864 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5867 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5868 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5871 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5872 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5875 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5876 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5883 8e7bd50a 2019-08-22 stsp free(id_str);
5884 d4efa91b 2020-01-14 stsp if (commit) {
5885 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5888 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5890 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5891 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5892 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5893 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5898 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5900 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5902 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5903 8e7bd50a 2019-08-22 stsp } while (line);
5904 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5907 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5908 8e7bd50a 2019-08-22 stsp return NULL;
5911 8e7bd50a 2019-08-22 stsp static const struct got_error *
5912 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5913 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5915 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5916 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5917 f372d5cd 2019-10-21 stsp char *editor = NULL;
5918 1601cb9f 2020-09-11 naddy int initial_content_len;
5919 8e7bd50a 2019-08-22 stsp int fd = -1;
5921 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5922 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5923 8e7bd50a 2019-08-22 stsp goto done;
5926 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
5927 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
5928 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
5929 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
5930 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5931 8e7bd50a 2019-08-22 stsp goto done;
5934 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5936 8e7bd50a 2019-08-22 stsp goto done;
5938 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
5939 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
5940 97972933 2020-09-11 stsp goto done;
5943 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5945 8e7bd50a 2019-08-22 stsp goto done;
5946 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
5947 0d5bb276 2020-12-15 stsp initial_content_len, 1);
5949 8e7bd50a 2019-08-22 stsp free(initial_content);
5950 8e7bd50a 2019-08-22 stsp free(template);
5951 8e7bd50a 2019-08-22 stsp free(editor);
5953 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5954 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
5956 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5957 59f86c76 2020-09-11 stsp if (err == NULL)
5958 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5959 59f86c76 2020-09-11 stsp if (err) {
5960 59f86c76 2020-09-11 stsp free(*tagmsg);
5961 59f86c76 2020-09-11 stsp *tagmsg = NULL;
5963 8e7bd50a 2019-08-22 stsp return err;
5966 8e7bd50a 2019-08-22 stsp static const struct got_error *
5967 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
5968 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5970 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5971 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5972 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5973 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5974 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5975 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5976 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5977 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5979 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5982 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5983 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5984 8e7bd50a 2019-08-22 stsp * an unintended typo.
5986 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5987 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5989 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
5991 8e7bd50a 2019-08-22 stsp return err;
5993 84de9106 2020-12-26 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5995 84de9106 2020-12-26 stsp goto done;
5997 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5998 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &refs, repo);
6000 8e7bd50a 2019-08-22 stsp goto done;
6002 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
6004 8e7bd50a 2019-08-22 stsp goto done;
6006 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
6007 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
6008 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
6009 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
6010 62d463ca 2020-10-20 naddy goto done;
6012 8e7bd50a 2019-08-22 stsp tag_name += 10;
6013 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6014 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
6015 62d463ca 2020-10-20 naddy goto done;
6018 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
6019 8e7bd50a 2019-08-22 stsp if (err == NULL) {
6020 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
6021 8e7bd50a 2019-08-22 stsp goto done;
6022 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
6023 8e7bd50a 2019-08-22 stsp goto done;
6025 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
6026 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6027 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
6028 f372d5cd 2019-10-21 stsp if (err) {
6029 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6030 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
6031 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6032 8e7bd50a 2019-08-22 stsp goto done;
6036 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
6037 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6038 f372d5cd 2019-10-21 stsp if (err) {
6039 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6040 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6041 8e7bd50a 2019-08-22 stsp goto done;
6044 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
6045 f372d5cd 2019-10-21 stsp if (err) {
6046 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6047 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6048 8e7bd50a 2019-08-22 stsp goto done;
6051 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
6052 f372d5cd 2019-10-21 stsp if (err) {
6053 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6054 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6055 f372d5cd 2019-10-21 stsp goto done;
6058 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
6059 f372d5cd 2019-10-21 stsp if (err) {
6060 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6061 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6062 f372d5cd 2019-10-21 stsp goto done;
6064 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6066 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6067 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6068 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6069 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6070 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6071 f372d5cd 2019-10-21 stsp free(tag_id_str);
6073 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6074 8e7bd50a 2019-08-22 stsp free(commit_id);
6075 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6076 8e7bd50a 2019-08-22 stsp free(refname);
6077 8e7bd50a 2019-08-22 stsp free(tagmsg);
6078 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6079 aba9c984 2019-09-08 stsp free(tagger);
6080 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
6081 8e7bd50a 2019-08-22 stsp return err;
6084 8e7bd50a 2019-08-22 stsp static const struct got_error *
6085 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6087 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6088 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6089 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6090 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6091 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6092 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6093 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6095 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6096 8e7bd50a 2019-08-22 stsp switch (ch) {
6098 80106605 2020-02-24 stsp commit_id_arg = optarg;
6101 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6104 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6105 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6106 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6108 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6111 8e7bd50a 2019-08-22 stsp do_list = 1;
6114 8e7bd50a 2019-08-22 stsp usage_tag();
6115 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6119 8e7bd50a 2019-08-22 stsp argc -= optind;
6120 8e7bd50a 2019-08-22 stsp argv += optind;
6122 8e7bd50a 2019-08-22 stsp if (do_list) {
6123 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6125 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6126 8e7bd50a 2019-08-22 stsp if (tagmsg)
6127 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
6128 8e7bd50a 2019-08-22 stsp if (argc > 0)
6129 8e7bd50a 2019-08-22 stsp usage_tag();
6130 80106605 2020-02-24 stsp } else if (argc != 1)
6131 8e7bd50a 2019-08-22 stsp usage_tag();
6133 a2887370 2019-08-23 stsp tag_name = argv[0];
6135 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6136 8e7bd50a 2019-08-22 stsp if (do_list) {
6137 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6138 8e7bd50a 2019-08-22 stsp NULL) == -1)
6139 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6141 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6142 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6143 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6146 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6147 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6148 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6149 8e7bd50a 2019-08-22 stsp goto done;
6152 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6153 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6154 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6155 8e7bd50a 2019-08-22 stsp goto done;
6157 8e7bd50a 2019-08-22 stsp error = NULL;
6158 8e7bd50a 2019-08-22 stsp if (worktree) {
6159 8e7bd50a 2019-08-22 stsp repo_path =
6160 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6161 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6162 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6163 8e7bd50a 2019-08-22 stsp if (error)
6164 8e7bd50a 2019-08-22 stsp goto done;
6166 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
6167 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6168 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6169 8e7bd50a 2019-08-22 stsp goto done;
6174 8e7bd50a 2019-08-22 stsp if (do_list) {
6175 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6176 c9956ddf 2019-09-08 stsp if (error != NULL)
6177 c9956ddf 2019-09-08 stsp goto done;
6178 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6179 8e7bd50a 2019-08-22 stsp if (error)
6180 8e7bd50a 2019-08-22 stsp goto done;
6181 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6183 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6184 c9956ddf 2019-09-08 stsp if (error)
6185 c9956ddf 2019-09-08 stsp goto done;
6186 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6187 c9956ddf 2019-09-08 stsp if (error != NULL)
6188 c9956ddf 2019-09-08 stsp goto done;
6190 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6191 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6192 8e7bd50a 2019-08-22 stsp if (error)
6193 8e7bd50a 2019-08-22 stsp goto done;
6196 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6197 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6198 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6199 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6200 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6201 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6202 8e7bd50a 2019-08-22 stsp if (error)
6203 8e7bd50a 2019-08-22 stsp goto done;
6204 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6205 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6206 8e7bd50a 2019-08-22 stsp if (error)
6207 8e7bd50a 2019-08-22 stsp goto done;
6208 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6209 8e7bd50a 2019-08-22 stsp free(commit_id);
6210 8e7bd50a 2019-08-22 stsp if (error)
6211 8e7bd50a 2019-08-22 stsp goto done;
6214 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6215 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6219 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
6220 8e7bd50a 2019-08-22 stsp if (worktree)
6221 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6222 8e7bd50a 2019-08-22 stsp free(cwd);
6223 8e7bd50a 2019-08-22 stsp free(repo_path);
6224 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6225 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6226 8e7bd50a 2019-08-22 stsp return error;
6229 8e7bd50a 2019-08-22 stsp __dead static void
6230 d00136be 2019-03-26 stsp usage_add(void)
6232 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6233 022fae89 2019-12-06 tracey getprogname());
6237 d00136be 2019-03-26 stsp static const struct got_error *
6238 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6240 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6242 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6243 4e68cba3 2019-11-23 stsp return NULL;
6246 4e68cba3 2019-11-23 stsp static const struct got_error *
6247 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6249 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6250 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6251 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6252 1dd54920 2019-05-11 stsp char *cwd = NULL;
6253 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6254 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6255 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6257 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6259 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6260 d00136be 2019-03-26 stsp switch (ch) {
6261 022fae89 2019-12-06 tracey case 'I':
6262 022fae89 2019-12-06 tracey no_ignores = 1;
6265 4e68cba3 2019-11-23 stsp can_recurse = 1;
6268 d00136be 2019-03-26 stsp usage_add();
6269 d00136be 2019-03-26 stsp /* NOTREACHED */
6273 d00136be 2019-03-26 stsp argc -= optind;
6274 d00136be 2019-03-26 stsp argv += optind;
6276 43012d58 2019-07-14 stsp #ifndef PROFILE
6277 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6278 43012d58 2019-07-14 stsp NULL) == -1)
6279 43012d58 2019-07-14 stsp err(1, "pledge");
6281 723c305c 2019-05-11 jcs if (argc < 1)
6282 d00136be 2019-03-26 stsp usage_add();
6284 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6285 d00136be 2019-03-26 stsp if (cwd == NULL) {
6286 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6287 d00136be 2019-03-26 stsp goto done;
6290 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6291 fa51e947 2020-03-27 stsp if (error) {
6292 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6293 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6294 d00136be 2019-03-26 stsp goto done;
6297 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6299 031a5338 2019-03-26 stsp if (error != NULL)
6300 031a5338 2019-03-26 stsp goto done;
6302 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6303 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6304 d00136be 2019-03-26 stsp if (error)
6305 d00136be 2019-03-26 stsp goto done;
6307 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6308 6d022e97 2019-08-04 stsp if (error)
6309 022fae89 2019-12-06 tracey goto done;
6311 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
6312 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6313 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
6314 6d022e97 2019-08-04 stsp goto done;
6318 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6319 4e68cba3 2019-11-23 stsp char *ondisk_path;
6320 4e68cba3 2019-11-23 stsp struct stat sb;
6321 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6322 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6323 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6324 62d463ca 2020-10-20 naddy pe->path) == -1) {
6325 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6326 4e68cba3 2019-11-23 stsp goto done;
6328 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6329 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6330 4e68cba3 2019-11-23 stsp free(ondisk_path);
6333 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6334 4e68cba3 2019-11-23 stsp ondisk_path);
6335 4e68cba3 2019-11-23 stsp free(ondisk_path);
6336 4e68cba3 2019-11-23 stsp goto done;
6338 4e68cba3 2019-11-23 stsp free(ondisk_path);
6339 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6340 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6341 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6342 4e68cba3 2019-11-23 stsp goto done;
6347 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6348 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6351 031a5338 2019-03-26 stsp got_repo_close(repo);
6352 d00136be 2019-03-26 stsp if (worktree)
6353 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6354 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6355 1dd54920 2019-05-11 stsp free((char *)pe->path);
6356 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6357 2ec1f75b 2019-03-26 stsp free(cwd);
6358 2ec1f75b 2019-03-26 stsp return error;
6361 2ec1f75b 2019-03-26 stsp __dead static void
6362 648e4ef7 2019-07-09 stsp usage_remove(void)
6364 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6365 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6369 2a06fe5f 2019-08-24 stsp static const struct got_error *
6370 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6371 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6373 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6375 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6376 2a06fe5f 2019-08-24 stsp return NULL;
6377 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6378 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6379 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6380 2a06fe5f 2019-08-24 stsp return NULL;
6383 2ec1f75b 2019-03-26 stsp static const struct got_error *
6384 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6386 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6387 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6388 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6389 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6390 17ed4618 2019-06-02 stsp char *cwd = NULL;
6391 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6392 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6393 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6395 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6397 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6398 2ec1f75b 2019-03-26 stsp switch (ch) {
6400 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6402 70e3e7f5 2019-12-13 tracey case 'k':
6403 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6405 f2a9dc41 2019-12-13 tracey case 'R':
6406 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6409 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6410 766841c2 2020-08-13 stsp switch (optarg[i]) {
6411 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6412 766841c2 2020-08-13 stsp delete_local_mods = 1;
6414 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6417 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6418 766841c2 2020-08-13 stsp optarg[i]);
6421 766841c2 2020-08-13 stsp status_codes = optarg;
6424 f2a9dc41 2019-12-13 tracey usage_remove();
6425 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6429 2ec1f75b 2019-03-26 stsp argc -= optind;
6430 2ec1f75b 2019-03-26 stsp argv += optind;
6432 43012d58 2019-07-14 stsp #ifndef PROFILE
6433 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6434 43012d58 2019-07-14 stsp NULL) == -1)
6435 43012d58 2019-07-14 stsp err(1, "pledge");
6437 17ed4618 2019-06-02 stsp if (argc < 1)
6438 648e4ef7 2019-07-09 stsp usage_remove();
6440 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
6441 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
6442 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6443 2ec1f75b 2019-03-26 stsp goto done;
6445 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6446 fa51e947 2020-03-27 stsp if (error) {
6447 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6448 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
6449 2ec1f75b 2019-03-26 stsp goto done;
6452 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6455 2ec1f75b 2019-03-26 stsp goto done;
6457 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6458 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6459 2ec1f75b 2019-03-26 stsp if (error)
6460 2ec1f75b 2019-03-26 stsp goto done;
6462 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6463 6d022e97 2019-08-04 stsp if (error)
6464 6d022e97 2019-08-04 stsp goto done;
6466 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
6467 f2a9dc41 2019-12-13 tracey char *ondisk_path;
6468 f2a9dc41 2019-12-13 tracey struct stat sb;
6469 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
6470 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6471 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6472 62d463ca 2020-10-20 naddy pe->path) == -1) {
6473 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6474 f2a9dc41 2019-12-13 tracey goto done;
6476 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6477 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6478 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6479 f2a9dc41 2019-12-13 tracey continue;
6481 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6482 f2a9dc41 2019-12-13 tracey ondisk_path);
6483 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6484 f2a9dc41 2019-12-13 tracey goto done;
6486 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6487 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6488 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6489 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6490 f2a9dc41 2019-12-13 tracey goto done;
6495 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6496 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
6497 766841c2 2020-08-13 stsp repo, keep_on_disk);
6500 a129376b 2019-03-28 stsp got_repo_close(repo);
6501 a129376b 2019-03-28 stsp if (worktree)
6502 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6503 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6504 17ed4618 2019-06-02 stsp free((char *)pe->path);
6505 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6506 a129376b 2019-03-28 stsp free(cwd);
6507 a129376b 2019-03-28 stsp return error;
6510 a129376b 2019-03-28 stsp __dead static void
6511 a129376b 2019-03-28 stsp usage_revert(void)
6513 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6514 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6518 1ee397ad 2019-07-12 stsp static const struct got_error *
6519 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6521 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6522 fb9704af 2020-01-27 stsp return NULL;
6524 a129376b 2019-03-28 stsp while (path[0] == '/')
6526 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6527 33aa809d 2019-08-08 stsp return NULL;
6530 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6531 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6532 33aa809d 2019-08-08 stsp const char *action;
6535 33aa809d 2019-08-08 stsp static const struct got_error *
6536 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6537 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6539 33aa809d 2019-08-08 stsp char *line = NULL;
6540 33aa809d 2019-08-08 stsp size_t linesize = 0;
6541 33aa809d 2019-08-08 stsp ssize_t linelen;
6543 33aa809d 2019-08-08 stsp switch (status) {
6544 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6545 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6547 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6548 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6550 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6551 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6552 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6553 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6554 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6555 33aa809d 2019-08-08 stsp printf("%s", line);
6556 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6557 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6558 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6559 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6560 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6563 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6566 33aa809d 2019-08-08 stsp return NULL;
6569 33aa809d 2019-08-08 stsp static const struct got_error *
6570 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6571 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6573 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6574 33aa809d 2019-08-08 stsp char *line = NULL;
6575 33aa809d 2019-08-08 stsp size_t linesize = 0;
6576 33aa809d 2019-08-08 stsp ssize_t linelen;
6577 33aa809d 2019-08-08 stsp int resp = ' ';
6578 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6580 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6582 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6584 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6585 33aa809d 2019-08-08 stsp a->action);
6587 33aa809d 2019-08-08 stsp return err;
6588 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6589 33aa809d 2019-08-08 stsp if (linelen == -1) {
6590 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6591 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6592 33aa809d 2019-08-08 stsp return NULL;
6594 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6596 33aa809d 2019-08-08 stsp *nl = '\0';
6597 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6598 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6599 33aa809d 2019-08-08 stsp printf("y\n");
6600 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6601 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6602 33aa809d 2019-08-08 stsp printf("n\n");
6603 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6604 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6605 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6606 33aa809d 2019-08-08 stsp printf("q\n");
6608 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6609 33aa809d 2019-08-08 stsp free(line);
6610 33aa809d 2019-08-08 stsp return NULL;
6613 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6614 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6615 33aa809d 2019-08-08 stsp a->action);
6617 33aa809d 2019-08-08 stsp return err;
6618 33aa809d 2019-08-08 stsp resp = getchar();
6619 33aa809d 2019-08-08 stsp if (resp == '\n')
6620 33aa809d 2019-08-08 stsp resp = getchar();
6621 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6622 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6623 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6624 33aa809d 2019-08-08 stsp resp = ' ';
6626 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6627 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6628 33aa809d 2019-08-08 stsp resp = ' ';
6632 33aa809d 2019-08-08 stsp if (resp == 'y')
6633 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6634 33aa809d 2019-08-08 stsp else if (resp == 'n')
6635 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6636 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6637 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6639 1ee397ad 2019-07-12 stsp return NULL;
6643 a129376b 2019-03-28 stsp static const struct got_error *
6644 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6646 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6647 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6648 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6649 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6650 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6651 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6652 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6653 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6654 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6655 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6657 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6659 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6660 a129376b 2019-03-28 stsp switch (ch) {
6662 33aa809d 2019-08-08 stsp pflag = 1;
6665 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6668 0f6d7415 2019-08-08 stsp can_recurse = 1;
6671 a129376b 2019-03-28 stsp usage_revert();
6672 a129376b 2019-03-28 stsp /* NOTREACHED */
6676 a129376b 2019-03-28 stsp argc -= optind;
6677 a129376b 2019-03-28 stsp argv += optind;
6679 43012d58 2019-07-14 stsp #ifndef PROFILE
6680 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6681 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6682 43012d58 2019-07-14 stsp err(1, "pledge");
6684 e20a8b6f 2019-06-04 stsp if (argc < 1)
6685 a129376b 2019-03-28 stsp usage_revert();
6686 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6687 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6689 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6690 a129376b 2019-03-28 stsp if (cwd == NULL) {
6691 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6692 a129376b 2019-03-28 stsp goto done;
6694 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6695 fa51e947 2020-03-27 stsp if (error) {
6696 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6697 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6698 2ec1f75b 2019-03-26 stsp goto done;
6701 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6703 a129376b 2019-03-28 stsp if (error != NULL)
6704 a129376b 2019-03-28 stsp goto done;
6706 33aa809d 2019-08-08 stsp if (patch_script_path) {
6707 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6708 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6709 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6710 33aa809d 2019-08-08 stsp patch_script_path);
6711 33aa809d 2019-08-08 stsp goto done;
6714 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6715 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6716 a129376b 2019-03-28 stsp if (error)
6717 a129376b 2019-03-28 stsp goto done;
6719 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6720 6d022e97 2019-08-04 stsp if (error)
6721 6d022e97 2019-08-04 stsp goto done;
6723 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6724 0f6d7415 2019-08-08 stsp char *ondisk_path;
6725 0f6d7415 2019-08-08 stsp struct stat sb;
6726 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6727 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6728 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6729 62d463ca 2020-10-20 naddy pe->path) == -1) {
6730 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6731 0f6d7415 2019-08-08 stsp goto done;
6733 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6734 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6735 0f6d7415 2019-08-08 stsp free(ondisk_path);
6738 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6739 0f6d7415 2019-08-08 stsp ondisk_path);
6740 0f6d7415 2019-08-08 stsp free(ondisk_path);
6741 0f6d7415 2019-08-08 stsp goto done;
6743 0f6d7415 2019-08-08 stsp free(ondisk_path);
6744 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6745 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6746 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6747 0f6d7415 2019-08-08 stsp goto done;
6752 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6753 33aa809d 2019-08-08 stsp cpa.action = "revert";
6754 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6755 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6757 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6758 33aa809d 2019-08-08 stsp error == NULL)
6759 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6761 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6762 2ec1f75b 2019-03-26 stsp if (worktree)
6763 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6764 2ec1f75b 2019-03-26 stsp free(path);
6765 d00136be 2019-03-26 stsp free(cwd);
6766 6bad629b 2019-02-04 stsp return error;
6769 c4296144 2019-05-09 stsp __dead static void
6770 c4296144 2019-05-09 stsp usage_commit(void)
6772 35213c7c 2020-07-23 stsp fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6773 5c1e53bc 2019-07-28 stsp getprogname());
6777 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6778 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6779 e2ba3d07 2019-05-13 stsp const char *editor;
6780 e0870e44 2019-05-13 stsp const char *worktree_path;
6781 76d98825 2019-06-03 stsp const char *branch_name;
6782 314a6357 2019-05-13 stsp const char *repo_path;
6783 e0870e44 2019-05-13 stsp char *logmsg_path;
6787 33ad4cbe 2019-05-12 jcs static const struct got_error *
6788 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6791 76d98825 2019-06-03 stsp char *initial_content = NULL;
6792 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6793 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6794 e0870e44 2019-05-13 stsp char *template = NULL;
6795 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6796 1601cb9f 2020-09-11 naddy int initial_content_len;
6797 97972933 2020-09-11 stsp int fd = -1;
6798 33ad4cbe 2019-05-12 jcs size_t len;
6800 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6801 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6802 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6803 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6804 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6805 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6806 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6807 33ad4cbe 2019-05-12 jcs return NULL;
6810 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6811 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6813 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6814 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6815 1601cb9f 2020-09-11 naddy a->branch_name);
6816 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
6817 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6819 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6821 e0870e44 2019-05-13 stsp goto done;
6823 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6824 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
6825 97972933 2020-09-11 stsp goto done;
6828 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6829 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6830 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6831 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6832 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6835 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6836 0d5bb276 2020-12-15 stsp initial_content_len, 1);
6838 76d98825 2019-06-03 stsp free(initial_content);
6839 e0870e44 2019-05-13 stsp free(template);
6841 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6842 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
6844 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6845 59f86c76 2020-09-11 stsp if (err == NULL)
6846 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6847 59f86c76 2020-09-11 stsp if (err) {
6848 59f86c76 2020-09-11 stsp free(*logmsg);
6849 59f86c76 2020-09-11 stsp *logmsg = NULL;
6851 33ad4cbe 2019-05-12 jcs return err;
6854 c4296144 2019-05-09 stsp static const struct got_error *
6855 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6857 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6858 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6859 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6860 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6861 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6862 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6863 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6864 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6865 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6866 35213c7c 2020-07-23 stsp int allow_bad_symlinks = 0;
6867 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6869 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6870 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6872 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "m:S")) != -1) {
6873 c4296144 2019-05-09 stsp switch (ch) {
6875 c4296144 2019-05-09 stsp logmsg = optarg;
6878 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
6881 c4296144 2019-05-09 stsp usage_commit();
6882 c4296144 2019-05-09 stsp /* NOTREACHED */
6886 c4296144 2019-05-09 stsp argc -= optind;
6887 c4296144 2019-05-09 stsp argv += optind;
6889 43012d58 2019-07-14 stsp #ifndef PROFILE
6890 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6891 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6892 43012d58 2019-07-14 stsp err(1, "pledge");
6894 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6895 c4296144 2019-05-09 stsp if (cwd == NULL) {
6896 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6897 c4296144 2019-05-09 stsp goto done;
6899 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6900 fa51e947 2020-03-27 stsp if (error) {
6901 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6902 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6903 7d5807f4 2019-07-11 stsp goto done;
6906 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6907 c4296144 2019-05-09 stsp if (error)
6908 a698f62e 2019-07-25 stsp goto done;
6909 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6910 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6911 c4296144 2019-05-09 stsp goto done;
6914 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6915 916f288c 2019-07-30 stsp worktree);
6916 5c1e53bc 2019-07-28 stsp if (error)
6917 5c1e53bc 2019-07-28 stsp goto done;
6919 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6920 c9956ddf 2019-09-08 stsp if (error)
6921 c9956ddf 2019-09-08 stsp goto done;
6922 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6923 c9956ddf 2019-09-08 stsp gitconfig_path);
6924 c4296144 2019-05-09 stsp if (error != NULL)
6925 c4296144 2019-05-09 stsp goto done;
6927 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
6928 aba9c984 2019-09-08 stsp if (error)
6929 aba9c984 2019-09-08 stsp return error;
6932 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6933 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6935 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6936 314a6357 2019-05-13 stsp error = get_editor(&editor);
6938 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6939 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6940 c4296144 2019-05-09 stsp if (error)
6941 c4296144 2019-05-09 stsp goto done;
6943 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6944 087fb88c 2019-08-04 stsp if (error)
6945 087fb88c 2019-08-04 stsp goto done;
6947 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6948 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6949 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6950 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6951 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6952 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6953 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6954 916f288c 2019-07-30 stsp goto done;
6956 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6958 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6959 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6960 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6961 35213c7c 2020-07-23 stsp print_status, NULL, repo);
6962 e0870e44 2019-05-13 stsp if (error) {
6963 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6964 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6965 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6966 c4296144 2019-05-09 stsp goto done;
6969 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6970 c4296144 2019-05-09 stsp if (error)
6971 c4296144 2019-05-09 stsp goto done;
6972 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6974 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6975 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6976 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6977 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6978 7266f21f 2019-10-21 stsp error == NULL)
6979 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6980 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6982 c4296144 2019-05-09 stsp got_repo_close(repo);
6983 c4296144 2019-05-09 stsp if (worktree)
6984 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6985 c4296144 2019-05-09 stsp free(cwd);
6986 c4296144 2019-05-09 stsp free(id_str);
6987 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6988 e2ba3d07 2019-05-13 stsp free(editor);
6989 aba9c984 2019-09-08 stsp free(author);
6990 234035bc 2019-06-01 stsp return error;
6993 234035bc 2019-06-01 stsp __dead static void
6994 234035bc 2019-06-01 stsp usage_cherrypick(void)
6996 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7000 234035bc 2019-06-01 stsp static const struct got_error *
7001 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
7003 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
7004 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
7005 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
7006 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
7007 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
7008 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
7009 234035bc 2019-06-01 stsp struct got_object_qid *pid;
7010 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
7012 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7014 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7015 234035bc 2019-06-01 stsp switch (ch) {
7017 234035bc 2019-06-01 stsp usage_cherrypick();
7018 234035bc 2019-06-01 stsp /* NOTREACHED */
7022 234035bc 2019-06-01 stsp argc -= optind;
7023 234035bc 2019-06-01 stsp argv += optind;
7025 43012d58 2019-07-14 stsp #ifndef PROFILE
7026 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7027 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7028 43012d58 2019-07-14 stsp err(1, "pledge");
7030 234035bc 2019-06-01 stsp if (argc != 1)
7031 234035bc 2019-06-01 stsp usage_cherrypick();
7033 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
7034 234035bc 2019-06-01 stsp if (cwd == NULL) {
7035 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
7036 234035bc 2019-06-01 stsp goto done;
7038 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
7039 fa51e947 2020-03-27 stsp if (error) {
7040 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7041 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
7043 234035bc 2019-06-01 stsp goto done;
7046 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7048 234035bc 2019-06-01 stsp if (error != NULL)
7049 234035bc 2019-06-01 stsp goto done;
7051 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7052 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7053 234035bc 2019-06-01 stsp if (error)
7054 234035bc 2019-06-01 stsp goto done;
7056 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7057 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7058 234035bc 2019-06-01 stsp if (error != NULL) {
7059 234035bc 2019-06-01 stsp struct got_reference *ref;
7060 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7061 234035bc 2019-06-01 stsp goto done;
7062 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7063 234035bc 2019-06-01 stsp if (error != NULL)
7064 234035bc 2019-06-01 stsp goto done;
7065 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
7066 234035bc 2019-06-01 stsp got_ref_close(ref);
7067 234035bc 2019-06-01 stsp if (error != NULL)
7068 234035bc 2019-06-01 stsp goto done;
7070 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
7071 234035bc 2019-06-01 stsp if (error)
7072 234035bc 2019-06-01 stsp goto done;
7074 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
7075 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
7076 234035bc 2019-06-01 stsp if (error != NULL)
7077 234035bc 2019-06-01 stsp goto done;
7079 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7080 234035bc 2019-06-01 stsp if (error) {
7081 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
7082 234035bc 2019-06-01 stsp goto done;
7083 234035bc 2019-06-01 stsp error = NULL;
7085 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
7086 234035bc 2019-06-01 stsp goto done;
7089 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7090 234035bc 2019-06-01 stsp if (error)
7091 234035bc 2019-06-01 stsp goto done;
7092 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7093 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7094 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7095 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
7097 234035bc 2019-06-01 stsp if (error != NULL)
7098 234035bc 2019-06-01 stsp goto done;
7100 9627c110 2020-04-18 stsp if (upa.did_something)
7101 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
7102 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7104 234035bc 2019-06-01 stsp if (commit)
7105 234035bc 2019-06-01 stsp got_object_commit_close(commit);
7106 234035bc 2019-06-01 stsp free(commit_id_str);
7107 234035bc 2019-06-01 stsp if (head_ref)
7108 234035bc 2019-06-01 stsp got_ref_close(head_ref);
7109 234035bc 2019-06-01 stsp if (worktree)
7110 234035bc 2019-06-01 stsp got_worktree_close(worktree);
7112 234035bc 2019-06-01 stsp got_repo_close(repo);
7113 c4296144 2019-05-09 stsp return error;
7116 5ef14e63 2019-06-02 stsp __dead static void
7117 5ef14e63 2019-06-02 stsp usage_backout(void)
7119 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7123 5ef14e63 2019-06-02 stsp static const struct got_error *
7124 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
7126 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
7127 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
7128 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
7129 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
7130 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
7131 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
7132 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
7133 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
7135 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7137 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7138 5ef14e63 2019-06-02 stsp switch (ch) {
7140 5ef14e63 2019-06-02 stsp usage_backout();
7141 5ef14e63 2019-06-02 stsp /* NOTREACHED */
7145 5ef14e63 2019-06-02 stsp argc -= optind;
7146 5ef14e63 2019-06-02 stsp argv += optind;
7148 43012d58 2019-07-14 stsp #ifndef PROFILE
7149 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7150 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7151 43012d58 2019-07-14 stsp err(1, "pledge");
7153 5ef14e63 2019-06-02 stsp if (argc != 1)
7154 5ef14e63 2019-06-02 stsp usage_backout();
7156 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
7157 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
7158 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
7159 5ef14e63 2019-06-02 stsp goto done;
7161 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
7162 fa51e947 2020-03-27 stsp if (error) {
7163 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7164 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
7165 5ef14e63 2019-06-02 stsp goto done;
7168 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7170 5ef14e63 2019-06-02 stsp if (error != NULL)
7171 5ef14e63 2019-06-02 stsp goto done;
7173 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7174 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7175 5ef14e63 2019-06-02 stsp if (error)
7176 5ef14e63 2019-06-02 stsp goto done;
7178 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7179 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7180 5ef14e63 2019-06-02 stsp if (error != NULL) {
7181 5ef14e63 2019-06-02 stsp struct got_reference *ref;
7182 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7183 5ef14e63 2019-06-02 stsp goto done;
7184 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7185 5ef14e63 2019-06-02 stsp if (error != NULL)
7186 5ef14e63 2019-06-02 stsp goto done;
7187 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
7188 5ef14e63 2019-06-02 stsp got_ref_close(ref);
7189 5ef14e63 2019-06-02 stsp if (error != NULL)
7190 5ef14e63 2019-06-02 stsp goto done;
7192 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
7193 5ef14e63 2019-06-02 stsp if (error)
7194 5ef14e63 2019-06-02 stsp goto done;
7196 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
7197 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
7198 5ef14e63 2019-06-02 stsp if (error != NULL)
7199 5ef14e63 2019-06-02 stsp goto done;
7201 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7202 5ef14e63 2019-06-02 stsp if (error)
7203 5ef14e63 2019-06-02 stsp goto done;
7205 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7206 5ef14e63 2019-06-02 stsp if (error)
7207 5ef14e63 2019-06-02 stsp goto done;
7208 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7209 5ef14e63 2019-06-02 stsp if (pid == NULL) {
7210 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
7211 5ef14e63 2019-06-02 stsp goto done;
7214 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7215 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7216 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7217 5ef14e63 2019-06-02 stsp if (error != NULL)
7218 5ef14e63 2019-06-02 stsp goto done;
7220 9627c110 2020-04-18 stsp if (upa.did_something)
7221 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
7222 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7224 5ef14e63 2019-06-02 stsp if (commit)
7225 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
7226 5ef14e63 2019-06-02 stsp free(commit_id_str);
7227 5ef14e63 2019-06-02 stsp if (head_ref)
7228 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
7229 818c7501 2019-07-11 stsp if (worktree)
7230 818c7501 2019-07-11 stsp got_worktree_close(worktree);
7232 818c7501 2019-07-11 stsp got_repo_close(repo);
7233 818c7501 2019-07-11 stsp return error;
7236 818c7501 2019-07-11 stsp __dead static void
7237 818c7501 2019-07-11 stsp usage_rebase(void)
7239 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7240 af54c8f8 2019-07-11 stsp getprogname());
7245 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
7248 0ebf8283 2019-07-24 stsp size_t len;
7250 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
7251 0ebf8283 2019-07-24 stsp if (len > limit)
7252 0ebf8283 2019-07-24 stsp len = limit;
7253 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
7254 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
7256 0ebf8283 2019-07-24 stsp *nl = '\0';
7259 0ebf8283 2019-07-24 stsp static const struct got_error *
7260 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7262 5943eee2 2019-08-13 stsp const struct got_error *err;
7263 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
7264 5943eee2 2019-08-13 stsp const char *s;
7266 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
7268 5943eee2 2019-08-13 stsp return err;
7270 5943eee2 2019-08-13 stsp s = logmsg0;
7271 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
7274 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
7275 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
7276 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
7277 5943eee2 2019-08-13 stsp goto done;
7280 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
7282 5943eee2 2019-08-13 stsp free(logmsg0);
7283 a0ea4fc0 2020-02-28 stsp return err;
7286 a0ea4fc0 2020-02-28 stsp static const struct got_error *
7287 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7289 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
7290 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
7291 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
7293 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
7295 a0ea4fc0 2020-02-28 stsp return err;
7297 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
7299 a0ea4fc0 2020-02-28 stsp goto done;
7301 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
7303 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
7305 a0ea4fc0 2020-02-28 stsp goto done;
7307 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
7309 a0ea4fc0 2020-02-28 stsp free(id_str);
7310 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
7311 a0ea4fc0 2020-02-28 stsp free(logmsg);
7312 5943eee2 2019-08-13 stsp return err;
7315 818c7501 2019-07-11 stsp static const struct got_error *
7316 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
7317 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
7319 818c7501 2019-07-11 stsp const struct got_error *err;
7320 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7322 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
7324 818c7501 2019-07-11 stsp goto done;
7326 ff0d2220 2019-07-11 stsp if (new_id) {
7327 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
7329 ff0d2220 2019-07-11 stsp goto done;
7332 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
7333 ff0d2220 2019-07-11 stsp if (new_id_str)
7334 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
7336 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7338 0ebf8283 2019-07-24 stsp goto done;
7340 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
7341 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7343 818c7501 2019-07-11 stsp free(old_id_str);
7344 818c7501 2019-07-11 stsp free(new_id_str);
7345 272a1371 2020-02-28 stsp free(logmsg);
7346 818c7501 2019-07-11 stsp return err;
7349 1ee397ad 2019-07-12 stsp static const struct got_error *
7350 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7351 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
7352 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
7354 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
7355 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
7356 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
7359 818c7501 2019-07-11 stsp static const struct got_error *
7360 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
7361 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7362 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
7363 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7365 ff0d2220 2019-07-11 stsp const struct got_error *error;
7366 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
7367 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
7369 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7370 ff0d2220 2019-07-11 stsp if (error)
7371 ff0d2220 2019-07-11 stsp return error;
7373 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7374 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
7375 ff0d2220 2019-07-11 stsp if (error) {
7376 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7377 ff0d2220 2019-07-11 stsp goto done;
7378 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
7380 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
7381 ff0d2220 2019-07-11 stsp free(new_commit_id);
7384 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
7385 ff0d2220 2019-07-11 stsp return error;
7388 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
7389 64c6d990 2019-07-11 stsp const char *path_prefix;
7390 64c6d990 2019-07-11 stsp size_t len;
7391 8ca9bd68 2019-07-25 stsp int errcode;
7394 64c6d990 2019-07-11 stsp static const struct got_error *
7395 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7396 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
7397 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
7398 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
7400 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
7402 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7403 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7404 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
7406 64c6d990 2019-07-11 stsp return NULL;
7409 64c6d990 2019-07-11 stsp static const struct got_error *
7410 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
7411 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
7412 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
7414 64c6d990 2019-07-11 stsp const struct got_error *err;
7415 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7416 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
7417 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
7419 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
7420 64c6d990 2019-07-11 stsp return NULL;
7422 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7424 64c6d990 2019-07-11 stsp goto done;
7426 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7428 64c6d990 2019-07-11 stsp goto done;
7430 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
7431 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
7433 64c6d990 2019-07-11 stsp goto done;
7435 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
7436 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
7438 64c6d990 2019-07-11 stsp goto done;
7440 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
7441 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
7442 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
7443 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
7444 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
7445 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
7446 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
7448 64c6d990 2019-07-11 stsp if (tree1)
7449 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
7450 64c6d990 2019-07-11 stsp if (tree2)
7451 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
7452 64c6d990 2019-07-11 stsp if (commit)
7453 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
7454 64c6d990 2019-07-11 stsp if (parent_commit)
7455 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
7456 64c6d990 2019-07-11 stsp return err;
7459 ff0d2220 2019-07-11 stsp static const struct got_error *
7460 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
7461 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
7462 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7463 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
7464 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
7466 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
7467 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
7468 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
7469 af61c510 2019-07-19 stsp struct got_object_qid *qid;
7470 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
7472 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
7474 af61c510 2019-07-19 stsp return err;
7476 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7477 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7479 af61c510 2019-07-19 stsp goto done;
7480 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7481 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
7482 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
7483 af61c510 2019-07-19 stsp if (err) {
7484 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7485 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7486 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7487 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7488 af61c510 2019-07-19 stsp "been reached?!?");
7490 ee780d5c 2020-01-04 stsp goto done;
7492 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7493 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7495 af61c510 2019-07-19 stsp goto done;
7497 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7499 af61c510 2019-07-19 stsp goto done;
7500 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7501 af61c510 2019-07-19 stsp commit_id = parent_id;
7505 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7506 af61c510 2019-07-19 stsp return err;
7509 af61c510 2019-07-19 stsp static const struct got_error *
7510 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7512 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7513 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7514 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7515 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7516 818c7501 2019-07-11 stsp char *cwd = NULL;
7517 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7518 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7519 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7520 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7521 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7522 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7523 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7524 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7525 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7526 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7527 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7528 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7529 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7531 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7532 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7534 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7535 818c7501 2019-07-11 stsp switch (ch) {
7537 818c7501 2019-07-11 stsp abort_rebase = 1;
7540 818c7501 2019-07-11 stsp continue_rebase = 1;
7543 818c7501 2019-07-11 stsp usage_rebase();
7544 818c7501 2019-07-11 stsp /* NOTREACHED */
7548 818c7501 2019-07-11 stsp argc -= optind;
7549 818c7501 2019-07-11 stsp argv += optind;
7551 43012d58 2019-07-14 stsp #ifndef PROFILE
7552 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7553 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7554 43012d58 2019-07-14 stsp err(1, "pledge");
7556 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7557 818c7501 2019-07-11 stsp usage_rebase();
7558 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7559 818c7501 2019-07-11 stsp if (argc != 0)
7560 818c7501 2019-07-11 stsp usage_rebase();
7561 818c7501 2019-07-11 stsp } else if (argc != 1)
7562 818c7501 2019-07-11 stsp usage_rebase();
7564 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7565 818c7501 2019-07-11 stsp if (cwd == NULL) {
7566 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7567 818c7501 2019-07-11 stsp goto done;
7569 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7570 fa51e947 2020-03-27 stsp if (error) {
7571 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7572 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7573 818c7501 2019-07-11 stsp goto done;
7576 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7578 818c7501 2019-07-11 stsp if (error != NULL)
7579 818c7501 2019-07-11 stsp goto done;
7581 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7582 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7583 7ef62c4e 2020-02-24 stsp if (error)
7584 7ef62c4e 2020-02-24 stsp goto done;
7586 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7587 7ef62c4e 2020-02-24 stsp worktree);
7588 818c7501 2019-07-11 stsp if (error)
7589 7ef62c4e 2020-02-24 stsp goto done;
7590 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7591 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7592 818c7501 2019-07-11 stsp goto done;
7595 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7596 818c7501 2019-07-11 stsp if (error)
7597 818c7501 2019-07-11 stsp goto done;
7599 f6794adc 2019-07-23 stsp if (abort_rebase) {
7600 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7601 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7602 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7603 f6794adc 2019-07-23 stsp goto done;
7605 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7606 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7607 3e3a69f1 2019-07-25 stsp worktree, repo);
7608 818c7501 2019-07-11 stsp if (error)
7609 818c7501 2019-07-11 stsp goto done;
7610 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7611 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7612 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7613 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7614 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7615 818c7501 2019-07-11 stsp if (error)
7616 818c7501 2019-07-11 stsp goto done;
7617 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7618 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7619 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7622 818c7501 2019-07-11 stsp if (continue_rebase) {
7623 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7624 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7625 f6794adc 2019-07-23 stsp goto done;
7627 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7628 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7629 3e3a69f1 2019-07-25 stsp worktree, repo);
7630 818c7501 2019-07-11 stsp if (error)
7631 818c7501 2019-07-11 stsp goto done;
7633 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7634 01757395 2019-07-12 stsp resume_commit_id, repo);
7635 818c7501 2019-07-11 stsp if (error)
7636 818c7501 2019-07-11 stsp goto done;
7638 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7639 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7640 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7641 818c7501 2019-07-11 stsp goto done;
7644 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7645 818c7501 2019-07-11 stsp if (error != NULL)
7646 818c7501 2019-07-11 stsp goto done;
7649 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7650 ff0d2220 2019-07-11 stsp if (error)
7651 ff0d2220 2019-07-11 stsp goto done;
7653 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7654 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7656 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7657 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7658 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7659 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7660 818c7501 2019-07-11 stsp if (error)
7661 818c7501 2019-07-11 stsp goto done;
7662 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7663 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7664 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7665 818c7501 2019-07-11 stsp "with work tree's branch");
7666 818c7501 2019-07-11 stsp goto done;
7669 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7670 a51a74b3 2019-07-27 stsp if (error) {
7671 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7672 a51a74b3 2019-07-27 stsp goto done;
7673 a51a74b3 2019-07-27 stsp error = NULL;
7675 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7676 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7677 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7678 a51a74b3 2019-07-27 stsp goto done;
7680 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7681 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7682 818c7501 2019-07-11 stsp if (error)
7683 818c7501 2019-07-11 stsp goto done;
7686 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7687 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7688 818c7501 2019-07-11 stsp if (error)
7689 818c7501 2019-07-11 stsp goto done;
7691 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7692 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7693 fc66b545 2019-08-12 stsp if (pid == NULL) {
7694 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7695 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7696 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7697 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7698 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7699 fc66b545 2019-08-12 stsp if (error)
7700 fc66b545 2019-08-12 stsp goto done;
7701 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7702 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7703 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7706 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7707 fc66b545 2019-08-12 stsp goto done;
7709 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7710 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7711 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7712 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7713 818c7501 2019-07-11 stsp commit = NULL;
7714 818c7501 2019-07-11 stsp if (error)
7715 818c7501 2019-07-11 stsp goto done;
7717 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7718 38b0338b 2019-11-29 stsp if (continue_rebase) {
7719 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7720 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7721 38b0338b 2019-11-29 stsp goto done;
7723 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7724 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7725 38b0338b 2019-11-29 stsp char *id_str;
7726 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7727 38b0338b 2019-11-29 stsp new_base_branch);
7728 38b0338b 2019-11-29 stsp if (error)
7729 38b0338b 2019-11-29 stsp goto done;
7730 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7731 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7732 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7733 38b0338b 2019-11-29 stsp free(id_str);
7734 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7735 38b0338b 2019-11-29 stsp new_head_commit_id);
7736 38b0338b 2019-11-29 stsp if (error)
7737 38b0338b 2019-11-29 stsp goto done;
7741 818c7501 2019-07-11 stsp pid = NULL;
7742 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7743 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7745 818c7501 2019-07-11 stsp commit_id = qid->id;
7746 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7747 818c7501 2019-07-11 stsp pid = qid;
7749 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7750 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7751 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7752 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7753 818c7501 2019-07-11 stsp if (error)
7754 818c7501 2019-07-11 stsp goto done;
7756 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7757 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7758 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7760 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7761 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7762 a0ea4fc0 2020-02-28 stsp if (error)
7763 a0ea4fc0 2020-02-28 stsp goto done;
7764 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7768 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7769 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7770 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7771 818c7501 2019-07-11 stsp if (error)
7772 818c7501 2019-07-11 stsp goto done;
7775 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7776 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7777 818c7501 2019-07-11 stsp if (error)
7778 818c7501 2019-07-11 stsp goto done;
7779 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7780 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7782 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7783 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7785 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7786 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7787 818c7501 2019-07-11 stsp free(resume_commit_id);
7788 818c7501 2019-07-11 stsp free(yca_id);
7789 818c7501 2019-07-11 stsp if (commit)
7790 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7791 818c7501 2019-07-11 stsp if (branch)
7792 818c7501 2019-07-11 stsp got_ref_close(branch);
7793 818c7501 2019-07-11 stsp if (new_base_branch)
7794 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7795 818c7501 2019-07-11 stsp if (tmp_branch)
7796 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7797 5ef14e63 2019-06-02 stsp if (worktree)
7798 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7800 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7801 5ef14e63 2019-06-02 stsp return error;
7804 0ebf8283 2019-07-24 stsp __dead static void
7805 0ebf8283 2019-07-24 stsp usage_histedit(void)
7807 466785b9 2020-12-10 jrick fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] [-F histedit-script] [-m]\n",
7808 0ebf8283 2019-07-24 stsp getprogname());
7812 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7813 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7814 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7815 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7816 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7818 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7819 0ebf8283 2019-07-24 stsp unsigned char code;
7820 0ebf8283 2019-07-24 stsp const char *name;
7821 0ebf8283 2019-07-24 stsp const char *desc;
7822 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7823 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7824 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7825 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7826 82997472 2020-01-29 stsp "be used" },
7827 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7828 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7829 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7832 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7833 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7834 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7835 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7836 0ebf8283 2019-07-24 stsp char *logmsg;
7838 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7840 0ebf8283 2019-07-24 stsp static const struct got_error *
7841 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7842 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7844 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7845 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7846 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7849 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7851 0ebf8283 2019-07-24 stsp goto done;
7853 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7855 0ebf8283 2019-07-24 stsp goto done;
7857 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7859 0ebf8283 2019-07-24 stsp goto done;
7861 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7862 0ebf8283 2019-07-24 stsp if (n < 0)
7863 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7865 0ebf8283 2019-07-24 stsp if (commit)
7866 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7867 0ebf8283 2019-07-24 stsp free(id_str);
7868 0ebf8283 2019-07-24 stsp free(logmsg);
7869 0ebf8283 2019-07-24 stsp return err;
7872 0ebf8283 2019-07-24 stsp static const struct got_error *
7873 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7874 466785b9 2020-12-10 jrick FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
7876 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7877 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7878 466785b9 2020-12-10 jrick const char *histedit_cmd = NULL;
7880 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7881 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7883 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7884 466785b9 2020-12-10 jrick histedit_cmd = got_histedit_cmds[0].name;
7885 466785b9 2020-12-10 jrick if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
7886 466785b9 2020-12-10 jrick histedit_cmd = "fold";
7887 466785b9 2020-12-10 jrick err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
7890 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7891 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7892 083957f4 2020-02-24 stsp if (n < 0) {
7893 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7899 0ebf8283 2019-07-24 stsp return err;
7902 0ebf8283 2019-07-24 stsp static const struct got_error *
7903 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7904 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7906 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7909 514f2ffe 2020-01-29 stsp char *id_str;
7910 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7912 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7913 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7915 514f2ffe 2020-01-29 stsp return err;
7917 514f2ffe 2020-01-29 stsp n = fprintf(f,
7918 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7919 514f2ffe 2020-01-29 stsp "# commit %s\n"
7920 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7921 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7922 514f2ffe 2020-01-29 stsp if (n < 0) {
7923 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7924 514f2ffe 2020-01-29 stsp goto done;
7927 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7928 514f2ffe 2020-01-29 stsp if (n < 0) {
7929 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7930 514f2ffe 2020-01-29 stsp goto done;
7933 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7934 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7935 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7936 0ebf8283 2019-07-24 stsp cmd->desc);
7937 0ebf8283 2019-07-24 stsp if (n < 0) {
7938 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7943 514f2ffe 2020-01-29 stsp free(id_str);
7944 0ebf8283 2019-07-24 stsp return err;
7947 0ebf8283 2019-07-24 stsp static const struct got_error *
7948 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7950 0ebf8283 2019-07-24 stsp static char msg[42];
7953 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7955 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7956 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7958 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7961 0ebf8283 2019-07-24 stsp static const struct got_error *
7962 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7963 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7965 0ebf8283 2019-07-24 stsp const struct got_error *err;
7966 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7967 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7969 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7971 0ebf8283 2019-07-24 stsp return err;
7973 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7975 0ebf8283 2019-07-24 stsp goto done;
7977 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7979 5943eee2 2019-08-13 stsp goto done;
7980 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7981 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7982 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7983 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7986 0ebf8283 2019-07-24 stsp if (folded_commit)
7987 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7988 0ebf8283 2019-07-24 stsp free(id_str);
7989 5943eee2 2019-08-13 stsp free(folded_logmsg);
7990 0ebf8283 2019-07-24 stsp return err;
7993 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7994 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7996 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7998 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7999 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8000 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
8001 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8002 3f9de99f 2019-07-24 stsp folded = prev;
8003 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
8006 0ebf8283 2019-07-24 stsp return folded;
8009 0ebf8283 2019-07-24 stsp static const struct got_error *
8010 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8011 0ebf8283 2019-07-24 stsp struct got_repository *repo)
8013 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8014 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8015 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8016 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8017 1601cb9f 2020-09-11 naddy int logmsg_len;
8019 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
8021 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8023 0ebf8283 2019-07-24 stsp return err;
8025 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
8026 0ebf8283 2019-07-24 stsp if (folded) {
8027 0ebf8283 2019-07-24 stsp while (folded != hle) {
8028 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8029 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8032 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
8033 0ebf8283 2019-07-24 stsp logmsg, repo);
8035 0ebf8283 2019-07-24 stsp goto done;
8036 0ebf8283 2019-07-24 stsp free(logmsg);
8037 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8038 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8042 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8044 0ebf8283 2019-07-24 stsp goto done;
8045 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8047 5943eee2 2019-08-13 stsp goto done;
8048 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
8049 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
8050 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
8051 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
8052 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8053 0ebf8283 2019-07-24 stsp goto done;
8055 0ebf8283 2019-07-24 stsp free(logmsg);
8056 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8058 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8060 0ebf8283 2019-07-24 stsp goto done;
8062 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
8063 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
8065 0ebf8283 2019-07-24 stsp goto done;
8067 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
8068 0ebf8283 2019-07-24 stsp close(fd);
8070 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8072 0ebf8283 2019-07-24 stsp goto done;
8074 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8075 0d5bb276 2020-12-15 stsp logmsg_len, 0);
8076 0ebf8283 2019-07-24 stsp if (err) {
8077 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8078 0ebf8283 2019-07-24 stsp goto done;
8079 71392a05 2020-12-13 stsp err = NULL;
8080 71392a05 2020-12-13 stsp hle->logmsg = strdup(new_msg);
8081 71392a05 2020-12-13 stsp if (hle->logmsg == NULL)
8082 71392a05 2020-12-13 stsp err = got_error_from_errno("strdup");
8085 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8086 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
8087 0ebf8283 2019-07-24 stsp free(logmsg_path);
8088 0ebf8283 2019-07-24 stsp free(logmsg);
8089 5943eee2 2019-08-13 stsp free(orig_logmsg);
8090 0ebf8283 2019-07-24 stsp free(editor);
8091 0ebf8283 2019-07-24 stsp if (commit)
8092 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8093 0ebf8283 2019-07-24 stsp return err;
8096 0ebf8283 2019-07-24 stsp static const struct got_error *
8097 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
8098 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8100 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8101 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
8102 6059809a 2020-12-17 stsp size_t i, size;
8103 0ebf8283 2019-07-24 stsp ssize_t len;
8104 6059809a 2020-12-17 stsp int lineno = 0;
8105 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8106 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
8107 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
8109 0ebf8283 2019-07-24 stsp for (;;) {
8110 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
8111 0ebf8283 2019-07-24 stsp if (len == -1) {
8112 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
8113 0ebf8283 2019-07-24 stsp if (feof(f))
8115 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
8116 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
8121 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8123 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
8124 0ebf8283 2019-07-24 stsp free(line);
8125 0ebf8283 2019-07-24 stsp line = NULL;
8128 0ebf8283 2019-07-24 stsp cmd = NULL;
8129 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8130 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
8131 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8132 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
8133 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
8136 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8141 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
8142 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8145 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8147 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
8148 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
8149 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
8152 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
8153 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8157 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
8158 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
8159 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8163 0ebf8283 2019-07-24 stsp free(line);
8164 0ebf8283 2019-07-24 stsp line = NULL;
8168 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
8170 0ebf8283 2019-07-24 stsp *end = '\0';
8172 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
8173 0ebf8283 2019-07-24 stsp if (err) {
8174 0ebf8283 2019-07-24 stsp /* override error code */
8175 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8179 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
8180 0ebf8283 2019-07-24 stsp if (hle == NULL) {
8181 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
8184 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
8185 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
8186 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
8187 0ebf8283 2019-07-24 stsp commit_id = NULL;
8188 0ebf8283 2019-07-24 stsp free(line);
8189 0ebf8283 2019-07-24 stsp line = NULL;
8190 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8193 0ebf8283 2019-07-24 stsp free(line);
8194 0ebf8283 2019-07-24 stsp free(commit_id);
8195 0ebf8283 2019-07-24 stsp return err;
8198 0ebf8283 2019-07-24 stsp static const struct got_error *
8199 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
8200 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
8202 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
8203 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
8204 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8205 5b87815e 2020-03-05 stsp static char msg[92];
8206 bfce7f83 2019-07-27 stsp char *id_str;
8208 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
8209 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8210 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
8211 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
8212 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8214 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8215 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
8216 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8217 5b87815e 2020-03-05 stsp if (hle == hle2)
8219 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
8220 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
8222 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
8224 5b87815e 2020-03-05 stsp return err;
8225 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
8226 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
8227 5b87815e 2020-03-05 stsp free(id_str);
8228 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8232 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8233 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8234 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8237 bfce7f83 2019-07-27 stsp if (hle == NULL) {
8238 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
8240 bfce7f83 2019-07-27 stsp return err;
8241 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
8242 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
8243 bfce7f83 2019-07-27 stsp free(id_str);
8244 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8248 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8249 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8250 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8251 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
8253 bfce7f83 2019-07-27 stsp return NULL;
8256 bfce7f83 2019-07-27 stsp static const struct got_error *
8257 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
8258 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
8259 bfce7f83 2019-07-27 stsp struct got_repository *repo)
8261 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8262 0ebf8283 2019-07-24 stsp char *editor;
8263 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8265 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8267 0ebf8283 2019-07-24 stsp return err;
8269 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
8270 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
8271 0ebf8283 2019-07-24 stsp goto done;
8274 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8275 0ebf8283 2019-07-24 stsp if (f == NULL) {
8276 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
8277 0ebf8283 2019-07-24 stsp goto done;
8279 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8281 bfce7f83 2019-07-27 stsp goto done;
8283 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
8285 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8286 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8287 0ebf8283 2019-07-24 stsp free(editor);
8288 0ebf8283 2019-07-24 stsp return err;
8291 0ebf8283 2019-07-24 stsp static const struct got_error *
8292 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8293 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
8294 514f2ffe 2020-01-29 stsp struct got_repository *);
8296 0ebf8283 2019-07-24 stsp static const struct got_error *
8297 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
8298 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
8299 466785b9 2020-12-10 jrick int edit_logmsg_only, int fold_only, struct got_repository *repo)
8301 0ebf8283 2019-07-24 stsp const struct got_error *err;
8302 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8303 0ebf8283 2019-07-24 stsp char *path = NULL;
8305 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
8307 0ebf8283 2019-07-24 stsp return err;
8309 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
8311 0ebf8283 2019-07-24 stsp goto done;
8313 466785b9 2020-12-10 jrick err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8314 466785b9 2020-12-10 jrick fold_only, repo);
8316 0ebf8283 2019-07-24 stsp goto done;
8318 466785b9 2020-12-10 jrick if (edit_logmsg_only || fold_only) {
8319 083957f4 2020-02-24 stsp rewind(f);
8320 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8322 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
8323 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
8324 0ebf8283 2019-07-24 stsp goto done;
8327 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
8328 083957f4 2020-02-24 stsp if (err) {
8329 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8330 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8331 083957f4 2020-02-24 stsp goto done;
8332 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
8333 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
8337 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8338 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8339 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
8340 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
8341 0ebf8283 2019-07-24 stsp free(path);
8342 0ebf8283 2019-07-24 stsp return err;
8345 0ebf8283 2019-07-24 stsp static const struct got_error *
8346 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
8347 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8349 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8350 0ebf8283 2019-07-24 stsp char *path = NULL;
8351 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8352 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8353 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8355 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
8357 0ebf8283 2019-07-24 stsp return err;
8359 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
8360 0ebf8283 2019-07-24 stsp if (f == NULL) {
8361 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8362 0ebf8283 2019-07-24 stsp goto done;
8364 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8365 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8370 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8371 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
8372 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
8373 0ebf8283 2019-07-24 stsp if (n < 0) {
8374 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8380 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8381 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8382 0ebf8283 2019-07-24 stsp free(path);
8383 0ebf8283 2019-07-24 stsp if (commit)
8384 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8385 0ebf8283 2019-07-24 stsp return err;
8389 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
8391 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8393 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
8394 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
8395 bfce7f83 2019-07-27 stsp free(hle);
8399 0ebf8283 2019-07-24 stsp static const struct got_error *
8400 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
8401 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
8403 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8404 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8406 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8407 0ebf8283 2019-07-24 stsp if (f == NULL) {
8408 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8409 0ebf8283 2019-07-24 stsp goto done;
8412 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8414 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8415 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8416 0ebf8283 2019-07-24 stsp return err;
8419 0ebf8283 2019-07-24 stsp static const struct got_error *
8420 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8421 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
8422 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
8424 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
8425 0ebf8283 2019-07-24 stsp int resp = ' ';
8427 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
8428 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8429 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
8430 0ebf8283 2019-07-24 stsp resp = getchar();
8431 a61a4414 2019-08-07 stsp if (resp == '\n')
8432 a61a4414 2019-08-07 stsp resp = getchar();
8433 426ebf2e 2019-07-25 stsp if (resp == 'c') {
8434 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8435 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
8437 426ebf2e 2019-07-25 stsp if (err) {
8438 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8439 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8441 bfce7f83 2019-07-27 stsp prev_err = err;
8442 426ebf2e 2019-07-25 stsp resp = ' ';
8446 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
8447 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8448 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
8449 466785b9 2020-12-10 jrick commits, branch_name, 0, 0, repo);
8450 426ebf2e 2019-07-25 stsp if (err) {
8451 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8452 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8454 bfce7f83 2019-07-27 stsp prev_err = err;
8455 426ebf2e 2019-07-25 stsp resp = ' ';
8459 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
8460 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8463 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
8466 0ebf8283 2019-07-24 stsp return err;
8469 0ebf8283 2019-07-24 stsp static const struct got_error *
8470 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
8471 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8472 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
8474 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8475 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8476 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8477 3e3a69f1 2019-07-25 stsp branch, repo);
8480 0ebf8283 2019-07-24 stsp static const struct got_error *
8481 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
8482 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8484 0ebf8283 2019-07-24 stsp const struct got_error *err;
8485 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8487 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
8489 0ebf8283 2019-07-24 stsp goto done;
8491 0ebf8283 2019-07-24 stsp if (new_id) {
8492 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
8494 0ebf8283 2019-07-24 stsp goto done;
8497 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8498 0ebf8283 2019-07-24 stsp if (new_id_str)
8499 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8501 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8502 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8503 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8504 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8505 0ebf8283 2019-07-24 stsp goto done;
8507 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8509 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8511 0ebf8283 2019-07-24 stsp goto done;
8514 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8515 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8516 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8517 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8518 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8520 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8521 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8522 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8529 0ebf8283 2019-07-24 stsp free(old_id_str);
8530 0ebf8283 2019-07-24 stsp free(new_id_str);
8531 0ebf8283 2019-07-24 stsp return err;
8534 0ebf8283 2019-07-24 stsp static const struct got_error *
8535 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8536 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8537 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8538 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8540 0ebf8283 2019-07-24 stsp const struct got_error *err;
8541 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8542 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8544 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8545 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8546 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8548 0ebf8283 2019-07-24 stsp return err;
8551 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8553 0ebf8283 2019-07-24 stsp return err;
8555 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8556 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8557 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8558 0ebf8283 2019-07-24 stsp if (err) {
8559 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8560 0ebf8283 2019-07-24 stsp goto done;
8561 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8563 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8564 0ebf8283 2019-07-24 stsp free(new_commit_id);
8567 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8568 0ebf8283 2019-07-24 stsp return err;
8571 0ebf8283 2019-07-24 stsp static const struct got_error *
8572 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8573 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8575 0ebf8283 2019-07-24 stsp const struct got_error *error;
8576 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8578 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8580 0ebf8283 2019-07-24 stsp if (error)
8581 0ebf8283 2019-07-24 stsp return error;
8583 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8584 0ebf8283 2019-07-24 stsp if (error)
8585 0ebf8283 2019-07-24 stsp return error;
8587 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8588 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8589 0ebf8283 2019-07-24 stsp return error;
8592 ab20a43a 2020-01-29 stsp static const struct got_error *
8593 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8594 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8595 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8596 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8598 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8600 ab20a43a 2020-01-29 stsp switch (status) {
8601 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8602 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8603 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8604 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8605 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8606 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8611 ab20a43a 2020-01-29 stsp switch (staged_status) {
8612 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8613 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8614 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8615 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8616 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8621 ab20a43a 2020-01-29 stsp return NULL;
8624 0ebf8283 2019-07-24 stsp static const struct got_error *
8625 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8627 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8628 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8629 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8630 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8631 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8632 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8633 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8634 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8635 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8636 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8637 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8638 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8639 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8640 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8641 466785b9 2020-12-10 jrick int edit_logmsg_only = 0, fold_only = 0;
8642 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8643 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8644 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8645 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8646 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8647 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8648 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8649 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8651 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8652 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8653 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8654 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8656 466785b9 2020-12-10 jrick while ((ch = getopt(argc, argv, "acfF:m")) != -1) {
8657 0ebf8283 2019-07-24 stsp switch (ch) {
8659 0ebf8283 2019-07-24 stsp abort_edit = 1;
8662 0ebf8283 2019-07-24 stsp continue_edit = 1;
8664 466785b9 2020-12-10 jrick case 'f':
8665 466785b9 2020-12-10 jrick fold_only = 1;
8668 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8671 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8674 0ebf8283 2019-07-24 stsp usage_histedit();
8675 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8679 0ebf8283 2019-07-24 stsp argc -= optind;
8680 0ebf8283 2019-07-24 stsp argv += optind;
8682 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8683 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8684 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8685 0ebf8283 2019-07-24 stsp err(1, "pledge");
8687 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8688 ff69268e 2020-12-13 stsp option_conflict('a', 'c');
8689 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8690 ff69268e 2020-12-13 stsp option_conflict('F', 'm');
8691 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8692 ff69268e 2020-12-13 stsp option_conflict('a', 'm');
8693 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8694 ff69268e 2020-12-13 stsp option_conflict('c', 'm');
8695 466785b9 2020-12-10 jrick if (abort_edit && fold_only)
8696 ff69268e 2020-12-13 stsp option_conflict('a', 'f');
8697 ff69268e 2020-12-13 stsp if (continue_edit && fold_only)
8698 ff69268e 2020-12-13 stsp option_conflict('c', 'f');
8699 466785b9 2020-12-10 jrick if (fold_only && edit_logmsg_only)
8700 ff69268e 2020-12-13 stsp option_conflict('f', 'm');
8701 b3805337 2020-12-13 stsp if (edit_script_path && fold_only)
8702 b3805337 2020-12-13 stsp option_conflict('F', 'f');
8703 0ebf8283 2019-07-24 stsp if (argc != 0)
8704 0ebf8283 2019-07-24 stsp usage_histedit();
8707 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8708 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8709 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8710 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8711 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8712 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8715 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8716 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8717 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8718 0ebf8283 2019-07-24 stsp goto done;
8720 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8721 fa51e947 2020-03-27 stsp if (error) {
8722 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8723 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8724 0ebf8283 2019-07-24 stsp goto done;
8727 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8729 0ebf8283 2019-07-24 stsp if (error != NULL)
8730 0ebf8283 2019-07-24 stsp goto done;
8732 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8733 0ebf8283 2019-07-24 stsp if (error)
8734 0ebf8283 2019-07-24 stsp goto done;
8735 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8736 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8737 0ebf8283 2019-07-24 stsp goto done;
8740 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8741 0ebf8283 2019-07-24 stsp if (error)
8742 0ebf8283 2019-07-24 stsp goto done;
8744 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8745 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8746 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8747 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8748 083957f4 2020-02-24 stsp "before the -m option can be used");
8749 083957f4 2020-02-24 stsp goto done;
8751 466785b9 2020-12-10 jrick if (edit_in_progress && fold_only) {
8752 466785b9 2020-12-10 jrick error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8753 466785b9 2020-12-10 jrick "histedit operation is in progress in this "
8754 466785b9 2020-12-10 jrick "work tree and must be continued or aborted "
8755 466785b9 2020-12-10 jrick "before the -f option can be used");
8756 466785b9 2020-12-10 jrick goto done;
8759 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8760 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8761 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8762 3e3a69f1 2019-07-25 stsp worktree, repo);
8763 0ebf8283 2019-07-24 stsp if (error)
8764 0ebf8283 2019-07-24 stsp goto done;
8765 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8766 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8767 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8768 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8769 0ebf8283 2019-07-24 stsp if (error)
8770 0ebf8283 2019-07-24 stsp goto done;
8771 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8772 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8773 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8774 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8775 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8776 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8777 0ebf8283 2019-07-24 stsp goto done;
8780 0ebf8283 2019-07-24 stsp if (continue_edit) {
8781 0ebf8283 2019-07-24 stsp char *path;
8783 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8784 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8785 0ebf8283 2019-07-24 stsp goto done;
8788 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8789 0ebf8283 2019-07-24 stsp if (error)
8790 0ebf8283 2019-07-24 stsp goto done;
8792 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8793 0ebf8283 2019-07-24 stsp free(path);
8794 0ebf8283 2019-07-24 stsp if (error)
8795 0ebf8283 2019-07-24 stsp goto done;
8797 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8798 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8799 3e3a69f1 2019-07-25 stsp worktree, repo);
8800 0ebf8283 2019-07-24 stsp if (error)
8801 0ebf8283 2019-07-24 stsp goto done;
8803 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8804 0ebf8283 2019-07-24 stsp if (error)
8805 0ebf8283 2019-07-24 stsp goto done;
8807 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8808 0ebf8283 2019-07-24 stsp head_commit_id);
8809 0ebf8283 2019-07-24 stsp if (error)
8810 0ebf8283 2019-07-24 stsp goto done;
8811 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8812 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8813 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8814 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8815 3aac7cf7 2019-07-25 stsp goto done;
8817 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8818 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8819 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8820 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8821 0ebf8283 2019-07-24 stsp commit = NULL;
8822 0ebf8283 2019-07-24 stsp if (error)
8823 0ebf8283 2019-07-24 stsp goto done;
8825 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8826 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8827 0ebf8283 2019-07-24 stsp goto done;
8830 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8831 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8832 0ebf8283 2019-07-24 stsp if (error != NULL)
8833 0ebf8283 2019-07-24 stsp goto done;
8835 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8836 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8837 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8838 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8839 c7d20a3f 2019-07-30 stsp goto done;
8842 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8843 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8844 bfce7f83 2019-07-27 stsp branch = NULL;
8845 0ebf8283 2019-07-24 stsp if (error)
8846 0ebf8283 2019-07-24 stsp goto done;
8848 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8849 0ebf8283 2019-07-24 stsp head_commit_id);
8850 0ebf8283 2019-07-24 stsp if (error)
8851 0ebf8283 2019-07-24 stsp goto done;
8852 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8853 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8854 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8855 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8856 3aac7cf7 2019-07-25 stsp goto done;
8858 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8859 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8860 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8861 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8862 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8863 0ebf8283 2019-07-24 stsp commit = NULL;
8864 0ebf8283 2019-07-24 stsp if (error)
8865 0ebf8283 2019-07-24 stsp goto done;
8867 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8868 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8869 c5996fff 2020-01-29 stsp goto done;
8872 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8873 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8874 bfce7f83 2019-07-27 stsp if (error)
8875 bfce7f83 2019-07-27 stsp goto done;
8877 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8878 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8879 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8880 6ba2bea2 2019-07-27 stsp if (error) {
8881 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8882 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8883 9627c110 2020-04-18 stsp update_progress, &upa);
8884 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8885 0ebf8283 2019-07-24 stsp goto done;
8888 514f2ffe 2020-01-29 stsp const char *branch_name;
8889 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8890 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8891 514f2ffe 2020-01-29 stsp branch_name += 11;
8892 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8893 466785b9 2020-12-10 jrick branch_name, edit_logmsg_only, fold_only, repo);
8894 6ba2bea2 2019-07-27 stsp if (error) {
8895 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8896 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8897 9627c110 2020-04-18 stsp update_progress, &upa);
8898 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8899 0ebf8283 2019-07-24 stsp goto done;
8904 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8906 6ba2bea2 2019-07-27 stsp if (error) {
8907 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8908 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8909 9627c110 2020-04-18 stsp update_progress, &upa);
8910 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8911 0ebf8283 2019-07-24 stsp goto done;
8916 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8917 4ec14e60 2019-08-28 hiltjo if (error)
8918 0ebf8283 2019-07-24 stsp goto done;
8920 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8921 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8922 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8923 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8926 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8927 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8928 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8929 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8931 ab20a43a 2020-01-29 stsp if (error)
8932 ab20a43a 2020-01-29 stsp goto done;
8934 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8935 ab20a43a 2020-01-29 stsp int have_changes = 0;
8937 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8938 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8939 ab20a43a 2020-01-29 stsp if (error)
8940 ab20a43a 2020-01-29 stsp goto done;
8941 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8942 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8943 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8944 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8945 ab20a43a 2020-01-29 stsp if (error) {
8946 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8947 ab20a43a 2020-01-29 stsp goto done;
8948 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8949 ab20a43a 2020-01-29 stsp goto done;
8951 ab20a43a 2020-01-29 stsp if (have_changes) {
8952 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8953 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8954 ab20a43a 2020-01-29 stsp if (error)
8955 ab20a43a 2020-01-29 stsp goto done;
8957 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8958 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8959 ab20a43a 2020-01-29 stsp if (error)
8960 ab20a43a 2020-01-29 stsp goto done;
8961 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8962 ab20a43a 2020-01-29 stsp hle, NULL);
8963 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8964 ab20a43a 2020-01-29 stsp commit = NULL;
8965 ab20a43a 2020-01-29 stsp if (error)
8966 ab20a43a 2020-01-29 stsp goto done;
8972 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8973 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8974 0ebf8283 2019-07-24 stsp if (error)
8975 0ebf8283 2019-07-24 stsp goto done;
8979 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8980 0ebf8283 2019-07-24 stsp hle->commit_id);
8981 0ebf8283 2019-07-24 stsp if (error)
8982 0ebf8283 2019-07-24 stsp goto done;
8983 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8984 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8986 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8987 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8988 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8989 0ebf8283 2019-07-24 stsp if (error)
8990 0ebf8283 2019-07-24 stsp goto done;
8991 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8992 0ebf8283 2019-07-24 stsp commit = NULL;
8994 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8995 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8996 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8998 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8999 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
9001 a0ea4fc0 2020-02-28 stsp if (error)
9002 a0ea4fc0 2020-02-28 stsp goto done;
9003 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9007 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9008 0ebf8283 2019-07-24 stsp char *id_str;
9009 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
9010 0ebf8283 2019-07-24 stsp if (error)
9011 0ebf8283 2019-07-24 stsp goto done;
9012 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
9014 0ebf8283 2019-07-24 stsp free(id_str);
9015 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9016 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
9017 3e3a69f1 2019-07-25 stsp fileindex);
9018 0ebf8283 2019-07-24 stsp goto done;
9021 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9022 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
9023 0ebf8283 2019-07-24 stsp if (error)
9024 0ebf8283 2019-07-24 stsp goto done;
9028 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
9029 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
9030 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9031 0ebf8283 2019-07-24 stsp if (error)
9032 0ebf8283 2019-07-24 stsp goto done;
9035 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
9036 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
9037 0ebf8283 2019-07-24 stsp if (error)
9038 0ebf8283 2019-07-24 stsp goto done;
9039 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
9040 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
9042 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
9043 3e3a69f1 2019-07-25 stsp branch, repo);
9045 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
9046 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
9047 0ebf8283 2019-07-24 stsp free(head_commit_id);
9048 0ebf8283 2019-07-24 stsp free(base_commit_id);
9049 0ebf8283 2019-07-24 stsp free(resume_commit_id);
9050 0ebf8283 2019-07-24 stsp if (commit)
9051 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9052 0ebf8283 2019-07-24 stsp if (branch)
9053 0ebf8283 2019-07-24 stsp got_ref_close(branch);
9054 0ebf8283 2019-07-24 stsp if (tmp_branch)
9055 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
9056 0ebf8283 2019-07-24 stsp if (worktree)
9057 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
9059 2822a352 2019-10-15 stsp got_repo_close(repo);
9060 2822a352 2019-10-15 stsp return error;
9063 2822a352 2019-10-15 stsp __dead static void
9064 2822a352 2019-10-15 stsp usage_integrate(void)
9066 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9070 2822a352 2019-10-15 stsp static const struct got_error *
9071 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
9073 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
9074 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
9075 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
9076 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9077 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
9078 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9079 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
9080 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9082 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9084 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9085 2822a352 2019-10-15 stsp switch (ch) {
9087 2822a352 2019-10-15 stsp usage_integrate();
9088 2822a352 2019-10-15 stsp /* NOTREACHED */
9092 2822a352 2019-10-15 stsp argc -= optind;
9093 2822a352 2019-10-15 stsp argv += optind;
9095 2822a352 2019-10-15 stsp if (argc != 1)
9096 2822a352 2019-10-15 stsp usage_integrate();
9097 2822a352 2019-10-15 stsp branch_arg = argv[0];
9098 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
9099 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9100 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
9101 2822a352 2019-10-15 stsp err(1, "pledge");
9103 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
9104 2822a352 2019-10-15 stsp if (cwd == NULL) {
9105 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
9106 2822a352 2019-10-15 stsp goto done;
9109 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
9110 fa51e947 2020-03-27 stsp if (error) {
9111 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9112 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
9114 2822a352 2019-10-15 stsp goto done;
9117 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
9118 2822a352 2019-10-15 stsp if (error)
9119 2822a352 2019-10-15 stsp goto done;
9121 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9123 2822a352 2019-10-15 stsp if (error != NULL)
9124 2822a352 2019-10-15 stsp goto done;
9126 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9127 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
9128 2822a352 2019-10-15 stsp if (error)
9129 2822a352 2019-10-15 stsp goto done;
9131 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9132 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
9133 2822a352 2019-10-15 stsp goto done;
9136 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9137 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
9138 2822a352 2019-10-15 stsp if (error)
9139 2822a352 2019-10-15 stsp goto done;
9141 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
9142 2822a352 2019-10-15 stsp if (refname == NULL) {
9143 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9144 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9145 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9146 2822a352 2019-10-15 stsp goto done;
9148 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
9149 2822a352 2019-10-15 stsp if (base_refname == NULL) {
9150 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9151 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9152 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9153 2822a352 2019-10-15 stsp goto done;
9156 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
9157 2822a352 2019-10-15 stsp if (error)
9158 2822a352 2019-10-15 stsp goto done;
9160 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9161 2822a352 2019-10-15 stsp if (error)
9162 2822a352 2019-10-15 stsp goto done;
9164 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9165 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
9166 2822a352 2019-10-15 stsp "specified branch has already been integrated");
9167 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9168 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9169 2822a352 2019-10-15 stsp goto done;
9172 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9173 2822a352 2019-10-15 stsp if (error) {
9174 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
9175 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
9176 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9177 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9178 2822a352 2019-10-15 stsp goto done;
9181 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9182 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
9183 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
9184 2822a352 2019-10-15 stsp check_cancelled, NULL);
9185 2822a352 2019-10-15 stsp if (error)
9186 2822a352 2019-10-15 stsp goto done;
9188 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
9189 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9192 715dc77e 2019-08-03 stsp got_repo_close(repo);
9193 2822a352 2019-10-15 stsp if (worktree)
9194 2822a352 2019-10-15 stsp got_worktree_close(worktree);
9195 2822a352 2019-10-15 stsp free(cwd);
9196 2822a352 2019-10-15 stsp free(base_commit_id);
9197 2822a352 2019-10-15 stsp free(commit_id);
9198 2822a352 2019-10-15 stsp free(refname);
9199 2822a352 2019-10-15 stsp free(base_refname);
9200 715dc77e 2019-08-03 stsp return error;
9203 715dc77e 2019-08-03 stsp __dead static void
9204 715dc77e 2019-08-03 stsp usage_stage(void)
9206 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9207 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
9208 715dc77e 2019-08-03 stsp getprogname());
9212 715dc77e 2019-08-03 stsp static const struct got_error *
9213 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
9214 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
9215 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9216 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
9218 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
9219 408b4ebc 2019-08-03 stsp char *id_str = NULL;
9221 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
9222 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
9223 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
9224 408b4ebc 2019-08-03 stsp return NULL;
9226 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
9227 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
9228 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
9230 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
9232 408b4ebc 2019-08-03 stsp return err;
9234 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
9235 408b4ebc 2019-08-03 stsp free(id_str);
9236 dc424a06 2019-08-07 stsp return NULL;
9239 dc424a06 2019-08-07 stsp static const struct got_error *
9240 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
9242 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
9243 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
9244 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
9245 715dc77e 2019-08-03 stsp char *cwd = NULL;
9246 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
9247 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
9248 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9249 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
9250 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9251 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9253 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
9255 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9256 715dc77e 2019-08-03 stsp switch (ch) {
9258 408b4ebc 2019-08-03 stsp list_stage = 1;
9261 dc424a06 2019-08-07 stsp pflag = 1;
9264 dc424a06 2019-08-07 stsp patch_script_path = optarg;
9267 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
9270 715dc77e 2019-08-03 stsp usage_stage();
9271 715dc77e 2019-08-03 stsp /* NOTREACHED */
9275 715dc77e 2019-08-03 stsp argc -= optind;
9276 715dc77e 2019-08-03 stsp argv += optind;
9278 715dc77e 2019-08-03 stsp #ifndef PROFILE
9279 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9280 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
9281 715dc77e 2019-08-03 stsp err(1, "pledge");
9283 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
9284 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
9285 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
9286 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
9288 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
9289 715dc77e 2019-08-03 stsp if (cwd == NULL) {
9290 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
9291 715dc77e 2019-08-03 stsp goto done;
9294 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9295 fa51e947 2020-03-27 stsp if (error) {
9296 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9297 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
9298 715dc77e 2019-08-03 stsp goto done;
9301 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9303 715dc77e 2019-08-03 stsp if (error != NULL)
9304 715dc77e 2019-08-03 stsp goto done;
9306 dc424a06 2019-08-07 stsp if (patch_script_path) {
9307 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
9308 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
9309 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
9310 dc424a06 2019-08-07 stsp patch_script_path);
9311 dc424a06 2019-08-07 stsp goto done;
9314 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9315 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
9316 715dc77e 2019-08-03 stsp if (error)
9317 715dc77e 2019-08-03 stsp goto done;
9319 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9320 6d022e97 2019-08-04 stsp if (error)
9321 6d022e97 2019-08-04 stsp goto done;
9323 6d022e97 2019-08-04 stsp if (list_stage)
9324 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
9325 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
9327 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9328 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
9329 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
9330 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
9331 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
9332 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
9335 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9336 2e1f37b0 2019-08-08 stsp error == NULL)
9337 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9339 ad493afc 2019-08-03 stsp got_repo_close(repo);
9340 ad493afc 2019-08-03 stsp if (worktree)
9341 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
9342 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9343 ad493afc 2019-08-03 stsp free((char *)pe->path);
9344 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
9345 ad493afc 2019-08-03 stsp free(cwd);
9346 ad493afc 2019-08-03 stsp return error;
9349 ad493afc 2019-08-03 stsp __dead static void
9350 ad493afc 2019-08-03 stsp usage_unstage(void)
9352 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9353 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
9354 ad493afc 2019-08-03 stsp getprogname());
9359 ad493afc 2019-08-03 stsp static const struct got_error *
9360 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
9362 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
9363 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
9364 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
9365 ad493afc 2019-08-03 stsp char *cwd = NULL;
9366 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
9367 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9368 9627c110 2020-04-18 stsp int ch, pflag = 0;
9369 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9370 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
9371 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9372 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9374 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
9376 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
9377 ad493afc 2019-08-03 stsp switch (ch) {
9379 2e1f37b0 2019-08-08 stsp pflag = 1;
9382 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
9385 ad493afc 2019-08-03 stsp usage_unstage();
9386 ad493afc 2019-08-03 stsp /* NOTREACHED */
9390 ad493afc 2019-08-03 stsp argc -= optind;
9391 ad493afc 2019-08-03 stsp argv += optind;
9393 ad493afc 2019-08-03 stsp #ifndef PROFILE
9394 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9395 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
9396 ad493afc 2019-08-03 stsp err(1, "pledge");
9398 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
9399 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
9401 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
9402 ad493afc 2019-08-03 stsp if (cwd == NULL) {
9403 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
9404 ad493afc 2019-08-03 stsp goto done;
9407 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9408 fa51e947 2020-03-27 stsp if (error) {
9409 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9410 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
9411 ad493afc 2019-08-03 stsp goto done;
9414 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9416 ad493afc 2019-08-03 stsp if (error != NULL)
9417 ad493afc 2019-08-03 stsp goto done;
9419 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
9420 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
9421 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
9422 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
9423 2e1f37b0 2019-08-08 stsp patch_script_path);
9424 2e1f37b0 2019-08-08 stsp goto done;
9428 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9429 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
9430 ad493afc 2019-08-03 stsp if (error)
9431 ad493afc 2019-08-03 stsp goto done;
9433 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9434 ad493afc 2019-08-03 stsp if (error)
9435 ad493afc 2019-08-03 stsp goto done;
9437 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9438 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
9439 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9440 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
9441 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
9442 9627c110 2020-04-18 stsp if (!error)
9443 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9445 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9446 2e1f37b0 2019-08-08 stsp error == NULL)
9447 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9449 0ebf8283 2019-07-24 stsp got_repo_close(repo);
9450 715dc77e 2019-08-03 stsp if (worktree)
9451 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
9452 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9453 715dc77e 2019-08-03 stsp free((char *)pe->path);
9454 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
9455 715dc77e 2019-08-03 stsp free(cwd);
9456 01073a5d 2019-08-22 stsp return error;
9459 01073a5d 2019-08-22 stsp __dead static void
9460 01073a5d 2019-08-22 stsp usage_cat(void)
9462 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9463 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
9467 01073a5d 2019-08-22 stsp static const struct got_error *
9468 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9470 01073a5d 2019-08-22 stsp const struct got_error *err;
9471 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
9473 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
9475 01073a5d 2019-08-22 stsp return err;
9477 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9478 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
9479 01073a5d 2019-08-22 stsp return err;
9482 01073a5d 2019-08-22 stsp static const struct got_error *
9483 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9485 01073a5d 2019-08-22 stsp const struct got_error *err;
9486 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
9487 56e0773d 2019-11-28 stsp int nentries, i;
9489 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
9491 01073a5d 2019-08-22 stsp return err;
9493 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
9494 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
9495 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
9496 01073a5d 2019-08-22 stsp char *id_str;
9497 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
9499 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
9500 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9503 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
9504 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
9505 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
9506 01073a5d 2019-08-22 stsp free(id_str);
9509 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
9510 01073a5d 2019-08-22 stsp return err;
9513 01073a5d 2019-08-22 stsp static const struct got_error *
9514 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9516 01073a5d 2019-08-22 stsp const struct got_error *err;
9517 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
9518 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9519 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9520 01073a5d 2019-08-22 stsp char *id_str = NULL;
9521 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9523 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9525 01073a5d 2019-08-22 stsp return err;
9527 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9529 01073a5d 2019-08-22 stsp goto done;
9531 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9532 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9533 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9534 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9535 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9536 01073a5d 2019-08-22 stsp char *pid_str;
9537 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9539 01073a5d 2019-08-22 stsp goto done;
9540 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9541 01073a5d 2019-08-22 stsp free(pid_str);
9543 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9544 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9545 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
9547 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9548 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9549 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
9551 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9552 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9553 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9555 01073a5d 2019-08-22 stsp free(id_str);
9556 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9557 01073a5d 2019-08-22 stsp return err;
9560 01073a5d 2019-08-22 stsp static const struct got_error *
9561 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9563 01073a5d 2019-08-22 stsp const struct got_error *err;
9564 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9565 01073a5d 2019-08-22 stsp char *id_str = NULL;
9566 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9568 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9570 01073a5d 2019-08-22 stsp return err;
9572 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9574 01073a5d 2019-08-22 stsp goto done;
9576 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9578 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9579 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9580 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9581 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9583 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9584 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9585 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9587 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9588 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9589 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9591 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9592 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9593 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9599 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9600 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9602 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9603 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9604 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
9606 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9607 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9608 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9610 01073a5d 2019-08-22 stsp free(id_str);
9611 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9612 01073a5d 2019-08-22 stsp return err;
9615 01073a5d 2019-08-22 stsp static const struct got_error *
9616 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9618 01073a5d 2019-08-22 stsp const struct got_error *error;
9619 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9620 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9621 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9622 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9623 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9624 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9625 84de9106 2020-12-26 stsp struct got_reflist_head refs;
9627 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
9629 01073a5d 2019-08-22 stsp #ifndef PROFILE
9630 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9631 01073a5d 2019-08-22 stsp NULL) == -1)
9632 01073a5d 2019-08-22 stsp err(1, "pledge");
9635 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9636 01073a5d 2019-08-22 stsp switch (ch) {
9638 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9641 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9642 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9643 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9645 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9648 896e9b6f 2019-08-26 stsp force_path = 1;
9651 01073a5d 2019-08-22 stsp usage_cat();
9652 01073a5d 2019-08-22 stsp /* NOTREACHED */
9656 01073a5d 2019-08-22 stsp argc -= optind;
9657 01073a5d 2019-08-22 stsp argv += optind;
9659 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9660 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9661 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9662 01073a5d 2019-08-22 stsp goto done;
9664 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9665 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9666 01073a5d 2019-08-22 stsp goto done;
9667 01073a5d 2019-08-22 stsp if (worktree) {
9668 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9669 01073a5d 2019-08-22 stsp repo_path = strdup(
9670 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9671 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9672 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9673 01073a5d 2019-08-22 stsp goto done;
9678 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9679 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9680 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9681 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9684 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9685 01073a5d 2019-08-22 stsp free(repo_path);
9686 01073a5d 2019-08-22 stsp if (error != NULL)
9687 01073a5d 2019-08-22 stsp goto done;
9689 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9690 896e9b6f 2019-08-26 stsp if (error)
9691 896e9b6f 2019-08-26 stsp goto done;
9693 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9694 84de9106 2020-12-26 stsp if (error)
9695 84de9106 2020-12-26 stsp goto done;
9697 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9698 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9699 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9700 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
9701 01073a5d 2019-08-22 stsp if (error)
9702 01073a5d 2019-08-22 stsp goto done;
9704 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9705 896e9b6f 2019-08-26 stsp if (force_path) {
9706 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9708 896e9b6f 2019-08-26 stsp if (error)
9711 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9712 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
9714 896e9b6f 2019-08-26 stsp if (error) {
9715 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9716 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9718 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9719 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9720 896e9b6f 2019-08-26 stsp if (error)
9725 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9726 01073a5d 2019-08-22 stsp if (error)
9729 01073a5d 2019-08-22 stsp switch (obj_type) {
9730 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9731 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9733 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9734 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9736 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9737 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9739 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9740 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9743 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9746 01073a5d 2019-08-22 stsp if (error)
9748 01073a5d 2019-08-22 stsp free(label);
9749 01073a5d 2019-08-22 stsp label = NULL;
9751 01073a5d 2019-08-22 stsp id = NULL;
9754 01073a5d 2019-08-22 stsp free(label);
9756 896e9b6f 2019-08-26 stsp free(commit_id);
9757 01073a5d 2019-08-22 stsp if (worktree)
9758 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9759 01073a5d 2019-08-22 stsp if (repo) {
9760 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9761 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9762 01073a5d 2019-08-22 stsp if (error == NULL)
9763 01073a5d 2019-08-22 stsp error = repo_error;
9765 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
9766 b2118c49 2020-07-28 stsp return error;
9769 b2118c49 2020-07-28 stsp __dead static void
9770 b2118c49 2020-07-28 stsp usage_info(void)
9772 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
9773 b2118c49 2020-07-28 stsp getprogname());
9777 b2118c49 2020-07-28 stsp static const struct got_error *
9778 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9779 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9780 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
9782 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
9783 b2118c49 2020-07-28 stsp char *id_str = NULL;
9784 b2118c49 2020-07-28 stsp char datebuf[128];
9785 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
9786 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
9787 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9790 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
9791 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
9793 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
9794 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
9795 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
9796 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
9797 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
9800 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
9801 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
9802 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
9803 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
9804 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
9805 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9806 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
9807 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
9809 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
9811 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
9812 b2118c49 2020-07-28 stsp if (tm == NULL)
9813 b2118c49 2020-07-28 stsp return NULL;
9814 b2118c49 2020-07-28 stsp if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9815 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
9816 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
9818 b2118c49 2020-07-28 stsp if (blob_id) {
9819 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
9821 b2118c49 2020-07-28 stsp return err;
9822 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
9823 b2118c49 2020-07-28 stsp free(id_str);
9826 b2118c49 2020-07-28 stsp if (staged_blob_id) {
9827 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
9829 b2118c49 2020-07-28 stsp return err;
9830 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
9831 b2118c49 2020-07-28 stsp free(id_str);
9834 b2118c49 2020-07-28 stsp if (commit_id) {
9835 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
9837 b2118c49 2020-07-28 stsp return err;
9838 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
9839 b2118c49 2020-07-28 stsp free(id_str);
9842 b2118c49 2020-07-28 stsp return NULL;
9845 b2118c49 2020-07-28 stsp static const struct got_error *
9846 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
9848 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
9849 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
9850 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
9851 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
9852 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9853 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
9854 b2118c49 2020-07-28 stsp int ch, show_files = 0;
9856 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
9858 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9859 b2118c49 2020-07-28 stsp switch (ch) {
9861 b2118c49 2020-07-28 stsp usage_info();
9862 b2118c49 2020-07-28 stsp /* NOTREACHED */
9866 b2118c49 2020-07-28 stsp argc -= optind;
9867 b2118c49 2020-07-28 stsp argv += optind;
9869 b2118c49 2020-07-28 stsp #ifndef PROFILE
9870 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9871 b2118c49 2020-07-28 stsp NULL) == -1)
9872 b2118c49 2020-07-28 stsp err(1, "pledge");
9874 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
9875 b2118c49 2020-07-28 stsp if (cwd == NULL) {
9876 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
9877 b2118c49 2020-07-28 stsp goto done;
9880 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
9881 b2118c49 2020-07-28 stsp if (error) {
9882 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9883 b2118c49 2020-07-28 stsp error = wrap_not_worktree_error(error, "status", cwd);
9884 b2118c49 2020-07-28 stsp goto done;
9887 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9888 b2118c49 2020-07-28 stsp if (error)
9889 b2118c49 2020-07-28 stsp goto done;
9891 b2118c49 2020-07-28 stsp if (argc >= 1) {
9892 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
9893 b2118c49 2020-07-28 stsp worktree);
9894 b2118c49 2020-07-28 stsp if (error)
9895 b2118c49 2020-07-28 stsp goto done;
9896 b2118c49 2020-07-28 stsp show_files = 1;
9899 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
9900 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
9901 b2118c49 2020-07-28 stsp if (error)
9902 b2118c49 2020-07-28 stsp goto done;
9904 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
9905 b2118c49 2020-07-28 stsp if (error)
9906 b2118c49 2020-07-28 stsp goto done;
9908 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9909 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
9910 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
9911 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
9912 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
9913 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
9914 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
9915 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9917 b2118c49 2020-07-28 stsp if (show_files) {
9918 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9919 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9920 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
9923 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
9924 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
9926 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
9927 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
9929 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
9930 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
9931 b2118c49 2020-07-28 stsp if (error)
9932 b2118c49 2020-07-28 stsp goto done;
9933 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9934 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
9935 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
9941 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
9942 b2118c49 2020-07-28 stsp free((char *)pe->path);
9943 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
9944 b2118c49 2020-07-28 stsp free(cwd);
9945 b2118c49 2020-07-28 stsp free(id_str);
9946 b2118c49 2020-07-28 stsp free(uuidstr);
9947 0ebf8283 2019-07-24 stsp return error;
