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 28cf319f 2021-01-28 stsp const char *initial_content, size_t initial_content_len,
435 28cf319f 2021-01-28 stsp int require_modification)
437 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
438 bfa12d5e 2020-09-26 stsp char *line = NULL;
439 bfa12d5e 2020-09-26 stsp size_t linesize = 0;
440 bfa12d5e 2020-09-26 stsp ssize_t linelen;
441 3ce1b845 2019-07-15 stsp struct stat st, st2;
442 bfa12d5e 2020-09-26 stsp FILE *fp = NULL;
443 bfa12d5e 2020-09-26 stsp size_t len, logmsg_len;
444 bfa12d5e 2020-09-26 stsp char *initial_content_stripped = NULL, *buf = NULL, *s;
446 3ce1b845 2019-07-15 stsp *logmsg = NULL;
448 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
449 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
451 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
452 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
454 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
455 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
457 28cf319f 2021-01-28 stsp if (require_modification &&
458 28cf319f 2021-01-28 stsp st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
459 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
460 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
463 bfa12d5e 2020-09-26 stsp * Set up a stripped version of the initial content without comments
464 bfa12d5e 2020-09-26 stsp * and blank lines. We need this in order to check if the message
465 bfa12d5e 2020-09-26 stsp * has in fact been edited.
467 bfa12d5e 2020-09-26 stsp initial_content_stripped = malloc(initial_content_len + 1);
468 bfa12d5e 2020-09-26 stsp if (initial_content_stripped == NULL)
469 bfa12d5e 2020-09-26 stsp return got_error_from_errno("malloc");
470 bfa12d5e 2020-09-26 stsp initial_content_stripped[0] = '\0';
472 bfa12d5e 2020-09-26 stsp buf = strdup(initial_content);
473 bfa12d5e 2020-09-26 stsp if (buf == NULL) {
474 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("strdup");
479 bfa12d5e 2020-09-26 stsp while ((line = strsep(&s, "\n")) != NULL) {
480 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
481 bfa12d5e 2020-09-26 stsp continue; /* remove comments and leading empty lines */
482 bfa12d5e 2020-09-26 stsp len = strlcat(initial_content_stripped, line,
483 bfa12d5e 2020-09-26 stsp initial_content_len + 1);
484 bfa12d5e 2020-09-26 stsp if (len >= initial_content_len + 1) {
485 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
489 bfa12d5e 2020-09-26 stsp while (len > 0 && initial_content_stripped[len - 1] == '\n') {
490 bfa12d5e 2020-09-26 stsp initial_content_stripped[len - 1] = '\0';
494 bfa12d5e 2020-09-26 stsp logmsg_len = st2.st_size;
495 bfa12d5e 2020-09-26 stsp *logmsg = malloc(logmsg_len + 1);
496 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
497 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
498 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
500 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
501 3ce1b845 2019-07-15 stsp if (fp == NULL) {
502 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
507 bfa12d5e 2020-09-26 stsp while ((linelen = getline(&line, &linesize, fp)) != -1) {
508 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
509 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
510 bfa12d5e 2020-09-26 stsp len = strlcat(*logmsg, line, logmsg_len + 1);
511 bfa12d5e 2020-09-26 stsp if (len >= logmsg_len + 1) {
512 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
516 bfa12d5e 2020-09-26 stsp free(line);
517 bfa12d5e 2020-09-26 stsp if (ferror(fp)) {
518 bfa12d5e 2020-09-26 stsp err = got_ferror(fp, GOT_ERR_IO);
521 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
522 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
526 bfa12d5e 2020-09-26 stsp if (len == 0) {
527 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
528 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
531 28cf319f 2021-01-28 stsp if (require_modification &&
532 28cf319f 2021-01-28 stsp strcmp(*logmsg, initial_content_stripped) == 0)
533 bfa12d5e 2020-09-26 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
534 bfa12d5e 2020-09-26 stsp "no changes made to commit message, aborting");
536 bfa12d5e 2020-09-26 stsp free(initial_content_stripped);
538 bfa12d5e 2020-09-26 stsp if (fp && fclose(fp) == EOF && err == NULL)
539 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("fclose");
541 3ce1b845 2019-07-15 stsp free(*logmsg);
542 3ce1b845 2019-07-15 stsp *logmsg = NULL;
544 3ce1b845 2019-07-15 stsp return err;
547 3ce1b845 2019-07-15 stsp static const struct got_error *
548 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
549 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
551 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
552 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
553 1601cb9f 2020-09-11 naddy int initial_content_len;
554 97972933 2020-09-11 stsp int fd = -1;
556 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
557 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
558 1601cb9f 2020-09-11 naddy branch_name);
559 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
560 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
562 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
563 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
567 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
568 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *logmsg_path);
572 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
573 0d5bb276 2020-12-15 stsp initial_content_len, 1);
575 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
576 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *logmsg_path);
577 3ce1b845 2019-07-15 stsp free(initial_content);
579 59f86c76 2020-09-11 stsp free(*logmsg_path);
580 59f86c76 2020-09-11 stsp *logmsg_path = NULL;
582 3ce1b845 2019-07-15 stsp return err;
585 3ce1b845 2019-07-15 stsp static const struct got_error *
586 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
588 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
589 3ce1b845 2019-07-15 stsp return NULL;
592 3ce1b845 2019-07-15 stsp static const struct got_error *
593 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
594 50b0790e 2020-09-11 stsp struct got_worktree *worktree)
596 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
597 50b0790e 2020-09-11 stsp const char *got_author = NULL, *name, *email;
598 50b0790e 2020-09-11 stsp const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
600 84792843 2019-08-09 stsp *author = NULL;
602 50b0790e 2020-09-11 stsp if (worktree)
603 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
604 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
607 50b0790e 2020-09-11 stsp * Priority of potential author information sources, from most
608 50b0790e 2020-09-11 stsp * significant to least significant:
609 50b0790e 2020-09-11 stsp * 1) work tree's .got/got.conf file
610 50b0790e 2020-09-11 stsp * 2) repository's got.conf file
611 50b0790e 2020-09-11 stsp * 3) repository's git config file
612 50b0790e 2020-09-11 stsp * 4) environment variables
613 50b0790e 2020-09-11 stsp * 5) global git config files (in user's home directory or /etc)
616 50b0790e 2020-09-11 stsp if (worktree_conf)
617 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(worktree_conf);
618 50b0790e 2020-09-11 stsp if (got_author == NULL)
619 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(repo_conf);
620 84792843 2019-08-09 stsp if (got_author == NULL) {
621 257add31 2020-09-09 stsp name = got_repo_get_gitconfig_author_name(repo);
622 257add31 2020-09-09 stsp email = got_repo_get_gitconfig_author_email(repo);
623 c9956ddf 2019-09-08 stsp if (name && email) {
624 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
625 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
626 c9956ddf 2019-09-08 stsp return NULL;
629 257add31 2020-09-09 stsp got_author = getenv("GOT_AUTHOR");
630 257add31 2020-09-09 stsp if (got_author == NULL) {
631 257add31 2020-09-09 stsp name = got_repo_get_global_gitconfig_author_name(repo);
632 257add31 2020-09-09 stsp email = got_repo_get_global_gitconfig_author_email(
634 257add31 2020-09-09 stsp if (name && email) {
635 257add31 2020-09-09 stsp if (asprintf(author, "%s <%s>", name, email)
637 257add31 2020-09-09 stsp return got_error_from_errno("asprintf");
638 257add31 2020-09-09 stsp return NULL;
640 257add31 2020-09-09 stsp /* TODO: Look up user in password database? */
641 257add31 2020-09-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
645 aba9c984 2019-09-08 stsp *author = strdup(got_author);
646 aba9c984 2019-09-08 stsp if (*author == NULL)
647 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
650 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
651 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
653 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
654 84792843 2019-08-09 stsp got_author++;
655 aba9c984 2019-09-08 stsp if (*got_author != '<') {
656 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
659 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
660 84792843 2019-08-09 stsp got_author++;
661 aba9c984 2019-09-08 stsp if (*got_author != '@') {
662 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
665 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
666 84792843 2019-08-09 stsp got_author++;
667 84792843 2019-08-09 stsp if (*got_author != '>')
668 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
671 aba9c984 2019-09-08 stsp free(*author);
672 aba9c984 2019-09-08 stsp *author = NULL;
674 aba9c984 2019-09-08 stsp return err;
677 c9956ddf 2019-09-08 stsp static const struct got_error *
678 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
680 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
682 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
683 c9956ddf 2019-09-08 stsp if (homedir) {
684 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
685 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
688 c9956ddf 2019-09-08 stsp return NULL;
691 84792843 2019-08-09 stsp static const struct got_error *
692 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
694 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
695 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
696 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
697 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
698 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
699 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
700 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
701 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
703 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
704 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
705 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
707 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
709 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
710 3ce1b845 2019-07-15 stsp switch (ch) {
712 3ce1b845 2019-07-15 stsp branch_name = optarg;
715 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
716 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
717 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
722 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
723 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
724 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
730 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
732 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
738 b2b65d18 2019-08-22 stsp usage_import();
739 3ce1b845 2019-07-15 stsp /* NOTREACHED */
743 3ce1b845 2019-07-15 stsp argc -= optind;
744 3ce1b845 2019-07-15 stsp argv += optind;
746 3ce1b845 2019-07-15 stsp #ifndef PROFILE
747 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
749 3ce1b845 2019-07-15 stsp NULL) == -1)
750 3ce1b845 2019-07-15 stsp err(1, "pledge");
752 3ce1b845 2019-07-15 stsp if (argc != 1)
753 3ce1b845 2019-07-15 stsp usage_import();
755 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
756 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
757 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
758 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
760 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
761 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
764 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
768 50b0790e 2020-09-11 stsp error = get_author(&author, repo, NULL);
770 aba9c984 2019-09-08 stsp return error;
773 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
774 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
775 e560b7e0 2019-11-28 stsp * an unintended typo.
777 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
778 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
780 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
781 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
785 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
786 3ce1b845 2019-07-15 stsp if (error) {
787 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
790 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
791 3ce1b845 2019-07-15 stsp "import target branch already exists");
795 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
796 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
797 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
800 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
803 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
804 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
806 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
807 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
810 8e158b01 2019-09-22 stsp free(logmsg);
811 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
812 ef293bdd 2019-10-21 stsp path_dir, refname);
813 ef293bdd 2019-10-21 stsp if (error) {
814 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
815 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
816 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
821 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
822 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
823 ef293bdd 2019-10-21 stsp if (logmsg_path)
824 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
828 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
829 ef293bdd 2019-10-21 stsp if (error) {
830 ef293bdd 2019-10-21 stsp if (logmsg_path)
831 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
835 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
836 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
837 ef293bdd 2019-10-21 stsp if (error) {
838 ef293bdd 2019-10-21 stsp if (logmsg_path)
839 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
843 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
844 ef293bdd 2019-10-21 stsp if (error) {
845 ef293bdd 2019-10-21 stsp if (logmsg_path)
846 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
850 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
851 ef293bdd 2019-10-21 stsp if (error) {
852 ef293bdd 2019-10-21 stsp if (logmsg_path)
853 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
857 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
858 ef293bdd 2019-10-21 stsp if (error) {
859 ef293bdd 2019-10-21 stsp if (logmsg_path)
860 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
864 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
865 3ce1b845 2019-07-15 stsp if (error) {
866 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
867 ef293bdd 2019-10-21 stsp if (logmsg_path)
868 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
872 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
873 3ce1b845 2019-07-15 stsp branch_ref);
874 ef293bdd 2019-10-21 stsp if (error) {
875 ef293bdd 2019-10-21 stsp if (logmsg_path)
876 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
880 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
881 ef293bdd 2019-10-21 stsp if (error) {
882 ef293bdd 2019-10-21 stsp if (logmsg_path)
883 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
888 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
889 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
891 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
892 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
893 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
894 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
895 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
896 8e158b01 2019-09-22 stsp free(logmsg);
897 ef293bdd 2019-10-21 stsp free(logmsg_path);
898 2c7829a4 2019-06-17 stsp free(repo_path);
899 3ce1b845 2019-07-15 stsp free(editor);
900 3ce1b845 2019-07-15 stsp free(refname);
901 3ce1b845 2019-07-15 stsp free(new_commit_id);
902 3ce1b845 2019-07-15 stsp free(id_str);
903 aba9c984 2019-09-08 stsp free(author);
904 c9956ddf 2019-09-08 stsp free(gitconfig_path);
905 3ce1b845 2019-07-15 stsp if (branch_ref)
906 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
907 3ce1b845 2019-07-15 stsp if (head_ref)
908 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
909 2c7829a4 2019-06-17 stsp return error;
912 93658fb9 2020-03-18 stsp __dead static void
913 93658fb9 2020-03-18 stsp usage_clone(void)
915 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
916 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
920 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
921 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
922 892ac3b6 2020-03-18 stsp int last_p_indexed;
923 892ac3b6 2020-03-18 stsp int last_p_resolved;
924 68999b92 2020-03-18 stsp int verbosity;
926 04d9a9ec 2020-09-24 stsp struct got_repository *repo;
928 04d9a9ec 2020-09-24 stsp int create_configs;
929 04d9a9ec 2020-09-24 stsp int configs_created;
931 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *symrefs;
932 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches;
933 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs;
934 04d9a9ec 2020-09-24 stsp const char *proto;
935 04d9a9ec 2020-09-24 stsp const char *host;
936 04d9a9ec 2020-09-24 stsp const char *port;
937 04d9a9ec 2020-09-24 stsp const char *remote_repo_path;
938 04d9a9ec 2020-09-24 stsp const char *git_url;
939 04d9a9ec 2020-09-24 stsp int fetch_all_branches;
940 04d9a9ec 2020-09-24 stsp int mirror_references;
941 04d9a9ec 2020-09-24 stsp } config_info;
944 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
945 93658fb9 2020-03-18 stsp static const struct got_error *
946 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
947 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
948 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
949 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_branches,
950 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, struct got_repository *repo);
952 04d9a9ec 2020-09-24 stsp static const struct got_error *
953 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
954 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
956 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
957 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
958 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
959 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
960 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
963 04d9a9ec 2020-09-24 stsp * In order to allow a failed clone to be resumed with 'got fetch'
964 04d9a9ec 2020-09-24 stsp * we try to create configuration files as soon as possible.
965 04d9a9ec 2020-09-24 stsp * Once the server has sent information about its default branch
966 04d9a9ec 2020-09-24 stsp * we have all required information.
968 04d9a9ec 2020-09-24 stsp if (a->create_configs && !a->configs_created &&
969 04d9a9ec 2020-09-24 stsp !TAILQ_EMPTY(a->config_info.symrefs)) {
970 04d9a9ec 2020-09-24 stsp err = create_config_files(a->config_info.proto,
971 62d463ca 2020-10-20 naddy a->config_info.host, a->config_info.port,
972 62d463ca 2020-10-20 naddy a->config_info.remote_repo_path,
973 62d463ca 2020-10-20 naddy a->config_info.git_url,
974 62d463ca 2020-10-20 naddy a->config_info.fetch_all_branches,
975 62d463ca 2020-10-20 naddy a->config_info.mirror_references,
976 62d463ca 2020-10-20 naddy a->config_info.symrefs,
977 99495ddb 2021-01-10 stsp a->config_info.wanted_branches,
978 99495ddb 2021-01-10 stsp a->config_info.wanted_refs, a->repo);
980 04d9a9ec 2020-09-24 stsp return err;
981 04d9a9ec 2020-09-24 stsp a->configs_created = 1;
984 68999b92 2020-03-18 stsp if (a->verbosity < 0)
985 68999b92 2020-03-18 stsp return NULL;
987 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
988 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
989 892ac3b6 2020-03-18 stsp fflush(stdout);
990 12d1281e 2020-03-19 stsp return NULL;
993 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
994 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
995 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
996 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
997 892ac3b6 2020-03-18 stsp print_size = 1;
998 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
999 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1000 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
1002 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
1003 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
1004 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
1005 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
1006 892ac3b6 2020-03-18 stsp print_indexed = 1;
1007 892ac3b6 2020-03-18 stsp print_size = 1;
1010 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
1011 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1012 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1013 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1014 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1015 892ac3b6 2020-03-18 stsp print_resolved = 1;
1016 892ac3b6 2020-03-18 stsp print_indexed = 1;
1017 892ac3b6 2020-03-18 stsp print_size = 1;
1022 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1023 892ac3b6 2020-03-18 stsp printf("\r");
1024 892ac3b6 2020-03-18 stsp if (print_size)
1025 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1026 d715f13e 2020-03-19 stsp if (print_indexed)
1027 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1028 d715f13e 2020-03-19 stsp if (print_resolved)
1029 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1030 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1031 892ac3b6 2020-03-18 stsp fflush(stdout);
1033 531c3985 2020-03-18 stsp return NULL;
1036 531c3985 2020-03-18 stsp static const struct got_error *
1037 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
1038 04d9a9ec 2020-09-24 stsp int verbosity, struct got_repository *repo)
1040 4ba14133 2020-03-20 stsp const struct got_error *err;
1041 04d9a9ec 2020-09-24 stsp struct got_reference *head_symref;
1043 04d9a9ec 2020-09-24 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1045 4ba14133 2020-03-20 stsp return err;
1047 04d9a9ec 2020-09-24 stsp err = got_ref_write(head_symref, repo);
1048 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
1049 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
1050 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
1052 04d9a9ec 2020-09-24 stsp got_ref_close(head_symref);
1053 4ba14133 2020-03-20 stsp return err;
1056 4ba14133 2020-03-20 stsp static const struct got_error *
1057 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
1058 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
1060 41b0de12 2020-03-21 stsp const struct got_error *err;
1061 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
1063 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1064 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1065 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
1067 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
1070 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
1071 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1072 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
1073 41b0de12 2020-03-21 stsp char *id_str;
1075 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1077 41b0de12 2020-03-21 stsp return err;
1078 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
1079 41b0de12 2020-03-21 stsp free(id_str);
1082 41b0de12 2020-03-21 stsp return NULL;
1085 6338a6a1 2020-03-21 stsp static const struct got_error *
1086 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
1087 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
1089 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
1090 6338a6a1 2020-03-21 stsp struct got_reference *ref;
1091 6338a6a1 2020-03-21 stsp char *id_str;
1093 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1095 6338a6a1 2020-03-21 stsp return err;
1097 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
1099 6338a6a1 2020-03-21 stsp goto done;
1101 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1102 6338a6a1 2020-03-21 stsp got_ref_close(ref);
1104 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
1105 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
1107 6338a6a1 2020-03-21 stsp free(id_str);
1108 6338a6a1 2020-03-21 stsp return err;
1111 0e4002ca 2020-03-21 stsp static int
1112 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
1114 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
1116 0e4002ca 2020-03-21 stsp refname += 5;
1119 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
1120 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
1122 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
1124 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
1127 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
1128 0e4002ca 2020-03-21 stsp wanted_ref += 5;
1130 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
1131 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1134 0e4002ca 2020-03-21 stsp /* Allow exact match. */
1135 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
1138 0e4002ca 2020-03-21 stsp static int
1139 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1141 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
1143 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1144 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1151 41b0de12 2020-03-21 stsp static const struct got_error *
1152 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1153 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1155 0e4002ca 2020-03-21 stsp const struct got_error *err;
1156 0e4002ca 2020-03-21 stsp char *remote_refname;
1158 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1159 0e4002ca 2020-03-21 stsp refname += 5;
1161 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1162 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1163 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1165 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1166 0e4002ca 2020-03-21 stsp free(remote_refname);
1167 7c0b7f42 2020-09-24 stsp return err;
1170 7c0b7f42 2020-09-24 stsp static const struct got_error *
1171 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
1172 15d3c221 2021-01-05 stsp const char *remote_repo_path, const char *default_branch,
1173 0c8b29c5 2021-01-05 stsp int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1174 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, int mirror_references,
1175 99495ddb 2021-01-10 stsp struct got_repository *repo)
1177 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1178 7c0b7f42 2020-09-24 stsp char *gotconfig_path = NULL;
1179 7c0b7f42 2020-09-24 stsp char *gotconfig = NULL;
1180 7c0b7f42 2020-09-24 stsp FILE *gotconfig_file = NULL;
1181 15d3c221 2021-01-05 stsp const char *branchname = NULL;
1182 99495ddb 2021-01-10 stsp char *branches = NULL, *refs = NULL;
1183 7c0b7f42 2020-09-24 stsp ssize_t n;
1185 0c8b29c5 2021-01-05 stsp if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1186 132af4a5 2021-01-05 stsp struct got_pathlist_entry *pe;
1187 132af4a5 2021-01-05 stsp TAILQ_FOREACH(pe, wanted_branches, entry) {
1189 132af4a5 2021-01-05 stsp branchname = pe->path;
1190 132af4a5 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1191 132af4a5 2021-01-05 stsp branchname += 11;
1192 132af4a5 2021-01-05 stsp if (asprintf(&s, "%s\"%s\" ",
1193 132af4a5 2021-01-05 stsp branches ? branches : "", branchname) == -1) {
1194 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1195 132af4a5 2021-01-05 stsp goto done;
1197 132af4a5 2021-01-05 stsp free(branches);
1198 132af4a5 2021-01-05 stsp branches = s;
1200 0c8b29c5 2021-01-05 stsp } else if (!fetch_all_branches && default_branch) {
1201 15d3c221 2021-01-05 stsp branchname = default_branch;
1202 15d3c221 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1203 15d3c221 2021-01-05 stsp branchname += 11;
1204 132af4a5 2021-01-05 stsp if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1205 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1206 132af4a5 2021-01-05 stsp goto done;
1209 99495ddb 2021-01-10 stsp if (!TAILQ_EMPTY(wanted_refs)) {
1210 99495ddb 2021-01-10 stsp struct got_pathlist_entry *pe;
1211 99495ddb 2021-01-10 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1213 99495ddb 2021-01-10 stsp const char *refname = pe->path;
1214 99495ddb 2021-01-10 stsp if (strncmp(refname, "refs/", 5) == 0)
1215 99495ddb 2021-01-10 stsp branchname += 5;
1216 99495ddb 2021-01-10 stsp if (asprintf(&s, "%s\"%s\" ",
1217 99495ddb 2021-01-10 stsp refs ? refs : "", refname) == -1) {
1218 99495ddb 2021-01-10 stsp err = got_error_from_errno("asprintf");
1219 99495ddb 2021-01-10 stsp goto done;
1221 99495ddb 2021-01-10 stsp free(refs);
1226 7c0b7f42 2020-09-24 stsp /* Create got.conf(5). */
1227 7c0b7f42 2020-09-24 stsp gotconfig_path = got_repo_get_path_gotconfig(repo);
1228 7c0b7f42 2020-09-24 stsp if (gotconfig_path == NULL) {
1229 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gotconfig");
1230 7c0b7f42 2020-09-24 stsp goto done;
1232 7c0b7f42 2020-09-24 stsp gotconfig_file = fopen(gotconfig_path, "a");
1233 7c0b7f42 2020-09-24 stsp if (gotconfig_file == NULL) {
1234 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gotconfig_path);
1235 7c0b7f42 2020-09-24 stsp goto done;
1237 7c0b7f42 2020-09-24 stsp if (asprintf(&gotconfig,
1238 7c0b7f42 2020-09-24 stsp "remote \"%s\" {\n"
1239 7c0b7f42 2020-09-24 stsp "\tserver %s\n"
1240 7c0b7f42 2020-09-24 stsp "\tprotocol %s\n"
1242 7c0b7f42 2020-09-24 stsp "\trepository \"%s\"\n"
1248 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1249 7c0b7f42 2020-09-24 stsp port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1250 132af4a5 2021-01-05 stsp remote_repo_path, branches ? "\tbranch { " : "",
1251 132af4a5 2021-01-05 stsp branches ? branches : "", branches ? "}\n" : "",
1252 99495ddb 2021-01-10 stsp refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1253 0c8b29c5 2021-01-05 stsp mirror_references ? "\tmirror-references yes\n" : "",
1254 0c8b29c5 2021-01-05 stsp fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1255 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1256 7c0b7f42 2020-09-24 stsp goto done;
1258 7c0b7f42 2020-09-24 stsp n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1259 7c0b7f42 2020-09-24 stsp if (n != strlen(gotconfig)) {
1260 7c0b7f42 2020-09-24 stsp err = got_ferror(gotconfig_file, GOT_ERR_IO);
1261 7c0b7f42 2020-09-24 stsp goto done;
1265 7c0b7f42 2020-09-24 stsp if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1266 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gotconfig_path);
1267 7c0b7f42 2020-09-24 stsp free(gotconfig_path);
1268 132af4a5 2021-01-05 stsp free(branches);
1269 7c0b7f42 2020-09-24 stsp return err;
1272 7c0b7f42 2020-09-24 stsp static const struct got_error *
1273 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
1274 132af4a5 2021-01-05 stsp int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1275 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, int mirror_references,
1276 99495ddb 2021-01-10 stsp struct got_repository *repo)
1278 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1279 7c0b7f42 2020-09-24 stsp char *gitconfig_path = NULL;
1280 7c0b7f42 2020-09-24 stsp char *gitconfig = NULL;
1281 7c0b7f42 2020-09-24 stsp FILE *gitconfig_file = NULL;
1282 99495ddb 2021-01-10 stsp char *branches = NULL, *refs = NULL;
1283 56d0a753 2021-01-20 stsp const char *branchname;
1284 7c0b7f42 2020-09-24 stsp ssize_t n;
1286 7c0b7f42 2020-09-24 stsp /* Create a config file Git can understand. */
1287 7c0b7f42 2020-09-24 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1288 7c0b7f42 2020-09-24 stsp if (gitconfig_path == NULL) {
1289 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gitconfig");
1290 7c0b7f42 2020-09-24 stsp goto done;
1292 7c0b7f42 2020-09-24 stsp gitconfig_file = fopen(gitconfig_path, "a");
1293 7c0b7f42 2020-09-24 stsp if (gitconfig_file == NULL) {
1294 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gitconfig_path);
1295 7c0b7f42 2020-09-24 stsp goto done;
1297 56d0a753 2021-01-20 stsp if (fetch_all_branches) {
1298 56d0a753 2021-01-20 stsp if (mirror_references) {
1299 56d0a753 2021-01-20 stsp if (asprintf(&branches,
1300 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1301 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1302 56d0a753 2021-01-20 stsp goto done;
1304 56d0a753 2021-01-20 stsp } else if (asprintf(&branches,
1305 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1306 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1307 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1308 7c0b7f42 2020-09-24 stsp goto done;
1310 132af4a5 2021-01-05 stsp } else if (!TAILQ_EMPTY(wanted_branches)) {
1311 132af4a5 2021-01-05 stsp struct got_pathlist_entry *pe;
1312 132af4a5 2021-01-05 stsp TAILQ_FOREACH(pe, wanted_branches, entry) {
1314 132af4a5 2021-01-05 stsp branchname = pe->path;
1315 132af4a5 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1316 132af4a5 2021-01-05 stsp branchname += 11;
1317 56d0a753 2021-01-20 stsp if (mirror_references) {
1318 56d0a753 2021-01-20 stsp if (asprintf(&s,
1319 56d0a753 2021-01-20 stsp "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1320 56d0a753 2021-01-20 stsp branches ? branches : "",
1321 56d0a753 2021-01-20 stsp branchname, branchname) == -1) {
1322 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1323 56d0a753 2021-01-20 stsp goto done;
1325 56d0a753 2021-01-20 stsp } else if (asprintf(&s,
1326 56d0a753 2021-01-20 stsp "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1327 132af4a5 2021-01-05 stsp branches ? branches : "",
1328 132af4a5 2021-01-05 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1329 132af4a5 2021-01-05 stsp branchname) == -1) {
1330 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1331 132af4a5 2021-01-05 stsp goto done;
1333 132af4a5 2021-01-05 stsp free(branches);
1334 132af4a5 2021-01-05 stsp branches = s;
1338 7c0b7f42 2020-09-24 stsp * If the server specified a default branch, use just that one.
1339 7c0b7f42 2020-09-24 stsp * Otherwise fall back to fetching all branches on next fetch.
1341 04d9a9ec 2020-09-24 stsp if (default_branch) {
1342 04d9a9ec 2020-09-24 stsp branchname = default_branch;
1343 7c0b7f42 2020-09-24 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1344 7c0b7f42 2020-09-24 stsp branchname += 11;
1346 7c0b7f42 2020-09-24 stsp branchname = "*"; /* fall back to all branches */
1347 56d0a753 2021-01-20 stsp if (mirror_references) {
1348 56d0a753 2021-01-20 stsp if (asprintf(&branches,
1349 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/%s:refs/heads/%s\n",
1350 56d0a753 2021-01-20 stsp branchname, branchname) == -1) {
1351 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1352 56d0a753 2021-01-20 stsp goto done;
1354 56d0a753 2021-01-20 stsp } else if (asprintf(&branches,
1355 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1356 7c0b7f42 2020-09-24 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1357 7c0b7f42 2020-09-24 stsp branchname) == -1) {
1358 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1359 7c0b7f42 2020-09-24 stsp goto done;
1362 56d0a753 2021-01-20 stsp if (!TAILQ_EMPTY(wanted_refs)) {
1363 99495ddb 2021-01-10 stsp struct got_pathlist_entry *pe;
1364 99495ddb 2021-01-10 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1366 99495ddb 2021-01-10 stsp const char *refname = pe->path;
1367 99495ddb 2021-01-10 stsp if (strncmp(refname, "refs/", 5) == 0)
1368 99495ddb 2021-01-10 stsp refname += 5;
1369 56d0a753 2021-01-20 stsp if (mirror_references) {
1370 56d0a753 2021-01-20 stsp if (asprintf(&s,
1371 56d0a753 2021-01-20 stsp "%s\tfetch = refs/%s:refs/%s\n",
1372 56d0a753 2021-01-20 stsp refs ? refs : "", refname, refname) == -1) {
1373 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1374 56d0a753 2021-01-20 stsp goto done;
1376 56d0a753 2021-01-20 stsp } else if (asprintf(&s,
1377 56d0a753 2021-01-20 stsp "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1378 99495ddb 2021-01-10 stsp refs ? refs : "",
1379 99495ddb 2021-01-10 stsp refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1380 99495ddb 2021-01-10 stsp refname) == -1) {
1381 99495ddb 2021-01-10 stsp err = got_error_from_errno("asprintf");
1382 99495ddb 2021-01-10 stsp goto done;
1384 99495ddb 2021-01-10 stsp free(refs);
1389 132af4a5 2021-01-05 stsp if (asprintf(&gitconfig,
1390 132af4a5 2021-01-05 stsp "[remote \"%s\"]\n"
1391 132af4a5 2021-01-05 stsp "\turl = %s\n"
1394 56d0a753 2021-01-20 stsp "\tfetch = refs/tags/*:refs/tags/*\n",
1395 132af4a5 2021-01-05 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1396 56d0a753 2021-01-20 stsp refs ? refs : "") == -1) {
1397 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1398 132af4a5 2021-01-05 stsp goto done;
1400 7c0b7f42 2020-09-24 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1401 7c0b7f42 2020-09-24 stsp if (n != strlen(gitconfig)) {
1402 7c0b7f42 2020-09-24 stsp err = got_ferror(gitconfig_file, GOT_ERR_IO);
1403 7c0b7f42 2020-09-24 stsp goto done;
1406 7c0b7f42 2020-09-24 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1407 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gitconfig_path);
1408 7c0b7f42 2020-09-24 stsp free(gitconfig_path);
1409 132af4a5 2021-01-05 stsp free(branches);
1410 0e4002ca 2020-03-21 stsp return err;
1413 0e4002ca 2020-03-21 stsp static const struct got_error *
1414 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
1415 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1416 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
1417 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_branches,
1418 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1420 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
1421 04d9a9ec 2020-09-24 stsp const char *default_branch = NULL;
1422 04d9a9ec 2020-09-24 stsp struct got_pathlist_entry *pe;
1425 04d9a9ec 2020-09-24 stsp * If we asked for a set of wanted branches then use the first
1426 04d9a9ec 2020-09-24 stsp * one of those.
1428 62d463ca 2020-10-20 naddy if (!TAILQ_EMPTY(wanted_branches)) {
1429 04d9a9ec 2020-09-24 stsp pe = TAILQ_FIRST(wanted_branches);
1430 04d9a9ec 2020-09-24 stsp default_branch = pe->path;
1432 04d9a9ec 2020-09-24 stsp /* First HEAD ref listed by server is the default branch. */
1433 04d9a9ec 2020-09-24 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1434 04d9a9ec 2020-09-24 stsp const char *refname = pe->path;
1435 04d9a9ec 2020-09-24 stsp const char *target = pe->data;
1437 04d9a9ec 2020-09-24 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1440 04d9a9ec 2020-09-24 stsp default_branch = target;
1445 04d9a9ec 2020-09-24 stsp /* Create got.conf(5). */
1446 04d9a9ec 2020-09-24 stsp err = create_gotconfig(proto, host, port, remote_repo_path,
1447 0c8b29c5 2021-01-05 stsp default_branch, fetch_all_branches, wanted_branches,
1448 99495ddb 2021-01-10 stsp wanted_refs, mirror_references, repo);
1450 04d9a9ec 2020-09-24 stsp return err;
1452 04d9a9ec 2020-09-24 stsp /* Create a config file Git can understand. */
1453 04d9a9ec 2020-09-24 stsp return create_gitconfig(git_url, default_branch, fetch_all_branches,
1454 99495ddb 2021-01-10 stsp wanted_branches, wanted_refs, mirror_references, repo);
1457 04d9a9ec 2020-09-24 stsp static const struct got_error *
1458 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1460 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1461 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1462 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1463 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1464 a9c2d4c2 2020-09-24 stsp const char *repo_path;
1465 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1466 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1467 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1468 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1469 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1470 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1471 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1472 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1473 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1474 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1476 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1477 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1478 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1479 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1481 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1482 93658fb9 2020-03-18 stsp switch (ch) {
1484 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1487 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1488 4ba14133 2020-03-20 stsp optarg, NULL);
1489 4ba14133 2020-03-20 stsp if (error)
1490 4ba14133 2020-03-20 stsp return error;
1493 41b0de12 2020-03-21 stsp list_refs_only = 1;
1496 469dd726 2020-03-20 stsp mirror_references = 1;
1499 68999b92 2020-03-18 stsp if (verbosity < 0)
1500 68999b92 2020-03-18 stsp verbosity = 0;
1501 68999b92 2020-03-18 stsp else if (verbosity < 3)
1502 68999b92 2020-03-18 stsp verbosity++;
1505 68999b92 2020-03-18 stsp verbosity = -1;
1508 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1509 0e4002ca 2020-03-21 stsp optarg, NULL);
1510 0e4002ca 2020-03-21 stsp if (error)
1511 0e4002ca 2020-03-21 stsp return error;
1514 93658fb9 2020-03-18 stsp usage_clone();
1518 93658fb9 2020-03-18 stsp argc -= optind;
1519 93658fb9 2020-03-18 stsp argv += optind;
1521 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1522 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
1523 41b0de12 2020-03-21 stsp if (list_refs_only) {
1524 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1525 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
1526 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1527 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
1528 41b0de12 2020-03-21 stsp if (mirror_references)
1529 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
1530 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1531 ff69268e 2020-12-13 stsp option_conflict('l', 'R');
1534 93658fb9 2020-03-18 stsp uri = argv[0];
1536 9df6f38b 2020-03-18 stsp if (argc == 1)
1537 93658fb9 2020-03-18 stsp dirname = NULL;
1538 9df6f38b 2020-03-18 stsp else if (argc == 2)
1539 93658fb9 2020-03-18 stsp dirname = argv[1];
1541 93658fb9 2020-03-18 stsp usage_clone();
1543 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1544 4dbec0a8 2020-08-27 stsp &repo_name, uri);
1545 39c64a6a 2020-03-18 stsp if (error)
1546 09f63084 2020-03-20 stsp goto done;
1548 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1549 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1550 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1551 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1552 09838ffc 2020-03-18 stsp goto done;
1555 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1556 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1557 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1558 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1559 39c64a6a 2020-03-18 stsp err(1, "pledge");
1561 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1562 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1563 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1564 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1565 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1566 39c64a6a 2020-03-18 stsp err(1, "pledge");
1568 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1569 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1570 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1571 39c64a6a 2020-03-18 stsp goto done;
1573 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1574 39c64a6a 2020-03-18 stsp goto done;
1576 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1577 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1578 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1579 bb64b798 2020-03-18 stsp goto done;
1581 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1583 bb64b798 2020-03-18 stsp repo_path = dirname;
1585 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1586 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1587 2751fe64 2020-09-24 stsp if (error &&
1588 2751fe64 2020-09-24 stsp (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1589 2751fe64 2020-09-24 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1590 41b0de12 2020-03-21 stsp goto done;
1591 2751fe64 2020-09-24 stsp if (!got_path_dir_is_empty(repo_path)) {
1592 2751fe64 2020-09-24 stsp error = got_error_path(repo_path,
1593 2751fe64 2020-09-24 stsp GOT_ERR_DIR_NOT_EMPTY);
1594 41b0de12 2020-03-21 stsp goto done;
1598 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1599 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1600 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1601 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1602 ee448f5f 2020-03-18 stsp goto done;
1605 f535bcd4 2020-09-30 stsp error = apply_unveil(repo_path, 0, NULL);
1606 ee448f5f 2020-03-18 stsp if (error)
1607 ee448f5f 2020-03-18 stsp goto done;
1609 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1610 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1611 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1613 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1614 9c52365f 2020-03-21 stsp server_path, verbosity);
1615 39c64a6a 2020-03-18 stsp if (error)
1616 bb64b798 2020-03-18 stsp goto done;
1618 2751fe64 2020-09-24 stsp if (!list_refs_only) {
1619 2751fe64 2020-09-24 stsp error = got_repo_init(repo_path);
1620 2751fe64 2020-09-24 stsp if (error)
1621 2751fe64 2020-09-24 stsp goto done;
1622 2751fe64 2020-09-24 stsp error = got_repo_open(&repo, repo_path, NULL);
1623 2751fe64 2020-09-24 stsp if (error)
1624 2751fe64 2020-09-24 stsp goto done;
1627 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1628 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1629 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1630 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1631 04d9a9ec 2020-09-24 stsp fpa.create_configs = 1;
1632 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
1633 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
1634 04d9a9ec 2020-09-24 stsp fpa.config_info.symrefs = &symrefs;
1635 04d9a9ec 2020-09-24 stsp fpa.config_info.wanted_branches = &wanted_branches;
1636 99495ddb 2021-01-10 stsp fpa.config_info.wanted_refs = &wanted_refs;
1637 04d9a9ec 2020-09-24 stsp fpa.config_info.proto = proto;
1638 04d9a9ec 2020-09-24 stsp fpa.config_info.host = host;
1639 04d9a9ec 2020-09-24 stsp fpa.config_info.port = port;
1640 04d9a9ec 2020-09-24 stsp fpa.config_info.remote_repo_path = server_path;
1641 04d9a9ec 2020-09-24 stsp fpa.config_info.git_url = git_url;
1642 04d9a9ec 2020-09-24 stsp fpa.config_info.fetch_all_branches = fetch_all_branches;
1643 04d9a9ec 2020-09-24 stsp fpa.config_info.mirror_references = mirror_references;
1644 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1645 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1646 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1647 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1648 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1649 39c64a6a 2020-03-18 stsp if (error)
1650 d9b4d0c0 2020-03-18 stsp goto done;
1652 41b0de12 2020-03-21 stsp if (list_refs_only) {
1653 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1654 41b0de12 2020-03-21 stsp goto done;
1657 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1658 39c64a6a 2020-03-18 stsp if (error)
1659 d9b4d0c0 2020-03-18 stsp goto done;
1660 68999b92 2020-03-18 stsp if (verbosity >= 0)
1661 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1662 d9b4d0c0 2020-03-18 stsp free(id_str);
1664 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1665 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1666 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1667 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1668 7ebc0570 2020-03-18 stsp char *remote_refname;
1670 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1671 0e4002ca 2020-03-21 stsp !mirror_references) {
1672 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1673 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1674 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1675 0e4002ca 2020-03-21 stsp if (error)
1676 0e4002ca 2020-03-21 stsp goto done;
1680 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1681 39c64a6a 2020-03-18 stsp if (error)
1682 d9b4d0c0 2020-03-18 stsp goto done;
1684 469dd726 2020-03-20 stsp if (mirror_references)
1687 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1690 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1691 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1692 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1693 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1694 7ebc0570 2020-03-18 stsp goto done;
1696 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1697 f298ae0f 2020-03-25 stsp free(remote_refname);
1698 39c64a6a 2020-03-18 stsp if (error)
1699 d9b4d0c0 2020-03-18 stsp goto done;
1702 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1703 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1704 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1705 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1706 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1707 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1709 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1712 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1713 39c64a6a 2020-03-18 stsp if (error) {
1714 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1715 55330abe 2020-03-20 stsp error = NULL;
1718 d9b4d0c0 2020-03-18 stsp goto done;
1721 04d9a9ec 2020-09-24 stsp error = create_symref(refname, target_ref, verbosity, repo);
1722 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1723 f298ae0f 2020-03-25 stsp if (error)
1724 f298ae0f 2020-03-25 stsp goto done;
1726 f298ae0f 2020-03-25 stsp if (mirror_references)
1729 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1732 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1733 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1734 f298ae0f 2020-03-25 stsp refname) == -1) {
1735 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1736 f298ae0f 2020-03-25 stsp goto done;
1738 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1739 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1740 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1741 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1742 f298ae0f 2020-03-25 stsp free(remote_refname);
1743 f298ae0f 2020-03-25 stsp goto done;
1745 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1746 f298ae0f 2020-03-25 stsp if (error) {
1747 f298ae0f 2020-03-25 stsp free(remote_refname);
1748 f298ae0f 2020-03-25 stsp free(remote_target);
1749 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1750 f298ae0f 2020-03-25 stsp error = NULL;
1753 f298ae0f 2020-03-25 stsp goto done;
1755 04d9a9ec 2020-09-24 stsp error = create_symref(remote_refname, target_ref,
1756 04d9a9ec 2020-09-24 stsp verbosity - 1, repo);
1757 f298ae0f 2020-03-25 stsp free(remote_refname);
1758 f298ae0f 2020-03-25 stsp free(remote_target);
1759 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1760 39c64a6a 2020-03-18 stsp if (error)
1761 d9b4d0c0 2020-03-18 stsp goto done;
1763 4ba14133 2020-03-20 stsp if (pe == NULL) {
1765 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1766 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1767 4ba14133 2020-03-20 stsp * which could be fetched instead.
1769 62d463ca 2020-10-20 naddy TAILQ_FOREACH(pe, &wanted_branches, entry) {
1770 4ba14133 2020-03-20 stsp const char *target = pe->path;
1771 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1773 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1774 4ba14133 2020-03-20 stsp if (error) {
1775 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1776 4ba14133 2020-03-20 stsp error = NULL;
1779 4ba14133 2020-03-20 stsp goto done;
1782 04d9a9ec 2020-09-24 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1783 04d9a9ec 2020-09-24 stsp verbosity, repo);
1784 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1785 4ba14133 2020-03-20 stsp if (error)
1786 4ba14133 2020-03-20 stsp goto done;
1791 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1792 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1793 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1795 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1796 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1797 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1798 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1799 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1801 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1802 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1804 bb64b798 2020-03-18 stsp got_repo_close(repo);
1805 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1806 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1807 d9b4d0c0 2020-03-18 stsp free(pe->data);
1809 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1810 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1811 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1812 d9b4d0c0 2020-03-18 stsp free(pe->data);
1814 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1815 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1816 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1817 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1818 09838ffc 2020-03-18 stsp free(proto);
1819 09838ffc 2020-03-18 stsp free(host);
1820 09838ffc 2020-03-18 stsp free(port);
1821 09838ffc 2020-03-18 stsp free(server_path);
1822 09838ffc 2020-03-18 stsp free(repo_name);
1823 bb64b798 2020-03-18 stsp free(default_destdir);
1824 b46f3e71 2020-03-18 stsp free(git_url);
1825 39c64a6a 2020-03-18 stsp return error;
1828 7848a0e1 2020-03-19 stsp static const struct got_error *
1829 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1830 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1832 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1833 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1834 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1836 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1838 7848a0e1 2020-03-19 stsp goto done;
1840 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1841 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1842 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1844 88609724 2020-03-21 stsp goto done;
1845 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1846 88609724 2020-03-21 stsp goto done;
1847 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1848 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1849 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1851 db6d8ad8 2020-03-21 stsp goto done;
1854 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1855 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1856 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1857 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1858 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1860 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1862 7848a0e1 2020-03-19 stsp goto done;
1863 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1865 e8a967e0 2020-03-21 stsp goto done;
1867 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1869 7848a0e1 2020-03-19 stsp goto done;
1870 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1871 6338a6a1 2020-03-21 stsp goto done;
1873 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1875 6338a6a1 2020-03-21 stsp goto done;
1876 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1878 6338a6a1 2020-03-21 stsp goto done;
1881 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1882 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1883 6338a6a1 2020-03-21 stsp new_id_str);
1885 7848a0e1 2020-03-19 stsp free(old_id);
1886 7848a0e1 2020-03-19 stsp free(new_id_str);
1887 7848a0e1 2020-03-19 stsp return err;
1890 f1bcca34 2020-03-25 stsp static const struct got_error *
1891 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1892 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1894 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1895 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1896 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1898 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1899 bcf34b0e 2020-03-26 stsp if (err) {
1900 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1901 bcf34b0e 2020-03-26 stsp return err;
1902 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1904 bcf34b0e 2020-03-26 stsp goto done;
1906 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1908 bcf34b0e 2020-03-26 stsp goto done;
1910 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1911 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1912 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1913 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1915 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1917 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1918 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1919 bcf34b0e 2020-03-26 stsp goto done;
1921 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1922 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1924 bcf34b0e 2020-03-26 stsp goto done;
1926 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1928 bcf34b0e 2020-03-26 stsp goto done;
1930 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1931 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1932 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1936 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1937 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1938 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1939 bcf34b0e 2020-03-26 stsp err = unlock_err;
1941 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1942 f1bcca34 2020-03-25 stsp return err;
1945 2ab43947 2020-03-18 stsp __dead static void
1946 7848a0e1 2020-03-19 stsp usage_fetch(void)
1948 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1949 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1950 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1951 13f12b09 2020-03-21 stsp getprogname());
1955 7848a0e1 2020-03-19 stsp static const struct got_error *
1956 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1957 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1959 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1960 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1961 3789fd73 2020-03-26 stsp char *id_str = NULL;
1963 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1964 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1966 3789fd73 2020-03-26 stsp return err;
1967 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1968 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1969 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1970 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1973 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1975 3789fd73 2020-03-26 stsp return err;
1976 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1978 3789fd73 2020-03-26 stsp goto done;
1980 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1982 3789fd73 2020-03-26 stsp goto done;
1983 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1984 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1985 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1990 3789fd73 2020-03-26 stsp free(id_str);
1991 3789fd73 2020-03-26 stsp return NULL;
1994 3789fd73 2020-03-26 stsp static const struct got_error *
1995 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1996 50b0790e 2020-09-11 stsp struct got_pathlist_head *their_symrefs,
1997 50b0790e 2020-09-11 stsp const struct got_remote_repo *remote,
1998 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
2000 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
2001 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
2002 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
2003 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
2004 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
2005 3789fd73 2020-03-26 stsp char *local_refname = NULL;
2007 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&my_refs);
2009 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2011 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
2013 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2015 3789fd73 2020-03-26 stsp goto done;
2017 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &my_refs, entry) {
2018 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
2020 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
2021 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
2022 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
2023 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
2024 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
2026 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
2027 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
2028 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
2029 3789fd73 2020-03-26 stsp goto done;
2031 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
2035 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
2036 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
2039 f21ec2f0 2020-03-21 stsp if (pe != NULL)
2042 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
2043 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
2046 3789fd73 2020-03-26 stsp if (pe != NULL)
2049 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
2053 3789fd73 2020-03-26 stsp if (local_refname) {
2054 3789fd73 2020-03-26 stsp struct got_reference *ref;
2055 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
2056 3789fd73 2020-03-26 stsp if (err) {
2057 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
2059 3789fd73 2020-03-26 stsp free(local_refname);
2060 3789fd73 2020-03-26 stsp local_refname = NULL;
2063 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
2066 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
2067 3789fd73 2020-03-26 stsp got_ref_close(ref);
2068 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
2069 3789fd73 2020-03-26 stsp err = unlock_err;
2073 3789fd73 2020-03-26 stsp free(local_refname);
2074 3789fd73 2020-03-26 stsp local_refname = NULL;
2078 3789fd73 2020-03-26 stsp free(remote_namespace);
2079 3789fd73 2020-03-26 stsp free(local_refname);
2080 0e4002ca 2020-03-21 stsp return err;
2083 0e4002ca 2020-03-21 stsp static const struct got_error *
2084 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
2085 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
2087 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
2088 0e4002ca 2020-03-21 stsp char *remote_refname;
2089 0e4002ca 2020-03-21 stsp struct got_reference *ref;
2091 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
2092 0e4002ca 2020-03-21 stsp refname += 5;
2094 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2095 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
2096 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
2098 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
2099 0e4002ca 2020-03-21 stsp if (err) {
2100 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
2101 0e4002ca 2020-03-21 stsp goto done;
2102 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
2104 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
2105 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2106 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
2107 9f142382 2020-03-21 stsp err = unlock_err;
2108 0e4002ca 2020-03-21 stsp got_ref_close(ref);
2111 0e4002ca 2020-03-21 stsp free(remote_refname);
2112 f21ec2f0 2020-03-21 stsp return err;
2115 f21ec2f0 2020-03-21 stsp static const struct got_error *
2116 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
2118 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
2119 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
2120 7848a0e1 2020-03-19 stsp const char *remote_name;
2121 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
2122 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
2123 50b0790e 2020-09-11 stsp const struct got_remote_repo *remotes, *remote = NULL;
2124 7848a0e1 2020-03-19 stsp int nremotes;
2125 7848a0e1 2020-03-19 stsp char *id_str = NULL;
2126 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
2127 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
2128 50b0790e 2020-09-11 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2129 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2130 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
2131 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
2132 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
2133 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
2134 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
2135 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2136 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
2138 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
2139 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
2140 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
2141 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
2143 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2144 7848a0e1 2020-03-19 stsp switch (ch) {
2146 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
2149 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
2150 4ba14133 2020-03-20 stsp optarg, NULL);
2151 4ba14133 2020-03-20 stsp if (error)
2152 4ba14133 2020-03-20 stsp return error;
2155 f21ec2f0 2020-03-21 stsp delete_refs = 1;
2158 41b0de12 2020-03-21 stsp list_refs_only = 1;
2161 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
2162 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2163 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
2165 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
2168 db6d8ad8 2020-03-21 stsp replace_tags = 1;
2171 7848a0e1 2020-03-19 stsp if (verbosity < 0)
2172 7848a0e1 2020-03-19 stsp verbosity = 0;
2173 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
2174 7848a0e1 2020-03-19 stsp verbosity++;
2177 7848a0e1 2020-03-19 stsp verbosity = -1;
2180 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
2181 0e4002ca 2020-03-21 stsp optarg, NULL);
2182 0e4002ca 2020-03-21 stsp if (error)
2183 0e4002ca 2020-03-21 stsp return error;
2186 7848a0e1 2020-03-19 stsp usage_fetch();
2190 7848a0e1 2020-03-19 stsp argc -= optind;
2191 7848a0e1 2020-03-19 stsp argv += optind;
2193 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2194 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
2195 41b0de12 2020-03-21 stsp if (list_refs_only) {
2196 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
2197 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
2198 ff69268e 2020-12-13 stsp if (fetch_all_branches)
2199 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
2200 f21ec2f0 2020-03-21 stsp if (delete_refs)
2201 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
2204 7848a0e1 2020-03-19 stsp if (argc == 0)
2205 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2206 7848a0e1 2020-03-19 stsp else if (argc == 1)
2207 7848a0e1 2020-03-19 stsp remote_name = argv[0];
2209 7848a0e1 2020-03-19 stsp usage_fetch();
2211 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
2212 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
2213 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
2214 7848a0e1 2020-03-19 stsp goto done;
2217 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2218 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
2219 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2220 7848a0e1 2020-03-19 stsp goto done;
2222 7848a0e1 2020-03-19 stsp error = NULL;
2223 7848a0e1 2020-03-19 stsp if (worktree) {
2224 7848a0e1 2020-03-19 stsp repo_path =
2225 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
2226 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2227 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2228 7848a0e1 2020-03-19 stsp if (error)
2229 7848a0e1 2020-03-19 stsp goto done;
2231 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
2232 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2233 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2234 7848a0e1 2020-03-19 stsp goto done;
2239 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
2240 7848a0e1 2020-03-19 stsp if (error)
2241 7848a0e1 2020-03-19 stsp goto done;
2243 50b0790e 2020-09-11 stsp if (worktree) {
2244 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
2245 50b0790e 2020-09-11 stsp if (worktree_conf) {
2246 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2247 50b0790e 2020-09-11 stsp worktree_conf);
2248 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2249 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2250 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2256 50b0790e 2020-09-11 stsp if (remote == NULL) {
2257 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
2258 50b0790e 2020-09-11 stsp if (repo_conf) {
2259 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2260 50b0790e 2020-09-11 stsp repo_conf);
2261 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2262 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2263 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2269 50b0790e 2020-09-11 stsp if (remote == NULL) {
2270 257add31 2020-09-09 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2271 257add31 2020-09-09 stsp for (i = 0; i < nremotes; i++) {
2272 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2273 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2278 50b0790e 2020-09-11 stsp if (remote == NULL) {
2279 50b0790e 2020-09-11 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2280 50b0790e 2020-09-11 stsp goto done;
2283 0c8b29c5 2021-01-05 stsp if (TAILQ_EMPTY(&wanted_branches)) {
2284 0c8b29c5 2021-01-05 stsp if (!fetch_all_branches)
2285 0c8b29c5 2021-01-05 stsp fetch_all_branches = remote->fetch_all_branches;
2286 b8adfa55 2020-09-25 stsp for (i = 0; i < remote->nbranches; i++) {
2287 b8adfa55 2020-09-25 stsp got_pathlist_append(&wanted_branches,
2288 b8adfa55 2020-09-25 stsp remote->branches[i], NULL);
2291 99495ddb 2021-01-10 stsp if (TAILQ_EMPTY(&wanted_refs)) {
2292 99495ddb 2021-01-10 stsp for (i = 0; i < remote->nrefs; i++) {
2293 99495ddb 2021-01-10 stsp got_pathlist_append(&wanted_refs,
2294 99495ddb 2021-01-10 stsp remote->refs[i], NULL);
2298 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2299 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
2300 7848a0e1 2020-03-19 stsp if (error)
2301 7848a0e1 2020-03-19 stsp goto done;
2303 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
2304 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2305 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2306 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
2307 7848a0e1 2020-03-19 stsp err(1, "pledge");
2309 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
2310 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
2311 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2312 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2313 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
2314 7848a0e1 2020-03-19 stsp err(1, "pledge");
2316 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
2317 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
2318 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2319 7848a0e1 2020-03-19 stsp goto done;
2321 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2322 7848a0e1 2020-03-19 stsp goto done;
2325 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2326 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2327 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
2328 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
2329 7848a0e1 2020-03-19 stsp goto done;
2332 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2333 7848a0e1 2020-03-19 stsp if (error)
2334 7848a0e1 2020-03-19 stsp goto done;
2336 f79e6490 2020-04-19 stsp if (verbosity >= 0)
2337 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2338 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
2340 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2341 9c52365f 2020-03-21 stsp server_path, verbosity);
2342 7848a0e1 2020-03-19 stsp if (error)
2343 7848a0e1 2020-03-19 stsp goto done;
2345 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
2346 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
2347 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
2348 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
2349 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
2350 04d9a9ec 2020-09-24 stsp fpa.create_configs = 0;
2351 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
2352 04d9a9ec 2020-09-24 stsp memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2353 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2354 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
2355 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2356 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
2357 7848a0e1 2020-03-19 stsp if (error)
2358 7848a0e1 2020-03-19 stsp goto done;
2360 41b0de12 2020-03-21 stsp if (list_refs_only) {
2361 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
2362 41b0de12 2020-03-21 stsp goto done;
2365 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
2366 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
2367 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
2368 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
2369 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
2370 984065c8 2020-03-19 stsp if (error)
2371 984065c8 2020-03-19 stsp goto done;
2372 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
2373 984065c8 2020-03-19 stsp free(id_str);
2374 984065c8 2020-03-19 stsp id_str = NULL;
2377 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
2378 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2379 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
2380 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
2381 7848a0e1 2020-03-19 stsp struct got_reference *ref;
2382 7848a0e1 2020-03-19 stsp char *remote_refname;
2384 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
2385 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
2386 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
2387 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
2388 0e4002ca 2020-03-21 stsp if (error)
2389 0e4002ca 2020-03-21 stsp goto done;
2393 1510c839 2020-03-20 stsp if (remote->mirror_references ||
2394 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
2395 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2396 7848a0e1 2020-03-19 stsp if (error) {
2397 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2398 7848a0e1 2020-03-19 stsp goto done;
2399 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2401 7848a0e1 2020-03-19 stsp if (error)
2402 7848a0e1 2020-03-19 stsp goto done;
2404 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2405 db6d8ad8 2020-03-21 stsp verbosity, repo);
2406 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2407 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2408 9f142382 2020-03-21 stsp error = unlock_err;
2409 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2410 7848a0e1 2020-03-19 stsp if (error)
2411 7848a0e1 2020-03-19 stsp goto done;
2413 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
2414 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2415 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
2416 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
2417 7848a0e1 2020-03-19 stsp goto done;
2420 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
2421 7848a0e1 2020-03-19 stsp if (error) {
2422 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2423 7848a0e1 2020-03-19 stsp goto done;
2424 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
2425 688f11b3 2020-03-21 stsp verbosity, repo);
2426 7848a0e1 2020-03-19 stsp if (error)
2427 7848a0e1 2020-03-19 stsp goto done;
2429 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2430 db6d8ad8 2020-03-21 stsp verbosity, repo);
2431 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2432 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2433 9f142382 2020-03-21 stsp error = unlock_err;
2434 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2435 7848a0e1 2020-03-19 stsp if (error)
2436 7848a0e1 2020-03-19 stsp goto done;
2439 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2440 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2441 2ec30c80 2020-03-20 stsp if (error) {
2442 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2443 2ec30c80 2020-03-20 stsp goto done;
2444 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2446 2ec30c80 2020-03-20 stsp if (error)
2447 2ec30c80 2020-03-20 stsp goto done;
2449 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2450 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2451 9f142382 2020-03-21 stsp error = unlock_err;
2452 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2456 f1bcca34 2020-03-25 stsp if (delete_refs) {
2457 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2458 3789fd73 2020-03-26 stsp verbosity, repo);
2459 f1bcca34 2020-03-25 stsp if (error)
2460 f1bcca34 2020-03-25 stsp goto done;
2463 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2464 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2465 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2466 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2467 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2468 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2469 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2471 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2474 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2477 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2478 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2479 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2480 f1bcca34 2020-03-25 stsp goto done;
2482 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2483 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2484 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2485 f1bcca34 2020-03-25 stsp free(remote_refname);
2486 f1bcca34 2020-03-25 stsp goto done;
2489 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2491 f1bcca34 2020-03-25 stsp if (error) {
2492 f1bcca34 2020-03-25 stsp free(remote_refname);
2493 f1bcca34 2020-03-25 stsp free(remote_target);
2494 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2495 f1bcca34 2020-03-25 stsp error = NULL;
2498 f1bcca34 2020-03-25 stsp goto done;
2500 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2501 f1bcca34 2020-03-25 stsp verbosity, repo);
2502 f1bcca34 2020-03-25 stsp free(remote_refname);
2503 f1bcca34 2020-03-25 stsp free(remote_target);
2504 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2505 f1bcca34 2020-03-25 stsp if (error)
2506 f1bcca34 2020-03-25 stsp goto done;
2510 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2511 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2512 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2513 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2514 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2516 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2517 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2519 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2520 7848a0e1 2020-03-19 stsp if (worktree)
2521 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2522 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2523 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2524 7848a0e1 2020-03-19 stsp free(pe->data);
2526 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2527 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2528 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2529 7848a0e1 2020-03-19 stsp free(pe->data);
2531 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2532 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2533 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2534 7848a0e1 2020-03-19 stsp free(id_str);
2535 7848a0e1 2020-03-19 stsp free(cwd);
2536 7848a0e1 2020-03-19 stsp free(repo_path);
2537 7848a0e1 2020-03-19 stsp free(pack_hash);
2538 7848a0e1 2020-03-19 stsp free(proto);
2539 7848a0e1 2020-03-19 stsp free(host);
2540 7848a0e1 2020-03-19 stsp free(port);
2541 7848a0e1 2020-03-19 stsp free(server_path);
2542 7848a0e1 2020-03-19 stsp free(repo_name);
2543 7848a0e1 2020-03-19 stsp return error;
2547 7848a0e1 2020-03-19 stsp __dead static void
2548 2ab43947 2020-03-18 stsp usage_checkout(void)
2550 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2551 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2555 2ab43947 2020-03-18 stsp static void
2556 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2558 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2559 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2560 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2561 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2562 2ab43947 2020-03-18 stsp getprogname());
2565 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2566 2ab43947 2020-03-18 stsp const char *worktree_path;
2567 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2570 2ab43947 2020-03-18 stsp static const struct got_error *
2571 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2573 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2575 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2576 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2577 2ab43947 2020-03-18 stsp return NULL;
2579 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2580 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2581 2ab43947 2020-03-18 stsp return NULL;
2584 2ab43947 2020-03-18 stsp while (path[0] == '/')
2587 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2588 2ab43947 2020-03-18 stsp return NULL;
2591 2ab43947 2020-03-18 stsp static const struct got_error *
2592 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2594 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2595 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2596 2ab43947 2020-03-18 stsp return NULL;
2599 2ab43947 2020-03-18 stsp static const struct got_error *
2600 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2601 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2602 2ab43947 2020-03-18 stsp struct got_repository *repo)
2604 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2605 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2607 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2608 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2610 2ab43947 2020-03-18 stsp return err;
2612 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2613 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2616 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2617 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2619 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2621 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2629 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2630 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2631 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2633 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2634 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2635 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2636 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2637 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2638 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2640 2ab43947 2020-03-18 stsp free(yca_id);
2641 2ab43947 2020-03-18 stsp return NULL;
2644 2ab43947 2020-03-18 stsp static const struct got_error *
2645 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2646 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2647 2ab43947 2020-03-18 stsp struct got_repository *repo)
2649 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2650 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2651 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2652 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2654 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2656 2ab43947 2020-03-18 stsp goto done;
2658 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2659 2ab43947 2020-03-18 stsp is_same_branch = 1;
2660 2ab43947 2020-03-18 stsp goto done;
2662 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2663 2ab43947 2020-03-18 stsp is_same_branch = 1;
2664 2ab43947 2020-03-18 stsp goto done;
2667 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2669 2ab43947 2020-03-18 stsp goto done;
2671 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2672 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2674 2ab43947 2020-03-18 stsp goto done;
2676 2ab43947 2020-03-18 stsp for (;;) {
2677 2ab43947 2020-03-18 stsp struct got_object_id *id;
2678 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2679 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2680 2ab43947 2020-03-18 stsp if (err) {
2681 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2682 2ab43947 2020-03-18 stsp err = NULL;
2687 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2689 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2690 2ab43947 2020-03-18 stsp is_same_branch = 1;
2696 2ab43947 2020-03-18 stsp if (graph)
2697 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2698 2ab43947 2020-03-18 stsp free(head_commit_id);
2699 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2700 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2701 2ab43947 2020-03-18 stsp return err;
2704 4ed7e80c 2018-05-20 stsp static const struct got_error *
2705 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2707 4b6c9460 2020-03-05 stsp static char msg[512];
2708 4b6c9460 2020-03-05 stsp const char *branch_name;
2710 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2711 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2713 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2715 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2716 4b6c9460 2020-03-05 stsp branch_name += 11;
2718 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2719 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2720 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2721 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2722 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2723 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2725 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2728 4b6c9460 2020-03-05 stsp static const struct got_error *
2729 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2731 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2732 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2733 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2734 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2735 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2736 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2737 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2738 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2739 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2740 f0207f6a 2020-10-19 stsp char *cwd = NULL;
2741 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2742 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2743 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2745 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2747 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2748 0bb8a95e 2018-03-12 stsp switch (ch) {
2750 08573d5b 2019-05-14 stsp branch_name = optarg;
2753 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2754 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2755 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2758 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2761 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2764 2deda0b9 2019-03-07 stsp usage_checkout();
2765 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2769 0bb8a95e 2018-03-12 stsp argc -= optind;
2770 0bb8a95e 2018-03-12 stsp argv += optind;
2772 6715a751 2018-03-16 stsp #ifndef PROFILE
2773 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2774 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2775 c09a553d 2018-03-12 stsp err(1, "pledge");
2777 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2778 c47340da 2020-09-20 stsp char *base, *dotgit;
2779 f0207f6a 2020-10-19 stsp const char *path;
2780 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2781 76089277 2018-04-01 stsp if (repo_path == NULL)
2782 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2783 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2784 76089277 2018-04-01 stsp if (cwd == NULL) {
2785 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2786 76089277 2018-04-01 stsp goto done;
2788 c47340da 2020-09-20 stsp if (path_prefix[0])
2789 f0207f6a 2020-10-19 stsp path = path_prefix;
2791 f0207f6a 2020-10-19 stsp path = repo_path;
2792 f0207f6a 2020-10-19 stsp error = got_path_basename(&base, path);
2793 f0207f6a 2020-10-19 stsp if (error)
2794 c47340da 2020-09-20 stsp goto done;
2795 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2796 c09a553d 2018-03-12 stsp if (dotgit)
2797 c09a553d 2018-03-12 stsp *dotgit = '\0';
2798 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2799 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2800 f0207f6a 2020-10-19 stsp free(base);
2801 76089277 2018-04-01 stsp goto done;
2803 f0207f6a 2020-10-19 stsp free(base);
2804 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2805 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2806 76089277 2018-04-01 stsp if (repo_path == NULL) {
2807 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2808 76089277 2018-04-01 stsp goto done;
2810 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2811 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2812 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2813 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2815 b4b3a7dd 2019-07-22 stsp goto done;
2817 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2818 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2819 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2820 b4b3a7dd 2019-07-22 stsp goto done;
2824 c09a553d 2018-03-12 stsp usage_checkout();
2826 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2827 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2829 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2830 c09a553d 2018-03-12 stsp if (error != NULL)
2831 c02c541e 2019-03-29 stsp goto done;
2833 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2834 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2835 c530dc23 2019-07-23 stsp if (error) {
2836 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2837 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2838 c530dc23 2019-07-23 stsp goto done;
2839 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2840 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2841 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2842 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2843 c530dc23 2019-07-23 stsp goto done;
2847 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2848 c02c541e 2019-03-29 stsp if (error)
2849 c09a553d 2018-03-12 stsp goto done;
2851 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2852 c09a553d 2018-03-12 stsp if (error != NULL)
2853 c09a553d 2018-03-12 stsp goto done;
2855 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2856 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2857 c09a553d 2018-03-12 stsp goto done;
2859 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2860 c09a553d 2018-03-12 stsp if (error != NULL)
2861 c09a553d 2018-03-12 stsp goto done;
2863 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2864 e5dc7198 2018-12-29 stsp path_prefix);
2865 e5dc7198 2018-12-29 stsp if (error != NULL)
2866 e5dc7198 2018-12-29 stsp goto done;
2867 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2868 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2869 49520a32 2018-12-29 stsp goto done;
2872 8069f636 2019-01-12 stsp if (commit_id_str) {
2873 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2874 84de9106 2020-12-26 stsp struct got_reflist_head refs;
2875 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
2876 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2878 84de9106 2020-12-26 stsp if (error)
2879 84de9106 2020-12-26 stsp goto done;
2880 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2881 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2882 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
2883 30837e32 2019-07-25 stsp if (error)
2884 8069f636 2019-01-12 stsp goto done;
2885 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2886 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2887 8069f636 2019-01-12 stsp if (error != NULL) {
2888 8069f636 2019-01-12 stsp free(commit_id);
2889 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2890 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2891 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2893 8069f636 2019-01-12 stsp goto done;
2895 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2896 4b6c9460 2020-03-05 stsp if (error) {
2897 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2898 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2899 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2901 45d344f6 2019-05-14 stsp goto done;
2903 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2904 8069f636 2019-01-12 stsp commit_id);
2905 8069f636 2019-01-12 stsp free(commit_id);
2906 8069f636 2019-01-12 stsp if (error)
2907 8069f636 2019-01-12 stsp goto done;
2910 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2911 f2ea84fa 2019-07-27 stsp if (error)
2912 f2ea84fa 2019-07-27 stsp goto done;
2913 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2914 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2915 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2916 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2917 c09a553d 2018-03-12 stsp if (error != NULL)
2918 c09a553d 2018-03-12 stsp goto done;
2920 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2921 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2922 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2924 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2925 8069f636 2019-01-12 stsp free(commit_id_str);
2926 76089277 2018-04-01 stsp free(repo_path);
2927 507dc3bb 2018-12-29 stsp free(worktree_path);
2928 c47340da 2020-09-20 stsp free(cwd);
2929 507dc3bb 2018-12-29 stsp return error;
2932 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2933 9627c110 2020-04-18 stsp int did_something;
2934 9627c110 2020-04-18 stsp int conflicts;
2935 9627c110 2020-04-18 stsp int obstructed;
2936 9627c110 2020-04-18 stsp int not_updated;
2940 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2942 9627c110 2020-04-18 stsp if (!upa->did_something)
2945 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2946 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2947 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2948 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2949 9627c110 2020-04-18 stsp upa->obstructed);
2950 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2951 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2952 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2955 507dc3bb 2018-12-29 stsp __dead static void
2956 507dc3bb 2018-12-29 stsp usage_update(void)
2958 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2959 507dc3bb 2018-12-29 stsp getprogname());
2963 1ee397ad 2019-07-12 stsp static const struct got_error *
2964 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2966 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2968 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2969 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2970 1ee397ad 2019-07-12 stsp return NULL;
2972 9627c110 2020-04-18 stsp upa->did_something = 1;
2974 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2975 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2976 1ee397ad 2019-07-12 stsp return NULL;
2978 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2979 9627c110 2020-04-18 stsp upa->conflicts++;
2980 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2981 9627c110 2020-04-18 stsp upa->obstructed++;
2982 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2983 9627c110 2020-04-18 stsp upa->not_updated++;
2985 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2987 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2988 1ee397ad 2019-07-12 stsp return NULL;
2991 be7061eb 2018-12-30 stsp static const struct got_error *
2992 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2993 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2994 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2996 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2997 a1fb16d8 2019-05-24 stsp char *base_id_str;
2998 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
3000 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
3001 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
3002 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
3003 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
3004 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
3005 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
3006 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
3009 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
3010 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3011 a1fb16d8 2019-05-24 stsp if (err) {
3012 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
3013 a1fb16d8 2019-05-24 stsp return err;
3014 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
3016 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
3017 a1fb16d8 2019-05-24 stsp return NULL;
3019 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
3020 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
3021 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
3023 a1fb16d8 2019-05-24 stsp return err;
3024 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
3025 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
3026 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
3027 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
3028 0ebf8283 2019-07-24 stsp return NULL;
3031 0ebf8283 2019-07-24 stsp static const struct got_error *
3032 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3034 0ebf8283 2019-07-24 stsp const struct got_error *err;
3035 0ebf8283 2019-07-24 stsp int in_progress;
3037 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
3039 0ebf8283 2019-07-24 stsp return err;
3040 0ebf8283 2019-07-24 stsp if (in_progress)
3041 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
3043 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
3045 0ebf8283 2019-07-24 stsp return err;
3046 0ebf8283 2019-07-24 stsp if (in_progress)
3047 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
3049 a1fb16d8 2019-05-24 stsp return NULL;
3052 a5edda0a 2019-07-27 stsp static const struct got_error *
3053 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3054 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
3056 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
3057 a5edda0a 2019-07-27 stsp char *path;
3060 a5edda0a 2019-07-27 stsp if (argc == 0) {
3061 a5edda0a 2019-07-27 stsp path = strdup("");
3062 a5edda0a 2019-07-27 stsp if (path == NULL)
3063 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
3064 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
3067 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
3068 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
3071 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
3072 a5edda0a 2019-07-27 stsp if (err) {
3073 a5edda0a 2019-07-27 stsp free(path);
3078 a5edda0a 2019-07-27 stsp return err;
3081 a1fb16d8 2019-05-24 stsp static const struct got_error *
3082 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
3083 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
3085 fa51e947 2020-03-27 stsp const struct got_error *err;
3086 fa51e947 2020-03-27 stsp struct got_repository *repo;
3087 fa51e947 2020-03-27 stsp static char msg[512];
3089 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
3091 fa51e947 2020-03-27 stsp return orig_err;
3093 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
3094 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
3095 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
3096 fa51e947 2020-03-27 stsp "'got checkout'.\n"
3097 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
3098 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3099 fa51e947 2020-03-27 stsp got_repo_close(repo);
3100 fa51e947 2020-03-27 stsp return err;
3103 fa51e947 2020-03-27 stsp static const struct got_error *
3104 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
3106 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
3107 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
3108 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
3109 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
3110 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
3111 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
3112 024e9686 2019-05-14 stsp const char *branch_name = NULL;
3113 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
3114 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
3115 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
3117 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
3119 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
3121 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
3122 507dc3bb 2018-12-29 stsp switch (ch) {
3124 024e9686 2019-05-14 stsp branch_name = optarg;
3127 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
3128 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
3129 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3132 2deda0b9 2019-03-07 stsp usage_update();
3133 507dc3bb 2018-12-29 stsp /* NOTREACHED */
3137 507dc3bb 2018-12-29 stsp argc -= optind;
3138 507dc3bb 2018-12-29 stsp argv += optind;
3140 507dc3bb 2018-12-29 stsp #ifndef PROFILE
3141 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3142 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
3143 507dc3bb 2018-12-29 stsp err(1, "pledge");
3145 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
3146 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
3147 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3148 c4cdcb68 2019-04-03 stsp goto done;
3150 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
3151 fa51e947 2020-03-27 stsp if (error) {
3152 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3153 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
3154 fa51e947 2020-03-27 stsp worktree_path);
3155 7d5807f4 2019-07-11 stsp goto done;
3158 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
3159 f2ea84fa 2019-07-27 stsp if (error)
3160 f2ea84fa 2019-07-27 stsp goto done;
3162 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3164 507dc3bb 2018-12-29 stsp if (error != NULL)
3165 507dc3bb 2018-12-29 stsp goto done;
3167 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3168 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3169 087fb88c 2019-08-04 stsp if (error)
3170 087fb88c 2019-08-04 stsp goto done;
3172 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3173 0266afb7 2019-01-04 stsp if (error)
3174 0266afb7 2019-01-04 stsp goto done;
3176 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3177 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
3178 024e9686 2019-05-14 stsp if (error != NULL)
3179 024e9686 2019-05-14 stsp goto done;
3180 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
3181 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3182 9c4b8182 2019-01-02 stsp if (error != NULL)
3183 9c4b8182 2019-01-02 stsp goto done;
3184 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3185 507dc3bb 2018-12-29 stsp if (error != NULL)
3186 507dc3bb 2018-12-29 stsp goto done;
3188 84de9106 2020-12-26 stsp struct got_reflist_head refs;
3189 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3190 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3192 84de9106 2020-12-26 stsp if (error)
3193 84de9106 2020-12-26 stsp goto done;
3194 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3195 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3196 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
3197 04f57cb3 2019-07-25 stsp free(commit_id_str);
3198 bb787f09 2019-07-25 stsp commit_id_str = NULL;
3199 30837e32 2019-07-25 stsp if (error)
3200 a297e751 2019-07-11 stsp goto done;
3201 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
3202 a297e751 2019-07-11 stsp if (error)
3203 507dc3bb 2018-12-29 stsp goto done;
3206 a1fb16d8 2019-05-24 stsp if (branch_name) {
3207 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
3208 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
3209 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
3211 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3212 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
3213 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
3214 024e9686 2019-05-14 stsp goto done;
3216 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
3217 024e9686 2019-05-14 stsp if (error)
3218 024e9686 2019-05-14 stsp goto done;
3219 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
3221 a367ff0f 2019-05-14 stsp free(head_commit_id);
3222 024e9686 2019-05-14 stsp if (error != NULL)
3223 024e9686 2019-05-14 stsp goto done;
3224 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3225 a367ff0f 2019-05-14 stsp if (error)
3226 a367ff0f 2019-05-14 stsp goto done;
3227 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
3228 024e9686 2019-05-14 stsp if (error)
3229 024e9686 2019-05-14 stsp goto done;
3231 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
3232 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3233 a367ff0f 2019-05-14 stsp if (error != NULL) {
3234 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
3235 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
3236 024e9686 2019-05-14 stsp goto done;
3238 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3239 a367ff0f 2019-05-14 stsp if (error)
3240 a367ff0f 2019-05-14 stsp goto done;
3243 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3244 507dc3bb 2018-12-29 stsp commit_id) != 0) {
3245 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3246 507dc3bb 2018-12-29 stsp commit_id);
3247 507dc3bb 2018-12-29 stsp if (error)
3248 507dc3bb 2018-12-29 stsp goto done;
3251 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
3252 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3253 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
3254 507dc3bb 2018-12-29 stsp if (error != NULL)
3255 507dc3bb 2018-12-29 stsp goto done;
3257 9627c110 2020-04-18 stsp if (upa.did_something)
3258 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
3260 784955db 2019-01-12 stsp printf("Already up-to-date\n");
3261 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
3263 c09a553d 2018-03-12 stsp free(worktree_path);
3264 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3265 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
3266 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3267 507dc3bb 2018-12-29 stsp free(commit_id);
3268 9c4b8182 2019-01-02 stsp free(commit_id_str);
3269 c09a553d 2018-03-12 stsp return error;
3272 f42b1b34 2018-03-12 stsp static const struct got_error *
3273 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3274 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3275 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3277 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
3278 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3280 44392932 2019-08-25 stsp if (blob_id1) {
3281 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3283 44392932 2019-08-25 stsp goto done;
3286 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3288 44392932 2019-08-25 stsp goto done;
3290 44392932 2019-08-25 stsp while (path[0] == '/')
3292 fe621944 2020-11-10 stsp err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3293 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, stdout);
3295 44392932 2019-08-25 stsp if (blob1)
3296 44392932 2019-08-25 stsp got_object_blob_close(blob1);
3297 44392932 2019-08-25 stsp got_object_blob_close(blob2);
3298 44392932 2019-08-25 stsp return err;
3301 44392932 2019-08-25 stsp static const struct got_error *
3302 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3303 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3304 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3306 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3307 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3308 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
3310 44392932 2019-08-25 stsp if (tree_id1) {
3311 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3313 44392932 2019-08-25 stsp goto done;
3316 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3318 0f2b3dca 2018-12-22 stsp goto done;
3320 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
3321 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3322 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
3323 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3324 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
3325 fe621944 2020-11-10 stsp arg.nlines = 0;
3326 44392932 2019-08-25 stsp while (path[0] == '/')
3328 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3329 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3331 79109fed 2018-03-27 stsp if (tree1)
3332 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3333 366e0a5f 2019-10-10 stsp if (tree2)
3334 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3335 44392932 2019-08-25 stsp return err;
3338 44392932 2019-08-25 stsp static const struct got_error *
3339 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3340 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3342 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3343 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3344 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3345 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3347 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3348 0208f208 2020-05-05 stsp if (qid != NULL) {
3349 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3350 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3353 0208f208 2020-05-05 stsp return err;
3355 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3356 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3360 0208f208 2020-05-05 stsp if (tree_id1) {
3361 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3363 0208f208 2020-05-05 stsp goto done;
3366 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3367 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3369 0208f208 2020-05-05 stsp goto done;
3371 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3372 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3374 0208f208 2020-05-05 stsp if (tree1)
3375 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3376 0208f208 2020-05-05 stsp if (tree2)
3377 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3378 0208f208 2020-05-05 stsp return err;
3381 0208f208 2020-05-05 stsp static const struct got_error *
3382 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3383 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3385 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3386 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3387 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3388 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3389 44392932 2019-08-25 stsp struct got_object_qid *qid;
3391 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3392 44392932 2019-08-25 stsp if (qid != NULL) {
3393 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3396 44392932 2019-08-25 stsp return err;
3399 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3400 44392932 2019-08-25 stsp int obj_type;
3401 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3403 44392932 2019-08-25 stsp goto done;
3404 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3405 44392932 2019-08-25 stsp if (err) {
3406 44392932 2019-08-25 stsp free(obj_id2);
3407 44392932 2019-08-25 stsp goto done;
3409 44392932 2019-08-25 stsp if (pcommit) {
3410 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3411 44392932 2019-08-25 stsp qid->id, path);
3412 44392932 2019-08-25 stsp if (err) {
3413 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3414 2e8c69d1 2020-05-04 stsp free(obj_id2);
3415 2e8c69d1 2020-05-04 stsp goto done;
3418 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3419 2e8c69d1 2020-05-04 stsp if (err) {
3420 2e8c69d1 2020-05-04 stsp free(obj_id2);
3421 2e8c69d1 2020-05-04 stsp goto done;
3425 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3426 44392932 2019-08-25 stsp if (err) {
3427 44392932 2019-08-25 stsp free(obj_id2);
3428 44392932 2019-08-25 stsp goto done;
3430 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3431 44392932 2019-08-25 stsp switch (obj_type) {
3432 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3433 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3434 64453f7e 2020-11-21 stsp 0, 0, repo);
3436 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3437 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3438 64453f7e 2020-11-21 stsp 0, 0, repo);
3441 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3444 44392932 2019-08-25 stsp free(obj_id1);
3445 44392932 2019-08-25 stsp free(obj_id2);
3447 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3448 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3450 44392932 2019-08-25 stsp goto done;
3451 579bd556 2020-10-24 stsp if (pcommit) {
3452 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3453 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3455 579bd556 2020-10-24 stsp goto done;
3457 64453f7e 2020-11-21 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3459 64453f7e 2020-11-21 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3463 0f2b3dca 2018-12-22 stsp free(id_str1);
3464 0f2b3dca 2018-12-22 stsp free(id_str2);
3465 44392932 2019-08-25 stsp if (pcommit)
3466 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3467 79109fed 2018-03-27 stsp return err;
3470 4bb494d5 2018-06-16 stsp static char *
3471 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3473 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3474 09867e48 2019-08-13 stsp char *p, *s;
3476 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3477 09867e48 2019-08-13 stsp if (tm == NULL)
3478 09867e48 2019-08-13 stsp return NULL;
3479 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3480 09867e48 2019-08-13 stsp if (s == NULL)
3481 09867e48 2019-08-13 stsp return NULL;
3482 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3484 6c281f94 2018-06-11 stsp *p = '\0';
3488 6841bf13 2019-11-29 kn static const struct got_error *
3489 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3490 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3492 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3493 6841bf13 2019-11-29 kn regmatch_t regmatch;
3494 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3496 6841bf13 2019-11-29 kn *have_match = 0;
3498 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3502 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3506 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3507 6841bf13 2019-11-29 kn *have_match = 1;
3509 6841bf13 2019-11-29 kn free(id_str);
3510 6841bf13 2019-11-29 kn free(logmsg);
3514 0208f208 2020-05-05 stsp static void
3515 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3516 0208f208 2020-05-05 stsp regex_t *regex)
3518 0208f208 2020-05-05 stsp regmatch_t regmatch;
3519 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3521 0208f208 2020-05-05 stsp *have_match = 0;
3523 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3524 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3525 0208f208 2020-05-05 stsp *have_match = 1;
3531 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3533 888b7d99 2020-12-26 stsp static const struct got_error*
3534 888b7d99 2020-12-26 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
3535 888b7d99 2020-12-26 stsp struct got_object_id *id, struct got_repository *repo)
3537 888b7d99 2020-12-26 stsp static const struct got_error *err = NULL;
3538 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3540 888b7d99 2020-12-26 stsp const char *name;
3542 888b7d99 2020-12-26 stsp *refs_str = NULL;
3544 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
3545 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3546 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3549 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3550 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3552 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3553 199a4027 2019-02-02 stsp name += 5;
3554 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3556 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3557 e34f9ed6 2019-02-02 stsp name += 6;
3558 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3559 141c2bff 2019-02-04 stsp name += 8;
3560 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3561 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3564 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3567 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3568 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3569 5d844a1e 2019-08-13 stsp if (err) {
3570 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3571 48cae60d 2020-09-22 stsp free(ref_id);
3574 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3575 5d844a1e 2019-08-13 stsp err = NULL;
3576 5d844a1e 2019-08-13 stsp tag = NULL;
3579 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3580 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3581 48cae60d 2020-09-22 stsp free(ref_id);
3583 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3584 a436ad14 2019-08-13 stsp if (cmp != 0)
3586 888b7d99 2020-12-26 stsp s = *refs_str;
3587 888b7d99 2020-12-26 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
3588 888b7d99 2020-12-26 stsp s ? ", " : "", name) == -1) {
3589 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3591 888b7d99 2020-12-26 stsp *refs_str = NULL;
3597 888b7d99 2020-12-26 stsp return err;
3600 888b7d99 2020-12-26 stsp static const struct got_error *
3601 888b7d99 2020-12-26 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3602 888b7d99 2020-12-26 stsp struct got_repository *repo, const char *path,
3603 888b7d99 2020-12-26 stsp struct got_pathlist_head *changed_paths, int show_patch,
3604 888b7d99 2020-12-26 stsp int diff_context, struct got_reflist_object_id_map *refs_idmap)
3606 888b7d99 2020-12-26 stsp const struct got_error *err = NULL;
3607 888b7d99 2020-12-26 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3608 888b7d99 2020-12-26 stsp char datebuf[26];
3609 888b7d99 2020-12-26 stsp time_t committer_time;
3610 888b7d99 2020-12-26 stsp const char *author, *committer;
3611 888b7d99 2020-12-26 stsp char *refs_str = NULL;
3612 888b7d99 2020-12-26 stsp struct got_reflist_head *refs;
3614 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3616 8bf5b3c9 2018-03-17 stsp return err;
3618 888b7d99 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3619 888b7d99 2020-12-26 stsp if (refs) {
3620 888b7d99 2020-12-26 stsp err = build_refs_str(&refs_str, refs, id, repo);
3622 888b7d99 2020-12-26 stsp goto done;
3625 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3626 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3627 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3628 832c249c 2018-06-10 stsp free(id_str);
3629 d3d493d7 2019-02-21 stsp id_str = NULL;
3630 d3d493d7 2019-02-21 stsp free(refs_str);
3631 d3d493d7 2019-02-21 stsp refs_str = NULL;
3632 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3633 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3634 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3635 09867e48 2019-08-13 stsp if (datestr)
3636 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3637 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3638 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3639 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3640 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3641 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3642 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3643 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3644 3fe1abad 2018-06-10 stsp int n = 1;
3645 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3646 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3647 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3649 888b7d99 2020-12-26 stsp goto done;
3650 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3651 a0603db2 2018-06-10 stsp free(id_str);
3652 888b7d99 2020-12-26 stsp id_str = NULL;
3656 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3658 888b7d99 2020-12-26 stsp goto done;
3660 621015ac 2018-07-23 stsp logmsg = logmsg0;
3662 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3664 832c249c 2018-06-10 stsp printf(" %s\n", line);
3665 832c249c 2018-06-10 stsp } while (line);
3666 621015ac 2018-07-23 stsp free(logmsg0);
3668 0208f208 2020-05-05 stsp if (changed_paths) {
3669 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3670 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3671 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3672 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3674 0208f208 2020-05-05 stsp printf("\n");
3676 971751ac 2018-03-27 stsp if (show_patch) {
3677 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3678 971751ac 2018-03-27 stsp if (err == 0)
3679 971751ac 2018-03-27 stsp printf("\n");
3682 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3683 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3685 888b7d99 2020-12-26 stsp free(id_str);
3686 888b7d99 2020-12-26 stsp free(refs_str);
3687 07862c20 2018-09-15 stsp return err;
3690 f42b1b34 2018-03-12 stsp static const struct got_error *
3691 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3692 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3693 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3694 888b7d99 2020-12-26 stsp int log_branches, int reverse_display_order,
3695 888b7d99 2020-12-26 stsp struct got_reflist_object_id_map *refs_idmap)
3697 f42b1b34 2018-03-12 stsp const struct got_error *err;
3698 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3699 6841bf13 2019-11-29 kn regex_t regex;
3700 6841bf13 2019-11-29 kn int have_match;
3701 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3702 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3703 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3704 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3705 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3707 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3708 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3710 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3711 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3712 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3714 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3716 f42b1b34 2018-03-12 stsp return err;
3717 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3718 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3720 fcc85cad 2018-07-22 stsp goto done;
3722 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3724 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3727 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3728 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3729 372ccdbb 2018-06-10 stsp if (err) {
3730 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3731 9ba79e04 2018-06-11 stsp err = NULL;
3734 b43fbaa0 2018-06-11 stsp if (id == NULL)
3737 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3741 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3742 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3747 6841bf13 2019-11-29 kn if (search_pattern) {
3748 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3750 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3753 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3754 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3755 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3756 6841bf13 2019-11-29 kn if (have_match == 0) {
3757 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3758 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3759 0208f208 2020-05-05 stsp free((char *)pe->path);
3760 0208f208 2020-05-05 stsp free(pe->data);
3762 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3767 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3768 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3771 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3772 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3774 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3775 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3776 888b7d99 2020-12-26 stsp show_patch, diff_context, refs_idmap);
3777 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3781 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3782 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3785 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3786 0208f208 2020-05-05 stsp free((char *)pe->path);
3787 0208f208 2020-05-05 stsp free(pe->data);
3789 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3791 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3792 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3793 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3796 502b9684 2020-07-31 stsp if (show_changed_paths) {
3797 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
3798 502b9684 2020-07-31 stsp commit, repo);
3802 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3803 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3804 888b7d99 2020-12-26 stsp show_patch, diff_context, refs_idmap);
3805 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3808 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3809 502b9684 2020-07-31 stsp free((char *)pe->path);
3810 502b9684 2020-07-31 stsp free(pe->data);
3812 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
3816 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3817 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3818 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3819 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3821 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3822 0208f208 2020-05-05 stsp free((char *)pe->path);
3823 0208f208 2020-05-05 stsp free(pe->data);
3825 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3826 6841bf13 2019-11-29 kn if (search_pattern)
3827 6841bf13 2019-11-29 kn regfree(®ex);
3828 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3829 f42b1b34 2018-03-12 stsp return err;
3832 4ed7e80c 2018-05-20 stsp __dead static void
3833 6f3d1eb0 2018-03-12 stsp usage_log(void)
3835 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3836 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3837 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3841 b1ebc001 2019-08-13 stsp static int
3842 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3844 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3845 b1ebc001 2019-08-13 stsp long long n;
3846 b1ebc001 2019-08-13 stsp const char *errstr;
3848 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3849 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3851 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3852 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3857 4ed7e80c 2018-05-20 stsp static const struct got_error *
3858 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3860 f42b1b34 2018-03-12 stsp const struct got_error *error;
3861 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3862 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3863 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3864 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3865 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3866 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3867 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3868 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3869 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3870 64a96a6d 2018-04-01 stsp const char *errstr;
3871 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3872 888b7d99 2020-12-26 stsp struct got_reflist_object_id_map *refs_idmap = NULL;
3874 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3876 6715a751 2018-03-16 stsp #ifndef PROFILE
3877 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3880 f42b1b34 2018-03-12 stsp err(1, "pledge");
3883 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3885 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3886 79109fed 2018-03-27 stsp switch (ch) {
3888 79109fed 2018-03-27 stsp show_patch = 1;
3891 0208f208 2020-05-05 stsp show_changed_paths = 1;
3894 d142fc45 2018-04-01 stsp start_commit = optarg;
3897 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3899 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3900 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3903 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3904 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3905 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3908 48c8c60d 2020-01-27 stsp log_branches = 1;
3911 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3912 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3913 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3915 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3918 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3921 6841bf13 2019-11-29 kn search_pattern = optarg;
3924 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3927 2deda0b9 2019-03-07 stsp usage_log();
3928 79109fed 2018-03-27 stsp /* NOTREACHED */
3932 79109fed 2018-03-27 stsp argc -= optind;
3933 79109fed 2018-03-27 stsp argv += optind;
3935 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3936 dc1edbfa 2019-11-29 kn diff_context = 3;
3937 dc1edbfa 2019-11-29 kn else if (!show_patch)
3938 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
3940 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3941 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3942 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3943 04ca23f4 2018-07-16 stsp goto done;
3946 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3947 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3948 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3949 50f2fada 2020-04-24 stsp goto done;
3950 50f2fada 2020-04-24 stsp error = NULL;
3953 603cdeb0 2020-10-22 stsp if (argc == 1) {
3954 e7301579 2019-03-18 stsp if (worktree) {
3955 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3957 e7301579 2019-03-18 stsp if (error)
3958 e7301579 2019-03-18 stsp goto done;
3960 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3961 e7301579 2019-03-18 stsp if (path == NULL) {
3962 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3963 e7301579 2019-03-18 stsp goto done;
3966 603cdeb0 2020-10-22 stsp } else if (argc != 0)
3967 cbd1af7a 2019-03-18 stsp usage_log();
3969 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3970 5486daa2 2019-05-11 stsp repo_path = worktree ?
3971 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3973 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3974 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3975 cffc0aa4 2019-02-05 stsp goto done;
3978 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3979 d7d4f210 2018-03-12 stsp if (error != NULL)
3980 04ca23f4 2018-07-16 stsp goto done;
3982 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3983 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3984 c02c541e 2019-03-29 stsp if (error)
3985 c02c541e 2019-03-29 stsp goto done;
3987 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3988 84de9106 2020-12-26 stsp if (error)
3989 84de9106 2020-12-26 stsp goto done;
3991 888b7d99 2020-12-26 stsp error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
3992 888b7d99 2020-12-26 stsp if (error)
3993 888b7d99 2020-12-26 stsp goto done;
3995 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3996 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3997 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3998 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3999 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4000 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
4001 3235492e 2018-04-01 stsp if (error != NULL)
4002 d1fe46f9 2020-04-18 stsp goto done;
4003 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
4004 3235492e 2018-04-01 stsp got_ref_close(head_ref);
4005 3235492e 2018-04-01 stsp if (error != NULL)
4006 d1fe46f9 2020-04-18 stsp goto done;
4007 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
4008 d1fe46f9 2020-04-18 stsp start_id);
4009 d1fe46f9 2020-04-18 stsp if (error != NULL)
4010 d1fe46f9 2020-04-18 stsp goto done;
4011 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
4013 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&start_id, NULL,
4014 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4015 d1fe46f9 2020-04-18 stsp if (error != NULL)
4016 d1fe46f9 2020-04-18 stsp goto done;
4018 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
4019 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&end_id, NULL,
4020 84de9106 2020-12-26 stsp end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4021 d1fe46f9 2020-04-18 stsp if (error != NULL)
4022 d1fe46f9 2020-04-18 stsp goto done;
4025 deeabeae 2019-08-27 stsp if (worktree) {
4027 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
4028 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
4029 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
4031 603cdeb0 2020-10-22 stsp if (path) {
4032 603cdeb0 2020-10-22 stsp const char *prefix;
4033 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
4034 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4035 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
4036 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
4037 603cdeb0 2020-10-22 stsp goto done;
4041 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
4042 8fa913ec 2020-11-14 stsp path ? path : "");
4043 04ca23f4 2018-07-16 stsp if (error != NULL)
4044 04ca23f4 2018-07-16 stsp goto done;
4045 04ca23f4 2018-07-16 stsp if (in_repo_path) {
4046 04ca23f4 2018-07-16 stsp free(path);
4047 04ca23f4 2018-07-16 stsp path = in_repo_path;
4050 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
4051 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
4052 888b7d99 2020-12-26 stsp limit, log_branches, reverse_display_order, refs_idmap);
4054 04ca23f4 2018-07-16 stsp free(path);
4055 04ca23f4 2018-07-16 stsp free(repo_path);
4056 04ca23f4 2018-07-16 stsp free(cwd);
4057 cffc0aa4 2019-02-05 stsp if (worktree)
4058 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
4059 ad242220 2018-09-08 stsp if (repo) {
4060 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4061 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4062 ad242220 2018-09-08 stsp if (error == NULL)
4063 ad242220 2018-09-08 stsp error = repo_error;
4065 888b7d99 2020-12-26 stsp if (refs_idmap)
4066 888b7d99 2020-12-26 stsp got_reflist_object_id_map_free(refs_idmap);
4067 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4068 8bf5b3c9 2018-03-17 stsp return error;
4071 4ed7e80c 2018-05-20 stsp __dead static void
4072 3f8b7d6a 2018-04-01 stsp usage_diff(void)
4074 64453f7e 2020-11-21 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
4075 64453f7e 2020-11-21 stsp "[-s] [-w] [object1 object2 | path]\n", getprogname());
4079 b72f483a 2019-02-05 stsp struct print_diff_arg {
4080 b72f483a 2019-02-05 stsp struct got_repository *repo;
4081 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
4082 b72f483a 2019-02-05 stsp int diff_context;
4083 3fc0c068 2019-02-10 stsp const char *id_str;
4084 3fc0c068 2019-02-10 stsp int header_shown;
4085 98eaaa12 2019-08-03 stsp int diff_staged;
4086 63035f9f 2019-10-06 stsp int ignore_whitespace;
4087 64453f7e 2020-11-21 stsp int force_text_diff;
4091 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
4092 39449a05 2020-07-23 stsp * it as content to the diff engine.
4094 39449a05 2020-07-23 stsp static const struct got_error *
4095 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4096 39449a05 2020-07-23 stsp const char *abspath)
4098 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
4099 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
4100 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
4104 39449a05 2020-07-23 stsp if (dirfd != -1) {
4105 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4106 39449a05 2020-07-23 stsp if (target_len == -1)
4107 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
4109 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
4110 39449a05 2020-07-23 stsp if (target_len == -1)
4111 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
4114 39449a05 2020-07-23 stsp *fd = got_opentempfd();
4115 39449a05 2020-07-23 stsp if (*fd == -1)
4116 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
4118 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
4119 39449a05 2020-07-23 stsp if (outlen == -1) {
4120 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
4121 39449a05 2020-07-23 stsp goto done;
4124 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
4125 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
4126 39449a05 2020-07-23 stsp goto done;
4129 39449a05 2020-07-23 stsp if (err) {
4130 39449a05 2020-07-23 stsp close(*fd);
4133 39449a05 2020-07-23 stsp return err;
4136 4ed7e80c 2018-05-20 stsp static const struct got_error *
4137 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
4138 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4139 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4140 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4142 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
4143 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
4144 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
4145 12463d8b 2019-12-13 stsp int fd = -1;
4146 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
4147 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
4148 b72f483a 2019-02-05 stsp struct stat sb;
4150 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4151 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4152 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4153 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4154 98eaaa12 2019-08-03 stsp return NULL;
4156 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4157 98eaaa12 2019-08-03 stsp return NULL;
4158 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4159 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
4160 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4161 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
4162 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
4163 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
4164 98eaaa12 2019-08-03 stsp return NULL;
4167 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
4168 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
4169 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
4170 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
4171 3fc0c068 2019-02-10 stsp a->header_shown = 1;
4174 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4175 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
4176 98eaaa12 2019-08-03 stsp switch (staged_status) {
4177 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
4178 98eaaa12 2019-08-03 stsp label1 = path;
4179 98eaaa12 2019-08-03 stsp label2 = path;
4181 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4182 98eaaa12 2019-08-03 stsp label2 = path;
4184 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4185 98eaaa12 2019-08-03 stsp label1 = path;
4188 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4190 fe621944 2020-11-10 stsp return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4191 fe621944 2020-11-10 stsp staged_blob_id, label1, label2, a->diff_context,
4192 64453f7e 2020-11-21 stsp a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4195 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4196 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4197 4ce46740 2019-08-08 stsp char *id_str;
4198 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4201 4ce46740 2019-08-08 stsp goto done;
4202 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4204 4ce46740 2019-08-08 stsp goto done;
4205 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4206 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4207 4ce46740 2019-08-08 stsp free(id_str);
4208 4ce46740 2019-08-08 stsp goto done;
4210 4ce46740 2019-08-08 stsp free(id_str);
4211 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4212 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4214 4ce46740 2019-08-08 stsp goto done;
4217 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4218 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4219 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4220 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4221 2ec1f75b 2019-03-26 stsp goto done;
4224 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4225 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4226 12463d8b 2019-12-13 stsp if (fd == -1) {
4227 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4228 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4230 39449a05 2020-07-23 stsp goto done;
4232 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4233 39449a05 2020-07-23 stsp de_name, abspath);
4235 39449a05 2020-07-23 stsp goto done;
4238 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4239 12463d8b 2019-12-13 stsp if (fd == -1) {
4240 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4241 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4243 39449a05 2020-07-23 stsp goto done;
4245 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4246 39449a05 2020-07-23 stsp de_name, abspath);
4248 39449a05 2020-07-23 stsp goto done;
4251 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4252 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4253 2ec1f75b 2019-03-26 stsp goto done;
4255 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4256 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4257 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4258 2ec1f75b 2019-03-26 stsp goto done;
4262 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4264 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4265 64453f7e 2020-11-21 stsp a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4267 b72f483a 2019-02-05 stsp if (blob1)
4268 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4269 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4270 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4271 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4272 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4273 b72f483a 2019-02-05 stsp free(abspath);
4274 927df6b7 2019-02-10 stsp return err;
4277 927df6b7 2019-02-10 stsp static const struct got_error *
4278 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4280 b00d56cd 2018-04-01 stsp const struct got_error *error;
4281 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4282 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4283 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4284 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4285 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
4286 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
4287 15a94983 2018-12-23 stsp int type1, type2;
4288 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4289 64453f7e 2020-11-21 stsp int force_text_diff = 0;
4290 c0cc5c62 2018-10-18 stsp const char *errstr;
4291 927df6b7 2019-02-10 stsp char *path = NULL;
4292 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4294 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4296 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4297 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4298 25eccc22 2019-01-04 stsp NULL) == -1)
4299 b00d56cd 2018-04-01 stsp err(1, "pledge");
4302 64453f7e 2020-11-21 stsp while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4303 b00d56cd 2018-04-01 stsp switch (ch) {
4305 64453f7e 2020-11-21 stsp force_text_diff = 1;
4308 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4310 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4311 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4314 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4315 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4316 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4318 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4321 98eaaa12 2019-08-03 stsp diff_staged = 1;
4324 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4327 2deda0b9 2019-03-07 stsp usage_diff();
4328 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4332 b00d56cd 2018-04-01 stsp argc -= optind;
4333 b00d56cd 2018-04-01 stsp argv += optind;
4335 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4336 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4337 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4338 b72f483a 2019-02-05 stsp goto done;
4340 927df6b7 2019-02-10 stsp if (argc <= 1) {
4341 b72f483a 2019-02-05 stsp if (repo_path)
4343 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
4344 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4345 fa51e947 2020-03-27 stsp if (error) {
4346 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4347 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
4349 1f03b8da 2020-03-20 stsp goto done;
4351 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
4352 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
4353 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4354 927df6b7 2019-02-10 stsp goto done;
4356 927df6b7 2019-02-10 stsp if (argc == 1) {
4357 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4359 927df6b7 2019-02-10 stsp if (error)
4360 927df6b7 2019-02-10 stsp goto done;
4362 927df6b7 2019-02-10 stsp path = strdup("");
4363 927df6b7 2019-02-10 stsp if (path == NULL) {
4364 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4365 927df6b7 2019-02-10 stsp goto done;
4368 b72f483a 2019-02-05 stsp } else if (argc == 2) {
4369 98eaaa12 2019-08-03 stsp if (diff_staged)
4370 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
4371 98eaaa12 2019-08-03 stsp "objects in repository");
4372 15a94983 2018-12-23 stsp id_str1 = argv[0];
4373 15a94983 2018-12-23 stsp id_str2 = argv[1];
4374 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4375 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4376 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4377 30db809c 2019-06-05 stsp goto done;
4378 1f03b8da 2020-03-20 stsp if (worktree) {
4379 1f03b8da 2020-03-20 stsp repo_path = strdup(
4380 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
4381 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4382 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4383 1f03b8da 2020-03-20 stsp goto done;
4386 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
4387 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4388 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4389 1f03b8da 2020-03-20 stsp goto done;
4394 b00d56cd 2018-04-01 stsp usage_diff();
4396 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4397 76089277 2018-04-01 stsp free(repo_path);
4398 b00d56cd 2018-04-01 stsp if (error != NULL)
4399 b00d56cd 2018-04-01 stsp goto done;
4401 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4402 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4403 c02c541e 2019-03-29 stsp if (error)
4404 c02c541e 2019-03-29 stsp goto done;
4406 30db809c 2019-06-05 stsp if (argc <= 1) {
4407 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4408 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4409 b72f483a 2019-02-05 stsp char *id_str;
4411 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4413 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4414 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4415 b72f483a 2019-02-05 stsp if (error)
4416 b72f483a 2019-02-05 stsp goto done;
4417 b72f483a 2019-02-05 stsp arg.repo = repo;
4418 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4419 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4420 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4421 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4422 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4423 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4424 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
4426 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
4427 72ea6654 2019-07-27 stsp if (error)
4428 72ea6654 2019-07-27 stsp goto done;
4430 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
4431 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
4432 b72f483a 2019-02-05 stsp free(id_str);
4433 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4434 b72f483a 2019-02-05 stsp goto done;
4437 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4438 84de9106 2020-12-26 stsp if (error)
4439 84de9106 2020-12-26 stsp return error;
4441 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4442 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &refs, repo);
4443 0adb7196 2019-08-11 stsp if (error)
4444 0adb7196 2019-08-11 stsp goto done;
4446 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4447 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &refs, repo);
4448 0adb7196 2019-08-11 stsp if (error)
4449 0adb7196 2019-08-11 stsp goto done;
4451 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
4452 15a94983 2018-12-23 stsp if (error)
4453 15a94983 2018-12-23 stsp goto done;
4455 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
4456 15a94983 2018-12-23 stsp if (error)
4457 15a94983 2018-12-23 stsp goto done;
4459 15a94983 2018-12-23 stsp if (type1 != type2) {
4460 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4461 b00d56cd 2018-04-01 stsp goto done;
4464 15a94983 2018-12-23 stsp switch (type1) {
4465 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4466 fe621944 2020-11-10 stsp error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4467 64453f7e 2020-11-21 stsp NULL, NULL, diff_context, ignore_whitespace,
4468 64453f7e 2020-11-21 stsp force_text_diff, repo, stdout);
4470 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4471 fe621944 2020-11-10 stsp error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4472 64453f7e 2020-11-21 stsp "", "", diff_context, ignore_whitespace, force_text_diff,
4473 64453f7e 2020-11-21 stsp repo, stdout);
4475 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4476 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
4477 fe621944 2020-11-10 stsp error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4478 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, repo,
4482 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4485 5e70831e 2019-05-28 stsp free(label1);
4486 5e70831e 2019-05-28 stsp free(label2);
4487 15a94983 2018-12-23 stsp free(id1);
4488 15a94983 2018-12-23 stsp free(id2);
4489 927df6b7 2019-02-10 stsp free(path);
4490 b72f483a 2019-02-05 stsp if (worktree)
4491 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4492 ad242220 2018-09-08 stsp if (repo) {
4493 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4494 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4495 ad242220 2018-09-08 stsp if (error == NULL)
4496 ad242220 2018-09-08 stsp error = repo_error;
4498 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4499 b00d56cd 2018-04-01 stsp return error;
4502 404c43c4 2018-06-21 stsp __dead static void
4503 404c43c4 2018-06-21 stsp usage_blame(void)
4505 9270e621 2019-02-05 stsp fprintf(stderr,
4506 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4507 404c43c4 2018-06-21 stsp getprogname());
4511 28315671 2019-08-14 stsp struct blame_line {
4512 28315671 2019-08-14 stsp int annotated;
4513 28315671 2019-08-14 stsp char *id_str;
4514 82f6abb8 2019-08-14 stsp char *committer;
4515 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4518 28315671 2019-08-14 stsp struct blame_cb_args {
4519 28315671 2019-08-14 stsp struct blame_line *lines;
4520 28315671 2019-08-14 stsp int nlines;
4521 7ef28ff8 2019-08-14 stsp int nlines_prec;
4522 28315671 2019-08-14 stsp int lineno_cur;
4523 28315671 2019-08-14 stsp off_t *line_offsets;
4525 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4528 404c43c4 2018-06-21 stsp static const struct got_error *
4529 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4531 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4532 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4533 28315671 2019-08-14 stsp struct blame_line *bline;
4534 82f6abb8 2019-08-14 stsp char *line = NULL;
4535 28315671 2019-08-14 stsp size_t linesize = 0;
4536 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4537 28315671 2019-08-14 stsp off_t offset;
4538 bcb49d15 2019-08-14 stsp struct tm tm;
4539 bcb49d15 2019-08-14 stsp time_t committer_time;
4541 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4542 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4543 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4545 28315671 2019-08-14 stsp if (sigint_received)
4546 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4548 2839f8b9 2019-08-18 stsp if (lineno == -1)
4549 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4551 28315671 2019-08-14 stsp /* Annotate this line. */
4552 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4553 28315671 2019-08-14 stsp if (bline->annotated)
4554 28315671 2019-08-14 stsp return NULL;
4555 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4557 28315671 2019-08-14 stsp return err;
4559 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4561 82f6abb8 2019-08-14 stsp goto done;
4563 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4564 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4565 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4566 bcb49d15 2019-08-14 stsp goto done;
4569 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4570 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4571 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4572 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4573 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4574 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4575 82f6abb8 2019-08-14 stsp goto done;
4577 28315671 2019-08-14 stsp bline->annotated = 1;
4579 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4580 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4581 28315671 2019-08-14 stsp if (!bline->annotated)
4582 82f6abb8 2019-08-14 stsp goto done;
4584 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4585 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4586 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4587 82f6abb8 2019-08-14 stsp goto done;
4590 28315671 2019-08-14 stsp while (bline->annotated) {
4591 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4592 82f6abb8 2019-08-14 stsp size_t len;
4594 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4595 28315671 2019-08-14 stsp if (ferror(a->f))
4596 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4600 82f6abb8 2019-08-14 stsp committer = bline->committer;
4601 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4602 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4603 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4604 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4606 82f6abb8 2019-08-14 stsp *at = '\0';
4607 82f6abb8 2019-08-14 stsp len = strlen(committer);
4608 82f6abb8 2019-08-14 stsp if (len >= 9)
4609 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4611 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4613 28315671 2019-08-14 stsp *nl = '\0';
4614 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4615 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4617 28315671 2019-08-14 stsp a->lineno_cur++;
4618 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4621 82f6abb8 2019-08-14 stsp if (commit)
4622 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4623 28315671 2019-08-14 stsp free(line);
4624 28315671 2019-08-14 stsp return err;
4627 28315671 2019-08-14 stsp static const struct got_error *
4628 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4630 404c43c4 2018-06-21 stsp const struct got_error *error;
4631 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4632 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4633 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4634 0587e10c 2020-07-23 stsp char *link_target = NULL;
4635 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4636 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4637 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4638 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4639 28315671 2019-08-14 stsp struct blame_cb_args bca;
4640 28315671 2019-08-14 stsp int ch, obj_type, i;
4641 be659d10 2020-11-18 stsp off_t filesize;
4643 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4645 404c43c4 2018-06-21 stsp #ifndef PROFILE
4646 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4647 36e2fb66 2019-01-04 stsp NULL) == -1)
4648 404c43c4 2018-06-21 stsp err(1, "pledge");
4651 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4652 404c43c4 2018-06-21 stsp switch (ch) {
4654 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4657 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4658 66bea077 2018-08-02 stsp if (repo_path == NULL)
4659 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4661 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4664 2deda0b9 2019-03-07 stsp usage_blame();
4665 404c43c4 2018-06-21 stsp /* NOTREACHED */
4669 404c43c4 2018-06-21 stsp argc -= optind;
4670 404c43c4 2018-06-21 stsp argv += optind;
4672 a39318fd 2018-08-02 stsp if (argc == 1)
4673 404c43c4 2018-06-21 stsp path = argv[0];
4675 404c43c4 2018-06-21 stsp usage_blame();
4677 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4678 66bea077 2018-08-02 stsp if (cwd == NULL) {
4679 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4680 66bea077 2018-08-02 stsp goto done;
4682 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4683 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4684 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4685 66bea077 2018-08-02 stsp goto done;
4687 0c06baac 2019-02-05 stsp error = NULL;
4688 0c06baac 2019-02-05 stsp if (worktree) {
4689 0c06baac 2019-02-05 stsp repo_path =
4690 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4691 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4692 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4693 1f03b8da 2020-03-20 stsp if (error)
4694 1f03b8da 2020-03-20 stsp goto done;
4697 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4698 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4699 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4700 0c06baac 2019-02-05 stsp goto done;
4705 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4706 c02c541e 2019-03-29 stsp if (error != NULL)
4707 404c43c4 2018-06-21 stsp goto done;
4709 0c06baac 2019-02-05 stsp if (worktree) {
4710 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4713 01740607 2020-11-04 stsp error = got_worktree_resolve_path(&p, worktree, path);
4714 01740607 2020-11-04 stsp if (error)
4715 01740607 2020-11-04 stsp goto done;
4716 01740607 2020-11-04 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4717 01740607 2020-11-04 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4718 01740607 2020-11-04 stsp p) == -1) {
4719 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4721 0c06baac 2019-02-05 stsp goto done;
4724 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4726 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4727 01740607 2020-11-04 stsp if (error)
4728 01740607 2020-11-04 stsp goto done;
4729 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4731 0c06baac 2019-02-05 stsp if (error)
4732 66bea077 2018-08-02 stsp goto done;
4734 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4735 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4736 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4737 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4738 404c43c4 2018-06-21 stsp if (error != NULL)
4739 66bea077 2018-08-02 stsp goto done;
4740 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4741 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4742 404c43c4 2018-06-21 stsp if (error != NULL)
4743 66bea077 2018-08-02 stsp goto done;
4745 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4746 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4747 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4749 84de9106 2020-12-26 stsp if (error)
4750 84de9106 2020-12-26 stsp goto done;
4751 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4752 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4753 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4754 30837e32 2019-07-25 stsp if (error)
4755 66bea077 2018-08-02 stsp goto done;
4758 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4759 0587e10c 2020-07-23 stsp commit_id, repo);
4760 0587e10c 2020-07-23 stsp if (error)
4761 0587e10c 2020-07-23 stsp goto done;
4763 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
4764 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
4765 28315671 2019-08-14 stsp if (error)
4766 28315671 2019-08-14 stsp goto done;
4768 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4769 28315671 2019-08-14 stsp if (error)
4770 28315671 2019-08-14 stsp goto done;
4772 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4773 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
4774 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
4775 28315671 2019-08-14 stsp goto done;
4778 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4779 28315671 2019-08-14 stsp if (error)
4780 28315671 2019-08-14 stsp goto done;
4781 28315671 2019-08-14 stsp bca.f = got_opentemp();
4782 28315671 2019-08-14 stsp if (bca.f == NULL) {
4783 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4784 28315671 2019-08-14 stsp goto done;
4786 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4787 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4788 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4789 28315671 2019-08-14 stsp goto done;
4791 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4792 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4793 b02560ec 2019-08-19 stsp bca.nlines--;
4795 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4796 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4797 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4798 28315671 2019-08-14 stsp goto done;
4800 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4801 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4802 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4803 7ef28ff8 2019-08-14 stsp while (i > 0) {
4805 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4807 82f6abb8 2019-08-14 stsp bca.repo = repo;
4809 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4810 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
4812 66bea077 2018-08-02 stsp free(in_repo_path);
4813 0587e10c 2020-07-23 stsp free(link_target);
4814 66bea077 2018-08-02 stsp free(repo_path);
4815 66bea077 2018-08-02 stsp free(cwd);
4816 404c43c4 2018-06-21 stsp free(commit_id);
4817 28315671 2019-08-14 stsp free(obj_id);
4819 28315671 2019-08-14 stsp got_object_blob_close(blob);
4820 0c06baac 2019-02-05 stsp if (worktree)
4821 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4822 ad242220 2018-09-08 stsp if (repo) {
4823 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4824 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4825 ad242220 2018-09-08 stsp if (error == NULL)
4826 ad242220 2018-09-08 stsp error = repo_error;
4828 3affba96 2019-09-22 stsp if (bca.lines) {
4829 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4830 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4831 3affba96 2019-09-22 stsp free(bline->id_str);
4832 3affba96 2019-09-22 stsp free(bline->committer);
4834 3affba96 2019-09-22 stsp free(bca.lines);
4836 28315671 2019-08-14 stsp free(bca.line_offsets);
4837 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4838 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4839 404c43c4 2018-06-21 stsp return error;
4842 5de5890b 2018-10-18 stsp __dead static void
4843 5de5890b 2018-10-18 stsp usage_tree(void)
4845 c1669e2e 2019-01-09 stsp fprintf(stderr,
4846 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4847 5de5890b 2018-10-18 stsp getprogname());
4851 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4852 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4853 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4855 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4856 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4857 848d6979 2019-08-12 stsp const char *modestr = "";
4858 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4859 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4861 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4862 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4865 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4866 63c5ca5d 2019-08-24 stsp modestr = "$";
4867 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4870 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4872 0d6c6ee3 2020-05-20 stsp return err;
4873 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4874 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4875 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4878 848d6979 2019-08-12 stsp modestr = "@";
4880 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4881 848d6979 2019-08-12 stsp modestr = "/";
4882 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4883 848d6979 2019-08-12 stsp modestr = "*";
4885 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4886 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4887 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4889 0d6c6ee3 2020-05-20 stsp free(link_target);
4890 0d6c6ee3 2020-05-20 stsp return NULL;
4893 5de5890b 2018-10-18 stsp static const struct got_error *
4894 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4895 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4896 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4898 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4899 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4900 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4901 56e0773d 2019-11-28 stsp int nentries, i;
4903 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4905 5de5890b 2018-10-18 stsp goto done;
4907 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4909 5de5890b 2018-10-18 stsp goto done;
4910 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4911 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4912 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4913 5de5890b 2018-10-18 stsp char *id = NULL;
4915 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4918 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4919 5de5890b 2018-10-18 stsp if (show_ids) {
4920 5de5890b 2018-10-18 stsp char *id_str;
4921 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4922 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4924 5de5890b 2018-10-18 stsp goto done;
4925 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4926 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4927 5de5890b 2018-10-18 stsp free(id_str);
4928 5de5890b 2018-10-18 stsp goto done;
4930 5de5890b 2018-10-18 stsp free(id_str);
4932 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4935 0d6c6ee3 2020-05-20 stsp goto done;
4937 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4938 c1669e2e 2019-01-09 stsp char *child_path;
4939 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4940 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4941 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4942 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4943 c1669e2e 2019-01-09 stsp goto done;
4945 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4946 c1669e2e 2019-01-09 stsp root_path, repo);
4947 c1669e2e 2019-01-09 stsp free(child_path);
4949 c1669e2e 2019-01-09 stsp goto done;
4954 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4955 5de5890b 2018-10-18 stsp free(tree_id);
4956 5de5890b 2018-10-18 stsp return err;
4959 5de5890b 2018-10-18 stsp static const struct got_error *
4960 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4962 5de5890b 2018-10-18 stsp const struct got_error *error;
4963 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4964 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4965 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4966 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4967 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4968 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4969 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4972 5de5890b 2018-10-18 stsp #ifndef PROFILE
4973 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4974 0f8d269b 2019-01-04 stsp NULL) == -1)
4975 5de5890b 2018-10-18 stsp err(1, "pledge");
4978 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4979 5de5890b 2018-10-18 stsp switch (ch) {
4981 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4984 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4985 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4986 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4988 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4991 5de5890b 2018-10-18 stsp show_ids = 1;
4994 c1669e2e 2019-01-09 stsp recurse = 1;
4997 2deda0b9 2019-03-07 stsp usage_tree();
4998 5de5890b 2018-10-18 stsp /* NOTREACHED */
5002 5de5890b 2018-10-18 stsp argc -= optind;
5003 5de5890b 2018-10-18 stsp argv += optind;
5005 5de5890b 2018-10-18 stsp if (argc == 1)
5006 5de5890b 2018-10-18 stsp path = argv[0];
5007 5de5890b 2018-10-18 stsp else if (argc > 1)
5008 5de5890b 2018-10-18 stsp usage_tree();
5010 7a2c19d6 2019-02-05 stsp path = NULL;
5012 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
5013 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
5014 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5015 9bf7a39b 2019-02-05 stsp goto done;
5017 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
5018 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
5019 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5020 7a2c19d6 2019-02-05 stsp goto done;
5022 7a2c19d6 2019-02-05 stsp error = NULL;
5023 7a2c19d6 2019-02-05 stsp if (worktree) {
5024 7a2c19d6 2019-02-05 stsp repo_path =
5025 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5026 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
5027 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5028 7a2c19d6 2019-02-05 stsp if (error)
5029 7a2c19d6 2019-02-05 stsp goto done;
5031 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
5032 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
5033 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5034 7a2c19d6 2019-02-05 stsp goto done;
5039 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5040 5de5890b 2018-10-18 stsp if (error != NULL)
5041 c02c541e 2019-03-29 stsp goto done;
5043 4fedbf4c 2020-11-07 stsp if (worktree) {
5044 4fedbf4c 2020-11-07 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
5047 4fedbf4c 2020-11-07 stsp if (path == NULL)
5048 4fedbf4c 2020-11-07 stsp path = "";
5049 4fedbf4c 2020-11-07 stsp error = got_worktree_resolve_path(&p, worktree, path);
5050 4fedbf4c 2020-11-07 stsp if (error)
5051 4fedbf4c 2020-11-07 stsp goto done;
5052 4fedbf4c 2020-11-07 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
5053 4fedbf4c 2020-11-07 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5054 4fedbf4c 2020-11-07 stsp p) == -1) {
5055 4fedbf4c 2020-11-07 stsp error = got_error_from_errno("asprintf");
5057 4fedbf4c 2020-11-07 stsp goto done;
5060 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5061 4fedbf4c 2020-11-07 stsp if (error)
5062 4fedbf4c 2020-11-07 stsp goto done;
5064 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5065 4fedbf4c 2020-11-07 stsp if (error)
5066 4fedbf4c 2020-11-07 stsp goto done;
5067 4fedbf4c 2020-11-07 stsp if (path == NULL)
5068 9bf7a39b 2019-02-05 stsp path = "/";
5069 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
5070 9bf7a39b 2019-02-05 stsp if (error != NULL)
5071 9bf7a39b 2019-02-05 stsp goto done;
5074 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
5075 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
5076 4e0a20a4 2020-03-23 tracey if (worktree)
5077 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
5079 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
5080 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
5081 5de5890b 2018-10-18 stsp if (error != NULL)
5082 5de5890b 2018-10-18 stsp goto done;
5083 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5084 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
5085 5de5890b 2018-10-18 stsp if (error != NULL)
5086 5de5890b 2018-10-18 stsp goto done;
5088 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5089 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5090 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5092 84de9106 2020-12-26 stsp if (error)
5093 84de9106 2020-12-26 stsp goto done;
5094 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5095 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5096 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5097 30837e32 2019-07-25 stsp if (error)
5098 5de5890b 2018-10-18 stsp goto done;
5101 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5102 c1669e2e 2019-01-09 stsp in_repo_path, repo);
5104 5de5890b 2018-10-18 stsp free(in_repo_path);
5105 5de5890b 2018-10-18 stsp free(repo_path);
5106 5de5890b 2018-10-18 stsp free(cwd);
5107 5de5890b 2018-10-18 stsp free(commit_id);
5108 7a2c19d6 2019-02-05 stsp if (worktree)
5109 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
5110 5de5890b 2018-10-18 stsp if (repo) {
5111 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
5112 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
5113 5de5890b 2018-10-18 stsp if (error == NULL)
5114 5de5890b 2018-10-18 stsp error = repo_error;
5116 5de5890b 2018-10-18 stsp return error;
5119 6bad629b 2019-02-04 stsp __dead static void
5120 6bad629b 2019-02-04 stsp usage_status(void)
5122 081470ac 2020-08-13 stsp fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
5123 081470ac 2020-08-13 stsp getprogname());
5127 b72f483a 2019-02-05 stsp static const struct got_error *
5128 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
5129 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5130 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5131 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5133 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5134 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
5135 081470ac 2020-08-13 stsp if (arg) {
5136 081470ac 2020-08-13 stsp char *status_codes = arg;
5137 081470ac 2020-08-13 stsp size_t ncodes = strlen(status_codes);
5139 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
5140 081470ac 2020-08-13 stsp if (status == status_codes[i] ||
5141 081470ac 2020-08-13 stsp staged_status == status_codes[i])
5144 081470ac 2020-08-13 stsp if (i == ncodes)
5145 081470ac 2020-08-13 stsp return NULL;
5147 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
5148 b72f483a 2019-02-05 stsp return NULL;
5151 6bad629b 2019-02-04 stsp static const struct got_error *
5152 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
5154 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
5155 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
5156 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
5157 081470ac 2020-08-13 stsp char *cwd = NULL, *status_codes = NULL;;
5158 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
5159 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
5160 081470ac 2020-08-13 stsp int ch, i;
5162 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
5164 081470ac 2020-08-13 stsp while ((ch = getopt(argc, argv, "s:")) != -1) {
5165 6bad629b 2019-02-04 stsp switch (ch) {
5167 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
5168 081470ac 2020-08-13 stsp switch (optarg[i]) {
5169 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
5170 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
5171 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
5172 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
5173 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
5174 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
5175 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
5176 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
5177 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
5180 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
5181 081470ac 2020-08-13 stsp optarg[i]);
5184 081470ac 2020-08-13 stsp status_codes = optarg;
5187 2deda0b9 2019-03-07 stsp usage_status();
5188 6bad629b 2019-02-04 stsp /* NOTREACHED */
5192 6bad629b 2019-02-04 stsp argc -= optind;
5193 6bad629b 2019-02-04 stsp argv += optind;
5195 6bad629b 2019-02-04 stsp #ifndef PROFILE
5196 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5197 6bad629b 2019-02-04 stsp NULL) == -1)
5198 6bad629b 2019-02-04 stsp err(1, "pledge");
5200 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
5201 927df6b7 2019-02-10 stsp if (cwd == NULL) {
5202 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5203 927df6b7 2019-02-10 stsp goto done;
5206 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5207 fa51e947 2020-03-27 stsp if (error) {
5208 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5209 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5210 a5edda0a 2019-07-27 stsp goto done;
5213 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5215 6bad629b 2019-02-04 stsp if (error != NULL)
5216 6bad629b 2019-02-04 stsp goto done;
5218 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5219 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5220 087fb88c 2019-08-04 stsp if (error)
5221 087fb88c 2019-08-04 stsp goto done;
5223 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5224 6bad629b 2019-02-04 stsp if (error)
5225 6bad629b 2019-02-04 stsp goto done;
5227 081470ac 2020-08-13 stsp error = got_worktree_status(worktree, &paths, repo, print_status,
5228 081470ac 2020-08-13 stsp status_codes, check_cancelled, NULL);
5230 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5231 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5232 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5233 927df6b7 2019-02-10 stsp free(cwd);
5234 d0eebce4 2019-03-11 stsp return error;
5237 d0eebce4 2019-03-11 stsp __dead static void
5238 d0eebce4 2019-03-11 stsp usage_ref(void)
5240 d0eebce4 2019-03-11 stsp fprintf(stderr,
5241 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5242 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5243 d0eebce4 2019-03-11 stsp getprogname());
5247 d0eebce4 2019-03-11 stsp static const struct got_error *
5248 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5250 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5251 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5252 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5254 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5255 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5257 d0eebce4 2019-03-11 stsp return err;
5259 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5260 d0eebce4 2019-03-11 stsp char *refstr;
5261 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5262 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5263 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5264 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5265 d0eebce4 2019-03-11 stsp free(refstr);
5268 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5269 d0eebce4 2019-03-11 stsp return NULL;
5272 d0eebce4 2019-03-11 stsp static const struct got_error *
5273 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
5275 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5276 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5278 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5280 d0eebce4 2019-03-11 stsp return err;
5282 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
5283 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5284 d0eebce4 2019-03-11 stsp return err;
5287 d0eebce4 2019-03-11 stsp static const struct got_error *
5288 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5290 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5291 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5292 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5295 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5296 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5297 d1644381 2019-07-14 stsp * an unintended typo.
5299 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5300 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5302 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5304 d83d9d5c 2019-05-13 stsp if (err) {
5305 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5307 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5308 d83d9d5c 2019-05-13 stsp return err;
5309 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5311 d83d9d5c 2019-05-13 stsp return err;
5312 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5313 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5315 d83d9d5c 2019-05-13 stsp return err;
5318 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5320 d0eebce4 2019-03-11 stsp goto done;
5322 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5325 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5327 d1c1ae5f 2019-08-12 stsp return err;
5330 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5331 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5333 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5334 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5335 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5338 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5339 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5340 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5342 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5343 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5345 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5347 d1c1ae5f 2019-08-12 stsp return err;
5349 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5351 d1c1ae5f 2019-08-12 stsp goto done;
5353 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5355 d1c1ae5f 2019-08-12 stsp if (target_ref)
5356 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5358 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5359 d0eebce4 2019-03-11 stsp return err;
5362 d0eebce4 2019-03-11 stsp static const struct got_error *
5363 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5365 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5366 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5367 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5368 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5369 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5370 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5371 b2070a3f 2020-03-22 stsp char *refname = NULL;
5373 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5374 d0eebce4 2019-03-11 stsp switch (ch) {
5376 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5379 e31abbf2 2020-03-22 stsp do_delete = 1;
5382 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5383 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5384 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5386 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5389 d0eebce4 2019-03-11 stsp do_list = 1;
5392 e31abbf2 2020-03-22 stsp symref_target = optarg;
5395 d0eebce4 2019-03-11 stsp usage_ref();
5396 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5400 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5401 ff69268e 2020-12-13 stsp option_conflict('c', 'l');
5402 ff69268e 2020-12-13 stsp if (obj_arg && do_delete)
5403 ff69268e 2020-12-13 stsp option_conflict('c', 'd');
5404 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5405 ff69268e 2020-12-13 stsp option_conflict('c', 's');
5406 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5407 ff69268e 2020-12-13 stsp option_conflict('s', 'd');
5408 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5409 ff69268e 2020-12-13 stsp option_conflict('s', 'l');
5410 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5411 ff69268e 2020-12-13 stsp option_conflict('d', 'l');
5413 d0eebce4 2019-03-11 stsp argc -= optind;
5414 d0eebce4 2019-03-11 stsp argv += optind;
5416 e31abbf2 2020-03-22 stsp if (do_list) {
5417 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5418 d0eebce4 2019-03-11 stsp usage_ref();
5419 b2070a3f 2020-03-22 stsp if (argc == 1) {
5420 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5421 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5422 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5423 b2070a3f 2020-03-22 stsp goto done;
5427 e31abbf2 2020-03-22 stsp if (argc != 1)
5428 e31abbf2 2020-03-22 stsp usage_ref();
5429 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5430 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5431 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5432 b2070a3f 2020-03-22 stsp goto done;
5436 b2070a3f 2020-03-22 stsp if (refname)
5437 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5439 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5440 e0b57350 2019-03-12 stsp if (do_list) {
5441 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5442 e0b57350 2019-03-12 stsp NULL) == -1)
5443 e0b57350 2019-03-12 stsp err(1, "pledge");
5445 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5446 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5447 e0b57350 2019-03-12 stsp err(1, "pledge");
5450 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5451 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5452 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5453 d0eebce4 2019-03-11 stsp goto done;
5456 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5457 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5458 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5459 d0eebce4 2019-03-11 stsp goto done;
5461 d0eebce4 2019-03-11 stsp error = NULL;
5462 d0eebce4 2019-03-11 stsp if (worktree) {
5463 d0eebce4 2019-03-11 stsp repo_path =
5464 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5465 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5466 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5467 d0eebce4 2019-03-11 stsp if (error)
5468 d0eebce4 2019-03-11 stsp goto done;
5470 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
5471 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5472 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5473 d0eebce4 2019-03-11 stsp goto done;
5478 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5479 d0eebce4 2019-03-11 stsp if (error != NULL)
5480 d0eebce4 2019-03-11 stsp goto done;
5482 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5483 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5484 c02c541e 2019-03-29 stsp if (error)
5485 c02c541e 2019-03-29 stsp goto done;
5487 d0eebce4 2019-03-11 stsp if (do_list)
5488 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5489 e31abbf2 2020-03-22 stsp else if (do_delete)
5490 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
5491 e31abbf2 2020-03-22 stsp else if (symref_target)
5492 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5494 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5495 e31abbf2 2020-03-22 stsp usage_ref();
5496 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5499 b2070a3f 2020-03-22 stsp free(refname);
5501 4e759de4 2019-06-26 stsp got_repo_close(repo);
5502 4e759de4 2019-06-26 stsp if (worktree)
5503 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5504 4e759de4 2019-06-26 stsp free(cwd);
5505 4e759de4 2019-06-26 stsp free(repo_path);
5506 4e759de4 2019-06-26 stsp return error;
5509 4e759de4 2019-06-26 stsp __dead static void
5510 4e759de4 2019-06-26 stsp usage_branch(void)
5512 4e759de4 2019-06-26 stsp fprintf(stderr,
5513 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5514 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5518 4e759de4 2019-06-26 stsp static const struct got_error *
5519 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5520 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5522 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5523 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5524 4e99b47e 2019-10-04 stsp char *refstr;
5526 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5527 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5528 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5529 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5531 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5533 4e99b47e 2019-10-04 stsp return err;
5534 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5535 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5536 4e99b47e 2019-10-04 stsp marker = "* ";
5538 4e99b47e 2019-10-04 stsp marker = "~ ";
5542 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5543 4e99b47e 2019-10-04 stsp refname += 11;
5544 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5545 4e99b47e 2019-10-04 stsp refname += 18;
5546 34d4e04c 2021-02-08 stsp if (strncmp(refname, "refs/remotes/", 13) == 0)
5547 34d4e04c 2021-02-08 stsp refname += 13;
5549 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5550 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5551 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5553 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5554 4e99b47e 2019-10-04 stsp free(refstr);
5555 4e99b47e 2019-10-04 stsp return NULL;
5558 4e99b47e 2019-10-04 stsp static const struct got_error *
5559 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5561 ad89fa31 2019-10-04 stsp const char *refname;
5563 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5564 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5566 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5568 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5569 ad89fa31 2019-10-04 stsp refname += 11;
5570 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5571 ad89fa31 2019-10-04 stsp refname += 18;
5573 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5575 ad89fa31 2019-10-04 stsp return NULL;
5578 ad89fa31 2019-10-04 stsp static const struct got_error *
5579 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5581 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5582 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5583 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5584 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5585 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5587 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5589 4e99b47e 2019-10-04 stsp if (worktree) {
5590 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5591 4e99b47e 2019-10-04 stsp worktree);
5593 4e99b47e 2019-10-04 stsp return err;
5595 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5596 4e99b47e 2019-10-04 stsp worktree);
5598 4e99b47e 2019-10-04 stsp return err;
5600 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5601 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5602 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5604 4e99b47e 2019-10-04 stsp return err;
5605 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5606 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5610 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5611 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5613 4e759de4 2019-06-26 stsp return err;
5615 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry)
5616 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5618 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5620 34d4e04c 2021-02-08 stsp err = got_ref_list(&refs, repo, "refs/remotes",
5621 34d4e04c 2021-02-08 stsp got_ref_cmp_by_name, NULL);
5623 34d4e04c 2021-02-08 stsp return err;
5625 34d4e04c 2021-02-08 stsp TAILQ_FOREACH(re, &refs, entry)
5626 34d4e04c 2021-02-08 stsp list_branch(repo, worktree, re->ref);
5628 34d4e04c 2021-02-08 stsp got_ref_list_free(&refs);
5630 4e759de4 2019-06-26 stsp return NULL;
5633 4e759de4 2019-06-26 stsp static const struct got_error *
5634 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5635 45cd4e47 2019-08-25 stsp const char *branch_name)
5637 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5638 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5639 4e759de4 2019-06-26 stsp char *refname;
5641 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5642 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5644 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5646 4e759de4 2019-06-26 stsp goto done;
5648 45cd4e47 2019-08-25 stsp if (worktree &&
5649 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5650 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5651 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5652 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5653 45cd4e47 2019-08-25 stsp goto done;
5656 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5659 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5660 4e759de4 2019-06-26 stsp free(refname);
5661 4e759de4 2019-06-26 stsp return err;
5664 4e759de4 2019-06-26 stsp static const struct got_error *
5665 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5666 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5668 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5669 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5670 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5673 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5674 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5675 d3f84d51 2019-07-11 stsp * an unintended typo.
5677 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5678 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5680 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5681 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5682 62d463ca 2020-10-20 naddy goto done;
5685 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5686 4e759de4 2019-06-26 stsp if (err == NULL) {
5687 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5688 4e759de4 2019-06-26 stsp goto done;
5689 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5690 4e759de4 2019-06-26 stsp goto done;
5692 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5694 4e759de4 2019-06-26 stsp goto done;
5696 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5699 4e759de4 2019-06-26 stsp got_ref_close(ref);
5700 4e759de4 2019-06-26 stsp free(base_refname);
5701 4e759de4 2019-06-26 stsp free(refname);
5702 4e759de4 2019-06-26 stsp return err;
5705 4e759de4 2019-06-26 stsp static const struct got_error *
5706 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5708 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5709 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5710 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5711 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5712 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5713 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5714 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5715 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5716 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5717 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5718 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5720 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5722 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5723 4e759de4 2019-06-26 stsp switch (ch) {
5725 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5728 4e759de4 2019-06-26 stsp delref = optarg;
5731 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5732 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5733 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5735 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5738 4e759de4 2019-06-26 stsp do_list = 1;
5741 da76fce2 2020-02-24 stsp do_update = 0;
5744 4e759de4 2019-06-26 stsp usage_branch();
5745 4e759de4 2019-06-26 stsp /* NOTREACHED */
5749 4e759de4 2019-06-26 stsp if (do_list && delref)
5750 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
5752 4e759de4 2019-06-26 stsp argc -= optind;
5753 4e759de4 2019-06-26 stsp argv += optind;
5755 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5756 ad89fa31 2019-10-04 stsp do_show = 1;
5758 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5759 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5761 4e759de4 2019-06-26 stsp if (do_list || delref) {
5762 4e759de4 2019-06-26 stsp if (argc > 0)
5763 4e759de4 2019-06-26 stsp usage_branch();
5764 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5765 4e759de4 2019-06-26 stsp usage_branch();
5767 4e759de4 2019-06-26 stsp #ifndef PROFILE
5768 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5769 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5770 4e759de4 2019-06-26 stsp NULL) == -1)
5771 4e759de4 2019-06-26 stsp err(1, "pledge");
5773 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5774 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5775 4e759de4 2019-06-26 stsp err(1, "pledge");
5778 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5779 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5780 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5781 4e759de4 2019-06-26 stsp goto done;
5784 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5785 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5786 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5787 4e759de4 2019-06-26 stsp goto done;
5789 4e759de4 2019-06-26 stsp error = NULL;
5790 4e759de4 2019-06-26 stsp if (worktree) {
5791 4e759de4 2019-06-26 stsp repo_path =
5792 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5793 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5794 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5795 4e759de4 2019-06-26 stsp if (error)
5796 4e759de4 2019-06-26 stsp goto done;
5798 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5799 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5800 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5801 4e759de4 2019-06-26 stsp goto done;
5806 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5807 4e759de4 2019-06-26 stsp if (error != NULL)
5808 4e759de4 2019-06-26 stsp goto done;
5810 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5811 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5812 4e759de4 2019-06-26 stsp if (error)
5813 4e759de4 2019-06-26 stsp goto done;
5815 ad89fa31 2019-10-04 stsp if (do_show)
5816 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5817 ad89fa31 2019-10-04 stsp else if (do_list)
5818 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5819 4e759de4 2019-06-26 stsp else if (delref)
5820 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5822 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5823 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5824 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5826 84de9106 2020-12-26 stsp if (error)
5827 84de9106 2020-12-26 stsp goto done;
5828 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5829 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5830 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5831 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5832 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5833 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5834 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5835 a74f7e83 2019-11-10 stsp if (error)
5836 a74f7e83 2019-11-10 stsp goto done;
5837 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5838 da76fce2 2020-02-24 stsp if (error)
5839 da76fce2 2020-02-24 stsp goto done;
5840 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5841 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5842 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5844 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5845 da76fce2 2020-02-24 stsp if (error)
5846 da76fce2 2020-02-24 stsp goto done;
5847 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5848 da76fce2 2020-02-24 stsp worktree);
5849 da76fce2 2020-02-24 stsp if (error)
5850 da76fce2 2020-02-24 stsp goto done;
5851 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5853 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5854 da76fce2 2020-02-24 stsp goto done;
5856 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5857 da76fce2 2020-02-24 stsp free(branch_refname);
5858 da76fce2 2020-02-24 stsp if (error)
5859 da76fce2 2020-02-24 stsp goto done;
5860 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5862 da76fce2 2020-02-24 stsp if (error)
5863 da76fce2 2020-02-24 stsp goto done;
5864 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5865 da76fce2 2020-02-24 stsp commit_id);
5866 da76fce2 2020-02-24 stsp if (error)
5867 da76fce2 2020-02-24 stsp goto done;
5868 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5869 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5870 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5872 da76fce2 2020-02-24 stsp if (error)
5873 da76fce2 2020-02-24 stsp goto done;
5874 9627c110 2020-04-18 stsp if (upa.did_something)
5875 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5876 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5881 da76fce2 2020-02-24 stsp got_ref_close(ref);
5883 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5884 d0eebce4 2019-03-11 stsp if (worktree)
5885 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5886 d0eebce4 2019-03-11 stsp free(cwd);
5887 d0eebce4 2019-03-11 stsp free(repo_path);
5888 da76fce2 2020-02-24 stsp free(commit_id);
5889 da76fce2 2020-02-24 stsp free(commit_id_str);
5890 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5891 da76fce2 2020-02-24 stsp free((char *)pe->path);
5892 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5893 d00136be 2019-03-26 stsp return error;
5897 d00136be 2019-03-26 stsp __dead static void
5898 8e7bd50a 2019-08-22 stsp usage_tag(void)
5900 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5901 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5902 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5907 b8bad2ba 2019-08-23 stsp static const struct got_error *
5908 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5910 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5911 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5912 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5913 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5914 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5916 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5917 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5918 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5919 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5921 b8bad2ba 2019-08-23 stsp return err;
5922 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5925 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5928 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5929 b8bad2ba 2019-08-23 stsp free(re_id);
5932 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5933 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5936 b8bad2ba 2019-08-23 stsp while (se) {
5937 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5940 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5941 b8bad2ba 2019-08-23 stsp free(se_id);
5944 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5945 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5947 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5948 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5950 b8bad2ba 2019-08-23 stsp return err;
5951 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5954 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5959 b8bad2ba 2019-08-23 stsp return err;
5963 b8bad2ba 2019-08-23 stsp static const struct got_error *
5964 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5966 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5967 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5968 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5970 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5972 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5974 8e7bd50a 2019-08-22 stsp return err;
5976 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5977 8e7bd50a 2019-08-22 stsp const char *refname;
5978 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5979 8e7bd50a 2019-08-22 stsp char datebuf[26];
5980 d4efa91b 2020-01-14 stsp const char *tagger;
5981 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5982 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5983 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5984 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5986 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5987 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5989 8e7bd50a 2019-08-22 stsp refname += 10;
5990 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5991 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5992 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5995 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5996 8e7bd50a 2019-08-22 stsp free(refstr);
5998 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
6001 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
6002 d4efa91b 2020-01-14 stsp if (err) {
6003 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
6007 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
6008 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
6009 d4efa91b 2020-01-14 stsp if (err) {
6013 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
6014 d4efa91b 2020-01-14 stsp tagger_time =
6015 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
6016 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
6022 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
6023 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
6024 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
6025 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
6029 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
6030 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
6031 2417344c 2019-08-23 stsp if (datestr)
6032 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
6033 d4efa91b 2020-01-14 stsp if (commit)
6034 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6036 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
6037 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
6038 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6041 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
6042 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6045 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
6046 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6049 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
6050 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6057 8e7bd50a 2019-08-22 stsp free(id_str);
6058 d4efa91b 2020-01-14 stsp if (commit) {
6059 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
6062 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
6064 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
6065 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
6066 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
6067 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
6072 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
6074 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
6076 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
6077 8e7bd50a 2019-08-22 stsp } while (line);
6078 8e7bd50a 2019-08-22 stsp free(tagmsg0);
6081 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
6082 8e7bd50a 2019-08-22 stsp return NULL;
6085 8e7bd50a 2019-08-22 stsp static const struct got_error *
6086 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6087 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
6089 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
6090 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
6091 f372d5cd 2019-10-21 stsp char *editor = NULL;
6092 1601cb9f 2020-09-11 naddy int initial_content_len;
6093 8e7bd50a 2019-08-22 stsp int fd = -1;
6095 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6096 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
6097 8e7bd50a 2019-08-22 stsp goto done;
6100 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6101 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
6102 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
6103 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
6104 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
6105 8e7bd50a 2019-08-22 stsp goto done;
6108 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6110 8e7bd50a 2019-08-22 stsp goto done;
6112 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6113 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
6114 97972933 2020-09-11 stsp goto done;
6117 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
6119 8e7bd50a 2019-08-22 stsp goto done;
6120 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6121 0d5bb276 2020-12-15 stsp initial_content_len, 1);
6123 8e7bd50a 2019-08-22 stsp free(initial_content);
6124 8e7bd50a 2019-08-22 stsp free(template);
6125 8e7bd50a 2019-08-22 stsp free(editor);
6127 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6128 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
6130 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
6131 59f86c76 2020-09-11 stsp if (err == NULL)
6132 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
6133 59f86c76 2020-09-11 stsp if (err) {
6134 59f86c76 2020-09-11 stsp free(*tagmsg);
6135 59f86c76 2020-09-11 stsp *tagmsg = NULL;
6137 8e7bd50a 2019-08-22 stsp return err;
6140 8e7bd50a 2019-08-22 stsp static const struct got_error *
6141 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
6142 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6144 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
6145 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
6146 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
6147 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
6148 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6149 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
6150 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
6151 84de9106 2020-12-26 stsp struct got_reflist_head refs;
6153 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
6156 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
6157 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
6158 8e7bd50a 2019-08-22 stsp * an unintended typo.
6160 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
6161 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6163 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
6165 8e7bd50a 2019-08-22 stsp return err;
6167 84de9106 2020-12-26 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6169 84de9106 2020-12-26 stsp goto done;
6171 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6172 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &refs, repo);
6174 8e7bd50a 2019-08-22 stsp goto done;
6176 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
6178 8e7bd50a 2019-08-22 stsp goto done;
6180 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
6181 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
6182 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
6183 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
6184 62d463ca 2020-10-20 naddy goto done;
6186 8e7bd50a 2019-08-22 stsp tag_name += 10;
6187 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6188 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
6189 62d463ca 2020-10-20 naddy goto done;
6192 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
6193 8e7bd50a 2019-08-22 stsp if (err == NULL) {
6194 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
6195 8e7bd50a 2019-08-22 stsp goto done;
6196 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
6197 8e7bd50a 2019-08-22 stsp goto done;
6199 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
6200 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6201 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
6202 f372d5cd 2019-10-21 stsp if (err) {
6203 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6204 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
6205 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6206 8e7bd50a 2019-08-22 stsp goto done;
6210 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
6211 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6212 f372d5cd 2019-10-21 stsp if (err) {
6213 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6214 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6215 8e7bd50a 2019-08-22 stsp goto done;
6218 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
6219 f372d5cd 2019-10-21 stsp if (err) {
6220 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6221 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6222 8e7bd50a 2019-08-22 stsp goto done;
6225 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
6226 f372d5cd 2019-10-21 stsp if (err) {
6227 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6228 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6229 f372d5cd 2019-10-21 stsp goto done;
6232 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
6233 f372d5cd 2019-10-21 stsp if (err) {
6234 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6235 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6236 f372d5cd 2019-10-21 stsp goto done;
6238 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6240 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6241 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6242 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6243 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6244 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6245 f372d5cd 2019-10-21 stsp free(tag_id_str);
6247 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6248 8e7bd50a 2019-08-22 stsp free(commit_id);
6249 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6250 8e7bd50a 2019-08-22 stsp free(refname);
6251 8e7bd50a 2019-08-22 stsp free(tagmsg);
6252 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6253 aba9c984 2019-09-08 stsp free(tagger);
6254 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
6255 8e7bd50a 2019-08-22 stsp return err;
6258 8e7bd50a 2019-08-22 stsp static const struct got_error *
6259 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6261 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6262 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6263 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6264 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6265 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6266 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6267 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6269 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6270 8e7bd50a 2019-08-22 stsp switch (ch) {
6272 80106605 2020-02-24 stsp commit_id_arg = optarg;
6275 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6278 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6279 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6280 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6282 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6285 8e7bd50a 2019-08-22 stsp do_list = 1;
6288 8e7bd50a 2019-08-22 stsp usage_tag();
6289 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6293 8e7bd50a 2019-08-22 stsp argc -= optind;
6294 8e7bd50a 2019-08-22 stsp argv += optind;
6296 8e7bd50a 2019-08-22 stsp if (do_list) {
6297 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6299 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6300 8e7bd50a 2019-08-22 stsp if (tagmsg)
6301 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
6302 8e7bd50a 2019-08-22 stsp if (argc > 0)
6303 8e7bd50a 2019-08-22 stsp usage_tag();
6304 80106605 2020-02-24 stsp } else if (argc != 1)
6305 8e7bd50a 2019-08-22 stsp usage_tag();
6307 a2887370 2019-08-23 stsp tag_name = argv[0];
6309 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6310 8e7bd50a 2019-08-22 stsp if (do_list) {
6311 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6312 8e7bd50a 2019-08-22 stsp NULL) == -1)
6313 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6315 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6316 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6317 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6320 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6321 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6322 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6323 8e7bd50a 2019-08-22 stsp goto done;
6326 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6327 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6328 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6329 8e7bd50a 2019-08-22 stsp goto done;
6331 8e7bd50a 2019-08-22 stsp error = NULL;
6332 8e7bd50a 2019-08-22 stsp if (worktree) {
6333 8e7bd50a 2019-08-22 stsp repo_path =
6334 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6335 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6336 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6337 8e7bd50a 2019-08-22 stsp if (error)
6338 8e7bd50a 2019-08-22 stsp goto done;
6340 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
6341 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6342 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6343 8e7bd50a 2019-08-22 stsp goto done;
6348 8e7bd50a 2019-08-22 stsp if (do_list) {
6349 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6350 c9956ddf 2019-09-08 stsp if (error != NULL)
6351 c9956ddf 2019-09-08 stsp goto done;
6352 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6353 8e7bd50a 2019-08-22 stsp if (error)
6354 8e7bd50a 2019-08-22 stsp goto done;
6355 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6357 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6358 c9956ddf 2019-09-08 stsp if (error)
6359 c9956ddf 2019-09-08 stsp goto done;
6360 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6361 c9956ddf 2019-09-08 stsp if (error != NULL)
6362 c9956ddf 2019-09-08 stsp goto done;
6364 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6365 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6366 8e7bd50a 2019-08-22 stsp if (error)
6367 8e7bd50a 2019-08-22 stsp goto done;
6370 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6371 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6372 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6373 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6374 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6375 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6376 8e7bd50a 2019-08-22 stsp if (error)
6377 8e7bd50a 2019-08-22 stsp goto done;
6378 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6379 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6380 8e7bd50a 2019-08-22 stsp if (error)
6381 8e7bd50a 2019-08-22 stsp goto done;
6382 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6383 8e7bd50a 2019-08-22 stsp free(commit_id);
6384 8e7bd50a 2019-08-22 stsp if (error)
6385 8e7bd50a 2019-08-22 stsp goto done;
6388 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6389 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6393 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
6394 8e7bd50a 2019-08-22 stsp if (worktree)
6395 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6396 8e7bd50a 2019-08-22 stsp free(cwd);
6397 8e7bd50a 2019-08-22 stsp free(repo_path);
6398 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6399 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6400 8e7bd50a 2019-08-22 stsp return error;
6403 8e7bd50a 2019-08-22 stsp __dead static void
6404 d00136be 2019-03-26 stsp usage_add(void)
6406 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6407 022fae89 2019-12-06 tracey getprogname());
6411 d00136be 2019-03-26 stsp static const struct got_error *
6412 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6414 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6416 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6417 4e68cba3 2019-11-23 stsp return NULL;
6420 4e68cba3 2019-11-23 stsp static const struct got_error *
6421 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6423 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6424 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6425 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6426 1dd54920 2019-05-11 stsp char *cwd = NULL;
6427 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6428 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6429 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6431 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6433 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6434 d00136be 2019-03-26 stsp switch (ch) {
6435 022fae89 2019-12-06 tracey case 'I':
6436 022fae89 2019-12-06 tracey no_ignores = 1;
6439 4e68cba3 2019-11-23 stsp can_recurse = 1;
6442 d00136be 2019-03-26 stsp usage_add();
6443 d00136be 2019-03-26 stsp /* NOTREACHED */
6447 d00136be 2019-03-26 stsp argc -= optind;
6448 d00136be 2019-03-26 stsp argv += optind;
6450 43012d58 2019-07-14 stsp #ifndef PROFILE
6451 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6452 43012d58 2019-07-14 stsp NULL) == -1)
6453 43012d58 2019-07-14 stsp err(1, "pledge");
6455 723c305c 2019-05-11 jcs if (argc < 1)
6456 d00136be 2019-03-26 stsp usage_add();
6458 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6459 d00136be 2019-03-26 stsp if (cwd == NULL) {
6460 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6461 d00136be 2019-03-26 stsp goto done;
6464 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6465 fa51e947 2020-03-27 stsp if (error) {
6466 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6467 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6468 d00136be 2019-03-26 stsp goto done;
6471 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6473 031a5338 2019-03-26 stsp if (error != NULL)
6474 031a5338 2019-03-26 stsp goto done;
6476 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6477 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6478 d00136be 2019-03-26 stsp if (error)
6479 d00136be 2019-03-26 stsp goto done;
6481 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6482 6d022e97 2019-08-04 stsp if (error)
6483 022fae89 2019-12-06 tracey goto done;
6485 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
6486 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6487 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
6488 6d022e97 2019-08-04 stsp goto done;
6492 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6493 4e68cba3 2019-11-23 stsp char *ondisk_path;
6494 4e68cba3 2019-11-23 stsp struct stat sb;
6495 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6496 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6497 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6498 62d463ca 2020-10-20 naddy pe->path) == -1) {
6499 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6500 4e68cba3 2019-11-23 stsp goto done;
6502 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6503 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6504 4e68cba3 2019-11-23 stsp free(ondisk_path);
6507 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6508 4e68cba3 2019-11-23 stsp ondisk_path);
6509 4e68cba3 2019-11-23 stsp free(ondisk_path);
6510 4e68cba3 2019-11-23 stsp goto done;
6512 4e68cba3 2019-11-23 stsp free(ondisk_path);
6513 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6514 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6515 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6516 4e68cba3 2019-11-23 stsp goto done;
6521 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6522 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6525 031a5338 2019-03-26 stsp got_repo_close(repo);
6526 d00136be 2019-03-26 stsp if (worktree)
6527 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6528 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6529 1dd54920 2019-05-11 stsp free((char *)pe->path);
6530 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6531 2ec1f75b 2019-03-26 stsp free(cwd);
6532 2ec1f75b 2019-03-26 stsp return error;
6535 2ec1f75b 2019-03-26 stsp __dead static void
6536 648e4ef7 2019-07-09 stsp usage_remove(void)
6538 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6539 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6543 2a06fe5f 2019-08-24 stsp static const struct got_error *
6544 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6545 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6547 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6549 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6550 2a06fe5f 2019-08-24 stsp return NULL;
6551 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6552 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6553 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6554 2a06fe5f 2019-08-24 stsp return NULL;
6557 2ec1f75b 2019-03-26 stsp static const struct got_error *
6558 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6560 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6561 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6562 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6563 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6564 17ed4618 2019-06-02 stsp char *cwd = NULL;
6565 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6566 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6567 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6569 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6571 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6572 2ec1f75b 2019-03-26 stsp switch (ch) {
6574 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6576 70e3e7f5 2019-12-13 tracey case 'k':
6577 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6579 f2a9dc41 2019-12-13 tracey case 'R':
6580 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6583 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6584 766841c2 2020-08-13 stsp switch (optarg[i]) {
6585 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6586 766841c2 2020-08-13 stsp delete_local_mods = 1;
6588 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6591 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6592 766841c2 2020-08-13 stsp optarg[i]);
6595 766841c2 2020-08-13 stsp status_codes = optarg;
6598 f2a9dc41 2019-12-13 tracey usage_remove();
6599 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6603 2ec1f75b 2019-03-26 stsp argc -= optind;
6604 2ec1f75b 2019-03-26 stsp argv += optind;
6606 43012d58 2019-07-14 stsp #ifndef PROFILE
6607 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6608 43012d58 2019-07-14 stsp NULL) == -1)
6609 43012d58 2019-07-14 stsp err(1, "pledge");
6611 17ed4618 2019-06-02 stsp if (argc < 1)
6612 648e4ef7 2019-07-09 stsp usage_remove();
6614 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
6615 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
6616 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6617 2ec1f75b 2019-03-26 stsp goto done;
6619 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6620 fa51e947 2020-03-27 stsp if (error) {
6621 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6622 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
6623 2ec1f75b 2019-03-26 stsp goto done;
6626 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6629 2ec1f75b 2019-03-26 stsp goto done;
6631 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6632 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6633 2ec1f75b 2019-03-26 stsp if (error)
6634 2ec1f75b 2019-03-26 stsp goto done;
6636 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6637 6d022e97 2019-08-04 stsp if (error)
6638 6d022e97 2019-08-04 stsp goto done;
6640 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
6641 f2a9dc41 2019-12-13 tracey char *ondisk_path;
6642 f2a9dc41 2019-12-13 tracey struct stat sb;
6643 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
6644 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6645 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6646 62d463ca 2020-10-20 naddy pe->path) == -1) {
6647 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6648 f2a9dc41 2019-12-13 tracey goto done;
6650 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6651 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6652 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6653 f2a9dc41 2019-12-13 tracey continue;
6655 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6656 f2a9dc41 2019-12-13 tracey ondisk_path);
6657 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6658 f2a9dc41 2019-12-13 tracey goto done;
6660 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6661 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6662 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6663 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6664 f2a9dc41 2019-12-13 tracey goto done;
6669 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6670 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
6671 766841c2 2020-08-13 stsp repo, keep_on_disk);
6674 a129376b 2019-03-28 stsp got_repo_close(repo);
6675 a129376b 2019-03-28 stsp if (worktree)
6676 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6677 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6678 17ed4618 2019-06-02 stsp free((char *)pe->path);
6679 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6680 a129376b 2019-03-28 stsp free(cwd);
6681 a129376b 2019-03-28 stsp return error;
6684 a129376b 2019-03-28 stsp __dead static void
6685 a129376b 2019-03-28 stsp usage_revert(void)
6687 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6688 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6692 1ee397ad 2019-07-12 stsp static const struct got_error *
6693 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6695 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6696 fb9704af 2020-01-27 stsp return NULL;
6698 a129376b 2019-03-28 stsp while (path[0] == '/')
6700 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6701 33aa809d 2019-08-08 stsp return NULL;
6704 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6705 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6706 33aa809d 2019-08-08 stsp const char *action;
6709 33aa809d 2019-08-08 stsp static const struct got_error *
6710 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6711 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6713 33aa809d 2019-08-08 stsp char *line = NULL;
6714 33aa809d 2019-08-08 stsp size_t linesize = 0;
6715 33aa809d 2019-08-08 stsp ssize_t linelen;
6717 33aa809d 2019-08-08 stsp switch (status) {
6718 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6719 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6721 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6722 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6724 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6725 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6726 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6727 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6728 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6729 33aa809d 2019-08-08 stsp printf("%s", line);
6730 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6731 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6732 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6733 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6734 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6737 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6740 33aa809d 2019-08-08 stsp return NULL;
6743 33aa809d 2019-08-08 stsp static const struct got_error *
6744 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6745 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6747 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6748 33aa809d 2019-08-08 stsp char *line = NULL;
6749 33aa809d 2019-08-08 stsp size_t linesize = 0;
6750 33aa809d 2019-08-08 stsp ssize_t linelen;
6751 33aa809d 2019-08-08 stsp int resp = ' ';
6752 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6754 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6756 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6758 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6759 33aa809d 2019-08-08 stsp a->action);
6761 33aa809d 2019-08-08 stsp return err;
6762 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6763 33aa809d 2019-08-08 stsp if (linelen == -1) {
6764 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6765 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6766 33aa809d 2019-08-08 stsp return NULL;
6768 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6770 33aa809d 2019-08-08 stsp *nl = '\0';
6771 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6772 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6773 33aa809d 2019-08-08 stsp printf("y\n");
6774 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6775 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6776 33aa809d 2019-08-08 stsp printf("n\n");
6777 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6778 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6779 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6780 33aa809d 2019-08-08 stsp printf("q\n");
6782 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6783 33aa809d 2019-08-08 stsp free(line);
6784 33aa809d 2019-08-08 stsp return NULL;
6787 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6788 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6789 33aa809d 2019-08-08 stsp a->action);
6791 33aa809d 2019-08-08 stsp return err;
6792 33aa809d 2019-08-08 stsp resp = getchar();
6793 33aa809d 2019-08-08 stsp if (resp == '\n')
6794 33aa809d 2019-08-08 stsp resp = getchar();
6795 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6796 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6797 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6798 33aa809d 2019-08-08 stsp resp = ' ';
6800 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6801 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6802 33aa809d 2019-08-08 stsp resp = ' ';
6806 33aa809d 2019-08-08 stsp if (resp == 'y')
6807 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6808 33aa809d 2019-08-08 stsp else if (resp == 'n')
6809 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6810 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6811 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6813 1ee397ad 2019-07-12 stsp return NULL;
6817 a129376b 2019-03-28 stsp static const struct got_error *
6818 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6820 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6821 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6822 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6823 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6824 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6825 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6826 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6827 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6828 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6829 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6831 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6833 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6834 a129376b 2019-03-28 stsp switch (ch) {
6836 33aa809d 2019-08-08 stsp pflag = 1;
6839 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6842 0f6d7415 2019-08-08 stsp can_recurse = 1;
6845 a129376b 2019-03-28 stsp usage_revert();
6846 a129376b 2019-03-28 stsp /* NOTREACHED */
6850 a129376b 2019-03-28 stsp argc -= optind;
6851 a129376b 2019-03-28 stsp argv += optind;
6853 43012d58 2019-07-14 stsp #ifndef PROFILE
6854 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6855 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6856 43012d58 2019-07-14 stsp err(1, "pledge");
6858 e20a8b6f 2019-06-04 stsp if (argc < 1)
6859 a129376b 2019-03-28 stsp usage_revert();
6860 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6861 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6863 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6864 a129376b 2019-03-28 stsp if (cwd == NULL) {
6865 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6866 a129376b 2019-03-28 stsp goto done;
6868 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6869 fa51e947 2020-03-27 stsp if (error) {
6870 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6871 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6872 2ec1f75b 2019-03-26 stsp goto done;
6875 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6877 a129376b 2019-03-28 stsp if (error != NULL)
6878 a129376b 2019-03-28 stsp goto done;
6880 33aa809d 2019-08-08 stsp if (patch_script_path) {
6881 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6882 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6883 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6884 33aa809d 2019-08-08 stsp patch_script_path);
6885 33aa809d 2019-08-08 stsp goto done;
6888 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6889 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6890 a129376b 2019-03-28 stsp if (error)
6891 a129376b 2019-03-28 stsp goto done;
6893 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6894 6d022e97 2019-08-04 stsp if (error)
6895 6d022e97 2019-08-04 stsp goto done;
6897 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6898 0f6d7415 2019-08-08 stsp char *ondisk_path;
6899 0f6d7415 2019-08-08 stsp struct stat sb;
6900 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6901 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6902 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6903 62d463ca 2020-10-20 naddy pe->path) == -1) {
6904 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6905 0f6d7415 2019-08-08 stsp goto done;
6907 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6908 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6909 0f6d7415 2019-08-08 stsp free(ondisk_path);
6912 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6913 0f6d7415 2019-08-08 stsp ondisk_path);
6914 0f6d7415 2019-08-08 stsp free(ondisk_path);
6915 0f6d7415 2019-08-08 stsp goto done;
6917 0f6d7415 2019-08-08 stsp free(ondisk_path);
6918 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6919 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6920 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6921 0f6d7415 2019-08-08 stsp goto done;
6926 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6927 33aa809d 2019-08-08 stsp cpa.action = "revert";
6928 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6929 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6931 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6932 33aa809d 2019-08-08 stsp error == NULL)
6933 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6935 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6936 2ec1f75b 2019-03-26 stsp if (worktree)
6937 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6938 2ec1f75b 2019-03-26 stsp free(path);
6939 d00136be 2019-03-26 stsp free(cwd);
6940 6bad629b 2019-02-04 stsp return error;
6943 c4296144 2019-05-09 stsp __dead static void
6944 c4296144 2019-05-09 stsp usage_commit(void)
6946 28cf319f 2021-01-28 stsp fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
6947 28cf319f 2021-01-28 stsp "[path ...]\n", getprogname());
6951 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6952 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6953 28cf319f 2021-01-28 stsp const char *prepared_log;
6954 28cf319f 2021-01-28 stsp int non_interactive;
6955 e2ba3d07 2019-05-13 stsp const char *editor;
6956 e0870e44 2019-05-13 stsp const char *worktree_path;
6957 76d98825 2019-06-03 stsp const char *branch_name;
6958 314a6357 2019-05-13 stsp const char *repo_path;
6959 e0870e44 2019-05-13 stsp char *logmsg_path;
6963 28cf319f 2021-01-28 stsp static const struct got_error *
6964 28cf319f 2021-01-28 stsp read_prepared_logmsg(char **logmsg, const char *path)
6966 28cf319f 2021-01-28 stsp const struct got_error *err = NULL;
6967 28cf319f 2021-01-28 stsp FILE *f = NULL;
6968 28cf319f 2021-01-28 stsp struct stat sb;
6971 28cf319f 2021-01-28 stsp *logmsg = NULL;
6972 28cf319f 2021-01-28 stsp memset(&sb, 0, sizeof(sb));
6974 28cf319f 2021-01-28 stsp f = fopen(path, "r");
6975 28cf319f 2021-01-28 stsp if (f == NULL)
6976 28cf319f 2021-01-28 stsp return got_error_from_errno2("fopen", path);
6978 28cf319f 2021-01-28 stsp if (fstat(fileno(f), &sb) == -1) {
6979 28cf319f 2021-01-28 stsp err = got_error_from_errno2("fstat", path);
6980 28cf319f 2021-01-28 stsp goto done;
6982 28cf319f 2021-01-28 stsp if (sb.st_size == 0) {
6983 28cf319f 2021-01-28 stsp err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6984 28cf319f 2021-01-28 stsp goto done;
6987 28cf319f 2021-01-28 stsp *logmsg = malloc(sb.st_size + 1);
6988 28cf319f 2021-01-28 stsp if (*logmsg == NULL) {
6989 28cf319f 2021-01-28 stsp err = got_error_from_errno("malloc");
6990 28cf319f 2021-01-28 stsp goto done;
6993 28cf319f 2021-01-28 stsp r = fread(*logmsg, 1, sb.st_size, f);
6994 28cf319f 2021-01-28 stsp if (r != sb.st_size) {
6995 28cf319f 2021-01-28 stsp if (ferror(f))
6996 28cf319f 2021-01-28 stsp err = got_error_from_errno2("fread", path);
6998 28cf319f 2021-01-28 stsp err = got_error(GOT_ERR_IO);
6999 28cf319f 2021-01-28 stsp goto done;
7001 28cf319f 2021-01-28 stsp (*logmsg)[sb.st_size] = '\0';
7003 28cf319f 2021-01-28 stsp if (fclose(f) == EOF && err == NULL)
7004 28cf319f 2021-01-28 stsp err = got_error_from_errno2("fclose", path);
7005 28cf319f 2021-01-28 stsp if (err) {
7006 28cf319f 2021-01-28 stsp free(*logmsg);
7007 28cf319f 2021-01-28 stsp *logmsg = NULL;
7009 28cf319f 2021-01-28 stsp return err;
7013 33ad4cbe 2019-05-12 jcs static const struct got_error *
7014 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7017 76d98825 2019-06-03 stsp char *initial_content = NULL;
7018 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
7019 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
7020 e0870e44 2019-05-13 stsp char *template = NULL;
7021 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
7022 1601cb9f 2020-09-11 naddy int initial_content_len;
7023 97972933 2020-09-11 stsp int fd = -1;
7024 33ad4cbe 2019-05-12 jcs size_t len;
7026 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
7027 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7028 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
7029 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
7030 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
7031 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
7032 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
7033 33ad4cbe 2019-05-12 jcs return NULL;
7034 28cf319f 2021-01-28 stsp } else if (a->prepared_log != NULL && a->non_interactive)
7035 28cf319f 2021-01-28 stsp return read_prepared_logmsg(logmsg, a->prepared_log);
7037 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7038 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
7040 28cf319f 2021-01-28 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7042 28cf319f 2021-01-28 stsp goto done;
7044 28cf319f 2021-01-28 stsp if (a->prepared_log) {
7045 28cf319f 2021-01-28 stsp char *msg;
7046 28cf319f 2021-01-28 stsp err = read_prepared_logmsg(&msg, a->prepared_log);
7048 28cf319f 2021-01-28 stsp goto done;
7049 28cf319f 2021-01-28 stsp if (write(fd, msg, strlen(msg)) == -1) {
7050 28cf319f 2021-01-28 stsp err = got_error_from_errno2("write", a->logmsg_path);
7051 28cf319f 2021-01-28 stsp free(msg);
7052 28cf319f 2021-01-28 stsp goto done;
7054 28cf319f 2021-01-28 stsp free(msg);
7057 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
7058 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
7059 1601cb9f 2020-09-11 naddy a->branch_name);
7060 28cf319f 2021-01-28 stsp if (initial_content_len == -1) {
7061 28cf319f 2021-01-28 stsp err = got_error_from_errno("asprintf");
7062 e0870e44 2019-05-13 stsp goto done;
7065 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
7066 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
7067 97972933 2020-09-11 stsp goto done;
7070 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
7071 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
7072 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
7073 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
7074 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
7077 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7078 28cf319f 2021-01-28 stsp initial_content_len, a->prepared_log ? 0 : 1);
7080 76d98825 2019-06-03 stsp free(initial_content);
7081 e0870e44 2019-05-13 stsp free(template);
7083 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
7084 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
7086 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
7087 59f86c76 2020-09-11 stsp if (err == NULL)
7088 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
7089 59f86c76 2020-09-11 stsp if (err) {
7090 59f86c76 2020-09-11 stsp free(*logmsg);
7091 59f86c76 2020-09-11 stsp *logmsg = NULL;
7093 33ad4cbe 2019-05-12 jcs return err;
7096 c4296144 2019-05-09 stsp static const struct got_error *
7097 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
7099 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
7100 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
7101 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
7102 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
7103 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
7104 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
7105 28cf319f 2021-01-28 stsp char *prepared_logmsg = NULL;
7106 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
7107 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7108 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7109 28cf319f 2021-01-28 stsp int allow_bad_symlinks = 0, non_interactive = 0;
7110 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
7112 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
7113 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
7115 28cf319f 2021-01-28 stsp while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7116 c4296144 2019-05-09 stsp switch (ch) {
7118 28cf319f 2021-01-28 stsp if (logmsg != NULL)
7119 28cf319f 2021-01-28 stsp option_conflict('F', 'm');
7120 28cf319f 2021-01-28 stsp prepared_logmsg = realpath(optarg, NULL);
7121 28cf319f 2021-01-28 stsp if (prepared_logmsg == NULL)
7122 28cf319f 2021-01-28 stsp return got_error_from_errno2("realpath",
7126 28cf319f 2021-01-28 stsp if (prepared_logmsg)
7127 28cf319f 2021-01-28 stsp option_conflict('m', 'F');
7128 c4296144 2019-05-09 stsp logmsg = optarg;
7131 28cf319f 2021-01-28 stsp non_interactive = 1;
7134 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
7137 c4296144 2019-05-09 stsp usage_commit();
7138 c4296144 2019-05-09 stsp /* NOTREACHED */
7142 c4296144 2019-05-09 stsp argc -= optind;
7143 c4296144 2019-05-09 stsp argv += optind;
7145 43012d58 2019-07-14 stsp #ifndef PROFILE
7146 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7147 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7148 43012d58 2019-07-14 stsp err(1, "pledge");
7150 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
7151 c4296144 2019-05-09 stsp if (cwd == NULL) {
7152 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
7153 c4296144 2019-05-09 stsp goto done;
7155 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
7156 fa51e947 2020-03-27 stsp if (error) {
7157 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7158 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
7159 7d5807f4 2019-07-11 stsp goto done;
7162 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7163 c4296144 2019-05-09 stsp if (error)
7164 a698f62e 2019-07-25 stsp goto done;
7165 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
7166 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
7167 c4296144 2019-05-09 stsp goto done;
7170 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7171 916f288c 2019-07-30 stsp worktree);
7172 5c1e53bc 2019-07-28 stsp if (error)
7173 5c1e53bc 2019-07-28 stsp goto done;
7175 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
7176 c9956ddf 2019-09-08 stsp if (error)
7177 c9956ddf 2019-09-08 stsp goto done;
7178 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7179 c9956ddf 2019-09-08 stsp gitconfig_path);
7180 c4296144 2019-05-09 stsp if (error != NULL)
7181 c4296144 2019-05-09 stsp goto done;
7183 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
7184 aba9c984 2019-09-08 stsp if (error)
7185 aba9c984 2019-09-08 stsp return error;
7188 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
7189 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
7191 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
7192 314a6357 2019-05-13 stsp error = get_editor(&editor);
7194 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7195 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7196 c4296144 2019-05-09 stsp if (error)
7197 c4296144 2019-05-09 stsp goto done;
7199 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7200 087fb88c 2019-08-04 stsp if (error)
7201 087fb88c 2019-08-04 stsp goto done;
7203 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
7204 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
7205 28cf319f 2021-01-28 stsp cl_arg.prepared_log = prepared_logmsg;
7206 28cf319f 2021-01-28 stsp cl_arg.non_interactive = non_interactive;
7207 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7208 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7209 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
7210 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7211 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
7212 916f288c 2019-07-30 stsp goto done;
7214 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
7216 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
7217 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7218 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7219 35213c7c 2020-07-23 stsp print_status, NULL, repo);
7220 e0870e44 2019-05-13 stsp if (error) {
7221 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7222 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
7223 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
7224 c4296144 2019-05-09 stsp goto done;
7227 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
7228 c4296144 2019-05-09 stsp if (error)
7229 c4296144 2019-05-09 stsp goto done;
7230 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
7232 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
7233 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
7234 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
7235 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7236 7266f21f 2019-10-21 stsp error == NULL)
7237 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7238 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
7240 c4296144 2019-05-09 stsp got_repo_close(repo);
7241 c4296144 2019-05-09 stsp if (worktree)
7242 c4296144 2019-05-09 stsp got_worktree_close(worktree);
7243 c4296144 2019-05-09 stsp free(cwd);
7244 c4296144 2019-05-09 stsp free(id_str);
7245 c9956ddf 2019-09-08 stsp free(gitconfig_path);
7246 e2ba3d07 2019-05-13 stsp free(editor);
7247 aba9c984 2019-09-08 stsp free(author);
7248 28cf319f 2021-01-28 stsp free(prepared_logmsg);
7249 234035bc 2019-06-01 stsp return error;
7252 234035bc 2019-06-01 stsp __dead static void
7253 234035bc 2019-06-01 stsp usage_cherrypick(void)
7255 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7259 234035bc 2019-06-01 stsp static const struct got_error *
7260 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
7262 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
7263 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
7264 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
7265 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
7266 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
7267 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
7268 234035bc 2019-06-01 stsp struct got_object_qid *pid;
7269 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
7271 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7273 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7274 234035bc 2019-06-01 stsp switch (ch) {
7276 234035bc 2019-06-01 stsp usage_cherrypick();
7277 234035bc 2019-06-01 stsp /* NOTREACHED */
7281 234035bc 2019-06-01 stsp argc -= optind;
7282 234035bc 2019-06-01 stsp argv += optind;
7284 43012d58 2019-07-14 stsp #ifndef PROFILE
7285 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7286 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7287 43012d58 2019-07-14 stsp err(1, "pledge");
7289 234035bc 2019-06-01 stsp if (argc != 1)
7290 234035bc 2019-06-01 stsp usage_cherrypick();
7292 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
7293 234035bc 2019-06-01 stsp if (cwd == NULL) {
7294 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
7295 234035bc 2019-06-01 stsp goto done;
7297 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
7298 fa51e947 2020-03-27 stsp if (error) {
7299 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7300 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
7302 234035bc 2019-06-01 stsp goto done;
7305 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7307 234035bc 2019-06-01 stsp if (error != NULL)
7308 234035bc 2019-06-01 stsp goto done;
7310 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7311 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7312 234035bc 2019-06-01 stsp if (error)
7313 234035bc 2019-06-01 stsp goto done;
7315 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7316 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7317 234035bc 2019-06-01 stsp if (error != NULL) {
7318 234035bc 2019-06-01 stsp struct got_reference *ref;
7319 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7320 234035bc 2019-06-01 stsp goto done;
7321 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7322 234035bc 2019-06-01 stsp if (error != NULL)
7323 234035bc 2019-06-01 stsp goto done;
7324 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
7325 234035bc 2019-06-01 stsp got_ref_close(ref);
7326 234035bc 2019-06-01 stsp if (error != NULL)
7327 234035bc 2019-06-01 stsp goto done;
7329 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
7330 234035bc 2019-06-01 stsp if (error)
7331 234035bc 2019-06-01 stsp goto done;
7333 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
7334 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
7335 234035bc 2019-06-01 stsp if (error != NULL)
7336 234035bc 2019-06-01 stsp goto done;
7338 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7339 234035bc 2019-06-01 stsp if (error) {
7340 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
7341 234035bc 2019-06-01 stsp goto done;
7342 234035bc 2019-06-01 stsp error = NULL;
7344 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
7345 234035bc 2019-06-01 stsp goto done;
7348 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7349 234035bc 2019-06-01 stsp if (error)
7350 234035bc 2019-06-01 stsp goto done;
7351 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7352 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7353 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7354 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
7356 234035bc 2019-06-01 stsp if (error != NULL)
7357 234035bc 2019-06-01 stsp goto done;
7359 9627c110 2020-04-18 stsp if (upa.did_something)
7360 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
7361 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7363 234035bc 2019-06-01 stsp if (commit)
7364 234035bc 2019-06-01 stsp got_object_commit_close(commit);
7365 234035bc 2019-06-01 stsp free(commit_id_str);
7366 234035bc 2019-06-01 stsp if (head_ref)
7367 234035bc 2019-06-01 stsp got_ref_close(head_ref);
7368 234035bc 2019-06-01 stsp if (worktree)
7369 234035bc 2019-06-01 stsp got_worktree_close(worktree);
7371 234035bc 2019-06-01 stsp got_repo_close(repo);
7372 c4296144 2019-05-09 stsp return error;
7375 5ef14e63 2019-06-02 stsp __dead static void
7376 5ef14e63 2019-06-02 stsp usage_backout(void)
7378 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7382 5ef14e63 2019-06-02 stsp static const struct got_error *
7383 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
7385 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
7386 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
7387 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
7388 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
7389 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
7390 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
7391 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
7392 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
7394 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7396 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7397 5ef14e63 2019-06-02 stsp switch (ch) {
7399 5ef14e63 2019-06-02 stsp usage_backout();
7400 5ef14e63 2019-06-02 stsp /* NOTREACHED */
7404 5ef14e63 2019-06-02 stsp argc -= optind;
7405 5ef14e63 2019-06-02 stsp argv += optind;
7407 43012d58 2019-07-14 stsp #ifndef PROFILE
7408 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7409 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7410 43012d58 2019-07-14 stsp err(1, "pledge");
7412 5ef14e63 2019-06-02 stsp if (argc != 1)
7413 5ef14e63 2019-06-02 stsp usage_backout();
7415 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
7416 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
7417 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
7418 5ef14e63 2019-06-02 stsp goto done;
7420 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
7421 fa51e947 2020-03-27 stsp if (error) {
7422 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7423 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
7424 5ef14e63 2019-06-02 stsp goto done;
7427 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7429 5ef14e63 2019-06-02 stsp if (error != NULL)
7430 5ef14e63 2019-06-02 stsp goto done;
7432 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7433 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7434 5ef14e63 2019-06-02 stsp if (error)
7435 5ef14e63 2019-06-02 stsp goto done;
7437 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7438 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7439 5ef14e63 2019-06-02 stsp if (error != NULL) {
7440 5ef14e63 2019-06-02 stsp struct got_reference *ref;
7441 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7442 5ef14e63 2019-06-02 stsp goto done;
7443 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7444 5ef14e63 2019-06-02 stsp if (error != NULL)
7445 5ef14e63 2019-06-02 stsp goto done;
7446 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
7447 5ef14e63 2019-06-02 stsp got_ref_close(ref);
7448 5ef14e63 2019-06-02 stsp if (error != NULL)
7449 5ef14e63 2019-06-02 stsp goto done;
7451 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
7452 5ef14e63 2019-06-02 stsp if (error)
7453 5ef14e63 2019-06-02 stsp goto done;
7455 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
7456 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
7457 5ef14e63 2019-06-02 stsp if (error != NULL)
7458 5ef14e63 2019-06-02 stsp goto done;
7460 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7461 5ef14e63 2019-06-02 stsp if (error)
7462 5ef14e63 2019-06-02 stsp goto done;
7464 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7465 5ef14e63 2019-06-02 stsp if (error)
7466 5ef14e63 2019-06-02 stsp goto done;
7467 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7468 5ef14e63 2019-06-02 stsp if (pid == NULL) {
7469 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
7470 5ef14e63 2019-06-02 stsp goto done;
7473 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7474 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7475 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7476 5ef14e63 2019-06-02 stsp if (error != NULL)
7477 5ef14e63 2019-06-02 stsp goto done;
7479 9627c110 2020-04-18 stsp if (upa.did_something)
7480 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
7481 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7483 5ef14e63 2019-06-02 stsp if (commit)
7484 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
7485 5ef14e63 2019-06-02 stsp free(commit_id_str);
7486 5ef14e63 2019-06-02 stsp if (head_ref)
7487 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
7488 818c7501 2019-07-11 stsp if (worktree)
7489 818c7501 2019-07-11 stsp got_worktree_close(worktree);
7491 818c7501 2019-07-11 stsp got_repo_close(repo);
7492 818c7501 2019-07-11 stsp return error;
7495 818c7501 2019-07-11 stsp __dead static void
7496 818c7501 2019-07-11 stsp usage_rebase(void)
7498 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7499 af54c8f8 2019-07-11 stsp getprogname());
7504 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
7507 0ebf8283 2019-07-24 stsp size_t len;
7509 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
7510 0ebf8283 2019-07-24 stsp if (len > limit)
7511 0ebf8283 2019-07-24 stsp len = limit;
7512 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
7513 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
7515 0ebf8283 2019-07-24 stsp *nl = '\0';
7518 0ebf8283 2019-07-24 stsp static const struct got_error *
7519 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7521 5943eee2 2019-08-13 stsp const struct got_error *err;
7522 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
7523 5943eee2 2019-08-13 stsp const char *s;
7525 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
7527 5943eee2 2019-08-13 stsp return err;
7529 5943eee2 2019-08-13 stsp s = logmsg0;
7530 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
7533 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
7534 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
7535 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
7536 5943eee2 2019-08-13 stsp goto done;
7539 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
7541 5943eee2 2019-08-13 stsp free(logmsg0);
7542 a0ea4fc0 2020-02-28 stsp return err;
7545 a0ea4fc0 2020-02-28 stsp static const struct got_error *
7546 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7548 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
7549 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
7550 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
7552 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
7554 a0ea4fc0 2020-02-28 stsp return err;
7556 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
7558 a0ea4fc0 2020-02-28 stsp goto done;
7560 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
7562 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
7564 a0ea4fc0 2020-02-28 stsp goto done;
7566 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
7568 a0ea4fc0 2020-02-28 stsp free(id_str);
7569 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
7570 a0ea4fc0 2020-02-28 stsp free(logmsg);
7571 5943eee2 2019-08-13 stsp return err;
7574 818c7501 2019-07-11 stsp static const struct got_error *
7575 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
7576 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
7578 818c7501 2019-07-11 stsp const struct got_error *err;
7579 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7581 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
7583 818c7501 2019-07-11 stsp goto done;
7585 ff0d2220 2019-07-11 stsp if (new_id) {
7586 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
7588 ff0d2220 2019-07-11 stsp goto done;
7591 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
7592 ff0d2220 2019-07-11 stsp if (new_id_str)
7593 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
7595 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7597 0ebf8283 2019-07-24 stsp goto done;
7599 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
7600 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7602 818c7501 2019-07-11 stsp free(old_id_str);
7603 818c7501 2019-07-11 stsp free(new_id_str);
7604 272a1371 2020-02-28 stsp free(logmsg);
7605 818c7501 2019-07-11 stsp return err;
7608 1ee397ad 2019-07-12 stsp static const struct got_error *
7609 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7610 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
7611 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
7613 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
7614 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
7615 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
7618 818c7501 2019-07-11 stsp static const struct got_error *
7619 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
7620 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7621 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
7622 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7624 ff0d2220 2019-07-11 stsp const struct got_error *error;
7625 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
7626 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
7628 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7629 ff0d2220 2019-07-11 stsp if (error)
7630 ff0d2220 2019-07-11 stsp return error;
7632 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7633 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
7634 ff0d2220 2019-07-11 stsp if (error) {
7635 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7636 ff0d2220 2019-07-11 stsp goto done;
7637 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
7639 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
7640 ff0d2220 2019-07-11 stsp free(new_commit_id);
7643 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
7644 ff0d2220 2019-07-11 stsp return error;
7647 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
7648 64c6d990 2019-07-11 stsp const char *path_prefix;
7649 64c6d990 2019-07-11 stsp size_t len;
7650 8ca9bd68 2019-07-25 stsp int errcode;
7653 64c6d990 2019-07-11 stsp static const struct got_error *
7654 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7655 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
7656 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
7657 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
7659 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
7661 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7662 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7663 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
7665 64c6d990 2019-07-11 stsp return NULL;
7668 64c6d990 2019-07-11 stsp static const struct got_error *
7669 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
7670 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
7671 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
7673 64c6d990 2019-07-11 stsp const struct got_error *err;
7674 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7675 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
7676 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
7678 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
7679 64c6d990 2019-07-11 stsp return NULL;
7681 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7683 64c6d990 2019-07-11 stsp goto done;
7685 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7687 64c6d990 2019-07-11 stsp goto done;
7689 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
7690 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
7692 64c6d990 2019-07-11 stsp goto done;
7694 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
7695 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
7697 64c6d990 2019-07-11 stsp goto done;
7699 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
7700 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
7701 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
7702 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
7703 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
7704 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
7705 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
7707 64c6d990 2019-07-11 stsp if (tree1)
7708 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
7709 64c6d990 2019-07-11 stsp if (tree2)
7710 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
7711 64c6d990 2019-07-11 stsp if (commit)
7712 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
7713 64c6d990 2019-07-11 stsp if (parent_commit)
7714 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
7715 64c6d990 2019-07-11 stsp return err;
7718 ff0d2220 2019-07-11 stsp static const struct got_error *
7719 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
7720 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
7721 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7722 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
7723 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
7725 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
7726 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
7727 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
7728 af61c510 2019-07-19 stsp struct got_object_qid *qid;
7729 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
7731 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
7733 af61c510 2019-07-19 stsp return err;
7735 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7736 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7738 af61c510 2019-07-19 stsp goto done;
7739 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7740 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
7741 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
7742 af61c510 2019-07-19 stsp if (err) {
7743 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7744 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7745 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7746 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7747 af61c510 2019-07-19 stsp "been reached?!?");
7749 ee780d5c 2020-01-04 stsp goto done;
7751 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7752 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7754 af61c510 2019-07-19 stsp goto done;
7756 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7758 af61c510 2019-07-19 stsp goto done;
7759 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7760 af61c510 2019-07-19 stsp commit_id = parent_id;
7764 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7765 af61c510 2019-07-19 stsp return err;
7768 af61c510 2019-07-19 stsp static const struct got_error *
7769 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7771 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7772 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7773 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7774 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7775 818c7501 2019-07-11 stsp char *cwd = NULL;
7776 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7777 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7778 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7779 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7780 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7781 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7782 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7783 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7784 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7785 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7786 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7787 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7788 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7790 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7791 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7793 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7794 818c7501 2019-07-11 stsp switch (ch) {
7796 818c7501 2019-07-11 stsp abort_rebase = 1;
7799 818c7501 2019-07-11 stsp continue_rebase = 1;
7802 818c7501 2019-07-11 stsp usage_rebase();
7803 818c7501 2019-07-11 stsp /* NOTREACHED */
7807 818c7501 2019-07-11 stsp argc -= optind;
7808 818c7501 2019-07-11 stsp argv += optind;
7810 43012d58 2019-07-14 stsp #ifndef PROFILE
7811 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7812 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7813 43012d58 2019-07-14 stsp err(1, "pledge");
7815 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7816 818c7501 2019-07-11 stsp usage_rebase();
7817 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7818 818c7501 2019-07-11 stsp if (argc != 0)
7819 818c7501 2019-07-11 stsp usage_rebase();
7820 818c7501 2019-07-11 stsp } else if (argc != 1)
7821 818c7501 2019-07-11 stsp usage_rebase();
7823 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7824 818c7501 2019-07-11 stsp if (cwd == NULL) {
7825 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7826 818c7501 2019-07-11 stsp goto done;
7828 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7829 fa51e947 2020-03-27 stsp if (error) {
7830 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7831 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7832 818c7501 2019-07-11 stsp goto done;
7835 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7837 818c7501 2019-07-11 stsp if (error != NULL)
7838 818c7501 2019-07-11 stsp goto done;
7840 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7841 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7842 7ef62c4e 2020-02-24 stsp if (error)
7843 7ef62c4e 2020-02-24 stsp goto done;
7845 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7846 7ef62c4e 2020-02-24 stsp worktree);
7847 818c7501 2019-07-11 stsp if (error)
7848 7ef62c4e 2020-02-24 stsp goto done;
7849 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7850 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7851 818c7501 2019-07-11 stsp goto done;
7854 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7855 818c7501 2019-07-11 stsp if (error)
7856 818c7501 2019-07-11 stsp goto done;
7858 f6794adc 2019-07-23 stsp if (abort_rebase) {
7859 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7860 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7861 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7862 f6794adc 2019-07-23 stsp goto done;
7864 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7865 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7866 3e3a69f1 2019-07-25 stsp worktree, repo);
7867 818c7501 2019-07-11 stsp if (error)
7868 818c7501 2019-07-11 stsp goto done;
7869 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7870 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7871 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7872 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7873 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7874 818c7501 2019-07-11 stsp if (error)
7875 818c7501 2019-07-11 stsp goto done;
7876 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7877 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7878 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7881 818c7501 2019-07-11 stsp if (continue_rebase) {
7882 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7883 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7884 f6794adc 2019-07-23 stsp goto done;
7886 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7887 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7888 3e3a69f1 2019-07-25 stsp worktree, repo);
7889 818c7501 2019-07-11 stsp if (error)
7890 818c7501 2019-07-11 stsp goto done;
7892 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7893 01757395 2019-07-12 stsp resume_commit_id, repo);
7894 818c7501 2019-07-11 stsp if (error)
7895 818c7501 2019-07-11 stsp goto done;
7897 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7898 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7899 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7900 818c7501 2019-07-11 stsp goto done;
7903 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7904 818c7501 2019-07-11 stsp if (error != NULL)
7905 818c7501 2019-07-11 stsp goto done;
7908 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7909 ff0d2220 2019-07-11 stsp if (error)
7910 ff0d2220 2019-07-11 stsp goto done;
7912 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7913 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7915 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7916 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7917 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7918 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7919 818c7501 2019-07-11 stsp if (error)
7920 818c7501 2019-07-11 stsp goto done;
7921 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7922 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7923 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7924 818c7501 2019-07-11 stsp "with work tree's branch");
7925 818c7501 2019-07-11 stsp goto done;
7928 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7929 a51a74b3 2019-07-27 stsp if (error) {
7930 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7931 a51a74b3 2019-07-27 stsp goto done;
7932 a51a74b3 2019-07-27 stsp error = NULL;
7934 df3ed485 2021-01-31 stsp static char msg[128];
7935 df3ed485 2021-01-31 stsp snprintf(msg, sizeof(msg),
7936 df3ed485 2021-01-31 stsp "%s is already based on %s",
7937 df3ed485 2021-01-31 stsp got_ref_get_name(branch),
7938 df3ed485 2021-01-31 stsp got_worktree_get_head_ref_name(worktree));
7939 df3ed485 2021-01-31 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
7940 a51a74b3 2019-07-27 stsp goto done;
7942 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7943 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7944 818c7501 2019-07-11 stsp if (error)
7945 818c7501 2019-07-11 stsp goto done;
7948 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7949 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7950 818c7501 2019-07-11 stsp if (error)
7951 818c7501 2019-07-11 stsp goto done;
7953 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7954 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7955 fc66b545 2019-08-12 stsp if (pid == NULL) {
7956 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7957 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7958 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7959 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7960 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7961 fc66b545 2019-08-12 stsp if (error)
7962 fc66b545 2019-08-12 stsp goto done;
7963 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7964 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7965 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7968 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7969 fc66b545 2019-08-12 stsp goto done;
7971 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7972 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7973 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7974 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7975 818c7501 2019-07-11 stsp commit = NULL;
7976 818c7501 2019-07-11 stsp if (error)
7977 818c7501 2019-07-11 stsp goto done;
7979 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7980 38b0338b 2019-11-29 stsp if (continue_rebase) {
7981 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7982 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7983 38b0338b 2019-11-29 stsp goto done;
7985 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7986 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7987 38b0338b 2019-11-29 stsp char *id_str;
7988 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7989 38b0338b 2019-11-29 stsp new_base_branch);
7990 38b0338b 2019-11-29 stsp if (error)
7991 38b0338b 2019-11-29 stsp goto done;
7992 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7993 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7994 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7995 38b0338b 2019-11-29 stsp free(id_str);
7996 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7997 38b0338b 2019-11-29 stsp new_head_commit_id);
7998 38b0338b 2019-11-29 stsp if (error)
7999 38b0338b 2019-11-29 stsp goto done;
8003 818c7501 2019-07-11 stsp pid = NULL;
8004 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
8005 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8007 818c7501 2019-07-11 stsp commit_id = qid->id;
8008 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
8009 818c7501 2019-07-11 stsp pid = qid;
8011 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8012 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
8013 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
8014 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8015 818c7501 2019-07-11 stsp if (error)
8016 818c7501 2019-07-11 stsp goto done;
8018 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8019 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8020 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8022 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8023 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
8024 a0ea4fc0 2020-02-28 stsp if (error)
8025 a0ea4fc0 2020-02-28 stsp goto done;
8026 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8030 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
8031 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
8032 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8033 818c7501 2019-07-11 stsp if (error)
8034 818c7501 2019-07-11 stsp goto done;
8037 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8038 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
8039 818c7501 2019-07-11 stsp if (error)
8040 818c7501 2019-07-11 stsp goto done;
8041 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8042 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
8044 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
8045 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
8047 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
8048 818c7501 2019-07-11 stsp free(branch_head_commit_id);
8049 818c7501 2019-07-11 stsp free(resume_commit_id);
8050 818c7501 2019-07-11 stsp free(yca_id);
8051 818c7501 2019-07-11 stsp if (commit)
8052 818c7501 2019-07-11 stsp got_object_commit_close(commit);
8053 818c7501 2019-07-11 stsp if (branch)
8054 818c7501 2019-07-11 stsp got_ref_close(branch);
8055 818c7501 2019-07-11 stsp if (new_base_branch)
8056 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
8057 818c7501 2019-07-11 stsp if (tmp_branch)
8058 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
8059 5ef14e63 2019-06-02 stsp if (worktree)
8060 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
8062 5ef14e63 2019-06-02 stsp got_repo_close(repo);
8063 5ef14e63 2019-06-02 stsp return error;
8066 0ebf8283 2019-07-24 stsp __dead static void
8067 0ebf8283 2019-07-24 stsp usage_histedit(void)
8069 466785b9 2020-12-10 jrick fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] [-F histedit-script] [-m]\n",
8070 0ebf8283 2019-07-24 stsp getprogname());
8074 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
8075 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
8076 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
8077 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
8078 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
8080 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
8081 0ebf8283 2019-07-24 stsp unsigned char code;
8082 0ebf8283 2019-07-24 stsp const char *name;
8083 0ebf8283 2019-07-24 stsp const char *desc;
8084 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
8085 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
8086 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
8087 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
8088 82997472 2020-01-29 stsp "be used" },
8089 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
8090 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
8091 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
8094 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
8095 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
8096 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
8097 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8098 0ebf8283 2019-07-24 stsp char *logmsg;
8100 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
8102 0ebf8283 2019-07-24 stsp static const struct got_error *
8103 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
8104 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8106 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8107 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
8108 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8111 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
8113 0ebf8283 2019-07-24 stsp goto done;
8115 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
8117 0ebf8283 2019-07-24 stsp goto done;
8119 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
8121 0ebf8283 2019-07-24 stsp goto done;
8123 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
8124 0ebf8283 2019-07-24 stsp if (n < 0)
8125 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8127 0ebf8283 2019-07-24 stsp if (commit)
8128 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8129 0ebf8283 2019-07-24 stsp free(id_str);
8130 0ebf8283 2019-07-24 stsp free(logmsg);
8131 0ebf8283 2019-07-24 stsp return err;
8134 0ebf8283 2019-07-24 stsp static const struct got_error *
8135 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
8136 466785b9 2020-12-10 jrick FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
8138 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8139 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
8140 466785b9 2020-12-10 jrick const char *histedit_cmd = NULL;
8142 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
8143 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8145 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8146 466785b9 2020-12-10 jrick histedit_cmd = got_histedit_cmds[0].name;
8147 466785b9 2020-12-10 jrick if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
8148 466785b9 2020-12-10 jrick histedit_cmd = "fold";
8149 466785b9 2020-12-10 jrick err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
8152 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
8153 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
8154 083957f4 2020-02-24 stsp if (n < 0) {
8155 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
8161 0ebf8283 2019-07-24 stsp return err;
8164 0ebf8283 2019-07-24 stsp static const struct got_error *
8165 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
8166 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
8168 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8171 514f2ffe 2020-01-29 stsp char *id_str;
8172 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
8174 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
8175 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
8177 514f2ffe 2020-01-29 stsp return err;
8179 514f2ffe 2020-01-29 stsp n = fprintf(f,
8180 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
8181 514f2ffe 2020-01-29 stsp "# commit %s\n"
8182 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
8183 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
8184 514f2ffe 2020-01-29 stsp if (n < 0) {
8185 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
8186 514f2ffe 2020-01-29 stsp goto done;
8189 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
8190 514f2ffe 2020-01-29 stsp if (n < 0) {
8191 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
8192 514f2ffe 2020-01-29 stsp goto done;
8195 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8196 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
8197 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
8198 0ebf8283 2019-07-24 stsp cmd->desc);
8199 0ebf8283 2019-07-24 stsp if (n < 0) {
8200 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8205 514f2ffe 2020-01-29 stsp free(id_str);
8206 0ebf8283 2019-07-24 stsp return err;
8209 0ebf8283 2019-07-24 stsp static const struct got_error *
8210 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
8212 0ebf8283 2019-07-24 stsp static char msg[42];
8215 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
8217 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
8218 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
8220 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
8223 0ebf8283 2019-07-24 stsp static const struct got_error *
8224 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
8225 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
8227 0ebf8283 2019-07-24 stsp const struct got_error *err;
8228 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
8229 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
8231 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8233 0ebf8283 2019-07-24 stsp return err;
8235 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
8237 0ebf8283 2019-07-24 stsp goto done;
8239 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
8241 5943eee2 2019-08-13 stsp goto done;
8242 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
8243 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
8244 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
8245 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8248 0ebf8283 2019-07-24 stsp if (folded_commit)
8249 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
8250 0ebf8283 2019-07-24 stsp free(id_str);
8251 5943eee2 2019-08-13 stsp free(folded_logmsg);
8252 0ebf8283 2019-07-24 stsp return err;
8255 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
8256 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
8258 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
8260 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
8261 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8262 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
8263 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8264 3f9de99f 2019-07-24 stsp folded = prev;
8265 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
8268 0ebf8283 2019-07-24 stsp return folded;
8271 0ebf8283 2019-07-24 stsp static const struct got_error *
8272 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8273 0ebf8283 2019-07-24 stsp struct got_repository *repo)
8275 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8276 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8277 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8278 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8279 1601cb9f 2020-09-11 naddy int logmsg_len;
8281 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
8283 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8285 0ebf8283 2019-07-24 stsp return err;
8287 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
8288 0ebf8283 2019-07-24 stsp if (folded) {
8289 0ebf8283 2019-07-24 stsp while (folded != hle) {
8290 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8291 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8294 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
8295 0ebf8283 2019-07-24 stsp logmsg, repo);
8297 0ebf8283 2019-07-24 stsp goto done;
8298 0ebf8283 2019-07-24 stsp free(logmsg);
8299 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8300 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8304 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8306 0ebf8283 2019-07-24 stsp goto done;
8307 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8309 5943eee2 2019-08-13 stsp goto done;
8310 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
8311 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
8312 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
8313 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
8314 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8315 0ebf8283 2019-07-24 stsp goto done;
8317 0ebf8283 2019-07-24 stsp free(logmsg);
8318 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8320 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8322 0ebf8283 2019-07-24 stsp goto done;
8324 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
8325 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
8327 0ebf8283 2019-07-24 stsp goto done;
8329 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
8330 0ebf8283 2019-07-24 stsp close(fd);
8332 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8334 0ebf8283 2019-07-24 stsp goto done;
8336 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8337 0d5bb276 2020-12-15 stsp logmsg_len, 0);
8338 0ebf8283 2019-07-24 stsp if (err) {
8339 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8340 0ebf8283 2019-07-24 stsp goto done;
8341 71392a05 2020-12-13 stsp err = NULL;
8342 71392a05 2020-12-13 stsp hle->logmsg = strdup(new_msg);
8343 71392a05 2020-12-13 stsp if (hle->logmsg == NULL)
8344 71392a05 2020-12-13 stsp err = got_error_from_errno("strdup");
8347 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8348 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
8349 0ebf8283 2019-07-24 stsp free(logmsg_path);
8350 0ebf8283 2019-07-24 stsp free(logmsg);
8351 5943eee2 2019-08-13 stsp free(orig_logmsg);
8352 0ebf8283 2019-07-24 stsp free(editor);
8353 0ebf8283 2019-07-24 stsp if (commit)
8354 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8355 0ebf8283 2019-07-24 stsp return err;
8358 0ebf8283 2019-07-24 stsp static const struct got_error *
8359 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
8360 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8362 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8363 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
8364 6059809a 2020-12-17 stsp size_t i, size;
8365 0ebf8283 2019-07-24 stsp ssize_t len;
8366 6059809a 2020-12-17 stsp int lineno = 0;
8367 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8368 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
8369 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
8371 0ebf8283 2019-07-24 stsp for (;;) {
8372 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
8373 0ebf8283 2019-07-24 stsp if (len == -1) {
8374 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
8375 0ebf8283 2019-07-24 stsp if (feof(f))
8377 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
8378 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
8383 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8385 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
8386 0ebf8283 2019-07-24 stsp free(line);
8387 0ebf8283 2019-07-24 stsp line = NULL;
8390 0ebf8283 2019-07-24 stsp cmd = NULL;
8391 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8392 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
8393 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8394 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
8395 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
8398 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8403 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
8404 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8407 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8409 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
8410 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
8411 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
8414 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
8415 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8419 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
8420 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
8421 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8425 0ebf8283 2019-07-24 stsp free(line);
8426 0ebf8283 2019-07-24 stsp line = NULL;
8430 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
8432 0ebf8283 2019-07-24 stsp *end = '\0';
8434 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
8435 0ebf8283 2019-07-24 stsp if (err) {
8436 0ebf8283 2019-07-24 stsp /* override error code */
8437 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8441 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
8442 0ebf8283 2019-07-24 stsp if (hle == NULL) {
8443 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
8446 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
8447 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
8448 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
8449 0ebf8283 2019-07-24 stsp commit_id = NULL;
8450 0ebf8283 2019-07-24 stsp free(line);
8451 0ebf8283 2019-07-24 stsp line = NULL;
8452 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8455 0ebf8283 2019-07-24 stsp free(line);
8456 0ebf8283 2019-07-24 stsp free(commit_id);
8457 0ebf8283 2019-07-24 stsp return err;
8460 0ebf8283 2019-07-24 stsp static const struct got_error *
8461 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
8462 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
8464 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
8465 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
8466 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8467 5b87815e 2020-03-05 stsp static char msg[92];
8468 bfce7f83 2019-07-27 stsp char *id_str;
8470 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
8471 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8472 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
8473 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
8474 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8476 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8477 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
8478 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8479 5b87815e 2020-03-05 stsp if (hle == hle2)
8481 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
8482 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
8484 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
8486 5b87815e 2020-03-05 stsp return err;
8487 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
8488 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
8489 5b87815e 2020-03-05 stsp free(id_str);
8490 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8494 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8495 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8496 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8499 bfce7f83 2019-07-27 stsp if (hle == NULL) {
8500 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
8502 bfce7f83 2019-07-27 stsp return err;
8503 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
8504 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
8505 bfce7f83 2019-07-27 stsp free(id_str);
8506 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8510 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8511 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8512 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8513 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
8515 bfce7f83 2019-07-27 stsp return NULL;
8518 bfce7f83 2019-07-27 stsp static const struct got_error *
8519 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
8520 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
8521 bfce7f83 2019-07-27 stsp struct got_repository *repo)
8523 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8524 0ebf8283 2019-07-24 stsp char *editor;
8525 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8527 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8529 0ebf8283 2019-07-24 stsp return err;
8531 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
8532 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
8533 0ebf8283 2019-07-24 stsp goto done;
8536 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8537 0ebf8283 2019-07-24 stsp if (f == NULL) {
8538 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
8539 0ebf8283 2019-07-24 stsp goto done;
8541 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8543 bfce7f83 2019-07-27 stsp goto done;
8545 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
8547 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8548 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8549 0ebf8283 2019-07-24 stsp free(editor);
8550 0ebf8283 2019-07-24 stsp return err;
8553 0ebf8283 2019-07-24 stsp static const struct got_error *
8554 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8555 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
8556 514f2ffe 2020-01-29 stsp struct got_repository *);
8558 0ebf8283 2019-07-24 stsp static const struct got_error *
8559 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
8560 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
8561 466785b9 2020-12-10 jrick int edit_logmsg_only, int fold_only, struct got_repository *repo)
8563 0ebf8283 2019-07-24 stsp const struct got_error *err;
8564 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8565 0ebf8283 2019-07-24 stsp char *path = NULL;
8567 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
8569 0ebf8283 2019-07-24 stsp return err;
8571 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
8573 0ebf8283 2019-07-24 stsp goto done;
8575 466785b9 2020-12-10 jrick err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8576 466785b9 2020-12-10 jrick fold_only, repo);
8578 0ebf8283 2019-07-24 stsp goto done;
8580 466785b9 2020-12-10 jrick if (edit_logmsg_only || fold_only) {
8581 083957f4 2020-02-24 stsp rewind(f);
8582 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8584 56b63ca4 2021-01-22 stsp if (fclose(f) == EOF) {
8585 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
8586 0ebf8283 2019-07-24 stsp goto done;
8589 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
8590 083957f4 2020-02-24 stsp if (err) {
8591 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8592 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8593 083957f4 2020-02-24 stsp goto done;
8594 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
8595 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
8599 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8600 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8601 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
8602 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
8603 0ebf8283 2019-07-24 stsp free(path);
8604 0ebf8283 2019-07-24 stsp return err;
8607 0ebf8283 2019-07-24 stsp static const struct got_error *
8608 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
8609 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8611 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8612 0ebf8283 2019-07-24 stsp char *path = NULL;
8613 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8614 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8615 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8617 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
8619 0ebf8283 2019-07-24 stsp return err;
8621 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
8622 0ebf8283 2019-07-24 stsp if (f == NULL) {
8623 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8624 0ebf8283 2019-07-24 stsp goto done;
8626 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8627 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8632 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8633 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
8634 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
8635 0ebf8283 2019-07-24 stsp if (n < 0) {
8636 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8642 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8643 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8644 0ebf8283 2019-07-24 stsp free(path);
8645 0ebf8283 2019-07-24 stsp if (commit)
8646 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8647 0ebf8283 2019-07-24 stsp return err;
8651 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
8653 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8655 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
8656 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
8657 bfce7f83 2019-07-27 stsp free(hle);
8661 0ebf8283 2019-07-24 stsp static const struct got_error *
8662 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
8663 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
8665 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8666 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8668 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8669 0ebf8283 2019-07-24 stsp if (f == NULL) {
8670 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8671 0ebf8283 2019-07-24 stsp goto done;
8674 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8676 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8677 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8678 0ebf8283 2019-07-24 stsp return err;
8681 0ebf8283 2019-07-24 stsp static const struct got_error *
8682 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8683 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
8684 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
8686 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
8687 0ebf8283 2019-07-24 stsp int resp = ' ';
8689 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
8690 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8691 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
8692 0ebf8283 2019-07-24 stsp resp = getchar();
8693 a61a4414 2019-08-07 stsp if (resp == '\n')
8694 a61a4414 2019-08-07 stsp resp = getchar();
8695 426ebf2e 2019-07-25 stsp if (resp == 'c') {
8696 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8697 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
8699 426ebf2e 2019-07-25 stsp if (err) {
8700 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8701 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8703 bfce7f83 2019-07-27 stsp prev_err = err;
8704 426ebf2e 2019-07-25 stsp resp = ' ';
8708 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
8709 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8710 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
8711 466785b9 2020-12-10 jrick commits, branch_name, 0, 0, repo);
8712 426ebf2e 2019-07-25 stsp if (err) {
8713 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8714 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8716 bfce7f83 2019-07-27 stsp prev_err = err;
8717 426ebf2e 2019-07-25 stsp resp = ' ';
8721 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
8722 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8725 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
8728 0ebf8283 2019-07-24 stsp return err;
8731 0ebf8283 2019-07-24 stsp static const struct got_error *
8732 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
8733 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8734 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
8736 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8737 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8738 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8739 3e3a69f1 2019-07-25 stsp branch, repo);
8742 0ebf8283 2019-07-24 stsp static const struct got_error *
8743 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
8744 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8746 0ebf8283 2019-07-24 stsp const struct got_error *err;
8747 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8749 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
8751 0ebf8283 2019-07-24 stsp goto done;
8753 0ebf8283 2019-07-24 stsp if (new_id) {
8754 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
8756 0ebf8283 2019-07-24 stsp goto done;
8759 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8760 0ebf8283 2019-07-24 stsp if (new_id_str)
8761 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8763 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8764 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8765 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8766 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8767 0ebf8283 2019-07-24 stsp goto done;
8769 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8771 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8773 0ebf8283 2019-07-24 stsp goto done;
8776 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8777 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8778 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8779 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8780 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8782 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8783 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8784 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8791 0ebf8283 2019-07-24 stsp free(old_id_str);
8792 0ebf8283 2019-07-24 stsp free(new_id_str);
8793 0ebf8283 2019-07-24 stsp return err;
8796 0ebf8283 2019-07-24 stsp static const struct got_error *
8797 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8798 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8799 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8800 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8802 0ebf8283 2019-07-24 stsp const struct got_error *err;
8803 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8804 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8806 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8807 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8808 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8810 0ebf8283 2019-07-24 stsp return err;
8813 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8815 0ebf8283 2019-07-24 stsp return err;
8817 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8818 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8819 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8820 0ebf8283 2019-07-24 stsp if (err) {
8821 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8822 0ebf8283 2019-07-24 stsp goto done;
8823 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8825 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8826 0ebf8283 2019-07-24 stsp free(new_commit_id);
8829 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8830 0ebf8283 2019-07-24 stsp return err;
8833 0ebf8283 2019-07-24 stsp static const struct got_error *
8834 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8835 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8837 0ebf8283 2019-07-24 stsp const struct got_error *error;
8838 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8840 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8842 0ebf8283 2019-07-24 stsp if (error)
8843 0ebf8283 2019-07-24 stsp return error;
8845 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8846 0ebf8283 2019-07-24 stsp if (error)
8847 0ebf8283 2019-07-24 stsp return error;
8849 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8850 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8851 0ebf8283 2019-07-24 stsp return error;
8854 ab20a43a 2020-01-29 stsp static const struct got_error *
8855 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8856 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8857 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8858 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8860 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8862 ab20a43a 2020-01-29 stsp switch (status) {
8863 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8864 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8865 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8866 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8867 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8868 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8873 ab20a43a 2020-01-29 stsp switch (staged_status) {
8874 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8875 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8876 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8877 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8878 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8883 ab20a43a 2020-01-29 stsp return NULL;
8886 0ebf8283 2019-07-24 stsp static const struct got_error *
8887 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8889 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8890 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8891 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8892 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8893 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8894 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8895 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8896 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8897 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8898 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8899 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8900 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8901 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8902 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8903 466785b9 2020-12-10 jrick int edit_logmsg_only = 0, fold_only = 0;
8904 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8905 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8906 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8907 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8908 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8909 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8910 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8911 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8913 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8914 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8915 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8916 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8918 466785b9 2020-12-10 jrick while ((ch = getopt(argc, argv, "acfF:m")) != -1) {
8919 0ebf8283 2019-07-24 stsp switch (ch) {
8921 0ebf8283 2019-07-24 stsp abort_edit = 1;
8924 0ebf8283 2019-07-24 stsp continue_edit = 1;
8926 466785b9 2020-12-10 jrick case 'f':
8927 466785b9 2020-12-10 jrick fold_only = 1;
8930 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8933 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8936 0ebf8283 2019-07-24 stsp usage_histedit();
8937 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8941 0ebf8283 2019-07-24 stsp argc -= optind;
8942 0ebf8283 2019-07-24 stsp argv += optind;
8944 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8945 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8946 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8947 0ebf8283 2019-07-24 stsp err(1, "pledge");
8949 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8950 ff69268e 2020-12-13 stsp option_conflict('a', 'c');
8951 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8952 ff69268e 2020-12-13 stsp option_conflict('F', 'm');
8953 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8954 ff69268e 2020-12-13 stsp option_conflict('a', 'm');
8955 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8956 ff69268e 2020-12-13 stsp option_conflict('c', 'm');
8957 466785b9 2020-12-10 jrick if (abort_edit && fold_only)
8958 ff69268e 2020-12-13 stsp option_conflict('a', 'f');
8959 ff69268e 2020-12-13 stsp if (continue_edit && fold_only)
8960 ff69268e 2020-12-13 stsp option_conflict('c', 'f');
8961 466785b9 2020-12-10 jrick if (fold_only && edit_logmsg_only)
8962 ff69268e 2020-12-13 stsp option_conflict('f', 'm');
8963 b3805337 2020-12-13 stsp if (edit_script_path && fold_only)
8964 b3805337 2020-12-13 stsp option_conflict('F', 'f');
8965 0ebf8283 2019-07-24 stsp if (argc != 0)
8966 0ebf8283 2019-07-24 stsp usage_histedit();
8969 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8970 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8971 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8972 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8973 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8974 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8977 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8978 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8979 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8980 0ebf8283 2019-07-24 stsp goto done;
8982 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8983 fa51e947 2020-03-27 stsp if (error) {
8984 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8985 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8986 0ebf8283 2019-07-24 stsp goto done;
8989 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8991 0ebf8283 2019-07-24 stsp if (error != NULL)
8992 0ebf8283 2019-07-24 stsp goto done;
8994 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8995 0ebf8283 2019-07-24 stsp if (error)
8996 0ebf8283 2019-07-24 stsp goto done;
8997 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8998 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8999 0ebf8283 2019-07-24 stsp goto done;
9002 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
9003 0ebf8283 2019-07-24 stsp if (error)
9004 0ebf8283 2019-07-24 stsp goto done;
9006 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
9007 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9008 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
9009 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
9010 083957f4 2020-02-24 stsp "before the -m option can be used");
9011 083957f4 2020-02-24 stsp goto done;
9013 466785b9 2020-12-10 jrick if (edit_in_progress && fold_only) {
9014 466785b9 2020-12-10 jrick error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9015 466785b9 2020-12-10 jrick "histedit operation is in progress in this "
9016 466785b9 2020-12-10 jrick "work tree and must be continued or aborted "
9017 466785b9 2020-12-10 jrick "before the -f option can be used");
9018 466785b9 2020-12-10 jrick goto done;
9021 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
9022 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
9023 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
9024 3e3a69f1 2019-07-25 stsp worktree, repo);
9025 0ebf8283 2019-07-24 stsp if (error)
9026 0ebf8283 2019-07-24 stsp goto done;
9027 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
9028 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
9029 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
9030 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
9031 0ebf8283 2019-07-24 stsp if (error)
9032 0ebf8283 2019-07-24 stsp goto done;
9033 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
9034 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
9035 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9036 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
9037 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
9038 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
9039 0ebf8283 2019-07-24 stsp goto done;
9042 0ebf8283 2019-07-24 stsp if (continue_edit) {
9043 0ebf8283 2019-07-24 stsp char *path;
9045 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
9046 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
9047 0ebf8283 2019-07-24 stsp goto done;
9050 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
9051 0ebf8283 2019-07-24 stsp if (error)
9052 0ebf8283 2019-07-24 stsp goto done;
9054 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
9055 0ebf8283 2019-07-24 stsp free(path);
9056 0ebf8283 2019-07-24 stsp if (error)
9057 0ebf8283 2019-07-24 stsp goto done;
9059 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
9060 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
9061 3e3a69f1 2019-07-25 stsp worktree, repo);
9062 0ebf8283 2019-07-24 stsp if (error)
9063 0ebf8283 2019-07-24 stsp goto done;
9065 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
9066 0ebf8283 2019-07-24 stsp if (error)
9067 0ebf8283 2019-07-24 stsp goto done;
9069 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
9070 0ebf8283 2019-07-24 stsp head_commit_id);
9071 0ebf8283 2019-07-24 stsp if (error)
9072 0ebf8283 2019-07-24 stsp goto done;
9073 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9074 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
9075 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
9076 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9077 3aac7cf7 2019-07-25 stsp goto done;
9079 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
9080 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
9081 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
9082 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9083 0ebf8283 2019-07-24 stsp commit = NULL;
9084 0ebf8283 2019-07-24 stsp if (error)
9085 0ebf8283 2019-07-24 stsp goto done;
9087 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
9088 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
9089 0ebf8283 2019-07-24 stsp goto done;
9092 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
9093 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
9094 0ebf8283 2019-07-24 stsp if (error != NULL)
9095 0ebf8283 2019-07-24 stsp goto done;
9097 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
9098 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
9099 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
9100 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
9101 c7d20a3f 2019-07-30 stsp goto done;
9104 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
9105 bfce7f83 2019-07-27 stsp got_ref_close(branch);
9106 bfce7f83 2019-07-27 stsp branch = NULL;
9107 0ebf8283 2019-07-24 stsp if (error)
9108 0ebf8283 2019-07-24 stsp goto done;
9110 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
9111 0ebf8283 2019-07-24 stsp head_commit_id);
9112 0ebf8283 2019-07-24 stsp if (error)
9113 0ebf8283 2019-07-24 stsp goto done;
9114 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9115 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
9116 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
9117 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9118 3aac7cf7 2019-07-25 stsp goto done;
9120 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
9121 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
9122 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
9123 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
9124 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9125 0ebf8283 2019-07-24 stsp commit = NULL;
9126 0ebf8283 2019-07-24 stsp if (error)
9127 0ebf8283 2019-07-24 stsp goto done;
9129 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
9130 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9131 c5996fff 2020-01-29 stsp goto done;
9134 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
9135 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
9136 bfce7f83 2019-07-27 stsp if (error)
9137 bfce7f83 2019-07-27 stsp goto done;
9139 0ebf8283 2019-07-24 stsp if (edit_script_path) {
9140 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
9141 0ebf8283 2019-07-24 stsp edit_script_path, repo);
9142 6ba2bea2 2019-07-27 stsp if (error) {
9143 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
9144 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
9145 9627c110 2020-04-18 stsp update_progress, &upa);
9146 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9147 0ebf8283 2019-07-24 stsp goto done;
9150 514f2ffe 2020-01-29 stsp const char *branch_name;
9151 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
9152 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
9153 514f2ffe 2020-01-29 stsp branch_name += 11;
9154 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
9155 466785b9 2020-12-10 jrick branch_name, edit_logmsg_only, fold_only, repo);
9156 6ba2bea2 2019-07-27 stsp if (error) {
9157 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
9158 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
9159 9627c110 2020-04-18 stsp update_progress, &upa);
9160 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9161 0ebf8283 2019-07-24 stsp goto done;
9166 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
9168 6ba2bea2 2019-07-27 stsp if (error) {
9169 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
9170 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
9171 9627c110 2020-04-18 stsp update_progress, &upa);
9172 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9173 0ebf8283 2019-07-24 stsp goto done;
9178 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
9179 4ec14e60 2019-08-28 hiltjo if (error)
9180 0ebf8283 2019-07-24 stsp goto done;
9182 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
9183 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
9184 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
9185 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
9188 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
9189 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
9190 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
9191 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
9193 ab20a43a 2020-01-29 stsp if (error)
9194 ab20a43a 2020-01-29 stsp goto done;
9196 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
9197 ab20a43a 2020-01-29 stsp int have_changes = 0;
9199 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
9200 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
9201 ab20a43a 2020-01-29 stsp if (error)
9202 ab20a43a 2020-01-29 stsp goto done;
9203 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
9204 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
9205 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
9206 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
9207 ab20a43a 2020-01-29 stsp if (error) {
9208 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
9209 ab20a43a 2020-01-29 stsp goto done;
9210 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
9211 ab20a43a 2020-01-29 stsp goto done;
9213 ab20a43a 2020-01-29 stsp if (have_changes) {
9214 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
9215 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
9216 ab20a43a 2020-01-29 stsp if (error)
9217 ab20a43a 2020-01-29 stsp goto done;
9219 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
9220 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
9221 ab20a43a 2020-01-29 stsp if (error)
9222 ab20a43a 2020-01-29 stsp goto done;
9223 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
9224 ab20a43a 2020-01-29 stsp hle, NULL);
9225 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
9226 ab20a43a 2020-01-29 stsp commit = NULL;
9227 ab20a43a 2020-01-29 stsp if (error)
9228 ab20a43a 2020-01-29 stsp goto done;
9234 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
9235 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
9236 0ebf8283 2019-07-24 stsp if (error)
9237 0ebf8283 2019-07-24 stsp goto done;
9241 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
9242 0ebf8283 2019-07-24 stsp hle->commit_id);
9243 0ebf8283 2019-07-24 stsp if (error)
9244 0ebf8283 2019-07-24 stsp goto done;
9245 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9246 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
9248 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
9249 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
9250 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
9251 0ebf8283 2019-07-24 stsp if (error)
9252 0ebf8283 2019-07-24 stsp goto done;
9253 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9254 0ebf8283 2019-07-24 stsp commit = NULL;
9256 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9257 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
9258 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
9260 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
9261 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
9263 a0ea4fc0 2020-02-28 stsp if (error)
9264 a0ea4fc0 2020-02-28 stsp goto done;
9265 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9269 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9270 0ebf8283 2019-07-24 stsp char *id_str;
9271 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
9272 0ebf8283 2019-07-24 stsp if (error)
9273 0ebf8283 2019-07-24 stsp goto done;
9274 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
9276 0ebf8283 2019-07-24 stsp free(id_str);
9277 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9278 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
9279 3e3a69f1 2019-07-25 stsp fileindex);
9280 0ebf8283 2019-07-24 stsp goto done;
9283 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9284 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
9285 0ebf8283 2019-07-24 stsp if (error)
9286 0ebf8283 2019-07-24 stsp goto done;
9290 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
9291 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
9292 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9293 0ebf8283 2019-07-24 stsp if (error)
9294 0ebf8283 2019-07-24 stsp goto done;
9297 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
9298 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
9299 0ebf8283 2019-07-24 stsp if (error)
9300 0ebf8283 2019-07-24 stsp goto done;
9301 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
9302 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
9304 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
9305 3e3a69f1 2019-07-25 stsp branch, repo);
9307 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
9308 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
9309 0ebf8283 2019-07-24 stsp free(head_commit_id);
9310 0ebf8283 2019-07-24 stsp free(base_commit_id);
9311 0ebf8283 2019-07-24 stsp free(resume_commit_id);
9312 0ebf8283 2019-07-24 stsp if (commit)
9313 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9314 0ebf8283 2019-07-24 stsp if (branch)
9315 0ebf8283 2019-07-24 stsp got_ref_close(branch);
9316 0ebf8283 2019-07-24 stsp if (tmp_branch)
9317 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
9318 0ebf8283 2019-07-24 stsp if (worktree)
9319 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
9321 2822a352 2019-10-15 stsp got_repo_close(repo);
9322 2822a352 2019-10-15 stsp return error;
9325 2822a352 2019-10-15 stsp __dead static void
9326 2822a352 2019-10-15 stsp usage_integrate(void)
9328 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9332 2822a352 2019-10-15 stsp static const struct got_error *
9333 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
9335 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
9336 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
9337 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
9338 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9339 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
9340 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9341 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
9342 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9344 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9346 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9347 2822a352 2019-10-15 stsp switch (ch) {
9349 2822a352 2019-10-15 stsp usage_integrate();
9350 2822a352 2019-10-15 stsp /* NOTREACHED */
9354 2822a352 2019-10-15 stsp argc -= optind;
9355 2822a352 2019-10-15 stsp argv += optind;
9357 2822a352 2019-10-15 stsp if (argc != 1)
9358 2822a352 2019-10-15 stsp usage_integrate();
9359 2822a352 2019-10-15 stsp branch_arg = argv[0];
9360 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
9361 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9362 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
9363 2822a352 2019-10-15 stsp err(1, "pledge");
9365 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
9366 2822a352 2019-10-15 stsp if (cwd == NULL) {
9367 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
9368 2822a352 2019-10-15 stsp goto done;
9371 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
9372 fa51e947 2020-03-27 stsp if (error) {
9373 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9374 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
9376 2822a352 2019-10-15 stsp goto done;
9379 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
9380 2822a352 2019-10-15 stsp if (error)
9381 2822a352 2019-10-15 stsp goto done;
9383 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9385 2822a352 2019-10-15 stsp if (error != NULL)
9386 2822a352 2019-10-15 stsp goto done;
9388 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9389 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
9390 2822a352 2019-10-15 stsp if (error)
9391 2822a352 2019-10-15 stsp goto done;
9393 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9394 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
9395 2822a352 2019-10-15 stsp goto done;
9398 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9399 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
9400 2822a352 2019-10-15 stsp if (error)
9401 2822a352 2019-10-15 stsp goto done;
9403 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
9404 2822a352 2019-10-15 stsp if (refname == NULL) {
9405 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9406 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9407 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9408 2822a352 2019-10-15 stsp goto done;
9410 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
9411 2822a352 2019-10-15 stsp if (base_refname == NULL) {
9412 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9413 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9414 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9415 2822a352 2019-10-15 stsp goto done;
9418 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
9419 2822a352 2019-10-15 stsp if (error)
9420 2822a352 2019-10-15 stsp goto done;
9422 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9423 2822a352 2019-10-15 stsp if (error)
9424 2822a352 2019-10-15 stsp goto done;
9426 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9427 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
9428 2822a352 2019-10-15 stsp "specified branch has already been integrated");
9429 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9430 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9431 2822a352 2019-10-15 stsp goto done;
9434 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9435 2822a352 2019-10-15 stsp if (error) {
9436 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
9437 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
9438 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9439 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9440 2822a352 2019-10-15 stsp goto done;
9443 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9444 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
9445 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
9446 2822a352 2019-10-15 stsp check_cancelled, NULL);
9447 2822a352 2019-10-15 stsp if (error)
9448 2822a352 2019-10-15 stsp goto done;
9450 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
9451 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9454 715dc77e 2019-08-03 stsp got_repo_close(repo);
9455 2822a352 2019-10-15 stsp if (worktree)
9456 2822a352 2019-10-15 stsp got_worktree_close(worktree);
9457 2822a352 2019-10-15 stsp free(cwd);
9458 2822a352 2019-10-15 stsp free(base_commit_id);
9459 2822a352 2019-10-15 stsp free(commit_id);
9460 2822a352 2019-10-15 stsp free(refname);
9461 2822a352 2019-10-15 stsp free(base_refname);
9462 715dc77e 2019-08-03 stsp return error;
9465 715dc77e 2019-08-03 stsp __dead static void
9466 715dc77e 2019-08-03 stsp usage_stage(void)
9468 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9469 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
9470 715dc77e 2019-08-03 stsp getprogname());
9474 715dc77e 2019-08-03 stsp static const struct got_error *
9475 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
9476 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
9477 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9478 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
9480 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
9481 408b4ebc 2019-08-03 stsp char *id_str = NULL;
9483 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
9484 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
9485 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
9486 408b4ebc 2019-08-03 stsp return NULL;
9488 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
9489 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
9490 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
9492 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
9494 408b4ebc 2019-08-03 stsp return err;
9496 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
9497 408b4ebc 2019-08-03 stsp free(id_str);
9498 dc424a06 2019-08-07 stsp return NULL;
9501 dc424a06 2019-08-07 stsp static const struct got_error *
9502 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
9504 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
9505 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
9506 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
9507 715dc77e 2019-08-03 stsp char *cwd = NULL;
9508 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
9509 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
9510 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9511 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
9512 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9513 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9515 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
9517 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9518 715dc77e 2019-08-03 stsp switch (ch) {
9520 408b4ebc 2019-08-03 stsp list_stage = 1;
9523 dc424a06 2019-08-07 stsp pflag = 1;
9526 dc424a06 2019-08-07 stsp patch_script_path = optarg;
9529 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
9532 715dc77e 2019-08-03 stsp usage_stage();
9533 715dc77e 2019-08-03 stsp /* NOTREACHED */
9537 715dc77e 2019-08-03 stsp argc -= optind;
9538 715dc77e 2019-08-03 stsp argv += optind;
9540 715dc77e 2019-08-03 stsp #ifndef PROFILE
9541 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9542 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
9543 715dc77e 2019-08-03 stsp err(1, "pledge");
9545 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
9546 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
9547 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
9548 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
9550 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
9551 715dc77e 2019-08-03 stsp if (cwd == NULL) {
9552 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
9553 715dc77e 2019-08-03 stsp goto done;
9556 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9557 fa51e947 2020-03-27 stsp if (error) {
9558 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9559 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
9560 715dc77e 2019-08-03 stsp goto done;
9563 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9565 715dc77e 2019-08-03 stsp if (error != NULL)
9566 715dc77e 2019-08-03 stsp goto done;
9568 dc424a06 2019-08-07 stsp if (patch_script_path) {
9569 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
9570 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
9571 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
9572 dc424a06 2019-08-07 stsp patch_script_path);
9573 dc424a06 2019-08-07 stsp goto done;
9576 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9577 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
9578 715dc77e 2019-08-03 stsp if (error)
9579 715dc77e 2019-08-03 stsp goto done;
9581 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9582 6d022e97 2019-08-04 stsp if (error)
9583 6d022e97 2019-08-04 stsp goto done;
9585 6d022e97 2019-08-04 stsp if (list_stage)
9586 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
9587 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
9589 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9590 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
9591 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
9592 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
9593 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
9594 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
9597 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9598 2e1f37b0 2019-08-08 stsp error == NULL)
9599 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9601 ad493afc 2019-08-03 stsp got_repo_close(repo);
9602 ad493afc 2019-08-03 stsp if (worktree)
9603 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
9604 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9605 ad493afc 2019-08-03 stsp free((char *)pe->path);
9606 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
9607 ad493afc 2019-08-03 stsp free(cwd);
9608 ad493afc 2019-08-03 stsp return error;
9611 ad493afc 2019-08-03 stsp __dead static void
9612 ad493afc 2019-08-03 stsp usage_unstage(void)
9614 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9615 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
9616 ad493afc 2019-08-03 stsp getprogname());
9621 ad493afc 2019-08-03 stsp static const struct got_error *
9622 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
9624 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
9625 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
9626 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
9627 ad493afc 2019-08-03 stsp char *cwd = NULL;
9628 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
9629 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9630 9627c110 2020-04-18 stsp int ch, pflag = 0;
9631 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9632 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
9633 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9634 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9636 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
9638 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
9639 ad493afc 2019-08-03 stsp switch (ch) {
9641 2e1f37b0 2019-08-08 stsp pflag = 1;
9644 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
9647 ad493afc 2019-08-03 stsp usage_unstage();
9648 ad493afc 2019-08-03 stsp /* NOTREACHED */
9652 ad493afc 2019-08-03 stsp argc -= optind;
9653 ad493afc 2019-08-03 stsp argv += optind;
9655 ad493afc 2019-08-03 stsp #ifndef PROFILE
9656 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9657 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
9658 ad493afc 2019-08-03 stsp err(1, "pledge");
9660 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
9661 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
9663 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
9664 ad493afc 2019-08-03 stsp if (cwd == NULL) {
9665 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
9666 ad493afc 2019-08-03 stsp goto done;
9669 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9670 fa51e947 2020-03-27 stsp if (error) {
9671 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9672 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
9673 ad493afc 2019-08-03 stsp goto done;
9676 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9678 ad493afc 2019-08-03 stsp if (error != NULL)
9679 ad493afc 2019-08-03 stsp goto done;
9681 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
9682 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
9683 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
9684 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
9685 2e1f37b0 2019-08-08 stsp patch_script_path);
9686 2e1f37b0 2019-08-08 stsp goto done;
9690 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9691 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
9692 ad493afc 2019-08-03 stsp if (error)
9693 ad493afc 2019-08-03 stsp goto done;
9695 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9696 ad493afc 2019-08-03 stsp if (error)
9697 ad493afc 2019-08-03 stsp goto done;
9699 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9700 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
9701 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9702 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
9703 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
9704 9627c110 2020-04-18 stsp if (!error)
9705 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9707 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9708 2e1f37b0 2019-08-08 stsp error == NULL)
9709 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9711 0ebf8283 2019-07-24 stsp got_repo_close(repo);
9712 715dc77e 2019-08-03 stsp if (worktree)
9713 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
9714 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9715 715dc77e 2019-08-03 stsp free((char *)pe->path);
9716 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
9717 715dc77e 2019-08-03 stsp free(cwd);
9718 01073a5d 2019-08-22 stsp return error;
9721 01073a5d 2019-08-22 stsp __dead static void
9722 01073a5d 2019-08-22 stsp usage_cat(void)
9724 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9725 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
9729 01073a5d 2019-08-22 stsp static const struct got_error *
9730 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9732 01073a5d 2019-08-22 stsp const struct got_error *err;
9733 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
9735 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
9737 01073a5d 2019-08-22 stsp return err;
9739 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9740 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
9741 01073a5d 2019-08-22 stsp return err;
9744 01073a5d 2019-08-22 stsp static const struct got_error *
9745 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9747 01073a5d 2019-08-22 stsp const struct got_error *err;
9748 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
9749 56e0773d 2019-11-28 stsp int nentries, i;
9751 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
9753 01073a5d 2019-08-22 stsp return err;
9755 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
9756 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
9757 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
9758 01073a5d 2019-08-22 stsp char *id_str;
9759 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
9761 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
9762 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9765 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
9766 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
9767 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
9768 01073a5d 2019-08-22 stsp free(id_str);
9771 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
9772 01073a5d 2019-08-22 stsp return err;
9775 01073a5d 2019-08-22 stsp static const struct got_error *
9776 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9778 01073a5d 2019-08-22 stsp const struct got_error *err;
9779 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
9780 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9781 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9782 01073a5d 2019-08-22 stsp char *id_str = NULL;
9783 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9785 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9787 01073a5d 2019-08-22 stsp return err;
9789 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9791 01073a5d 2019-08-22 stsp goto done;
9793 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9794 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9795 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9796 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9797 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9798 01073a5d 2019-08-22 stsp char *pid_str;
9799 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9801 01073a5d 2019-08-22 stsp goto done;
9802 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9803 01073a5d 2019-08-22 stsp free(pid_str);
9805 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9806 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9807 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
9809 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9810 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9811 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
9813 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9814 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9815 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9817 01073a5d 2019-08-22 stsp free(id_str);
9818 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9819 01073a5d 2019-08-22 stsp return err;
9822 01073a5d 2019-08-22 stsp static const struct got_error *
9823 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9825 01073a5d 2019-08-22 stsp const struct got_error *err;
9826 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9827 01073a5d 2019-08-22 stsp char *id_str = NULL;
9828 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9830 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9832 01073a5d 2019-08-22 stsp return err;
9834 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9836 01073a5d 2019-08-22 stsp goto done;
9838 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9840 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9841 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9842 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9843 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9845 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9846 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9847 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9849 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9850 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9851 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9853 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9854 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9855 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9861 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9862 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9864 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9865 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9866 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
9868 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9869 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9870 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9872 01073a5d 2019-08-22 stsp free(id_str);
9873 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9874 01073a5d 2019-08-22 stsp return err;
9877 01073a5d 2019-08-22 stsp static const struct got_error *
9878 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9880 01073a5d 2019-08-22 stsp const struct got_error *error;
9881 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9882 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9883 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9884 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9885 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9886 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9887 84de9106 2020-12-26 stsp struct got_reflist_head refs;
9889 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
9891 01073a5d 2019-08-22 stsp #ifndef PROFILE
9892 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9893 01073a5d 2019-08-22 stsp NULL) == -1)
9894 01073a5d 2019-08-22 stsp err(1, "pledge");
9897 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9898 01073a5d 2019-08-22 stsp switch (ch) {
9900 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9903 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9904 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9905 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9907 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9910 896e9b6f 2019-08-26 stsp force_path = 1;
9913 01073a5d 2019-08-22 stsp usage_cat();
9914 01073a5d 2019-08-22 stsp /* NOTREACHED */
9918 01073a5d 2019-08-22 stsp argc -= optind;
9919 01073a5d 2019-08-22 stsp argv += optind;
9921 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9922 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9923 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9924 01073a5d 2019-08-22 stsp goto done;
9926 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9927 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9928 01073a5d 2019-08-22 stsp goto done;
9929 01073a5d 2019-08-22 stsp if (worktree) {
9930 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9931 01073a5d 2019-08-22 stsp repo_path = strdup(
9932 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9933 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9934 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9935 01073a5d 2019-08-22 stsp goto done;
9940 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9941 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9942 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9943 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9946 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9947 01073a5d 2019-08-22 stsp free(repo_path);
9948 01073a5d 2019-08-22 stsp if (error != NULL)
9949 01073a5d 2019-08-22 stsp goto done;
9951 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9952 896e9b6f 2019-08-26 stsp if (error)
9953 896e9b6f 2019-08-26 stsp goto done;
9955 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9956 84de9106 2020-12-26 stsp if (error)
9957 84de9106 2020-12-26 stsp goto done;
9959 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9960 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9961 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9962 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
9963 01073a5d 2019-08-22 stsp if (error)
9964 01073a5d 2019-08-22 stsp goto done;
9966 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9967 896e9b6f 2019-08-26 stsp if (force_path) {
9968 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9970 896e9b6f 2019-08-26 stsp if (error)
9973 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9974 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
9976 896e9b6f 2019-08-26 stsp if (error) {
9977 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9978 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9980 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9981 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9982 896e9b6f 2019-08-26 stsp if (error)
9987 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9988 01073a5d 2019-08-22 stsp if (error)
9991 01073a5d 2019-08-22 stsp switch (obj_type) {
9992 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9993 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9995 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9996 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9998 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9999 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
10001 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
10002 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
10005 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
10008 01073a5d 2019-08-22 stsp if (error)
10010 01073a5d 2019-08-22 stsp free(label);
10011 01073a5d 2019-08-22 stsp label = NULL;
10012 01073a5d 2019-08-22 stsp free(id);
10013 01073a5d 2019-08-22 stsp id = NULL;
10016 01073a5d 2019-08-22 stsp free(label);
10017 01073a5d 2019-08-22 stsp free(id);
10018 896e9b6f 2019-08-26 stsp free(commit_id);
10019 01073a5d 2019-08-22 stsp if (worktree)
10020 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
10021 01073a5d 2019-08-22 stsp if (repo) {
10022 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
10023 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
10024 01073a5d 2019-08-22 stsp if (error == NULL)
10025 01073a5d 2019-08-22 stsp error = repo_error;
10027 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
10028 b2118c49 2020-07-28 stsp return error;
10031 b2118c49 2020-07-28 stsp __dead static void
10032 b2118c49 2020-07-28 stsp usage_info(void)
10034 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
10035 b2118c49 2020-07-28 stsp getprogname());
10039 b2118c49 2020-07-28 stsp static const struct got_error *
10040 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
10041 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10042 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
10044 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
10045 b2118c49 2020-07-28 stsp char *id_str = NULL;
10046 b2118c49 2020-07-28 stsp char datebuf[128];
10047 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
10048 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
10049 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
10052 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
10053 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
10055 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
10056 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
10057 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
10058 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
10059 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
10062 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
10063 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
10064 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
10065 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
10066 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
10067 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
10068 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
10069 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
10071 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
10073 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
10074 b2118c49 2020-07-28 stsp if (tm == NULL)
10075 b2118c49 2020-07-28 stsp return NULL;
10076 b2118c49 2020-07-28 stsp if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
10077 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
10078 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
10080 b2118c49 2020-07-28 stsp if (blob_id) {
10081 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
10083 b2118c49 2020-07-28 stsp return err;
10084 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
10085 b2118c49 2020-07-28 stsp free(id_str);
10088 b2118c49 2020-07-28 stsp if (staged_blob_id) {
10089 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
10091 b2118c49 2020-07-28 stsp return err;
10092 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
10093 b2118c49 2020-07-28 stsp free(id_str);
10096 b2118c49 2020-07-28 stsp if (commit_id) {
10097 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
10099 b2118c49 2020-07-28 stsp return err;
10100 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
10101 b2118c49 2020-07-28 stsp free(id_str);
10104 b2118c49 2020-07-28 stsp return NULL;
10107 b2118c49 2020-07-28 stsp static const struct got_error *
10108 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
10110 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
10111 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
10112 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
10113 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
10114 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
10115 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
10116 b2118c49 2020-07-28 stsp int ch, show_files = 0;
10118 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
10120 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
10121 b2118c49 2020-07-28 stsp switch (ch) {
10123 b2118c49 2020-07-28 stsp usage_info();
10124 b2118c49 2020-07-28 stsp /* NOTREACHED */
10128 b2118c49 2020-07-28 stsp argc -= optind;
10129 b2118c49 2020-07-28 stsp argv += optind;
10131 b2118c49 2020-07-28 stsp #ifndef PROFILE
10132 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
10133 b2118c49 2020-07-28 stsp NULL) == -1)
10134 b2118c49 2020-07-28 stsp err(1, "pledge");
10136 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
10137 b2118c49 2020-07-28 stsp if (cwd == NULL) {
10138 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
10139 b2118c49 2020-07-28 stsp goto done;
10142 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
10143 b2118c49 2020-07-28 stsp if (error) {
10144 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
10145 8ea5c997 2021-02-07 naddy error = wrap_not_worktree_error(error, "info", cwd);
10146 b2118c49 2020-07-28 stsp goto done;
10149 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
10150 b2118c49 2020-07-28 stsp if (error)
10151 b2118c49 2020-07-28 stsp goto done;
10153 b2118c49 2020-07-28 stsp if (argc >= 1) {
10154 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
10155 b2118c49 2020-07-28 stsp worktree);
10156 b2118c49 2020-07-28 stsp if (error)
10157 b2118c49 2020-07-28 stsp goto done;
10158 b2118c49 2020-07-28 stsp show_files = 1;
10161 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
10162 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
10163 b2118c49 2020-07-28 stsp if (error)
10164 b2118c49 2020-07-28 stsp goto done;
10166 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
10167 b2118c49 2020-07-28 stsp if (error)
10168 b2118c49 2020-07-28 stsp goto done;
10170 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
10171 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
10172 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
10173 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
10174 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
10175 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
10176 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
10177 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
10179 b2118c49 2020-07-28 stsp if (show_files) {
10180 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
10181 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
10182 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
10183 b2118c49 2020-07-28 stsp continue;
10185 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
10186 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
10188 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
10189 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
10191 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
10192 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
10193 b2118c49 2020-07-28 stsp if (error)
10194 b2118c49 2020-07-28 stsp goto done;
10195 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
10196 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
10197 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
10203 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
10204 b2118c49 2020-07-28 stsp free((char *)pe->path);
10205 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
10206 b2118c49 2020-07-28 stsp free(cwd);
10207 b2118c49 2020-07-28 stsp free(id_str);
10208 b2118c49 2020-07-28 stsp free(uuidstr);
10209 0ebf8283 2019-07-24 stsp return error;
