2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 93658fb9 2020-03-18 stsp * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
7 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
8 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
10 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 12463d8b 2019-12-13 stsp #include <fcntl.h>
28 12ce7a6c 2019-08-12 stsp #include <limits.h>
29 5c860e29 2018-03-12 stsp #include <locale.h>
30 818c7501 2019-07-11 stsp #include <ctype.h>
31 99437157 2018-11-11 stsp #include <signal.h>
32 5c860e29 2018-03-12 stsp #include <stdio.h>
33 5c860e29 2018-03-12 stsp #include <stdlib.h>
34 5c860e29 2018-03-12 stsp #include <string.h>
35 5c860e29 2018-03-12 stsp #include <unistd.h>
36 c09a553d 2018-03-12 stsp #include <libgen.h>
37 c0768b0f 2018-06-10 stsp #include <time.h>
38 33ad4cbe 2019-05-12 jcs #include <paths.h>
39 6841bf13 2019-11-29 kn #include <regex.h>
40 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 d2cdc636 2020-03-18 stsp #include <util.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 f42b1b34 2018-03-12 stsp #include "got_error.h"
45 f42b1b34 2018-03-12 stsp #include "got_object.h"
46 5261c201 2018-04-01 stsp #include "got_reference.h"
47 f42b1b34 2018-03-12 stsp #include "got_repository.h"
48 1dd54920 2019-05-11 stsp #include "got_path.h"
49 e6209546 2019-08-22 stsp #include "got_cancel.h"
50 c09a553d 2018-03-12 stsp #include "got_worktree.h"
51 79109fed 2018-03-27 stsp #include "got_diff.h"
52 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
53 6f23baec 2020-03-18 stsp #include "got_fetch.h"
54 404c43c4 2018-06-21 stsp #include "got_blame.h"
55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
57 50b0790e 2020-09-11 stsp #include "got_gotconfig.h"
59 5c860e29 2018-03-12 stsp #ifndef nitems
60 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
64 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
67 99437157 2018-11-11 stsp catch_sigint(int signo)
69 99437157 2018-11-11 stsp sigint_received = 1;
73 99437157 2018-11-11 stsp catch_sigpipe(int signo)
75 99437157 2018-11-11 stsp sigpipe_received = 1;
79 8cfb4057 2019-07-09 stsp struct got_cmd {
80 820059fa 2020-09-25 stsp const char *cmd_name;
81 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
82 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
83 97b3a7be 2019-07-09 stsp const char *cmd_alias;
86 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
87 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
88 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
89 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
90 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
91 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
92 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
93 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
94 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
95 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
96 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
97 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
98 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
99 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
100 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
101 d00136be 2019-03-26 stsp __dead static void usage_add(void);
102 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
103 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
104 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
105 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
106 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
107 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
108 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
109 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
110 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
111 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
112 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
113 b2118c49 2020-07-28 stsp __dead static void usage_info(void);
115 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
116 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
117 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
118 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
119 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
120 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
121 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
122 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
123 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
124 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
125 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
126 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
127 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
128 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
129 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
130 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
131 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
132 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
133 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
134 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
135 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
136 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
137 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
138 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
139 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
140 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
141 b2118c49 2020-07-28 stsp static const struct got_error* cmd_info(int, char *[]);
143 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
144 b2118c49 2020-07-28 stsp { "init", cmd_init, usage_init, "" },
145 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
146 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
147 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
148 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
149 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
150 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
151 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
152 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
153 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
154 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
155 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
156 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
157 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
158 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
159 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
160 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
161 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
162 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
163 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
164 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
165 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
166 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
167 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
168 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
169 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
170 b2118c49 2020-07-28 stsp { "info", cmd_info, usage_info, "" },
173 ce5b7c56 2019-07-09 stsp static void
174 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
178 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
179 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
180 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
181 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->cmd_name);
183 6879ba42 2020-10-01 naddy fputc('\n', fp);
186 ff69268e 2020-12-13 stsp __dead static void
187 ff69268e 2020-12-13 stsp option_conflict(char a, char b)
189 ff69268e 2020-12-13 stsp errx(1, "-%c and -%c options are mutually exclusive", a, b);
193 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
195 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
198 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
199 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
200 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
201 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0 }
204 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
206 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
207 5c860e29 2018-03-12 stsp switch (ch) {
215 6879ba42 2020-10-01 naddy usage(hflag, 1);
216 5c860e29 2018-03-12 stsp /* NOTREACHED */
220 5c860e29 2018-03-12 stsp argc -= optind;
221 5c860e29 2018-03-12 stsp argv += optind;
222 9814e6a3 2020-09-27 naddy optind = 1;
223 9814e6a3 2020-09-27 naddy optreset = 1;
225 53ccebc2 2019-07-30 stsp if (Vflag) {
226 53ccebc2 2019-07-30 stsp got_version_print_str();
230 5c860e29 2018-03-12 stsp if (argc <= 0)
231 6879ba42 2020-10-01 naddy usage(hflag, hflag ? 0 : 1);
233 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
234 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
236 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
237 d7d4f210 2018-03-12 stsp const struct got_error *error;
239 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
241 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
242 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
246 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
248 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
249 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
250 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
251 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
252 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
253 70015d7a 2019-11-08 stsp !(sigint_received &&
254 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
255 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
262 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
263 6879ba42 2020-10-01 naddy list_commands(stderr);
267 4ed7e80c 2018-05-20 stsp __dead static void
268 6879ba42 2020-10-01 naddy usage(int hflag, int status)
270 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
272 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
273 53ccebc2 2019-07-30 stsp getprogname());
275 6879ba42 2020-10-01 naddy list_commands(fp);
276 6879ba42 2020-10-01 naddy exit(status);
279 0266afb7 2019-01-04 stsp static const struct got_error *
280 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
282 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
283 e2ba3d07 2019-05-13 stsp const char *editor;
285 8920fa04 2019-08-18 stsp *abspath = NULL;
287 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
288 e2ba3d07 2019-05-13 stsp if (editor == NULL)
289 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
291 0ee7065d 2019-05-13 stsp if (editor) {
292 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
294 0ee7065d 2019-05-13 stsp return err;
297 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
298 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
299 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
300 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
303 e2ba3d07 2019-05-13 stsp return NULL;
306 e2ba3d07 2019-05-13 stsp static const struct got_error *
307 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
308 c530dc23 2019-07-23 stsp const char *worktree_path)
310 163ce85a 2019-05-13 stsp const struct got_error *err;
312 37c06ea4 2019-07-15 stsp #ifdef PROFILE
313 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
314 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
316 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
317 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
319 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
320 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
322 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
323 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
325 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
326 163ce85a 2019-05-13 stsp if (err != NULL)
327 163ce85a 2019-05-13 stsp return err;
329 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
330 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
332 0266afb7 2019-01-04 stsp return NULL;
335 2c7829a4 2019-06-17 stsp __dead static void
336 2c7829a4 2019-06-17 stsp usage_init(void)
338 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
342 2c7829a4 2019-06-17 stsp static const struct got_error *
343 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
345 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
346 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
349 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
350 2c7829a4 2019-06-17 stsp switch (ch) {
352 2c7829a4 2019-06-17 stsp usage_init();
353 2c7829a4 2019-06-17 stsp /* NOTREACHED */
357 2c7829a4 2019-06-17 stsp argc -= optind;
358 2c7829a4 2019-06-17 stsp argv += optind;
360 2c7829a4 2019-06-17 stsp #ifndef PROFILE
361 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
362 2c7829a4 2019-06-17 stsp err(1, "pledge");
364 2c7829a4 2019-06-17 stsp if (argc != 1)
365 bc20e173 2019-06-17 stsp usage_init();
367 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
368 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
369 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
371 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
373 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
374 2c7829a4 2019-06-17 stsp if (error &&
375 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
378 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
382 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
384 3ce1b845 2019-07-15 stsp free(repo_path);
385 3ce1b845 2019-07-15 stsp return error;
388 3ce1b845 2019-07-15 stsp __dead static void
389 3ce1b845 2019-07-15 stsp usage_import(void)
391 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
392 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
397 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
400 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
401 3ce1b845 2019-07-15 stsp int st = -1;
403 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
404 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
405 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
407 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
409 3ce1b845 2019-07-15 stsp goto doneediting;
411 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
412 3ce1b845 2019-07-15 stsp _exit(127);
415 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
416 3ce1b845 2019-07-15 stsp if (errno != EINTR)
419 3ce1b845 2019-07-15 stsp doneediting:
420 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
421 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
422 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
424 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
425 3ce1b845 2019-07-15 stsp errno = EINTR;
429 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
432 3ce1b845 2019-07-15 stsp static const struct got_error *
433 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
434 0d5bb276 2020-12-15 stsp const char *initial_content, size_t initial_content_len, int check_comments)
436 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
437 bfa12d5e 2020-09-26 stsp char *line = NULL;
438 bfa12d5e 2020-09-26 stsp size_t linesize = 0;
439 bfa12d5e 2020-09-26 stsp ssize_t linelen;
440 3ce1b845 2019-07-15 stsp struct stat st, st2;
441 bfa12d5e 2020-09-26 stsp FILE *fp = NULL;
442 bfa12d5e 2020-09-26 stsp size_t len, logmsg_len;
443 bfa12d5e 2020-09-26 stsp char *initial_content_stripped = NULL, *buf = NULL, *s;
445 3ce1b845 2019-07-15 stsp *logmsg = NULL;
447 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
448 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
450 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
451 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
453 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
454 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
456 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
457 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
458 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
461 bfa12d5e 2020-09-26 stsp * Set up a stripped version of the initial content without comments
462 bfa12d5e 2020-09-26 stsp * and blank lines. We need this in order to check if the message
463 bfa12d5e 2020-09-26 stsp * has in fact been edited.
465 bfa12d5e 2020-09-26 stsp initial_content_stripped = malloc(initial_content_len + 1);
466 bfa12d5e 2020-09-26 stsp if (initial_content_stripped == NULL)
467 bfa12d5e 2020-09-26 stsp return got_error_from_errno("malloc");
468 bfa12d5e 2020-09-26 stsp initial_content_stripped[0] = '\0';
470 bfa12d5e 2020-09-26 stsp buf = strdup(initial_content);
471 bfa12d5e 2020-09-26 stsp if (buf == NULL) {
472 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("strdup");
477 bfa12d5e 2020-09-26 stsp while ((line = strsep(&s, "\n")) != NULL) {
478 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
479 bfa12d5e 2020-09-26 stsp continue; /* remove comments and leading empty lines */
480 bfa12d5e 2020-09-26 stsp len = strlcat(initial_content_stripped, line,
481 bfa12d5e 2020-09-26 stsp initial_content_len + 1);
482 bfa12d5e 2020-09-26 stsp if (len >= initial_content_len + 1) {
483 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
487 bfa12d5e 2020-09-26 stsp while (len > 0 && initial_content_stripped[len - 1] == '\n') {
488 bfa12d5e 2020-09-26 stsp initial_content_stripped[len - 1] = '\0';
492 bfa12d5e 2020-09-26 stsp logmsg_len = st2.st_size;
493 bfa12d5e 2020-09-26 stsp *logmsg = malloc(logmsg_len + 1);
494 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
495 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
496 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
498 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
499 3ce1b845 2019-07-15 stsp if (fp == NULL) {
500 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
505 bfa12d5e 2020-09-26 stsp while ((linelen = getline(&line, &linesize, fp)) != -1) {
506 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
507 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
508 bfa12d5e 2020-09-26 stsp len = strlcat(*logmsg, line, logmsg_len + 1);
509 bfa12d5e 2020-09-26 stsp if (len >= logmsg_len + 1) {
510 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
514 bfa12d5e 2020-09-26 stsp free(line);
515 bfa12d5e 2020-09-26 stsp if (ferror(fp)) {
516 bfa12d5e 2020-09-26 stsp err = got_ferror(fp, GOT_ERR_IO);
519 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
520 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
524 bfa12d5e 2020-09-26 stsp if (len == 0) {
525 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
526 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
529 0d5bb276 2020-12-15 stsp if (check_comments && strcmp(*logmsg, initial_content_stripped) == 0)
530 bfa12d5e 2020-09-26 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
531 bfa12d5e 2020-09-26 stsp "no changes made to commit message, aborting");
533 bfa12d5e 2020-09-26 stsp free(initial_content_stripped);
535 bfa12d5e 2020-09-26 stsp if (fp && fclose(fp) == EOF && err == NULL)
536 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("fclose");
538 3ce1b845 2019-07-15 stsp free(*logmsg);
539 3ce1b845 2019-07-15 stsp *logmsg = NULL;
541 3ce1b845 2019-07-15 stsp return err;
544 3ce1b845 2019-07-15 stsp static const struct got_error *
545 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
546 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
548 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
549 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
550 1601cb9f 2020-09-11 naddy int initial_content_len;
551 97972933 2020-09-11 stsp int fd = -1;
553 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
554 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
555 1601cb9f 2020-09-11 naddy branch_name);
556 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
557 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
559 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
560 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
564 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
565 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *logmsg_path);
569 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
570 0d5bb276 2020-12-15 stsp initial_content_len, 1);
572 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
573 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *logmsg_path);
574 3ce1b845 2019-07-15 stsp free(initial_content);
576 59f86c76 2020-09-11 stsp free(*logmsg_path);
577 59f86c76 2020-09-11 stsp *logmsg_path = NULL;
579 3ce1b845 2019-07-15 stsp return err;
582 3ce1b845 2019-07-15 stsp static const struct got_error *
583 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
585 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
586 3ce1b845 2019-07-15 stsp return NULL;
589 3ce1b845 2019-07-15 stsp static const struct got_error *
590 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
591 50b0790e 2020-09-11 stsp struct got_worktree *worktree)
593 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
594 50b0790e 2020-09-11 stsp const char *got_author = NULL, *name, *email;
595 50b0790e 2020-09-11 stsp const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
597 84792843 2019-08-09 stsp *author = NULL;
599 50b0790e 2020-09-11 stsp if (worktree)
600 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
601 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
604 50b0790e 2020-09-11 stsp * Priority of potential author information sources, from most
605 50b0790e 2020-09-11 stsp * significant to least significant:
606 50b0790e 2020-09-11 stsp * 1) work tree's .got/got.conf file
607 50b0790e 2020-09-11 stsp * 2) repository's got.conf file
608 50b0790e 2020-09-11 stsp * 3) repository's git config file
609 50b0790e 2020-09-11 stsp * 4) environment variables
610 50b0790e 2020-09-11 stsp * 5) global git config files (in user's home directory or /etc)
613 50b0790e 2020-09-11 stsp if (worktree_conf)
614 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(worktree_conf);
615 50b0790e 2020-09-11 stsp if (got_author == NULL)
616 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(repo_conf);
617 84792843 2019-08-09 stsp if (got_author == NULL) {
618 257add31 2020-09-09 stsp name = got_repo_get_gitconfig_author_name(repo);
619 257add31 2020-09-09 stsp email = got_repo_get_gitconfig_author_email(repo);
620 c9956ddf 2019-09-08 stsp if (name && email) {
621 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
622 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
623 c9956ddf 2019-09-08 stsp return NULL;
626 257add31 2020-09-09 stsp got_author = getenv("GOT_AUTHOR");
627 257add31 2020-09-09 stsp if (got_author == NULL) {
628 257add31 2020-09-09 stsp name = got_repo_get_global_gitconfig_author_name(repo);
629 257add31 2020-09-09 stsp email = got_repo_get_global_gitconfig_author_email(
631 257add31 2020-09-09 stsp if (name && email) {
632 257add31 2020-09-09 stsp if (asprintf(author, "%s <%s>", name, email)
634 257add31 2020-09-09 stsp return got_error_from_errno("asprintf");
635 257add31 2020-09-09 stsp return NULL;
637 257add31 2020-09-09 stsp /* TODO: Look up user in password database? */
638 257add31 2020-09-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
642 aba9c984 2019-09-08 stsp *author = strdup(got_author);
643 aba9c984 2019-09-08 stsp if (*author == NULL)
644 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
647 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
648 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
650 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
651 84792843 2019-08-09 stsp got_author++;
652 aba9c984 2019-09-08 stsp if (*got_author != '<') {
653 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
656 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
657 84792843 2019-08-09 stsp got_author++;
658 aba9c984 2019-09-08 stsp if (*got_author != '@') {
659 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
662 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
663 84792843 2019-08-09 stsp got_author++;
664 84792843 2019-08-09 stsp if (*got_author != '>')
665 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
668 aba9c984 2019-09-08 stsp free(*author);
669 aba9c984 2019-09-08 stsp *author = NULL;
671 aba9c984 2019-09-08 stsp return err;
674 c9956ddf 2019-09-08 stsp static const struct got_error *
675 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
677 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
679 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
680 c9956ddf 2019-09-08 stsp if (homedir) {
681 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
682 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
685 c9956ddf 2019-09-08 stsp return NULL;
688 84792843 2019-08-09 stsp static const struct got_error *
689 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
691 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
692 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
693 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
694 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
695 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
696 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
697 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
698 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
700 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
701 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
702 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
704 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
706 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
707 3ce1b845 2019-07-15 stsp switch (ch) {
709 3ce1b845 2019-07-15 stsp branch_name = optarg;
712 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
713 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
714 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
719 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
720 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
721 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
727 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
729 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
735 b2b65d18 2019-08-22 stsp usage_import();
736 3ce1b845 2019-07-15 stsp /* NOTREACHED */
740 3ce1b845 2019-07-15 stsp argc -= optind;
741 3ce1b845 2019-07-15 stsp argv += optind;
743 3ce1b845 2019-07-15 stsp #ifndef PROFILE
744 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
746 3ce1b845 2019-07-15 stsp NULL) == -1)
747 3ce1b845 2019-07-15 stsp err(1, "pledge");
749 3ce1b845 2019-07-15 stsp if (argc != 1)
750 3ce1b845 2019-07-15 stsp usage_import();
752 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
753 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
754 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
755 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
757 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
758 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
761 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
765 50b0790e 2020-09-11 stsp error = get_author(&author, repo, NULL);
767 aba9c984 2019-09-08 stsp return error;
770 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
771 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
772 e560b7e0 2019-11-28 stsp * an unintended typo.
774 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
775 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
777 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
778 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
782 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
783 3ce1b845 2019-07-15 stsp if (error) {
784 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
787 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
788 3ce1b845 2019-07-15 stsp "import target branch already exists");
792 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
793 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
794 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
797 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
800 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
801 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
803 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
804 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
807 8e158b01 2019-09-22 stsp free(logmsg);
808 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
809 ef293bdd 2019-10-21 stsp path_dir, refname);
810 ef293bdd 2019-10-21 stsp if (error) {
811 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
812 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
813 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
818 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
819 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
820 ef293bdd 2019-10-21 stsp if (logmsg_path)
821 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
825 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
826 ef293bdd 2019-10-21 stsp if (error) {
827 ef293bdd 2019-10-21 stsp if (logmsg_path)
828 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
832 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
833 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
834 ef293bdd 2019-10-21 stsp if (error) {
835 ef293bdd 2019-10-21 stsp if (logmsg_path)
836 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
840 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
841 ef293bdd 2019-10-21 stsp if (error) {
842 ef293bdd 2019-10-21 stsp if (logmsg_path)
843 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
847 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
848 ef293bdd 2019-10-21 stsp if (error) {
849 ef293bdd 2019-10-21 stsp if (logmsg_path)
850 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
854 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
855 ef293bdd 2019-10-21 stsp if (error) {
856 ef293bdd 2019-10-21 stsp if (logmsg_path)
857 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
861 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
862 3ce1b845 2019-07-15 stsp if (error) {
863 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
864 ef293bdd 2019-10-21 stsp if (logmsg_path)
865 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
869 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
870 3ce1b845 2019-07-15 stsp branch_ref);
871 ef293bdd 2019-10-21 stsp if (error) {
872 ef293bdd 2019-10-21 stsp if (logmsg_path)
873 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
877 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
878 ef293bdd 2019-10-21 stsp if (error) {
879 ef293bdd 2019-10-21 stsp if (logmsg_path)
880 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
885 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
886 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
888 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
889 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
890 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
891 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
892 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
893 8e158b01 2019-09-22 stsp free(logmsg);
894 ef293bdd 2019-10-21 stsp free(logmsg_path);
895 2c7829a4 2019-06-17 stsp free(repo_path);
896 3ce1b845 2019-07-15 stsp free(editor);
897 3ce1b845 2019-07-15 stsp free(refname);
898 3ce1b845 2019-07-15 stsp free(new_commit_id);
899 3ce1b845 2019-07-15 stsp free(id_str);
900 aba9c984 2019-09-08 stsp free(author);
901 c9956ddf 2019-09-08 stsp free(gitconfig_path);
902 3ce1b845 2019-07-15 stsp if (branch_ref)
903 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
904 3ce1b845 2019-07-15 stsp if (head_ref)
905 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
906 2c7829a4 2019-06-17 stsp return error;
909 93658fb9 2020-03-18 stsp __dead static void
910 93658fb9 2020-03-18 stsp usage_clone(void)
912 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
913 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
917 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
918 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
919 892ac3b6 2020-03-18 stsp int last_p_indexed;
920 892ac3b6 2020-03-18 stsp int last_p_resolved;
921 68999b92 2020-03-18 stsp int verbosity;
923 04d9a9ec 2020-09-24 stsp struct got_repository *repo;
925 04d9a9ec 2020-09-24 stsp int create_configs;
926 04d9a9ec 2020-09-24 stsp int configs_created;
928 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *symrefs;
929 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches;
930 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs;
931 04d9a9ec 2020-09-24 stsp const char *proto;
932 04d9a9ec 2020-09-24 stsp const char *host;
933 04d9a9ec 2020-09-24 stsp const char *port;
934 04d9a9ec 2020-09-24 stsp const char *remote_repo_path;
935 04d9a9ec 2020-09-24 stsp const char *git_url;
936 04d9a9ec 2020-09-24 stsp int fetch_all_branches;
937 04d9a9ec 2020-09-24 stsp int mirror_references;
938 04d9a9ec 2020-09-24 stsp } config_info;
941 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
942 93658fb9 2020-03-18 stsp static const struct got_error *
943 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
944 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
945 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
946 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_branches,
947 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, struct got_repository *repo);
949 04d9a9ec 2020-09-24 stsp static const struct got_error *
950 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
951 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
953 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
954 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
955 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
956 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
957 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
960 04d9a9ec 2020-09-24 stsp * In order to allow a failed clone to be resumed with 'got fetch'
961 04d9a9ec 2020-09-24 stsp * we try to create configuration files as soon as possible.
962 04d9a9ec 2020-09-24 stsp * Once the server has sent information about its default branch
963 04d9a9ec 2020-09-24 stsp * we have all required information.
965 04d9a9ec 2020-09-24 stsp if (a->create_configs && !a->configs_created &&
966 04d9a9ec 2020-09-24 stsp !TAILQ_EMPTY(a->config_info.symrefs)) {
967 04d9a9ec 2020-09-24 stsp err = create_config_files(a->config_info.proto,
968 62d463ca 2020-10-20 naddy a->config_info.host, a->config_info.port,
969 62d463ca 2020-10-20 naddy a->config_info.remote_repo_path,
970 62d463ca 2020-10-20 naddy a->config_info.git_url,
971 62d463ca 2020-10-20 naddy a->config_info.fetch_all_branches,
972 62d463ca 2020-10-20 naddy a->config_info.mirror_references,
973 62d463ca 2020-10-20 naddy a->config_info.symrefs,
974 99495ddb 2021-01-10 stsp a->config_info.wanted_branches,
975 99495ddb 2021-01-10 stsp a->config_info.wanted_refs, a->repo);
977 04d9a9ec 2020-09-24 stsp return err;
978 04d9a9ec 2020-09-24 stsp a->configs_created = 1;
981 68999b92 2020-03-18 stsp if (a->verbosity < 0)
982 68999b92 2020-03-18 stsp return NULL;
984 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
985 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
986 892ac3b6 2020-03-18 stsp fflush(stdout);
987 12d1281e 2020-03-19 stsp return NULL;
990 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
991 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
992 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
993 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
994 892ac3b6 2020-03-18 stsp print_size = 1;
995 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
996 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
997 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
999 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
1000 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
1001 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
1002 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
1003 892ac3b6 2020-03-18 stsp print_indexed = 1;
1004 892ac3b6 2020-03-18 stsp print_size = 1;
1007 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
1008 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1009 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1010 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1011 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1012 892ac3b6 2020-03-18 stsp print_resolved = 1;
1013 892ac3b6 2020-03-18 stsp print_indexed = 1;
1014 892ac3b6 2020-03-18 stsp print_size = 1;
1019 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1020 892ac3b6 2020-03-18 stsp printf("\r");
1021 892ac3b6 2020-03-18 stsp if (print_size)
1022 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1023 d715f13e 2020-03-19 stsp if (print_indexed)
1024 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1025 d715f13e 2020-03-19 stsp if (print_resolved)
1026 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1027 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1028 892ac3b6 2020-03-18 stsp fflush(stdout);
1030 531c3985 2020-03-18 stsp return NULL;
1033 531c3985 2020-03-18 stsp static const struct got_error *
1034 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
1035 04d9a9ec 2020-09-24 stsp int verbosity, struct got_repository *repo)
1037 4ba14133 2020-03-20 stsp const struct got_error *err;
1038 04d9a9ec 2020-09-24 stsp struct got_reference *head_symref;
1040 04d9a9ec 2020-09-24 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1042 4ba14133 2020-03-20 stsp return err;
1044 04d9a9ec 2020-09-24 stsp err = got_ref_write(head_symref, repo);
1045 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
1046 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
1047 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
1049 04d9a9ec 2020-09-24 stsp got_ref_close(head_symref);
1050 4ba14133 2020-03-20 stsp return err;
1053 4ba14133 2020-03-20 stsp static const struct got_error *
1054 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
1055 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
1057 41b0de12 2020-03-21 stsp const struct got_error *err;
1058 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
1060 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1061 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1062 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
1064 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
1067 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
1068 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1069 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
1070 41b0de12 2020-03-21 stsp char *id_str;
1072 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1074 41b0de12 2020-03-21 stsp return err;
1075 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
1076 41b0de12 2020-03-21 stsp free(id_str);
1079 41b0de12 2020-03-21 stsp return NULL;
1082 6338a6a1 2020-03-21 stsp static const struct got_error *
1083 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
1084 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
1086 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
1087 6338a6a1 2020-03-21 stsp struct got_reference *ref;
1088 6338a6a1 2020-03-21 stsp char *id_str;
1090 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1092 6338a6a1 2020-03-21 stsp return err;
1094 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
1096 6338a6a1 2020-03-21 stsp goto done;
1098 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1099 6338a6a1 2020-03-21 stsp got_ref_close(ref);
1101 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
1102 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
1104 6338a6a1 2020-03-21 stsp free(id_str);
1105 6338a6a1 2020-03-21 stsp return err;
1108 0e4002ca 2020-03-21 stsp static int
1109 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
1111 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
1113 0e4002ca 2020-03-21 stsp refname += 5;
1116 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
1117 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
1119 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
1121 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
1124 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
1125 0e4002ca 2020-03-21 stsp wanted_ref += 5;
1127 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
1128 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1131 0e4002ca 2020-03-21 stsp /* Allow exact match. */
1132 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
1135 0e4002ca 2020-03-21 stsp static int
1136 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1138 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
1140 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1141 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1148 41b0de12 2020-03-21 stsp static const struct got_error *
1149 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1150 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1152 0e4002ca 2020-03-21 stsp const struct got_error *err;
1153 0e4002ca 2020-03-21 stsp char *remote_refname;
1155 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1156 0e4002ca 2020-03-21 stsp refname += 5;
1158 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1159 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1160 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1162 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1163 0e4002ca 2020-03-21 stsp free(remote_refname);
1164 7c0b7f42 2020-09-24 stsp return err;
1167 7c0b7f42 2020-09-24 stsp static const struct got_error *
1168 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
1169 15d3c221 2021-01-05 stsp const char *remote_repo_path, const char *default_branch,
1170 0c8b29c5 2021-01-05 stsp int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1171 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, int mirror_references,
1172 99495ddb 2021-01-10 stsp struct got_repository *repo)
1174 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1175 7c0b7f42 2020-09-24 stsp char *gotconfig_path = NULL;
1176 7c0b7f42 2020-09-24 stsp char *gotconfig = NULL;
1177 7c0b7f42 2020-09-24 stsp FILE *gotconfig_file = NULL;
1178 15d3c221 2021-01-05 stsp const char *branchname = NULL;
1179 99495ddb 2021-01-10 stsp char *branches = NULL, *refs = NULL;
1180 7c0b7f42 2020-09-24 stsp ssize_t n;
1182 0c8b29c5 2021-01-05 stsp if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1183 132af4a5 2021-01-05 stsp struct got_pathlist_entry *pe;
1184 132af4a5 2021-01-05 stsp TAILQ_FOREACH(pe, wanted_branches, entry) {
1186 132af4a5 2021-01-05 stsp branchname = pe->path;
1187 132af4a5 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1188 132af4a5 2021-01-05 stsp branchname += 11;
1189 132af4a5 2021-01-05 stsp if (asprintf(&s, "%s\"%s\" ",
1190 132af4a5 2021-01-05 stsp branches ? branches : "", branchname) == -1) {
1191 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1192 132af4a5 2021-01-05 stsp goto done;
1194 132af4a5 2021-01-05 stsp free(branches);
1195 132af4a5 2021-01-05 stsp branches = s;
1197 0c8b29c5 2021-01-05 stsp } else if (!fetch_all_branches && default_branch) {
1198 15d3c221 2021-01-05 stsp branchname = default_branch;
1199 15d3c221 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1200 15d3c221 2021-01-05 stsp branchname += 11;
1201 132af4a5 2021-01-05 stsp if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1202 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1203 132af4a5 2021-01-05 stsp goto done;
1206 99495ddb 2021-01-10 stsp if (!TAILQ_EMPTY(wanted_refs)) {
1207 99495ddb 2021-01-10 stsp struct got_pathlist_entry *pe;
1208 99495ddb 2021-01-10 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1210 99495ddb 2021-01-10 stsp const char *refname = pe->path;
1211 99495ddb 2021-01-10 stsp if (strncmp(refname, "refs/", 5) == 0)
1212 99495ddb 2021-01-10 stsp branchname += 5;
1213 99495ddb 2021-01-10 stsp if (asprintf(&s, "%s\"%s\" ",
1214 99495ddb 2021-01-10 stsp refs ? refs : "", refname) == -1) {
1215 99495ddb 2021-01-10 stsp err = got_error_from_errno("asprintf");
1216 99495ddb 2021-01-10 stsp goto done;
1218 99495ddb 2021-01-10 stsp free(refs);
1223 7c0b7f42 2020-09-24 stsp /* Create got.conf(5). */
1224 7c0b7f42 2020-09-24 stsp gotconfig_path = got_repo_get_path_gotconfig(repo);
1225 7c0b7f42 2020-09-24 stsp if (gotconfig_path == NULL) {
1226 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gotconfig");
1227 7c0b7f42 2020-09-24 stsp goto done;
1229 7c0b7f42 2020-09-24 stsp gotconfig_file = fopen(gotconfig_path, "a");
1230 7c0b7f42 2020-09-24 stsp if (gotconfig_file == NULL) {
1231 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gotconfig_path);
1232 7c0b7f42 2020-09-24 stsp goto done;
1234 7c0b7f42 2020-09-24 stsp if (asprintf(&gotconfig,
1235 7c0b7f42 2020-09-24 stsp "remote \"%s\" {\n"
1236 7c0b7f42 2020-09-24 stsp "\tserver %s\n"
1237 7c0b7f42 2020-09-24 stsp "\tprotocol %s\n"
1239 7c0b7f42 2020-09-24 stsp "\trepository \"%s\"\n"
1245 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1246 7c0b7f42 2020-09-24 stsp port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1247 132af4a5 2021-01-05 stsp remote_repo_path, branches ? "\tbranch { " : "",
1248 132af4a5 2021-01-05 stsp branches ? branches : "", branches ? "}\n" : "",
1249 99495ddb 2021-01-10 stsp refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1250 0c8b29c5 2021-01-05 stsp mirror_references ? "\tmirror-references yes\n" : "",
1251 0c8b29c5 2021-01-05 stsp fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1252 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1253 7c0b7f42 2020-09-24 stsp goto done;
1255 7c0b7f42 2020-09-24 stsp n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1256 7c0b7f42 2020-09-24 stsp if (n != strlen(gotconfig)) {
1257 7c0b7f42 2020-09-24 stsp err = got_ferror(gotconfig_file, GOT_ERR_IO);
1258 7c0b7f42 2020-09-24 stsp goto done;
1262 7c0b7f42 2020-09-24 stsp if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1263 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gotconfig_path);
1264 7c0b7f42 2020-09-24 stsp free(gotconfig_path);
1265 132af4a5 2021-01-05 stsp free(branches);
1266 7c0b7f42 2020-09-24 stsp return err;
1269 7c0b7f42 2020-09-24 stsp static const struct got_error *
1270 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
1271 132af4a5 2021-01-05 stsp int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1272 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, int mirror_references,
1273 99495ddb 2021-01-10 stsp struct got_repository *repo)
1275 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1276 7c0b7f42 2020-09-24 stsp char *gitconfig_path = NULL;
1277 7c0b7f42 2020-09-24 stsp char *gitconfig = NULL;
1278 7c0b7f42 2020-09-24 stsp FILE *gitconfig_file = NULL;
1279 99495ddb 2021-01-10 stsp char *branches = NULL, *refs = NULL;
1280 56d0a753 2021-01-20 stsp const char *branchname;
1281 7c0b7f42 2020-09-24 stsp ssize_t n;
1283 7c0b7f42 2020-09-24 stsp /* Create a config file Git can understand. */
1284 7c0b7f42 2020-09-24 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1285 7c0b7f42 2020-09-24 stsp if (gitconfig_path == NULL) {
1286 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gitconfig");
1287 7c0b7f42 2020-09-24 stsp goto done;
1289 7c0b7f42 2020-09-24 stsp gitconfig_file = fopen(gitconfig_path, "a");
1290 7c0b7f42 2020-09-24 stsp if (gitconfig_file == NULL) {
1291 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gitconfig_path);
1292 7c0b7f42 2020-09-24 stsp goto done;
1294 56d0a753 2021-01-20 stsp if (fetch_all_branches) {
1295 56d0a753 2021-01-20 stsp if (mirror_references) {
1296 56d0a753 2021-01-20 stsp if (asprintf(&branches,
1297 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1298 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1299 56d0a753 2021-01-20 stsp goto done;
1301 56d0a753 2021-01-20 stsp } else if (asprintf(&branches,
1302 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1303 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1304 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1305 7c0b7f42 2020-09-24 stsp goto done;
1307 132af4a5 2021-01-05 stsp } else if (!TAILQ_EMPTY(wanted_branches)) {
1308 132af4a5 2021-01-05 stsp struct got_pathlist_entry *pe;
1309 132af4a5 2021-01-05 stsp TAILQ_FOREACH(pe, wanted_branches, entry) {
1311 132af4a5 2021-01-05 stsp branchname = pe->path;
1312 132af4a5 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1313 132af4a5 2021-01-05 stsp branchname += 11;
1314 56d0a753 2021-01-20 stsp if (mirror_references) {
1315 56d0a753 2021-01-20 stsp if (asprintf(&s,
1316 56d0a753 2021-01-20 stsp "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1317 56d0a753 2021-01-20 stsp branches ? branches : "",
1318 56d0a753 2021-01-20 stsp branchname, branchname) == -1) {
1319 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1320 56d0a753 2021-01-20 stsp goto done;
1322 56d0a753 2021-01-20 stsp } else if (asprintf(&s,
1323 56d0a753 2021-01-20 stsp "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1324 132af4a5 2021-01-05 stsp branches ? branches : "",
1325 132af4a5 2021-01-05 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1326 132af4a5 2021-01-05 stsp branchname) == -1) {
1327 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1328 132af4a5 2021-01-05 stsp goto done;
1330 132af4a5 2021-01-05 stsp free(branches);
1331 132af4a5 2021-01-05 stsp branches = s;
1335 7c0b7f42 2020-09-24 stsp * If the server specified a default branch, use just that one.
1336 7c0b7f42 2020-09-24 stsp * Otherwise fall back to fetching all branches on next fetch.
1338 04d9a9ec 2020-09-24 stsp if (default_branch) {
1339 04d9a9ec 2020-09-24 stsp branchname = default_branch;
1340 7c0b7f42 2020-09-24 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1341 7c0b7f42 2020-09-24 stsp branchname += 11;
1343 7c0b7f42 2020-09-24 stsp branchname = "*"; /* fall back to all branches */
1344 56d0a753 2021-01-20 stsp if (mirror_references) {
1345 56d0a753 2021-01-20 stsp if (asprintf(&branches,
1346 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/%s:refs/heads/%s\n",
1347 56d0a753 2021-01-20 stsp branchname, branchname) == -1) {
1348 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1349 56d0a753 2021-01-20 stsp goto done;
1351 56d0a753 2021-01-20 stsp } else if (asprintf(&branches,
1352 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1353 7c0b7f42 2020-09-24 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1354 7c0b7f42 2020-09-24 stsp branchname) == -1) {
1355 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1356 7c0b7f42 2020-09-24 stsp goto done;
1359 56d0a753 2021-01-20 stsp if (!TAILQ_EMPTY(wanted_refs)) {
1360 99495ddb 2021-01-10 stsp struct got_pathlist_entry *pe;
1361 99495ddb 2021-01-10 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1363 99495ddb 2021-01-10 stsp const char *refname = pe->path;
1364 99495ddb 2021-01-10 stsp if (strncmp(refname, "refs/", 5) == 0)
1365 99495ddb 2021-01-10 stsp refname += 5;
1366 56d0a753 2021-01-20 stsp if (mirror_references) {
1367 56d0a753 2021-01-20 stsp if (asprintf(&s,
1368 56d0a753 2021-01-20 stsp "%s\tfetch = refs/%s:refs/%s\n",
1369 56d0a753 2021-01-20 stsp refs ? refs : "", refname, refname) == -1) {
1370 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1371 56d0a753 2021-01-20 stsp goto done;
1373 56d0a753 2021-01-20 stsp } else if (asprintf(&s,
1374 56d0a753 2021-01-20 stsp "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1375 99495ddb 2021-01-10 stsp refs ? refs : "",
1376 99495ddb 2021-01-10 stsp refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1377 99495ddb 2021-01-10 stsp refname) == -1) {
1378 99495ddb 2021-01-10 stsp err = got_error_from_errno("asprintf");
1379 99495ddb 2021-01-10 stsp goto done;
1381 99495ddb 2021-01-10 stsp free(refs);
1386 132af4a5 2021-01-05 stsp if (asprintf(&gitconfig,
1387 132af4a5 2021-01-05 stsp "[remote \"%s\"]\n"
1388 132af4a5 2021-01-05 stsp "\turl = %s\n"
1391 56d0a753 2021-01-20 stsp "\tfetch = refs/tags/*:refs/tags/*\n",
1392 132af4a5 2021-01-05 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1393 56d0a753 2021-01-20 stsp refs ? refs : "") == -1) {
1394 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1395 132af4a5 2021-01-05 stsp goto done;
1397 7c0b7f42 2020-09-24 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1398 7c0b7f42 2020-09-24 stsp if (n != strlen(gitconfig)) {
1399 7c0b7f42 2020-09-24 stsp err = got_ferror(gitconfig_file, GOT_ERR_IO);
1400 7c0b7f42 2020-09-24 stsp goto done;
1403 7c0b7f42 2020-09-24 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1404 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gitconfig_path);
1405 7c0b7f42 2020-09-24 stsp free(gitconfig_path);
1406 132af4a5 2021-01-05 stsp free(branches);
1407 0e4002ca 2020-03-21 stsp return err;
1410 0e4002ca 2020-03-21 stsp static const struct got_error *
1411 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
1412 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1413 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
1414 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_branches,
1415 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1417 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
1418 04d9a9ec 2020-09-24 stsp const char *default_branch = NULL;
1419 04d9a9ec 2020-09-24 stsp struct got_pathlist_entry *pe;
1422 04d9a9ec 2020-09-24 stsp * If we asked for a set of wanted branches then use the first
1423 04d9a9ec 2020-09-24 stsp * one of those.
1425 62d463ca 2020-10-20 naddy if (!TAILQ_EMPTY(wanted_branches)) {
1426 04d9a9ec 2020-09-24 stsp pe = TAILQ_FIRST(wanted_branches);
1427 04d9a9ec 2020-09-24 stsp default_branch = pe->path;
1429 04d9a9ec 2020-09-24 stsp /* First HEAD ref listed by server is the default branch. */
1430 04d9a9ec 2020-09-24 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1431 04d9a9ec 2020-09-24 stsp const char *refname = pe->path;
1432 04d9a9ec 2020-09-24 stsp const char *target = pe->data;
1434 04d9a9ec 2020-09-24 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1437 04d9a9ec 2020-09-24 stsp default_branch = target;
1442 04d9a9ec 2020-09-24 stsp /* Create got.conf(5). */
1443 04d9a9ec 2020-09-24 stsp err = create_gotconfig(proto, host, port, remote_repo_path,
1444 0c8b29c5 2021-01-05 stsp default_branch, fetch_all_branches, wanted_branches,
1445 99495ddb 2021-01-10 stsp wanted_refs, mirror_references, repo);
1447 04d9a9ec 2020-09-24 stsp return err;
1449 04d9a9ec 2020-09-24 stsp /* Create a config file Git can understand. */
1450 04d9a9ec 2020-09-24 stsp return create_gitconfig(git_url, default_branch, fetch_all_branches,
1451 99495ddb 2021-01-10 stsp wanted_branches, wanted_refs, mirror_references, repo);
1454 04d9a9ec 2020-09-24 stsp static const struct got_error *
1455 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1457 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1458 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1459 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1460 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1461 a9c2d4c2 2020-09-24 stsp const char *repo_path;
1462 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1463 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1464 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1465 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1466 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1467 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1468 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1469 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1470 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1471 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1473 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1474 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1475 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1476 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1478 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1479 93658fb9 2020-03-18 stsp switch (ch) {
1481 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1484 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1485 4ba14133 2020-03-20 stsp optarg, NULL);
1486 4ba14133 2020-03-20 stsp if (error)
1487 4ba14133 2020-03-20 stsp return error;
1490 41b0de12 2020-03-21 stsp list_refs_only = 1;
1493 469dd726 2020-03-20 stsp mirror_references = 1;
1496 68999b92 2020-03-18 stsp if (verbosity < 0)
1497 68999b92 2020-03-18 stsp verbosity = 0;
1498 68999b92 2020-03-18 stsp else if (verbosity < 3)
1499 68999b92 2020-03-18 stsp verbosity++;
1502 68999b92 2020-03-18 stsp verbosity = -1;
1505 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1506 0e4002ca 2020-03-21 stsp optarg, NULL);
1507 0e4002ca 2020-03-21 stsp if (error)
1508 0e4002ca 2020-03-21 stsp return error;
1511 93658fb9 2020-03-18 stsp usage_clone();
1515 93658fb9 2020-03-18 stsp argc -= optind;
1516 93658fb9 2020-03-18 stsp argv += optind;
1518 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1519 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
1520 41b0de12 2020-03-21 stsp if (list_refs_only) {
1521 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1522 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
1523 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1524 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
1525 41b0de12 2020-03-21 stsp if (mirror_references)
1526 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
1527 41b0de12 2020-03-21 stsp if (verbosity == -1)
1528 ff69268e 2020-12-13 stsp option_conflict('l', 'q');
1529 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1530 ff69268e 2020-12-13 stsp option_conflict('l', 'R');
1533 93658fb9 2020-03-18 stsp uri = argv[0];
1535 9df6f38b 2020-03-18 stsp if (argc == 1)
1536 93658fb9 2020-03-18 stsp dirname = NULL;
1537 9df6f38b 2020-03-18 stsp else if (argc == 2)
1538 93658fb9 2020-03-18 stsp dirname = argv[1];
1540 93658fb9 2020-03-18 stsp usage_clone();
1542 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1543 4dbec0a8 2020-08-27 stsp &repo_name, uri);
1544 39c64a6a 2020-03-18 stsp if (error)
1545 09f63084 2020-03-20 stsp goto done;
1547 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1548 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1549 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1550 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1551 09838ffc 2020-03-18 stsp goto done;
1554 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1555 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1556 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1557 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1558 39c64a6a 2020-03-18 stsp err(1, "pledge");
1560 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1561 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1562 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1563 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1564 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1565 39c64a6a 2020-03-18 stsp err(1, "pledge");
1567 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1568 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1569 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1570 39c64a6a 2020-03-18 stsp goto done;
1572 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1573 39c64a6a 2020-03-18 stsp goto done;
1575 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1576 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1577 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1578 bb64b798 2020-03-18 stsp goto done;
1580 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1582 bb64b798 2020-03-18 stsp repo_path = dirname;
1584 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1585 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1586 2751fe64 2020-09-24 stsp if (error &&
1587 2751fe64 2020-09-24 stsp (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1588 2751fe64 2020-09-24 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1589 41b0de12 2020-03-21 stsp goto done;
1590 2751fe64 2020-09-24 stsp if (!got_path_dir_is_empty(repo_path)) {
1591 2751fe64 2020-09-24 stsp error = got_error_path(repo_path,
1592 2751fe64 2020-09-24 stsp GOT_ERR_DIR_NOT_EMPTY);
1593 41b0de12 2020-03-21 stsp goto done;
1597 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1598 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1599 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1600 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1601 ee448f5f 2020-03-18 stsp goto done;
1604 f535bcd4 2020-09-30 stsp error = apply_unveil(repo_path, 0, NULL);
1605 ee448f5f 2020-03-18 stsp if (error)
1606 ee448f5f 2020-03-18 stsp goto done;
1608 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1609 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1610 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1612 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1613 9c52365f 2020-03-21 stsp server_path, verbosity);
1614 39c64a6a 2020-03-18 stsp if (error)
1615 bb64b798 2020-03-18 stsp goto done;
1617 2751fe64 2020-09-24 stsp if (!list_refs_only) {
1618 2751fe64 2020-09-24 stsp error = got_repo_init(repo_path);
1619 2751fe64 2020-09-24 stsp if (error)
1620 2751fe64 2020-09-24 stsp goto done;
1621 2751fe64 2020-09-24 stsp error = got_repo_open(&repo, repo_path, NULL);
1622 2751fe64 2020-09-24 stsp if (error)
1623 2751fe64 2020-09-24 stsp goto done;
1626 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1627 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1628 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1629 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1630 04d9a9ec 2020-09-24 stsp fpa.create_configs = 1;
1631 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
1632 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
1633 04d9a9ec 2020-09-24 stsp fpa.config_info.symrefs = &symrefs;
1634 04d9a9ec 2020-09-24 stsp fpa.config_info.wanted_branches = &wanted_branches;
1635 99495ddb 2021-01-10 stsp fpa.config_info.wanted_refs = &wanted_refs;
1636 04d9a9ec 2020-09-24 stsp fpa.config_info.proto = proto;
1637 04d9a9ec 2020-09-24 stsp fpa.config_info.host = host;
1638 04d9a9ec 2020-09-24 stsp fpa.config_info.port = port;
1639 04d9a9ec 2020-09-24 stsp fpa.config_info.remote_repo_path = server_path;
1640 04d9a9ec 2020-09-24 stsp fpa.config_info.git_url = git_url;
1641 04d9a9ec 2020-09-24 stsp fpa.config_info.fetch_all_branches = fetch_all_branches;
1642 04d9a9ec 2020-09-24 stsp fpa.config_info.mirror_references = mirror_references;
1643 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1644 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1645 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1646 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1647 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1648 39c64a6a 2020-03-18 stsp if (error)
1649 d9b4d0c0 2020-03-18 stsp goto done;
1651 41b0de12 2020-03-21 stsp if (list_refs_only) {
1652 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1653 41b0de12 2020-03-21 stsp goto done;
1656 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1657 39c64a6a 2020-03-18 stsp if (error)
1658 d9b4d0c0 2020-03-18 stsp goto done;
1659 68999b92 2020-03-18 stsp if (verbosity >= 0)
1660 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1661 d9b4d0c0 2020-03-18 stsp free(id_str);
1663 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1664 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1665 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1666 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1667 7ebc0570 2020-03-18 stsp char *remote_refname;
1669 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1670 0e4002ca 2020-03-21 stsp !mirror_references) {
1671 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1672 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1673 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1674 0e4002ca 2020-03-21 stsp if (error)
1675 0e4002ca 2020-03-21 stsp goto done;
1679 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1680 39c64a6a 2020-03-18 stsp if (error)
1681 d9b4d0c0 2020-03-18 stsp goto done;
1683 469dd726 2020-03-20 stsp if (mirror_references)
1686 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1689 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1690 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1691 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1692 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1693 7ebc0570 2020-03-18 stsp goto done;
1695 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1696 f298ae0f 2020-03-25 stsp free(remote_refname);
1697 39c64a6a 2020-03-18 stsp if (error)
1698 d9b4d0c0 2020-03-18 stsp goto done;
1701 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1702 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1703 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1704 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1705 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1706 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1708 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1711 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1712 39c64a6a 2020-03-18 stsp if (error) {
1713 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1714 55330abe 2020-03-20 stsp error = NULL;
1717 d9b4d0c0 2020-03-18 stsp goto done;
1720 04d9a9ec 2020-09-24 stsp error = create_symref(refname, target_ref, verbosity, repo);
1721 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1722 f298ae0f 2020-03-25 stsp if (error)
1723 f298ae0f 2020-03-25 stsp goto done;
1725 f298ae0f 2020-03-25 stsp if (mirror_references)
1728 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1731 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1732 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1733 f298ae0f 2020-03-25 stsp refname) == -1) {
1734 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1735 f298ae0f 2020-03-25 stsp goto done;
1737 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1738 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1739 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1740 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1741 f298ae0f 2020-03-25 stsp free(remote_refname);
1742 f298ae0f 2020-03-25 stsp goto done;
1744 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1745 f298ae0f 2020-03-25 stsp if (error) {
1746 f298ae0f 2020-03-25 stsp free(remote_refname);
1747 f298ae0f 2020-03-25 stsp free(remote_target);
1748 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1749 f298ae0f 2020-03-25 stsp error = NULL;
1752 f298ae0f 2020-03-25 stsp goto done;
1754 04d9a9ec 2020-09-24 stsp error = create_symref(remote_refname, target_ref,
1755 04d9a9ec 2020-09-24 stsp verbosity - 1, repo);
1756 f298ae0f 2020-03-25 stsp free(remote_refname);
1757 f298ae0f 2020-03-25 stsp free(remote_target);
1758 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1759 39c64a6a 2020-03-18 stsp if (error)
1760 d9b4d0c0 2020-03-18 stsp goto done;
1762 4ba14133 2020-03-20 stsp if (pe == NULL) {
1764 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1765 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1766 4ba14133 2020-03-20 stsp * which could be fetched instead.
1768 62d463ca 2020-10-20 naddy TAILQ_FOREACH(pe, &wanted_branches, entry) {
1769 4ba14133 2020-03-20 stsp const char *target = pe->path;
1770 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1772 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1773 4ba14133 2020-03-20 stsp if (error) {
1774 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1775 4ba14133 2020-03-20 stsp error = NULL;
1778 4ba14133 2020-03-20 stsp goto done;
1781 04d9a9ec 2020-09-24 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1782 04d9a9ec 2020-09-24 stsp verbosity, repo);
1783 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1784 4ba14133 2020-03-20 stsp if (error)
1785 4ba14133 2020-03-20 stsp goto done;
1790 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1791 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1792 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1794 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1795 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1796 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1797 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1798 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1800 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1801 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1803 bb64b798 2020-03-18 stsp got_repo_close(repo);
1804 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1805 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1806 d9b4d0c0 2020-03-18 stsp free(pe->data);
1808 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1809 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1810 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1811 d9b4d0c0 2020-03-18 stsp free(pe->data);
1813 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1814 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1815 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1816 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1817 09838ffc 2020-03-18 stsp free(proto);
1818 09838ffc 2020-03-18 stsp free(host);
1819 09838ffc 2020-03-18 stsp free(port);
1820 09838ffc 2020-03-18 stsp free(server_path);
1821 09838ffc 2020-03-18 stsp free(repo_name);
1822 bb64b798 2020-03-18 stsp free(default_destdir);
1823 b46f3e71 2020-03-18 stsp free(git_url);
1824 39c64a6a 2020-03-18 stsp return error;
1827 7848a0e1 2020-03-19 stsp static const struct got_error *
1828 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1829 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1831 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1832 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1833 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1835 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1837 7848a0e1 2020-03-19 stsp goto done;
1839 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1840 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1841 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1843 88609724 2020-03-21 stsp goto done;
1844 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1845 88609724 2020-03-21 stsp goto done;
1846 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1847 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1848 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1850 db6d8ad8 2020-03-21 stsp goto done;
1853 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1854 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1855 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1856 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1857 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1859 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1861 7848a0e1 2020-03-19 stsp goto done;
1862 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1864 e8a967e0 2020-03-21 stsp goto done;
1866 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1868 7848a0e1 2020-03-19 stsp goto done;
1869 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1870 6338a6a1 2020-03-21 stsp goto done;
1872 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1874 6338a6a1 2020-03-21 stsp goto done;
1875 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1877 6338a6a1 2020-03-21 stsp goto done;
1880 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1881 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1882 6338a6a1 2020-03-21 stsp new_id_str);
1884 7848a0e1 2020-03-19 stsp free(old_id);
1885 7848a0e1 2020-03-19 stsp free(new_id_str);
1886 7848a0e1 2020-03-19 stsp return err;
1889 f1bcca34 2020-03-25 stsp static const struct got_error *
1890 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1891 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1893 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1894 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1895 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1897 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1898 bcf34b0e 2020-03-26 stsp if (err) {
1899 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1900 bcf34b0e 2020-03-26 stsp return err;
1901 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1903 bcf34b0e 2020-03-26 stsp goto done;
1905 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1907 bcf34b0e 2020-03-26 stsp goto done;
1909 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1910 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1911 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1912 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1914 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1916 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1917 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1918 bcf34b0e 2020-03-26 stsp goto done;
1920 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1921 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1923 bcf34b0e 2020-03-26 stsp goto done;
1925 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1927 bcf34b0e 2020-03-26 stsp goto done;
1929 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1930 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1931 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1935 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1936 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1937 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1938 bcf34b0e 2020-03-26 stsp err = unlock_err;
1940 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1941 f1bcca34 2020-03-25 stsp return err;
1944 2ab43947 2020-03-18 stsp __dead static void
1945 7848a0e1 2020-03-19 stsp usage_fetch(void)
1947 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1948 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1949 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1950 13f12b09 2020-03-21 stsp getprogname());
1954 7848a0e1 2020-03-19 stsp static const struct got_error *
1955 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1956 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1958 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1959 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1960 3789fd73 2020-03-26 stsp char *id_str = NULL;
1962 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1963 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1965 3789fd73 2020-03-26 stsp return err;
1966 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1967 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1968 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1969 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1972 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1974 3789fd73 2020-03-26 stsp return err;
1975 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1977 3789fd73 2020-03-26 stsp goto done;
1979 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1981 3789fd73 2020-03-26 stsp goto done;
1982 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1983 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1984 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1989 3789fd73 2020-03-26 stsp free(id_str);
1990 3789fd73 2020-03-26 stsp return NULL;
1993 3789fd73 2020-03-26 stsp static const struct got_error *
1994 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1995 50b0790e 2020-09-11 stsp struct got_pathlist_head *their_symrefs,
1996 50b0790e 2020-09-11 stsp const struct got_remote_repo *remote,
1997 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1999 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
2000 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
2001 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
2002 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
2003 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
2004 3789fd73 2020-03-26 stsp char *local_refname = NULL;
2006 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&my_refs);
2008 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2010 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
2012 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2014 3789fd73 2020-03-26 stsp goto done;
2016 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &my_refs, entry) {
2017 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
2019 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
2020 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
2021 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
2022 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
2023 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
2025 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
2026 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
2027 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
2028 3789fd73 2020-03-26 stsp goto done;
2030 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
2034 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
2035 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
2038 f21ec2f0 2020-03-21 stsp if (pe != NULL)
2041 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
2042 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
2045 3789fd73 2020-03-26 stsp if (pe != NULL)
2048 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
2052 3789fd73 2020-03-26 stsp if (local_refname) {
2053 3789fd73 2020-03-26 stsp struct got_reference *ref;
2054 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
2055 3789fd73 2020-03-26 stsp if (err) {
2056 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
2058 3789fd73 2020-03-26 stsp free(local_refname);
2059 3789fd73 2020-03-26 stsp local_refname = NULL;
2062 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
2065 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
2066 3789fd73 2020-03-26 stsp got_ref_close(ref);
2067 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
2068 3789fd73 2020-03-26 stsp err = unlock_err;
2072 3789fd73 2020-03-26 stsp free(local_refname);
2073 3789fd73 2020-03-26 stsp local_refname = NULL;
2077 3789fd73 2020-03-26 stsp free(remote_namespace);
2078 3789fd73 2020-03-26 stsp free(local_refname);
2079 0e4002ca 2020-03-21 stsp return err;
2082 0e4002ca 2020-03-21 stsp static const struct got_error *
2083 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
2084 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
2086 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
2087 0e4002ca 2020-03-21 stsp char *remote_refname;
2088 0e4002ca 2020-03-21 stsp struct got_reference *ref;
2090 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
2091 0e4002ca 2020-03-21 stsp refname += 5;
2093 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2094 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
2095 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
2097 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
2098 0e4002ca 2020-03-21 stsp if (err) {
2099 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
2100 0e4002ca 2020-03-21 stsp goto done;
2101 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
2103 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
2104 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2105 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
2106 9f142382 2020-03-21 stsp err = unlock_err;
2107 0e4002ca 2020-03-21 stsp got_ref_close(ref);
2110 0e4002ca 2020-03-21 stsp free(remote_refname);
2111 f21ec2f0 2020-03-21 stsp return err;
2114 f21ec2f0 2020-03-21 stsp static const struct got_error *
2115 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
2117 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
2118 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
2119 7848a0e1 2020-03-19 stsp const char *remote_name;
2120 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
2121 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
2122 50b0790e 2020-09-11 stsp const struct got_remote_repo *remotes, *remote = NULL;
2123 7848a0e1 2020-03-19 stsp int nremotes;
2124 7848a0e1 2020-03-19 stsp char *id_str = NULL;
2125 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
2126 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
2127 50b0790e 2020-09-11 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2128 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2129 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
2130 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
2131 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
2132 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
2133 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
2134 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2135 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
2137 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
2138 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
2139 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
2140 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
2142 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2143 7848a0e1 2020-03-19 stsp switch (ch) {
2145 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
2148 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
2149 4ba14133 2020-03-20 stsp optarg, NULL);
2150 4ba14133 2020-03-20 stsp if (error)
2151 4ba14133 2020-03-20 stsp return error;
2154 f21ec2f0 2020-03-21 stsp delete_refs = 1;
2157 41b0de12 2020-03-21 stsp list_refs_only = 1;
2160 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
2161 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2162 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
2164 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
2167 db6d8ad8 2020-03-21 stsp replace_tags = 1;
2170 7848a0e1 2020-03-19 stsp if (verbosity < 0)
2171 7848a0e1 2020-03-19 stsp verbosity = 0;
2172 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
2173 7848a0e1 2020-03-19 stsp verbosity++;
2176 7848a0e1 2020-03-19 stsp verbosity = -1;
2179 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
2180 0e4002ca 2020-03-21 stsp optarg, NULL);
2181 0e4002ca 2020-03-21 stsp if (error)
2182 0e4002ca 2020-03-21 stsp return error;
2185 7848a0e1 2020-03-19 stsp usage_fetch();
2189 7848a0e1 2020-03-19 stsp argc -= optind;
2190 7848a0e1 2020-03-19 stsp argv += optind;
2192 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2193 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
2194 41b0de12 2020-03-21 stsp if (list_refs_only) {
2195 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
2196 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
2197 ff69268e 2020-12-13 stsp if (fetch_all_branches)
2198 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
2199 f21ec2f0 2020-03-21 stsp if (delete_refs)
2200 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
2203 7848a0e1 2020-03-19 stsp if (argc == 0)
2204 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2205 7848a0e1 2020-03-19 stsp else if (argc == 1)
2206 7848a0e1 2020-03-19 stsp remote_name = argv[0];
2208 7848a0e1 2020-03-19 stsp usage_fetch();
2210 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
2211 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
2212 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
2213 7848a0e1 2020-03-19 stsp goto done;
2216 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2217 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
2218 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2219 7848a0e1 2020-03-19 stsp goto done;
2221 7848a0e1 2020-03-19 stsp error = NULL;
2222 7848a0e1 2020-03-19 stsp if (worktree) {
2223 7848a0e1 2020-03-19 stsp repo_path =
2224 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
2225 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2226 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2227 7848a0e1 2020-03-19 stsp if (error)
2228 7848a0e1 2020-03-19 stsp goto done;
2230 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
2231 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2232 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2233 7848a0e1 2020-03-19 stsp goto done;
2238 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
2239 7848a0e1 2020-03-19 stsp if (error)
2240 7848a0e1 2020-03-19 stsp goto done;
2242 50b0790e 2020-09-11 stsp if (worktree) {
2243 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
2244 50b0790e 2020-09-11 stsp if (worktree_conf) {
2245 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2246 50b0790e 2020-09-11 stsp worktree_conf);
2247 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2248 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2249 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2255 50b0790e 2020-09-11 stsp if (remote == NULL) {
2256 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
2257 50b0790e 2020-09-11 stsp if (repo_conf) {
2258 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2259 50b0790e 2020-09-11 stsp repo_conf);
2260 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2261 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2262 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2268 50b0790e 2020-09-11 stsp if (remote == NULL) {
2269 257add31 2020-09-09 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2270 257add31 2020-09-09 stsp for (i = 0; i < nremotes; i++) {
2271 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2272 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2277 50b0790e 2020-09-11 stsp if (remote == NULL) {
2278 50b0790e 2020-09-11 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2279 50b0790e 2020-09-11 stsp goto done;
2282 0c8b29c5 2021-01-05 stsp if (TAILQ_EMPTY(&wanted_branches)) {
2283 0c8b29c5 2021-01-05 stsp if (!fetch_all_branches)
2284 0c8b29c5 2021-01-05 stsp fetch_all_branches = remote->fetch_all_branches;
2285 b8adfa55 2020-09-25 stsp for (i = 0; i < remote->nbranches; i++) {
2286 b8adfa55 2020-09-25 stsp got_pathlist_append(&wanted_branches,
2287 b8adfa55 2020-09-25 stsp remote->branches[i], NULL);
2290 99495ddb 2021-01-10 stsp if (TAILQ_EMPTY(&wanted_refs)) {
2291 99495ddb 2021-01-10 stsp for (i = 0; i < remote->nrefs; i++) {
2292 99495ddb 2021-01-10 stsp got_pathlist_append(&wanted_refs,
2293 99495ddb 2021-01-10 stsp remote->refs[i], NULL);
2297 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2298 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
2299 7848a0e1 2020-03-19 stsp if (error)
2300 7848a0e1 2020-03-19 stsp goto done;
2302 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
2303 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2304 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2305 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
2306 7848a0e1 2020-03-19 stsp err(1, "pledge");
2308 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
2309 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
2310 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2311 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2312 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
2313 7848a0e1 2020-03-19 stsp err(1, "pledge");
2315 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
2316 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
2317 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2318 7848a0e1 2020-03-19 stsp goto done;
2320 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2321 7848a0e1 2020-03-19 stsp goto done;
2324 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2325 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2326 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
2327 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
2328 7848a0e1 2020-03-19 stsp goto done;
2331 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2332 7848a0e1 2020-03-19 stsp if (error)
2333 7848a0e1 2020-03-19 stsp goto done;
2335 f79e6490 2020-04-19 stsp if (verbosity >= 0)
2336 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2337 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
2339 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2340 9c52365f 2020-03-21 stsp server_path, verbosity);
2341 7848a0e1 2020-03-19 stsp if (error)
2342 7848a0e1 2020-03-19 stsp goto done;
2344 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
2345 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
2346 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
2347 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
2348 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
2349 04d9a9ec 2020-09-24 stsp fpa.create_configs = 0;
2350 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
2351 04d9a9ec 2020-09-24 stsp memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2352 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2353 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
2354 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2355 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
2356 7848a0e1 2020-03-19 stsp if (error)
2357 7848a0e1 2020-03-19 stsp goto done;
2359 41b0de12 2020-03-21 stsp if (list_refs_only) {
2360 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
2361 41b0de12 2020-03-21 stsp goto done;
2364 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
2365 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
2366 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
2367 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
2368 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
2369 984065c8 2020-03-19 stsp if (error)
2370 984065c8 2020-03-19 stsp goto done;
2371 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
2372 984065c8 2020-03-19 stsp free(id_str);
2373 984065c8 2020-03-19 stsp id_str = NULL;
2376 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
2377 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2378 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
2379 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
2380 7848a0e1 2020-03-19 stsp struct got_reference *ref;
2381 7848a0e1 2020-03-19 stsp char *remote_refname;
2383 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
2384 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
2385 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
2386 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
2387 0e4002ca 2020-03-21 stsp if (error)
2388 0e4002ca 2020-03-21 stsp goto done;
2392 1510c839 2020-03-20 stsp if (remote->mirror_references ||
2393 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
2394 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2395 7848a0e1 2020-03-19 stsp if (error) {
2396 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2397 7848a0e1 2020-03-19 stsp goto done;
2398 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2400 7848a0e1 2020-03-19 stsp if (error)
2401 7848a0e1 2020-03-19 stsp goto done;
2403 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2404 db6d8ad8 2020-03-21 stsp verbosity, repo);
2405 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2406 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2407 9f142382 2020-03-21 stsp error = unlock_err;
2408 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2409 7848a0e1 2020-03-19 stsp if (error)
2410 7848a0e1 2020-03-19 stsp goto done;
2412 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
2413 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2414 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
2415 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
2416 7848a0e1 2020-03-19 stsp goto done;
2419 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
2420 7848a0e1 2020-03-19 stsp if (error) {
2421 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2422 7848a0e1 2020-03-19 stsp goto done;
2423 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
2424 688f11b3 2020-03-21 stsp verbosity, repo);
2425 7848a0e1 2020-03-19 stsp if (error)
2426 7848a0e1 2020-03-19 stsp goto done;
2428 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2429 db6d8ad8 2020-03-21 stsp verbosity, repo);
2430 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2431 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2432 9f142382 2020-03-21 stsp error = unlock_err;
2433 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2434 7848a0e1 2020-03-19 stsp if (error)
2435 7848a0e1 2020-03-19 stsp goto done;
2438 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2439 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2440 2ec30c80 2020-03-20 stsp if (error) {
2441 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2442 2ec30c80 2020-03-20 stsp goto done;
2443 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2445 2ec30c80 2020-03-20 stsp if (error)
2446 2ec30c80 2020-03-20 stsp goto done;
2448 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2449 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2450 9f142382 2020-03-21 stsp error = unlock_err;
2451 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2455 f1bcca34 2020-03-25 stsp if (delete_refs) {
2456 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2457 3789fd73 2020-03-26 stsp verbosity, repo);
2458 f1bcca34 2020-03-25 stsp if (error)
2459 f1bcca34 2020-03-25 stsp goto done;
2462 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2463 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2464 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2465 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2466 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2467 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2468 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2470 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2473 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2476 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2477 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2478 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2479 f1bcca34 2020-03-25 stsp goto done;
2481 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2482 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2483 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2484 f1bcca34 2020-03-25 stsp free(remote_refname);
2485 f1bcca34 2020-03-25 stsp goto done;
2488 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2490 f1bcca34 2020-03-25 stsp if (error) {
2491 f1bcca34 2020-03-25 stsp free(remote_refname);
2492 f1bcca34 2020-03-25 stsp free(remote_target);
2493 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2494 f1bcca34 2020-03-25 stsp error = NULL;
2497 f1bcca34 2020-03-25 stsp goto done;
2499 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2500 f1bcca34 2020-03-25 stsp verbosity, repo);
2501 f1bcca34 2020-03-25 stsp free(remote_refname);
2502 f1bcca34 2020-03-25 stsp free(remote_target);
2503 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2504 f1bcca34 2020-03-25 stsp if (error)
2505 f1bcca34 2020-03-25 stsp goto done;
2509 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2510 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2511 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2512 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2513 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2515 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2516 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2518 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2519 7848a0e1 2020-03-19 stsp if (worktree)
2520 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2521 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2522 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2523 7848a0e1 2020-03-19 stsp free(pe->data);
2525 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2526 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2527 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2528 7848a0e1 2020-03-19 stsp free(pe->data);
2530 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2531 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2532 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2533 7848a0e1 2020-03-19 stsp free(id_str);
2534 7848a0e1 2020-03-19 stsp free(cwd);
2535 7848a0e1 2020-03-19 stsp free(repo_path);
2536 7848a0e1 2020-03-19 stsp free(pack_hash);
2537 7848a0e1 2020-03-19 stsp free(proto);
2538 7848a0e1 2020-03-19 stsp free(host);
2539 7848a0e1 2020-03-19 stsp free(port);
2540 7848a0e1 2020-03-19 stsp free(server_path);
2541 7848a0e1 2020-03-19 stsp free(repo_name);
2542 7848a0e1 2020-03-19 stsp return error;
2546 7848a0e1 2020-03-19 stsp __dead static void
2547 2ab43947 2020-03-18 stsp usage_checkout(void)
2549 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2550 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2554 2ab43947 2020-03-18 stsp static void
2555 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2557 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2558 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2559 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2560 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2561 2ab43947 2020-03-18 stsp getprogname());
2564 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2565 2ab43947 2020-03-18 stsp const char *worktree_path;
2566 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2569 2ab43947 2020-03-18 stsp static const struct got_error *
2570 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2572 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2574 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2575 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2576 2ab43947 2020-03-18 stsp return NULL;
2578 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2579 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2580 2ab43947 2020-03-18 stsp return NULL;
2583 2ab43947 2020-03-18 stsp while (path[0] == '/')
2586 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2587 2ab43947 2020-03-18 stsp return NULL;
2590 2ab43947 2020-03-18 stsp static const struct got_error *
2591 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2593 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2594 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2595 2ab43947 2020-03-18 stsp return NULL;
2598 2ab43947 2020-03-18 stsp static const struct got_error *
2599 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2600 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2601 2ab43947 2020-03-18 stsp struct got_repository *repo)
2603 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2604 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2606 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2607 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2609 2ab43947 2020-03-18 stsp return err;
2611 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2612 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2615 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2616 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2618 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2620 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2628 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2629 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2630 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2632 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2633 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2634 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2635 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2636 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2637 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2639 2ab43947 2020-03-18 stsp free(yca_id);
2640 2ab43947 2020-03-18 stsp return NULL;
2643 2ab43947 2020-03-18 stsp static const struct got_error *
2644 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2645 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2646 2ab43947 2020-03-18 stsp struct got_repository *repo)
2648 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2649 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2650 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2651 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2653 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2655 2ab43947 2020-03-18 stsp goto done;
2657 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2658 2ab43947 2020-03-18 stsp is_same_branch = 1;
2659 2ab43947 2020-03-18 stsp goto done;
2661 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2662 2ab43947 2020-03-18 stsp is_same_branch = 1;
2663 2ab43947 2020-03-18 stsp goto done;
2666 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2668 2ab43947 2020-03-18 stsp goto done;
2670 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2671 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2673 2ab43947 2020-03-18 stsp goto done;
2675 2ab43947 2020-03-18 stsp for (;;) {
2676 2ab43947 2020-03-18 stsp struct got_object_id *id;
2677 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2678 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2679 2ab43947 2020-03-18 stsp if (err) {
2680 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2681 2ab43947 2020-03-18 stsp err = NULL;
2686 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2688 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2689 2ab43947 2020-03-18 stsp is_same_branch = 1;
2695 2ab43947 2020-03-18 stsp if (graph)
2696 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2697 2ab43947 2020-03-18 stsp free(head_commit_id);
2698 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2699 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2700 2ab43947 2020-03-18 stsp return err;
2703 4ed7e80c 2018-05-20 stsp static const struct got_error *
2704 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2706 4b6c9460 2020-03-05 stsp static char msg[512];
2707 4b6c9460 2020-03-05 stsp const char *branch_name;
2709 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2710 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2712 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2714 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2715 4b6c9460 2020-03-05 stsp branch_name += 11;
2717 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2718 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2719 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2720 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2721 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2722 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2724 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2727 4b6c9460 2020-03-05 stsp static const struct got_error *
2728 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2730 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2731 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2732 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2733 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2734 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2735 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2736 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2737 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2738 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2739 f0207f6a 2020-10-19 stsp char *cwd = NULL;
2740 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2741 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2742 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2744 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2746 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2747 0bb8a95e 2018-03-12 stsp switch (ch) {
2749 08573d5b 2019-05-14 stsp branch_name = optarg;
2752 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2753 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2754 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2757 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2760 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2763 2deda0b9 2019-03-07 stsp usage_checkout();
2764 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2768 0bb8a95e 2018-03-12 stsp argc -= optind;
2769 0bb8a95e 2018-03-12 stsp argv += optind;
2771 6715a751 2018-03-16 stsp #ifndef PROFILE
2772 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2773 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2774 c09a553d 2018-03-12 stsp err(1, "pledge");
2776 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2777 c47340da 2020-09-20 stsp char *base, *dotgit;
2778 f0207f6a 2020-10-19 stsp const char *path;
2779 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2780 76089277 2018-04-01 stsp if (repo_path == NULL)
2781 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2782 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2783 76089277 2018-04-01 stsp if (cwd == NULL) {
2784 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2785 76089277 2018-04-01 stsp goto done;
2787 c47340da 2020-09-20 stsp if (path_prefix[0])
2788 f0207f6a 2020-10-19 stsp path = path_prefix;
2790 f0207f6a 2020-10-19 stsp path = repo_path;
2791 f0207f6a 2020-10-19 stsp error = got_path_basename(&base, path);
2792 f0207f6a 2020-10-19 stsp if (error)
2793 c47340da 2020-09-20 stsp goto done;
2794 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2795 c09a553d 2018-03-12 stsp if (dotgit)
2796 c09a553d 2018-03-12 stsp *dotgit = '\0';
2797 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2798 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2799 f0207f6a 2020-10-19 stsp free(base);
2800 76089277 2018-04-01 stsp goto done;
2802 f0207f6a 2020-10-19 stsp free(base);
2803 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2804 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2805 76089277 2018-04-01 stsp if (repo_path == NULL) {
2806 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2807 76089277 2018-04-01 stsp goto done;
2809 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2810 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2811 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2812 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2814 b4b3a7dd 2019-07-22 stsp goto done;
2816 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2817 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2818 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2819 b4b3a7dd 2019-07-22 stsp goto done;
2823 c09a553d 2018-03-12 stsp usage_checkout();
2825 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2826 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2828 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2829 c09a553d 2018-03-12 stsp if (error != NULL)
2830 c02c541e 2019-03-29 stsp goto done;
2832 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2833 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2834 c530dc23 2019-07-23 stsp if (error) {
2835 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2836 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2837 c530dc23 2019-07-23 stsp goto done;
2838 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2839 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2840 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2841 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2842 c530dc23 2019-07-23 stsp goto done;
2846 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2847 c02c541e 2019-03-29 stsp if (error)
2848 c09a553d 2018-03-12 stsp goto done;
2850 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2851 c09a553d 2018-03-12 stsp if (error != NULL)
2852 c09a553d 2018-03-12 stsp goto done;
2854 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2855 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2856 c09a553d 2018-03-12 stsp goto done;
2858 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2859 c09a553d 2018-03-12 stsp if (error != NULL)
2860 c09a553d 2018-03-12 stsp goto done;
2862 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2863 e5dc7198 2018-12-29 stsp path_prefix);
2864 e5dc7198 2018-12-29 stsp if (error != NULL)
2865 e5dc7198 2018-12-29 stsp goto done;
2866 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2867 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2868 49520a32 2018-12-29 stsp goto done;
2871 8069f636 2019-01-12 stsp if (commit_id_str) {
2872 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2873 84de9106 2020-12-26 stsp struct got_reflist_head refs;
2874 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
2875 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2877 84de9106 2020-12-26 stsp if (error)
2878 84de9106 2020-12-26 stsp goto done;
2879 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2880 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2881 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
2882 30837e32 2019-07-25 stsp if (error)
2883 8069f636 2019-01-12 stsp goto done;
2884 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2885 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2886 8069f636 2019-01-12 stsp if (error != NULL) {
2887 8069f636 2019-01-12 stsp free(commit_id);
2888 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2889 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2890 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2892 8069f636 2019-01-12 stsp goto done;
2894 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2895 4b6c9460 2020-03-05 stsp if (error) {
2896 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2897 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2898 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2900 45d344f6 2019-05-14 stsp goto done;
2902 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2903 8069f636 2019-01-12 stsp commit_id);
2904 8069f636 2019-01-12 stsp free(commit_id);
2905 8069f636 2019-01-12 stsp if (error)
2906 8069f636 2019-01-12 stsp goto done;
2909 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2910 f2ea84fa 2019-07-27 stsp if (error)
2911 f2ea84fa 2019-07-27 stsp goto done;
2912 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2913 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2914 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2915 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2916 c09a553d 2018-03-12 stsp if (error != NULL)
2917 c09a553d 2018-03-12 stsp goto done;
2919 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2920 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2921 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2923 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2924 8069f636 2019-01-12 stsp free(commit_id_str);
2925 76089277 2018-04-01 stsp free(repo_path);
2926 507dc3bb 2018-12-29 stsp free(worktree_path);
2927 c47340da 2020-09-20 stsp free(cwd);
2928 507dc3bb 2018-12-29 stsp return error;
2931 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2932 9627c110 2020-04-18 stsp int did_something;
2933 9627c110 2020-04-18 stsp int conflicts;
2934 9627c110 2020-04-18 stsp int obstructed;
2935 9627c110 2020-04-18 stsp int not_updated;
2939 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2941 9627c110 2020-04-18 stsp if (!upa->did_something)
2944 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2945 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2946 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2947 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2948 9627c110 2020-04-18 stsp upa->obstructed);
2949 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2950 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2951 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2954 507dc3bb 2018-12-29 stsp __dead static void
2955 507dc3bb 2018-12-29 stsp usage_update(void)
2957 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2958 507dc3bb 2018-12-29 stsp getprogname());
2962 1ee397ad 2019-07-12 stsp static const struct got_error *
2963 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2965 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2967 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2968 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2969 1ee397ad 2019-07-12 stsp return NULL;
2971 9627c110 2020-04-18 stsp upa->did_something = 1;
2973 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2974 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2975 1ee397ad 2019-07-12 stsp return NULL;
2977 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2978 9627c110 2020-04-18 stsp upa->conflicts++;
2979 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2980 9627c110 2020-04-18 stsp upa->obstructed++;
2981 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2982 9627c110 2020-04-18 stsp upa->not_updated++;
2984 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2986 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2987 1ee397ad 2019-07-12 stsp return NULL;
2990 be7061eb 2018-12-30 stsp static const struct got_error *
2991 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2992 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2993 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2995 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2996 a1fb16d8 2019-05-24 stsp char *base_id_str;
2997 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2999 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
3000 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
3001 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
3002 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
3003 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
3004 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
3005 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
3008 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
3009 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3010 a1fb16d8 2019-05-24 stsp if (err) {
3011 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
3012 a1fb16d8 2019-05-24 stsp return err;
3013 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
3015 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
3016 a1fb16d8 2019-05-24 stsp return NULL;
3018 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
3019 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
3020 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
3022 a1fb16d8 2019-05-24 stsp return err;
3023 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
3024 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
3025 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
3026 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
3027 0ebf8283 2019-07-24 stsp return NULL;
3030 0ebf8283 2019-07-24 stsp static const struct got_error *
3031 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3033 0ebf8283 2019-07-24 stsp const struct got_error *err;
3034 0ebf8283 2019-07-24 stsp int in_progress;
3036 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
3038 0ebf8283 2019-07-24 stsp return err;
3039 0ebf8283 2019-07-24 stsp if (in_progress)
3040 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
3042 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
3044 0ebf8283 2019-07-24 stsp return err;
3045 0ebf8283 2019-07-24 stsp if (in_progress)
3046 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
3048 a1fb16d8 2019-05-24 stsp return NULL;
3051 a5edda0a 2019-07-27 stsp static const struct got_error *
3052 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3053 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
3055 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
3056 a5edda0a 2019-07-27 stsp char *path;
3059 a5edda0a 2019-07-27 stsp if (argc == 0) {
3060 a5edda0a 2019-07-27 stsp path = strdup("");
3061 a5edda0a 2019-07-27 stsp if (path == NULL)
3062 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
3063 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
3066 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
3067 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
3070 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
3071 a5edda0a 2019-07-27 stsp if (err) {
3072 a5edda0a 2019-07-27 stsp free(path);
3077 a5edda0a 2019-07-27 stsp return err;
3080 a1fb16d8 2019-05-24 stsp static const struct got_error *
3081 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
3082 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
3084 fa51e947 2020-03-27 stsp const struct got_error *err;
3085 fa51e947 2020-03-27 stsp struct got_repository *repo;
3086 fa51e947 2020-03-27 stsp static char msg[512];
3088 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
3090 fa51e947 2020-03-27 stsp return orig_err;
3092 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
3093 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
3094 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
3095 fa51e947 2020-03-27 stsp "'got checkout'.\n"
3096 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
3097 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3098 fa51e947 2020-03-27 stsp got_repo_close(repo);
3099 fa51e947 2020-03-27 stsp return err;
3102 fa51e947 2020-03-27 stsp static const struct got_error *
3103 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
3105 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
3106 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
3107 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
3108 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
3109 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
3110 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
3111 024e9686 2019-05-14 stsp const char *branch_name = NULL;
3112 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
3113 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
3114 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
3116 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
3118 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
3120 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
3121 507dc3bb 2018-12-29 stsp switch (ch) {
3123 024e9686 2019-05-14 stsp branch_name = optarg;
3126 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
3127 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
3128 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3131 2deda0b9 2019-03-07 stsp usage_update();
3132 507dc3bb 2018-12-29 stsp /* NOTREACHED */
3136 507dc3bb 2018-12-29 stsp argc -= optind;
3137 507dc3bb 2018-12-29 stsp argv += optind;
3139 507dc3bb 2018-12-29 stsp #ifndef PROFILE
3140 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3141 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
3142 507dc3bb 2018-12-29 stsp err(1, "pledge");
3144 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
3145 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
3146 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3147 c4cdcb68 2019-04-03 stsp goto done;
3149 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
3150 fa51e947 2020-03-27 stsp if (error) {
3151 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3152 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
3153 fa51e947 2020-03-27 stsp worktree_path);
3154 7d5807f4 2019-07-11 stsp goto done;
3157 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
3158 f2ea84fa 2019-07-27 stsp if (error)
3159 f2ea84fa 2019-07-27 stsp goto done;
3161 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3163 507dc3bb 2018-12-29 stsp if (error != NULL)
3164 507dc3bb 2018-12-29 stsp goto done;
3166 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3167 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3168 087fb88c 2019-08-04 stsp if (error)
3169 087fb88c 2019-08-04 stsp goto done;
3171 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3172 0266afb7 2019-01-04 stsp if (error)
3173 0266afb7 2019-01-04 stsp goto done;
3175 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3176 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
3177 024e9686 2019-05-14 stsp if (error != NULL)
3178 024e9686 2019-05-14 stsp goto done;
3179 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
3180 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3181 9c4b8182 2019-01-02 stsp if (error != NULL)
3182 9c4b8182 2019-01-02 stsp goto done;
3183 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3184 507dc3bb 2018-12-29 stsp if (error != NULL)
3185 507dc3bb 2018-12-29 stsp goto done;
3187 84de9106 2020-12-26 stsp struct got_reflist_head refs;
3188 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3189 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3191 84de9106 2020-12-26 stsp if (error)
3192 84de9106 2020-12-26 stsp goto done;
3193 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3194 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3195 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
3196 04f57cb3 2019-07-25 stsp free(commit_id_str);
3197 bb787f09 2019-07-25 stsp commit_id_str = NULL;
3198 30837e32 2019-07-25 stsp if (error)
3199 a297e751 2019-07-11 stsp goto done;
3200 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
3201 a297e751 2019-07-11 stsp if (error)
3202 507dc3bb 2018-12-29 stsp goto done;
3205 a1fb16d8 2019-05-24 stsp if (branch_name) {
3206 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
3207 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
3208 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
3210 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3211 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
3212 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
3213 024e9686 2019-05-14 stsp goto done;
3215 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
3216 024e9686 2019-05-14 stsp if (error)
3217 024e9686 2019-05-14 stsp goto done;
3218 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
3220 a367ff0f 2019-05-14 stsp free(head_commit_id);
3221 024e9686 2019-05-14 stsp if (error != NULL)
3222 024e9686 2019-05-14 stsp goto done;
3223 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3224 a367ff0f 2019-05-14 stsp if (error)
3225 a367ff0f 2019-05-14 stsp goto done;
3226 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
3227 024e9686 2019-05-14 stsp if (error)
3228 024e9686 2019-05-14 stsp goto done;
3230 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
3231 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3232 a367ff0f 2019-05-14 stsp if (error != NULL) {
3233 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
3234 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
3235 024e9686 2019-05-14 stsp goto done;
3237 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3238 a367ff0f 2019-05-14 stsp if (error)
3239 a367ff0f 2019-05-14 stsp goto done;
3242 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3243 507dc3bb 2018-12-29 stsp commit_id) != 0) {
3244 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3245 507dc3bb 2018-12-29 stsp commit_id);
3246 507dc3bb 2018-12-29 stsp if (error)
3247 507dc3bb 2018-12-29 stsp goto done;
3250 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
3251 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3252 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
3253 507dc3bb 2018-12-29 stsp if (error != NULL)
3254 507dc3bb 2018-12-29 stsp goto done;
3256 9627c110 2020-04-18 stsp if (upa.did_something)
3257 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
3259 784955db 2019-01-12 stsp printf("Already up-to-date\n");
3260 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
3262 c09a553d 2018-03-12 stsp free(worktree_path);
3263 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3264 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
3265 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3266 507dc3bb 2018-12-29 stsp free(commit_id);
3267 9c4b8182 2019-01-02 stsp free(commit_id_str);
3268 c09a553d 2018-03-12 stsp return error;
3271 f42b1b34 2018-03-12 stsp static const struct got_error *
3272 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3273 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3274 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3276 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
3277 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3279 44392932 2019-08-25 stsp if (blob_id1) {
3280 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3282 44392932 2019-08-25 stsp goto done;
3285 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3287 44392932 2019-08-25 stsp goto done;
3289 44392932 2019-08-25 stsp while (path[0] == '/')
3291 fe621944 2020-11-10 stsp err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3292 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, stdout);
3294 44392932 2019-08-25 stsp if (blob1)
3295 44392932 2019-08-25 stsp got_object_blob_close(blob1);
3296 44392932 2019-08-25 stsp got_object_blob_close(blob2);
3297 44392932 2019-08-25 stsp return err;
3300 44392932 2019-08-25 stsp static const struct got_error *
3301 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3302 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3303 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3305 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3306 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3307 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
3309 44392932 2019-08-25 stsp if (tree_id1) {
3310 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3312 44392932 2019-08-25 stsp goto done;
3315 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3317 0f2b3dca 2018-12-22 stsp goto done;
3319 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
3320 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3321 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
3322 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3323 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
3324 fe621944 2020-11-10 stsp arg.nlines = 0;
3325 44392932 2019-08-25 stsp while (path[0] == '/')
3327 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3328 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3330 79109fed 2018-03-27 stsp if (tree1)
3331 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3332 366e0a5f 2019-10-10 stsp if (tree2)
3333 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3334 44392932 2019-08-25 stsp return err;
3337 44392932 2019-08-25 stsp static const struct got_error *
3338 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3339 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3341 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3342 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3343 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3344 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3346 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3347 0208f208 2020-05-05 stsp if (qid != NULL) {
3348 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3349 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3352 0208f208 2020-05-05 stsp return err;
3354 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3355 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3359 0208f208 2020-05-05 stsp if (tree_id1) {
3360 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3362 0208f208 2020-05-05 stsp goto done;
3365 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3366 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3368 0208f208 2020-05-05 stsp goto done;
3370 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3371 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3373 0208f208 2020-05-05 stsp if (tree1)
3374 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3375 0208f208 2020-05-05 stsp if (tree2)
3376 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3377 0208f208 2020-05-05 stsp return err;
3380 0208f208 2020-05-05 stsp static const struct got_error *
3381 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3382 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3384 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3385 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3386 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3387 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3388 44392932 2019-08-25 stsp struct got_object_qid *qid;
3390 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3391 44392932 2019-08-25 stsp if (qid != NULL) {
3392 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3395 44392932 2019-08-25 stsp return err;
3398 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3399 44392932 2019-08-25 stsp int obj_type;
3400 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3402 44392932 2019-08-25 stsp goto done;
3403 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3404 44392932 2019-08-25 stsp if (err) {
3405 44392932 2019-08-25 stsp free(obj_id2);
3406 44392932 2019-08-25 stsp goto done;
3408 44392932 2019-08-25 stsp if (pcommit) {
3409 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3410 44392932 2019-08-25 stsp qid->id, path);
3411 44392932 2019-08-25 stsp if (err) {
3412 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3413 2e8c69d1 2020-05-04 stsp free(obj_id2);
3414 2e8c69d1 2020-05-04 stsp goto done;
3417 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3418 2e8c69d1 2020-05-04 stsp if (err) {
3419 2e8c69d1 2020-05-04 stsp free(obj_id2);
3420 2e8c69d1 2020-05-04 stsp goto done;
3424 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3425 44392932 2019-08-25 stsp if (err) {
3426 44392932 2019-08-25 stsp free(obj_id2);
3427 44392932 2019-08-25 stsp goto done;
3429 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3430 44392932 2019-08-25 stsp switch (obj_type) {
3431 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3432 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3433 64453f7e 2020-11-21 stsp 0, 0, repo);
3435 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3436 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3437 64453f7e 2020-11-21 stsp 0, 0, repo);
3440 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3443 44392932 2019-08-25 stsp free(obj_id1);
3444 44392932 2019-08-25 stsp free(obj_id2);
3446 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3447 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3449 44392932 2019-08-25 stsp goto done;
3450 579bd556 2020-10-24 stsp if (pcommit) {
3451 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3452 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3454 579bd556 2020-10-24 stsp goto done;
3456 64453f7e 2020-11-21 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3458 64453f7e 2020-11-21 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3462 0f2b3dca 2018-12-22 stsp free(id_str1);
3463 0f2b3dca 2018-12-22 stsp free(id_str2);
3464 44392932 2019-08-25 stsp if (pcommit)
3465 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3466 79109fed 2018-03-27 stsp return err;
3469 4bb494d5 2018-06-16 stsp static char *
3470 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3472 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3473 09867e48 2019-08-13 stsp char *p, *s;
3475 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3476 09867e48 2019-08-13 stsp if (tm == NULL)
3477 09867e48 2019-08-13 stsp return NULL;
3478 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3479 09867e48 2019-08-13 stsp if (s == NULL)
3480 09867e48 2019-08-13 stsp return NULL;
3481 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3483 6c281f94 2018-06-11 stsp *p = '\0';
3487 6841bf13 2019-11-29 kn static const struct got_error *
3488 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3489 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3491 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3492 6841bf13 2019-11-29 kn regmatch_t regmatch;
3493 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3495 6841bf13 2019-11-29 kn *have_match = 0;
3497 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3501 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3505 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3506 6841bf13 2019-11-29 kn *have_match = 1;
3508 6841bf13 2019-11-29 kn free(id_str);
3509 6841bf13 2019-11-29 kn free(logmsg);
3513 0208f208 2020-05-05 stsp static void
3514 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3515 0208f208 2020-05-05 stsp regex_t *regex)
3517 0208f208 2020-05-05 stsp regmatch_t regmatch;
3518 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3520 0208f208 2020-05-05 stsp *have_match = 0;
3522 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3523 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3524 0208f208 2020-05-05 stsp *have_match = 1;
3530 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3532 888b7d99 2020-12-26 stsp static const struct got_error*
3533 888b7d99 2020-12-26 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
3534 888b7d99 2020-12-26 stsp struct got_object_id *id, struct got_repository *repo)
3536 888b7d99 2020-12-26 stsp static const struct got_error *err = NULL;
3537 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3539 888b7d99 2020-12-26 stsp const char *name;
3541 888b7d99 2020-12-26 stsp *refs_str = NULL;
3543 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
3544 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3545 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3548 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3549 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3551 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3552 199a4027 2019-02-02 stsp name += 5;
3553 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3555 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3556 e34f9ed6 2019-02-02 stsp name += 6;
3557 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3558 141c2bff 2019-02-04 stsp name += 8;
3559 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3560 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3563 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3566 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3567 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3568 5d844a1e 2019-08-13 stsp if (err) {
3569 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3570 48cae60d 2020-09-22 stsp free(ref_id);
3573 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3574 5d844a1e 2019-08-13 stsp err = NULL;
3575 5d844a1e 2019-08-13 stsp tag = NULL;
3578 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3579 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3580 48cae60d 2020-09-22 stsp free(ref_id);
3582 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3583 a436ad14 2019-08-13 stsp if (cmp != 0)
3585 888b7d99 2020-12-26 stsp s = *refs_str;
3586 888b7d99 2020-12-26 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
3587 888b7d99 2020-12-26 stsp s ? ", " : "", name) == -1) {
3588 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3590 888b7d99 2020-12-26 stsp *refs_str = NULL;
3596 888b7d99 2020-12-26 stsp return err;
3599 888b7d99 2020-12-26 stsp static const struct got_error *
3600 888b7d99 2020-12-26 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3601 888b7d99 2020-12-26 stsp struct got_repository *repo, const char *path,
3602 888b7d99 2020-12-26 stsp struct got_pathlist_head *changed_paths, int show_patch,
3603 888b7d99 2020-12-26 stsp int diff_context, struct got_reflist_object_id_map *refs_idmap)
3605 888b7d99 2020-12-26 stsp const struct got_error *err = NULL;
3606 888b7d99 2020-12-26 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3607 888b7d99 2020-12-26 stsp char datebuf[26];
3608 888b7d99 2020-12-26 stsp time_t committer_time;
3609 888b7d99 2020-12-26 stsp const char *author, *committer;
3610 888b7d99 2020-12-26 stsp char *refs_str = NULL;
3611 888b7d99 2020-12-26 stsp struct got_reflist_head *refs;
3613 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3615 8bf5b3c9 2018-03-17 stsp return err;
3617 888b7d99 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3618 888b7d99 2020-12-26 stsp if (refs) {
3619 888b7d99 2020-12-26 stsp err = build_refs_str(&refs_str, refs, id, repo);
3621 888b7d99 2020-12-26 stsp goto done;
3624 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3625 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3626 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3627 832c249c 2018-06-10 stsp free(id_str);
3628 d3d493d7 2019-02-21 stsp id_str = NULL;
3629 d3d493d7 2019-02-21 stsp free(refs_str);
3630 d3d493d7 2019-02-21 stsp refs_str = NULL;
3631 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3632 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3633 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3634 09867e48 2019-08-13 stsp if (datestr)
3635 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3636 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3637 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3638 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3639 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3640 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3641 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3642 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3643 3fe1abad 2018-06-10 stsp int n = 1;
3644 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3645 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3646 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3648 888b7d99 2020-12-26 stsp goto done;
3649 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3650 a0603db2 2018-06-10 stsp free(id_str);
3651 888b7d99 2020-12-26 stsp id_str = NULL;
3655 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3657 888b7d99 2020-12-26 stsp goto done;
3659 621015ac 2018-07-23 stsp logmsg = logmsg0;
3661 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3663 832c249c 2018-06-10 stsp printf(" %s\n", line);
3664 832c249c 2018-06-10 stsp } while (line);
3665 621015ac 2018-07-23 stsp free(logmsg0);
3667 0208f208 2020-05-05 stsp if (changed_paths) {
3668 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3669 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3670 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3671 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3673 0208f208 2020-05-05 stsp printf("\n");
3675 971751ac 2018-03-27 stsp if (show_patch) {
3676 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3677 971751ac 2018-03-27 stsp if (err == 0)
3678 971751ac 2018-03-27 stsp printf("\n");
3681 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3682 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3684 888b7d99 2020-12-26 stsp free(id_str);
3685 888b7d99 2020-12-26 stsp free(refs_str);
3686 07862c20 2018-09-15 stsp return err;
3689 f42b1b34 2018-03-12 stsp static const struct got_error *
3690 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3691 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3692 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3693 888b7d99 2020-12-26 stsp int log_branches, int reverse_display_order,
3694 888b7d99 2020-12-26 stsp struct got_reflist_object_id_map *refs_idmap)
3696 f42b1b34 2018-03-12 stsp const struct got_error *err;
3697 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3698 6841bf13 2019-11-29 kn regex_t regex;
3699 6841bf13 2019-11-29 kn int have_match;
3700 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3701 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3702 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3703 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3704 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3706 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3707 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3709 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3710 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3711 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3713 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3715 f42b1b34 2018-03-12 stsp return err;
3716 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3717 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3719 fcc85cad 2018-07-22 stsp goto done;
3721 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3723 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3726 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3727 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3728 372ccdbb 2018-06-10 stsp if (err) {
3729 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3730 9ba79e04 2018-06-11 stsp err = NULL;
3733 b43fbaa0 2018-06-11 stsp if (id == NULL)
3736 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3740 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3741 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3746 6841bf13 2019-11-29 kn if (search_pattern) {
3747 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3749 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3752 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3753 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3754 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3755 6841bf13 2019-11-29 kn if (have_match == 0) {
3756 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3757 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3758 0208f208 2020-05-05 stsp free((char *)pe->path);
3759 0208f208 2020-05-05 stsp free(pe->data);
3761 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3766 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3767 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3770 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3771 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3773 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3774 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3775 888b7d99 2020-12-26 stsp show_patch, diff_context, refs_idmap);
3776 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3780 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3781 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3784 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3785 0208f208 2020-05-05 stsp free((char *)pe->path);
3786 0208f208 2020-05-05 stsp free(pe->data);
3788 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3790 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3791 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3792 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3795 502b9684 2020-07-31 stsp if (show_changed_paths) {
3796 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
3797 502b9684 2020-07-31 stsp commit, repo);
3801 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3802 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3803 888b7d99 2020-12-26 stsp show_patch, diff_context, refs_idmap);
3804 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3807 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3808 502b9684 2020-07-31 stsp free((char *)pe->path);
3809 502b9684 2020-07-31 stsp free(pe->data);
3811 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
3815 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3816 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3817 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3818 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3820 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3821 0208f208 2020-05-05 stsp free((char *)pe->path);
3822 0208f208 2020-05-05 stsp free(pe->data);
3824 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3825 6841bf13 2019-11-29 kn if (search_pattern)
3826 6841bf13 2019-11-29 kn regfree(®ex);
3827 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3828 f42b1b34 2018-03-12 stsp return err;
3831 4ed7e80c 2018-05-20 stsp __dead static void
3832 6f3d1eb0 2018-03-12 stsp usage_log(void)
3834 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3835 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3836 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3840 b1ebc001 2019-08-13 stsp static int
3841 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3843 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3844 b1ebc001 2019-08-13 stsp long long n;
3845 b1ebc001 2019-08-13 stsp const char *errstr;
3847 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3848 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3850 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3851 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3856 4ed7e80c 2018-05-20 stsp static const struct got_error *
3857 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3859 f42b1b34 2018-03-12 stsp const struct got_error *error;
3860 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3861 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3862 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3863 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3864 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3865 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3866 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3867 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3868 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3869 64a96a6d 2018-04-01 stsp const char *errstr;
3870 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3871 888b7d99 2020-12-26 stsp struct got_reflist_object_id_map *refs_idmap = NULL;
3873 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3875 6715a751 2018-03-16 stsp #ifndef PROFILE
3876 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3879 f42b1b34 2018-03-12 stsp err(1, "pledge");
3882 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3884 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3885 79109fed 2018-03-27 stsp switch (ch) {
3887 79109fed 2018-03-27 stsp show_patch = 1;
3890 0208f208 2020-05-05 stsp show_changed_paths = 1;
3893 d142fc45 2018-04-01 stsp start_commit = optarg;
3896 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3898 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3899 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3902 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3903 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3904 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3907 48c8c60d 2020-01-27 stsp log_branches = 1;
3910 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3911 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3912 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3914 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3917 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3920 6841bf13 2019-11-29 kn search_pattern = optarg;
3923 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3926 2deda0b9 2019-03-07 stsp usage_log();
3927 79109fed 2018-03-27 stsp /* NOTREACHED */
3931 79109fed 2018-03-27 stsp argc -= optind;
3932 79109fed 2018-03-27 stsp argv += optind;
3934 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3935 dc1edbfa 2019-11-29 kn diff_context = 3;
3936 dc1edbfa 2019-11-29 kn else if (!show_patch)
3937 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
3939 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3940 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3941 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3942 04ca23f4 2018-07-16 stsp goto done;
3945 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3946 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3947 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3948 50f2fada 2020-04-24 stsp goto done;
3949 50f2fada 2020-04-24 stsp error = NULL;
3952 603cdeb0 2020-10-22 stsp if (argc == 1) {
3953 e7301579 2019-03-18 stsp if (worktree) {
3954 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3956 e7301579 2019-03-18 stsp if (error)
3957 e7301579 2019-03-18 stsp goto done;
3959 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3960 e7301579 2019-03-18 stsp if (path == NULL) {
3961 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3962 e7301579 2019-03-18 stsp goto done;
3965 603cdeb0 2020-10-22 stsp } else if (argc != 0)
3966 cbd1af7a 2019-03-18 stsp usage_log();
3968 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3969 5486daa2 2019-05-11 stsp repo_path = worktree ?
3970 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3972 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3973 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3974 cffc0aa4 2019-02-05 stsp goto done;
3977 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3978 d7d4f210 2018-03-12 stsp if (error != NULL)
3979 04ca23f4 2018-07-16 stsp goto done;
3981 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3982 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3983 c02c541e 2019-03-29 stsp if (error)
3984 c02c541e 2019-03-29 stsp goto done;
3986 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3987 84de9106 2020-12-26 stsp if (error)
3988 84de9106 2020-12-26 stsp goto done;
3990 888b7d99 2020-12-26 stsp error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
3991 888b7d99 2020-12-26 stsp if (error)
3992 888b7d99 2020-12-26 stsp goto done;
3994 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3995 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3996 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3997 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3998 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3999 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
4000 3235492e 2018-04-01 stsp if (error != NULL)
4001 d1fe46f9 2020-04-18 stsp goto done;
4002 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
4003 3235492e 2018-04-01 stsp got_ref_close(head_ref);
4004 3235492e 2018-04-01 stsp if (error != NULL)
4005 d1fe46f9 2020-04-18 stsp goto done;
4006 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
4007 d1fe46f9 2020-04-18 stsp start_id);
4008 d1fe46f9 2020-04-18 stsp if (error != NULL)
4009 d1fe46f9 2020-04-18 stsp goto done;
4010 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
4012 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&start_id, NULL,
4013 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4014 d1fe46f9 2020-04-18 stsp if (error != NULL)
4015 d1fe46f9 2020-04-18 stsp goto done;
4017 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
4018 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&end_id, NULL,
4019 84de9106 2020-12-26 stsp end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4020 d1fe46f9 2020-04-18 stsp if (error != NULL)
4021 d1fe46f9 2020-04-18 stsp goto done;
4024 deeabeae 2019-08-27 stsp if (worktree) {
4026 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
4027 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
4028 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
4030 603cdeb0 2020-10-22 stsp if (path) {
4031 603cdeb0 2020-10-22 stsp const char *prefix;
4032 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
4033 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4034 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
4035 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
4036 603cdeb0 2020-10-22 stsp goto done;
4040 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
4041 8fa913ec 2020-11-14 stsp path ? path : "");
4042 04ca23f4 2018-07-16 stsp if (error != NULL)
4043 04ca23f4 2018-07-16 stsp goto done;
4044 04ca23f4 2018-07-16 stsp if (in_repo_path) {
4045 04ca23f4 2018-07-16 stsp free(path);
4046 04ca23f4 2018-07-16 stsp path = in_repo_path;
4049 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
4050 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
4051 888b7d99 2020-12-26 stsp limit, log_branches, reverse_display_order, refs_idmap);
4053 04ca23f4 2018-07-16 stsp free(path);
4054 04ca23f4 2018-07-16 stsp free(repo_path);
4055 04ca23f4 2018-07-16 stsp free(cwd);
4056 cffc0aa4 2019-02-05 stsp if (worktree)
4057 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
4058 ad242220 2018-09-08 stsp if (repo) {
4059 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4060 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4061 ad242220 2018-09-08 stsp if (error == NULL)
4062 ad242220 2018-09-08 stsp error = repo_error;
4064 888b7d99 2020-12-26 stsp if (refs_idmap)
4065 888b7d99 2020-12-26 stsp got_reflist_object_id_map_free(refs_idmap);
4066 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4067 8bf5b3c9 2018-03-17 stsp return error;
4070 4ed7e80c 2018-05-20 stsp __dead static void
4071 3f8b7d6a 2018-04-01 stsp usage_diff(void)
4073 64453f7e 2020-11-21 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
4074 64453f7e 2020-11-21 stsp "[-s] [-w] [object1 object2 | path]\n", getprogname());
4078 b72f483a 2019-02-05 stsp struct print_diff_arg {
4079 b72f483a 2019-02-05 stsp struct got_repository *repo;
4080 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
4081 b72f483a 2019-02-05 stsp int diff_context;
4082 3fc0c068 2019-02-10 stsp const char *id_str;
4083 3fc0c068 2019-02-10 stsp int header_shown;
4084 98eaaa12 2019-08-03 stsp int diff_staged;
4085 63035f9f 2019-10-06 stsp int ignore_whitespace;
4086 64453f7e 2020-11-21 stsp int force_text_diff;
4090 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
4091 39449a05 2020-07-23 stsp * it as content to the diff engine.
4093 39449a05 2020-07-23 stsp static const struct got_error *
4094 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4095 39449a05 2020-07-23 stsp const char *abspath)
4097 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
4098 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
4099 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
4103 39449a05 2020-07-23 stsp if (dirfd != -1) {
4104 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4105 39449a05 2020-07-23 stsp if (target_len == -1)
4106 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
4108 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
4109 39449a05 2020-07-23 stsp if (target_len == -1)
4110 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
4113 39449a05 2020-07-23 stsp *fd = got_opentempfd();
4114 39449a05 2020-07-23 stsp if (*fd == -1)
4115 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
4117 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
4118 39449a05 2020-07-23 stsp if (outlen == -1) {
4119 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
4120 39449a05 2020-07-23 stsp goto done;
4123 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
4124 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
4125 39449a05 2020-07-23 stsp goto done;
4128 39449a05 2020-07-23 stsp if (err) {
4129 39449a05 2020-07-23 stsp close(*fd);
4132 39449a05 2020-07-23 stsp return err;
4135 4ed7e80c 2018-05-20 stsp static const struct got_error *
4136 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
4137 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4138 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4139 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4141 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
4142 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
4143 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
4144 12463d8b 2019-12-13 stsp int fd = -1;
4145 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
4146 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
4147 b72f483a 2019-02-05 stsp struct stat sb;
4149 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4150 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4151 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4152 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4153 98eaaa12 2019-08-03 stsp return NULL;
4155 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4156 98eaaa12 2019-08-03 stsp return NULL;
4157 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4158 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
4159 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4160 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
4161 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
4162 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
4163 98eaaa12 2019-08-03 stsp return NULL;
4166 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
4167 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
4168 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
4169 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
4170 3fc0c068 2019-02-10 stsp a->header_shown = 1;
4173 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4174 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
4175 98eaaa12 2019-08-03 stsp switch (staged_status) {
4176 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
4177 98eaaa12 2019-08-03 stsp label1 = path;
4178 98eaaa12 2019-08-03 stsp label2 = path;
4180 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4181 98eaaa12 2019-08-03 stsp label2 = path;
4183 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4184 98eaaa12 2019-08-03 stsp label1 = path;
4187 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4189 fe621944 2020-11-10 stsp return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4190 fe621944 2020-11-10 stsp staged_blob_id, label1, label2, a->diff_context,
4191 64453f7e 2020-11-21 stsp a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4194 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4195 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4196 4ce46740 2019-08-08 stsp char *id_str;
4197 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4200 4ce46740 2019-08-08 stsp goto done;
4201 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4203 4ce46740 2019-08-08 stsp goto done;
4204 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4205 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4206 4ce46740 2019-08-08 stsp free(id_str);
4207 4ce46740 2019-08-08 stsp goto done;
4209 4ce46740 2019-08-08 stsp free(id_str);
4210 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4211 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4213 4ce46740 2019-08-08 stsp goto done;
4216 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4217 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4218 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4219 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4220 2ec1f75b 2019-03-26 stsp goto done;
4223 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4224 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4225 12463d8b 2019-12-13 stsp if (fd == -1) {
4226 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4227 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4229 39449a05 2020-07-23 stsp goto done;
4231 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4232 39449a05 2020-07-23 stsp de_name, abspath);
4234 39449a05 2020-07-23 stsp goto done;
4237 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4238 12463d8b 2019-12-13 stsp if (fd == -1) {
4239 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4240 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4242 39449a05 2020-07-23 stsp goto done;
4244 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4245 39449a05 2020-07-23 stsp de_name, abspath);
4247 39449a05 2020-07-23 stsp goto done;
4250 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4251 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4252 2ec1f75b 2019-03-26 stsp goto done;
4254 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4255 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4256 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4257 2ec1f75b 2019-03-26 stsp goto done;
4261 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4263 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4264 64453f7e 2020-11-21 stsp a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4266 b72f483a 2019-02-05 stsp if (blob1)
4267 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4268 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4269 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4270 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4271 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4272 b72f483a 2019-02-05 stsp free(abspath);
4273 927df6b7 2019-02-10 stsp return err;
4276 927df6b7 2019-02-10 stsp static const struct got_error *
4277 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4279 b00d56cd 2018-04-01 stsp const struct got_error *error;
4280 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4281 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4282 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4283 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4284 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
4285 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
4286 15a94983 2018-12-23 stsp int type1, type2;
4287 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4288 64453f7e 2020-11-21 stsp int force_text_diff = 0;
4289 c0cc5c62 2018-10-18 stsp const char *errstr;
4290 927df6b7 2019-02-10 stsp char *path = NULL;
4291 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4293 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4295 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4296 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4297 25eccc22 2019-01-04 stsp NULL) == -1)
4298 b00d56cd 2018-04-01 stsp err(1, "pledge");
4301 64453f7e 2020-11-21 stsp while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4302 b00d56cd 2018-04-01 stsp switch (ch) {
4304 64453f7e 2020-11-21 stsp force_text_diff = 1;
4307 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4309 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4310 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4313 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4314 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4315 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4317 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4320 98eaaa12 2019-08-03 stsp diff_staged = 1;
4323 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4326 2deda0b9 2019-03-07 stsp usage_diff();
4327 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4331 b00d56cd 2018-04-01 stsp argc -= optind;
4332 b00d56cd 2018-04-01 stsp argv += optind;
4334 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4335 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4336 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4337 b72f483a 2019-02-05 stsp goto done;
4339 927df6b7 2019-02-10 stsp if (argc <= 1) {
4340 b72f483a 2019-02-05 stsp if (repo_path)
4342 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
4343 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4344 fa51e947 2020-03-27 stsp if (error) {
4345 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4346 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
4348 1f03b8da 2020-03-20 stsp goto done;
4350 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
4351 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
4352 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4353 927df6b7 2019-02-10 stsp goto done;
4355 927df6b7 2019-02-10 stsp if (argc == 1) {
4356 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4358 927df6b7 2019-02-10 stsp if (error)
4359 927df6b7 2019-02-10 stsp goto done;
4361 927df6b7 2019-02-10 stsp path = strdup("");
4362 927df6b7 2019-02-10 stsp if (path == NULL) {
4363 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4364 927df6b7 2019-02-10 stsp goto done;
4367 b72f483a 2019-02-05 stsp } else if (argc == 2) {
4368 98eaaa12 2019-08-03 stsp if (diff_staged)
4369 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
4370 98eaaa12 2019-08-03 stsp "objects in repository");
4371 15a94983 2018-12-23 stsp id_str1 = argv[0];
4372 15a94983 2018-12-23 stsp id_str2 = argv[1];
4373 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4374 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4375 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4376 30db809c 2019-06-05 stsp goto done;
4377 1f03b8da 2020-03-20 stsp if (worktree) {
4378 1f03b8da 2020-03-20 stsp repo_path = strdup(
4379 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
4380 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4381 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4382 1f03b8da 2020-03-20 stsp goto done;
4385 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
4386 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4387 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4388 1f03b8da 2020-03-20 stsp goto done;
4393 b00d56cd 2018-04-01 stsp usage_diff();
4395 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4396 76089277 2018-04-01 stsp free(repo_path);
4397 b00d56cd 2018-04-01 stsp if (error != NULL)
4398 b00d56cd 2018-04-01 stsp goto done;
4400 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4401 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4402 c02c541e 2019-03-29 stsp if (error)
4403 c02c541e 2019-03-29 stsp goto done;
4405 30db809c 2019-06-05 stsp if (argc <= 1) {
4406 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4407 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4408 b72f483a 2019-02-05 stsp char *id_str;
4410 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4412 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4413 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4414 b72f483a 2019-02-05 stsp if (error)
4415 b72f483a 2019-02-05 stsp goto done;
4416 b72f483a 2019-02-05 stsp arg.repo = repo;
4417 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4418 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4419 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4420 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4421 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4422 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4423 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
4425 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
4426 72ea6654 2019-07-27 stsp if (error)
4427 72ea6654 2019-07-27 stsp goto done;
4429 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
4430 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
4431 b72f483a 2019-02-05 stsp free(id_str);
4432 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4433 b72f483a 2019-02-05 stsp goto done;
4436 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4437 84de9106 2020-12-26 stsp if (error)
4438 84de9106 2020-12-26 stsp return error;
4440 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4441 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &refs, repo);
4442 0adb7196 2019-08-11 stsp if (error)
4443 0adb7196 2019-08-11 stsp goto done;
4445 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4446 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &refs, repo);
4447 0adb7196 2019-08-11 stsp if (error)
4448 0adb7196 2019-08-11 stsp goto done;
4450 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
4451 15a94983 2018-12-23 stsp if (error)
4452 15a94983 2018-12-23 stsp goto done;
4454 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
4455 15a94983 2018-12-23 stsp if (error)
4456 15a94983 2018-12-23 stsp goto done;
4458 15a94983 2018-12-23 stsp if (type1 != type2) {
4459 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4460 b00d56cd 2018-04-01 stsp goto done;
4463 15a94983 2018-12-23 stsp switch (type1) {
4464 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4465 fe621944 2020-11-10 stsp error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4466 64453f7e 2020-11-21 stsp NULL, NULL, diff_context, ignore_whitespace,
4467 64453f7e 2020-11-21 stsp force_text_diff, repo, stdout);
4469 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4470 fe621944 2020-11-10 stsp error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4471 64453f7e 2020-11-21 stsp "", "", diff_context, ignore_whitespace, force_text_diff,
4472 64453f7e 2020-11-21 stsp repo, stdout);
4474 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4475 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
4476 fe621944 2020-11-10 stsp error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4477 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, repo,
4481 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4484 5e70831e 2019-05-28 stsp free(label1);
4485 5e70831e 2019-05-28 stsp free(label2);
4486 15a94983 2018-12-23 stsp free(id1);
4487 15a94983 2018-12-23 stsp free(id2);
4488 927df6b7 2019-02-10 stsp free(path);
4489 b72f483a 2019-02-05 stsp if (worktree)
4490 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4491 ad242220 2018-09-08 stsp if (repo) {
4492 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4493 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4494 ad242220 2018-09-08 stsp if (error == NULL)
4495 ad242220 2018-09-08 stsp error = repo_error;
4497 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4498 b00d56cd 2018-04-01 stsp return error;
4501 404c43c4 2018-06-21 stsp __dead static void
4502 404c43c4 2018-06-21 stsp usage_blame(void)
4504 9270e621 2019-02-05 stsp fprintf(stderr,
4505 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4506 404c43c4 2018-06-21 stsp getprogname());
4510 28315671 2019-08-14 stsp struct blame_line {
4511 28315671 2019-08-14 stsp int annotated;
4512 28315671 2019-08-14 stsp char *id_str;
4513 82f6abb8 2019-08-14 stsp char *committer;
4514 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4517 28315671 2019-08-14 stsp struct blame_cb_args {
4518 28315671 2019-08-14 stsp struct blame_line *lines;
4519 28315671 2019-08-14 stsp int nlines;
4520 7ef28ff8 2019-08-14 stsp int nlines_prec;
4521 28315671 2019-08-14 stsp int lineno_cur;
4522 28315671 2019-08-14 stsp off_t *line_offsets;
4524 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4527 404c43c4 2018-06-21 stsp static const struct got_error *
4528 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4530 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4531 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4532 28315671 2019-08-14 stsp struct blame_line *bline;
4533 82f6abb8 2019-08-14 stsp char *line = NULL;
4534 28315671 2019-08-14 stsp size_t linesize = 0;
4535 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4536 28315671 2019-08-14 stsp off_t offset;
4537 bcb49d15 2019-08-14 stsp struct tm tm;
4538 bcb49d15 2019-08-14 stsp time_t committer_time;
4540 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4541 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4542 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4544 28315671 2019-08-14 stsp if (sigint_received)
4545 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4547 2839f8b9 2019-08-18 stsp if (lineno == -1)
4548 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4550 28315671 2019-08-14 stsp /* Annotate this line. */
4551 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4552 28315671 2019-08-14 stsp if (bline->annotated)
4553 28315671 2019-08-14 stsp return NULL;
4554 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4556 28315671 2019-08-14 stsp return err;
4558 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4560 82f6abb8 2019-08-14 stsp goto done;
4562 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4563 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4564 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4565 bcb49d15 2019-08-14 stsp goto done;
4568 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4569 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4570 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4571 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4572 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4573 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4574 82f6abb8 2019-08-14 stsp goto done;
4576 28315671 2019-08-14 stsp bline->annotated = 1;
4578 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4579 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4580 28315671 2019-08-14 stsp if (!bline->annotated)
4581 82f6abb8 2019-08-14 stsp goto done;
4583 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4584 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4585 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4586 82f6abb8 2019-08-14 stsp goto done;
4589 28315671 2019-08-14 stsp while (bline->annotated) {
4590 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4591 82f6abb8 2019-08-14 stsp size_t len;
4593 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4594 28315671 2019-08-14 stsp if (ferror(a->f))
4595 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4599 82f6abb8 2019-08-14 stsp committer = bline->committer;
4600 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4601 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4602 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4603 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4605 82f6abb8 2019-08-14 stsp *at = '\0';
4606 82f6abb8 2019-08-14 stsp len = strlen(committer);
4607 82f6abb8 2019-08-14 stsp if (len >= 9)
4608 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4610 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4612 28315671 2019-08-14 stsp *nl = '\0';
4613 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4614 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4616 28315671 2019-08-14 stsp a->lineno_cur++;
4617 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4620 82f6abb8 2019-08-14 stsp if (commit)
4621 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4622 28315671 2019-08-14 stsp free(line);
4623 28315671 2019-08-14 stsp return err;
4626 28315671 2019-08-14 stsp static const struct got_error *
4627 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4629 404c43c4 2018-06-21 stsp const struct got_error *error;
4630 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4631 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4632 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4633 0587e10c 2020-07-23 stsp char *link_target = NULL;
4634 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4635 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4636 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4637 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4638 28315671 2019-08-14 stsp struct blame_cb_args bca;
4639 28315671 2019-08-14 stsp int ch, obj_type, i;
4640 be659d10 2020-11-18 stsp off_t filesize;
4642 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4644 404c43c4 2018-06-21 stsp #ifndef PROFILE
4645 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4646 36e2fb66 2019-01-04 stsp NULL) == -1)
4647 404c43c4 2018-06-21 stsp err(1, "pledge");
4650 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4651 404c43c4 2018-06-21 stsp switch (ch) {
4653 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4656 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4657 66bea077 2018-08-02 stsp if (repo_path == NULL)
4658 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4660 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4663 2deda0b9 2019-03-07 stsp usage_blame();
4664 404c43c4 2018-06-21 stsp /* NOTREACHED */
4668 404c43c4 2018-06-21 stsp argc -= optind;
4669 404c43c4 2018-06-21 stsp argv += optind;
4671 a39318fd 2018-08-02 stsp if (argc == 1)
4672 404c43c4 2018-06-21 stsp path = argv[0];
4674 404c43c4 2018-06-21 stsp usage_blame();
4676 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4677 66bea077 2018-08-02 stsp if (cwd == NULL) {
4678 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4679 66bea077 2018-08-02 stsp goto done;
4681 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4682 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4683 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4684 66bea077 2018-08-02 stsp goto done;
4686 0c06baac 2019-02-05 stsp error = NULL;
4687 0c06baac 2019-02-05 stsp if (worktree) {
4688 0c06baac 2019-02-05 stsp repo_path =
4689 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4690 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4691 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4692 1f03b8da 2020-03-20 stsp if (error)
4693 1f03b8da 2020-03-20 stsp goto done;
4696 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4697 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4698 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4699 0c06baac 2019-02-05 stsp goto done;
4704 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4705 c02c541e 2019-03-29 stsp if (error != NULL)
4706 404c43c4 2018-06-21 stsp goto done;
4708 0c06baac 2019-02-05 stsp if (worktree) {
4709 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4712 01740607 2020-11-04 stsp error = got_worktree_resolve_path(&p, worktree, path);
4713 01740607 2020-11-04 stsp if (error)
4714 01740607 2020-11-04 stsp goto done;
4715 01740607 2020-11-04 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4716 01740607 2020-11-04 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4717 01740607 2020-11-04 stsp p) == -1) {
4718 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4720 0c06baac 2019-02-05 stsp goto done;
4723 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4725 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4726 01740607 2020-11-04 stsp if (error)
4727 01740607 2020-11-04 stsp goto done;
4728 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4730 0c06baac 2019-02-05 stsp if (error)
4731 66bea077 2018-08-02 stsp goto done;
4733 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4734 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4735 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4736 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4737 404c43c4 2018-06-21 stsp if (error != NULL)
4738 66bea077 2018-08-02 stsp goto done;
4739 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4740 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4741 404c43c4 2018-06-21 stsp if (error != NULL)
4742 66bea077 2018-08-02 stsp goto done;
4744 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4745 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4746 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4748 84de9106 2020-12-26 stsp if (error)
4749 84de9106 2020-12-26 stsp goto done;
4750 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4751 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4752 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4753 30837e32 2019-07-25 stsp if (error)
4754 66bea077 2018-08-02 stsp goto done;
4757 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4758 0587e10c 2020-07-23 stsp commit_id, repo);
4759 0587e10c 2020-07-23 stsp if (error)
4760 0587e10c 2020-07-23 stsp goto done;
4762 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
4763 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
4764 28315671 2019-08-14 stsp if (error)
4765 28315671 2019-08-14 stsp goto done;
4767 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4768 28315671 2019-08-14 stsp if (error)
4769 28315671 2019-08-14 stsp goto done;
4771 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4772 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
4773 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
4774 28315671 2019-08-14 stsp goto done;
4777 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4778 28315671 2019-08-14 stsp if (error)
4779 28315671 2019-08-14 stsp goto done;
4780 28315671 2019-08-14 stsp bca.f = got_opentemp();
4781 28315671 2019-08-14 stsp if (bca.f == NULL) {
4782 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4783 28315671 2019-08-14 stsp goto done;
4785 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4786 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4787 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4788 28315671 2019-08-14 stsp goto done;
4790 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4791 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4792 b02560ec 2019-08-19 stsp bca.nlines--;
4794 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4795 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4796 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4797 28315671 2019-08-14 stsp goto done;
4799 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4800 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4801 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4802 7ef28ff8 2019-08-14 stsp while (i > 0) {
4804 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4806 82f6abb8 2019-08-14 stsp bca.repo = repo;
4808 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4809 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
4811 66bea077 2018-08-02 stsp free(in_repo_path);
4812 0587e10c 2020-07-23 stsp free(link_target);
4813 66bea077 2018-08-02 stsp free(repo_path);
4814 66bea077 2018-08-02 stsp free(cwd);
4815 404c43c4 2018-06-21 stsp free(commit_id);
4816 28315671 2019-08-14 stsp free(obj_id);
4818 28315671 2019-08-14 stsp got_object_blob_close(blob);
4819 0c06baac 2019-02-05 stsp if (worktree)
4820 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4821 ad242220 2018-09-08 stsp if (repo) {
4822 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4823 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4824 ad242220 2018-09-08 stsp if (error == NULL)
4825 ad242220 2018-09-08 stsp error = repo_error;
4827 3affba96 2019-09-22 stsp if (bca.lines) {
4828 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4829 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4830 3affba96 2019-09-22 stsp free(bline->id_str);
4831 3affba96 2019-09-22 stsp free(bline->committer);
4833 3affba96 2019-09-22 stsp free(bca.lines);
4835 28315671 2019-08-14 stsp free(bca.line_offsets);
4836 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4837 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4838 404c43c4 2018-06-21 stsp return error;
4841 5de5890b 2018-10-18 stsp __dead static void
4842 5de5890b 2018-10-18 stsp usage_tree(void)
4844 c1669e2e 2019-01-09 stsp fprintf(stderr,
4845 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4846 5de5890b 2018-10-18 stsp getprogname());
4850 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4851 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4852 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4854 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4855 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4856 848d6979 2019-08-12 stsp const char *modestr = "";
4857 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4858 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4860 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4861 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4864 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4865 63c5ca5d 2019-08-24 stsp modestr = "$";
4866 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4869 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4871 0d6c6ee3 2020-05-20 stsp return err;
4872 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4873 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4874 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4877 848d6979 2019-08-12 stsp modestr = "@";
4879 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4880 848d6979 2019-08-12 stsp modestr = "/";
4881 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4882 848d6979 2019-08-12 stsp modestr = "*";
4884 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4885 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4886 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4888 0d6c6ee3 2020-05-20 stsp free(link_target);
4889 0d6c6ee3 2020-05-20 stsp return NULL;
4892 5de5890b 2018-10-18 stsp static const struct got_error *
4893 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4894 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4895 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4897 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4898 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4899 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4900 56e0773d 2019-11-28 stsp int nentries, i;
4902 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4904 5de5890b 2018-10-18 stsp goto done;
4906 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4908 5de5890b 2018-10-18 stsp goto done;
4909 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4910 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4911 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4912 5de5890b 2018-10-18 stsp char *id = NULL;
4914 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4917 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4918 5de5890b 2018-10-18 stsp if (show_ids) {
4919 5de5890b 2018-10-18 stsp char *id_str;
4920 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4921 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4923 5de5890b 2018-10-18 stsp goto done;
4924 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4925 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4926 5de5890b 2018-10-18 stsp free(id_str);
4927 5de5890b 2018-10-18 stsp goto done;
4929 5de5890b 2018-10-18 stsp free(id_str);
4931 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4934 0d6c6ee3 2020-05-20 stsp goto done;
4936 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4937 c1669e2e 2019-01-09 stsp char *child_path;
4938 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4939 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4940 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4941 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4942 c1669e2e 2019-01-09 stsp goto done;
4944 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4945 c1669e2e 2019-01-09 stsp root_path, repo);
4946 c1669e2e 2019-01-09 stsp free(child_path);
4948 c1669e2e 2019-01-09 stsp goto done;
4953 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4954 5de5890b 2018-10-18 stsp free(tree_id);
4955 5de5890b 2018-10-18 stsp return err;
4958 5de5890b 2018-10-18 stsp static const struct got_error *
4959 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4961 5de5890b 2018-10-18 stsp const struct got_error *error;
4962 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4963 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4964 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4965 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4966 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4967 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4968 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4971 5de5890b 2018-10-18 stsp #ifndef PROFILE
4972 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4973 0f8d269b 2019-01-04 stsp NULL) == -1)
4974 5de5890b 2018-10-18 stsp err(1, "pledge");
4977 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4978 5de5890b 2018-10-18 stsp switch (ch) {
4980 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4983 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4984 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4985 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4987 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4990 5de5890b 2018-10-18 stsp show_ids = 1;
4993 c1669e2e 2019-01-09 stsp recurse = 1;
4996 2deda0b9 2019-03-07 stsp usage_tree();
4997 5de5890b 2018-10-18 stsp /* NOTREACHED */
5001 5de5890b 2018-10-18 stsp argc -= optind;
5002 5de5890b 2018-10-18 stsp argv += optind;
5004 5de5890b 2018-10-18 stsp if (argc == 1)
5005 5de5890b 2018-10-18 stsp path = argv[0];
5006 5de5890b 2018-10-18 stsp else if (argc > 1)
5007 5de5890b 2018-10-18 stsp usage_tree();
5009 7a2c19d6 2019-02-05 stsp path = NULL;
5011 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
5012 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
5013 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5014 9bf7a39b 2019-02-05 stsp goto done;
5016 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
5017 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
5018 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5019 7a2c19d6 2019-02-05 stsp goto done;
5021 7a2c19d6 2019-02-05 stsp error = NULL;
5022 7a2c19d6 2019-02-05 stsp if (worktree) {
5023 7a2c19d6 2019-02-05 stsp repo_path =
5024 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5025 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
5026 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5027 7a2c19d6 2019-02-05 stsp if (error)
5028 7a2c19d6 2019-02-05 stsp goto done;
5030 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
5031 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
5032 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5033 7a2c19d6 2019-02-05 stsp goto done;
5038 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5039 5de5890b 2018-10-18 stsp if (error != NULL)
5040 c02c541e 2019-03-29 stsp goto done;
5042 4fedbf4c 2020-11-07 stsp if (worktree) {
5043 4fedbf4c 2020-11-07 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
5046 4fedbf4c 2020-11-07 stsp if (path == NULL)
5047 4fedbf4c 2020-11-07 stsp path = "";
5048 4fedbf4c 2020-11-07 stsp error = got_worktree_resolve_path(&p, worktree, path);
5049 4fedbf4c 2020-11-07 stsp if (error)
5050 4fedbf4c 2020-11-07 stsp goto done;
5051 4fedbf4c 2020-11-07 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
5052 4fedbf4c 2020-11-07 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5053 4fedbf4c 2020-11-07 stsp p) == -1) {
5054 4fedbf4c 2020-11-07 stsp error = got_error_from_errno("asprintf");
5056 4fedbf4c 2020-11-07 stsp goto done;
5059 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5060 4fedbf4c 2020-11-07 stsp if (error)
5061 4fedbf4c 2020-11-07 stsp goto done;
5063 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5064 4fedbf4c 2020-11-07 stsp if (error)
5065 4fedbf4c 2020-11-07 stsp goto done;
5066 4fedbf4c 2020-11-07 stsp if (path == NULL)
5067 9bf7a39b 2019-02-05 stsp path = "/";
5068 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
5069 9bf7a39b 2019-02-05 stsp if (error != NULL)
5070 9bf7a39b 2019-02-05 stsp goto done;
5073 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
5074 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
5075 4e0a20a4 2020-03-23 tracey if (worktree)
5076 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
5078 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
5079 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
5080 5de5890b 2018-10-18 stsp if (error != NULL)
5081 5de5890b 2018-10-18 stsp goto done;
5082 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5083 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
5084 5de5890b 2018-10-18 stsp if (error != NULL)
5085 5de5890b 2018-10-18 stsp goto done;
5087 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5088 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5089 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5091 84de9106 2020-12-26 stsp if (error)
5092 84de9106 2020-12-26 stsp goto done;
5093 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5094 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5095 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5096 30837e32 2019-07-25 stsp if (error)
5097 5de5890b 2018-10-18 stsp goto done;
5100 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5101 c1669e2e 2019-01-09 stsp in_repo_path, repo);
5103 5de5890b 2018-10-18 stsp free(in_repo_path);
5104 5de5890b 2018-10-18 stsp free(repo_path);
5105 5de5890b 2018-10-18 stsp free(cwd);
5106 5de5890b 2018-10-18 stsp free(commit_id);
5107 7a2c19d6 2019-02-05 stsp if (worktree)
5108 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
5109 5de5890b 2018-10-18 stsp if (repo) {
5110 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
5111 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
5112 5de5890b 2018-10-18 stsp if (error == NULL)
5113 5de5890b 2018-10-18 stsp error = repo_error;
5115 5de5890b 2018-10-18 stsp return error;
5118 6bad629b 2019-02-04 stsp __dead static void
5119 6bad629b 2019-02-04 stsp usage_status(void)
5121 081470ac 2020-08-13 stsp fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
5122 081470ac 2020-08-13 stsp getprogname());
5126 b72f483a 2019-02-05 stsp static const struct got_error *
5127 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
5128 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5129 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5130 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5132 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5133 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
5134 081470ac 2020-08-13 stsp if (arg) {
5135 081470ac 2020-08-13 stsp char *status_codes = arg;
5136 081470ac 2020-08-13 stsp size_t ncodes = strlen(status_codes);
5138 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
5139 081470ac 2020-08-13 stsp if (status == status_codes[i] ||
5140 081470ac 2020-08-13 stsp staged_status == status_codes[i])
5143 081470ac 2020-08-13 stsp if (i == ncodes)
5144 081470ac 2020-08-13 stsp return NULL;
5146 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
5147 b72f483a 2019-02-05 stsp return NULL;
5150 6bad629b 2019-02-04 stsp static const struct got_error *
5151 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
5153 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
5154 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
5155 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
5156 081470ac 2020-08-13 stsp char *cwd = NULL, *status_codes = NULL;;
5157 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
5158 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
5159 081470ac 2020-08-13 stsp int ch, i;
5161 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
5163 081470ac 2020-08-13 stsp while ((ch = getopt(argc, argv, "s:")) != -1) {
5164 6bad629b 2019-02-04 stsp switch (ch) {
5166 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
5167 081470ac 2020-08-13 stsp switch (optarg[i]) {
5168 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
5169 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
5170 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
5171 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
5172 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
5173 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
5174 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
5175 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
5176 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
5179 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
5180 081470ac 2020-08-13 stsp optarg[i]);
5183 081470ac 2020-08-13 stsp status_codes = optarg;
5186 2deda0b9 2019-03-07 stsp usage_status();
5187 6bad629b 2019-02-04 stsp /* NOTREACHED */
5191 6bad629b 2019-02-04 stsp argc -= optind;
5192 6bad629b 2019-02-04 stsp argv += optind;
5194 6bad629b 2019-02-04 stsp #ifndef PROFILE
5195 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5196 6bad629b 2019-02-04 stsp NULL) == -1)
5197 6bad629b 2019-02-04 stsp err(1, "pledge");
5199 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
5200 927df6b7 2019-02-10 stsp if (cwd == NULL) {
5201 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5202 927df6b7 2019-02-10 stsp goto done;
5205 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5206 fa51e947 2020-03-27 stsp if (error) {
5207 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5208 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5209 a5edda0a 2019-07-27 stsp goto done;
5212 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5214 6bad629b 2019-02-04 stsp if (error != NULL)
5215 6bad629b 2019-02-04 stsp goto done;
5217 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5218 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5219 087fb88c 2019-08-04 stsp if (error)
5220 087fb88c 2019-08-04 stsp goto done;
5222 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5223 6bad629b 2019-02-04 stsp if (error)
5224 6bad629b 2019-02-04 stsp goto done;
5226 081470ac 2020-08-13 stsp error = got_worktree_status(worktree, &paths, repo, print_status,
5227 081470ac 2020-08-13 stsp status_codes, check_cancelled, NULL);
5229 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5230 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5231 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5232 927df6b7 2019-02-10 stsp free(cwd);
5233 d0eebce4 2019-03-11 stsp return error;
5236 d0eebce4 2019-03-11 stsp __dead static void
5237 d0eebce4 2019-03-11 stsp usage_ref(void)
5239 d0eebce4 2019-03-11 stsp fprintf(stderr,
5240 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5241 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5242 d0eebce4 2019-03-11 stsp getprogname());
5246 d0eebce4 2019-03-11 stsp static const struct got_error *
5247 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5249 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5250 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5251 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5253 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5254 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5256 d0eebce4 2019-03-11 stsp return err;
5258 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5259 d0eebce4 2019-03-11 stsp char *refstr;
5260 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5261 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5262 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5263 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5264 d0eebce4 2019-03-11 stsp free(refstr);
5267 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5268 d0eebce4 2019-03-11 stsp return NULL;
5271 d0eebce4 2019-03-11 stsp static const struct got_error *
5272 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
5274 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5275 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5277 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5279 d0eebce4 2019-03-11 stsp return err;
5281 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
5282 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5283 d0eebce4 2019-03-11 stsp return err;
5286 d0eebce4 2019-03-11 stsp static const struct got_error *
5287 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5289 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5290 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5291 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5294 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5295 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5296 d1644381 2019-07-14 stsp * an unintended typo.
5298 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5299 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5301 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5303 d83d9d5c 2019-05-13 stsp if (err) {
5304 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5306 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5307 d83d9d5c 2019-05-13 stsp return err;
5308 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5310 d83d9d5c 2019-05-13 stsp return err;
5311 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5312 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5314 d83d9d5c 2019-05-13 stsp return err;
5317 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5319 d0eebce4 2019-03-11 stsp goto done;
5321 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5324 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5326 d1c1ae5f 2019-08-12 stsp return err;
5329 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5330 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5332 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5333 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5334 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5337 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5338 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5339 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5341 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5342 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5344 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5346 d1c1ae5f 2019-08-12 stsp return err;
5348 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5350 d1c1ae5f 2019-08-12 stsp goto done;
5352 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5354 d1c1ae5f 2019-08-12 stsp if (target_ref)
5355 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5357 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5358 d0eebce4 2019-03-11 stsp return err;
5361 d0eebce4 2019-03-11 stsp static const struct got_error *
5362 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5364 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5365 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5366 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5367 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5368 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5369 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5370 b2070a3f 2020-03-22 stsp char *refname = NULL;
5372 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5373 d0eebce4 2019-03-11 stsp switch (ch) {
5375 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5378 e31abbf2 2020-03-22 stsp do_delete = 1;
5381 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5382 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5383 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5385 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5388 d0eebce4 2019-03-11 stsp do_list = 1;
5391 e31abbf2 2020-03-22 stsp symref_target = optarg;
5394 d0eebce4 2019-03-11 stsp usage_ref();
5395 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5399 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5400 ff69268e 2020-12-13 stsp option_conflict('c', 'l');
5401 ff69268e 2020-12-13 stsp if (obj_arg && do_delete)
5402 ff69268e 2020-12-13 stsp option_conflict('c', 'd');
5403 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5404 ff69268e 2020-12-13 stsp option_conflict('c', 's');
5405 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5406 ff69268e 2020-12-13 stsp option_conflict('s', 'd');
5407 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5408 ff69268e 2020-12-13 stsp option_conflict('s', 'l');
5409 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5410 ff69268e 2020-12-13 stsp option_conflict('d', 'l');
5412 d0eebce4 2019-03-11 stsp argc -= optind;
5413 d0eebce4 2019-03-11 stsp argv += optind;
5415 e31abbf2 2020-03-22 stsp if (do_list) {
5416 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5417 d0eebce4 2019-03-11 stsp usage_ref();
5418 b2070a3f 2020-03-22 stsp if (argc == 1) {
5419 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5420 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5421 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5422 b2070a3f 2020-03-22 stsp goto done;
5426 e31abbf2 2020-03-22 stsp if (argc != 1)
5427 e31abbf2 2020-03-22 stsp usage_ref();
5428 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5429 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5430 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5431 b2070a3f 2020-03-22 stsp goto done;
5435 b2070a3f 2020-03-22 stsp if (refname)
5436 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5438 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5439 e0b57350 2019-03-12 stsp if (do_list) {
5440 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5441 e0b57350 2019-03-12 stsp NULL) == -1)
5442 e0b57350 2019-03-12 stsp err(1, "pledge");
5444 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5445 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5446 e0b57350 2019-03-12 stsp err(1, "pledge");
5449 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5450 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5451 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5452 d0eebce4 2019-03-11 stsp goto done;
5455 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5456 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5457 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5458 d0eebce4 2019-03-11 stsp goto done;
5460 d0eebce4 2019-03-11 stsp error = NULL;
5461 d0eebce4 2019-03-11 stsp if (worktree) {
5462 d0eebce4 2019-03-11 stsp repo_path =
5463 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5464 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5465 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5466 d0eebce4 2019-03-11 stsp if (error)
5467 d0eebce4 2019-03-11 stsp goto done;
5469 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
5470 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5471 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5472 d0eebce4 2019-03-11 stsp goto done;
5477 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5478 d0eebce4 2019-03-11 stsp if (error != NULL)
5479 d0eebce4 2019-03-11 stsp goto done;
5481 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5482 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5483 c02c541e 2019-03-29 stsp if (error)
5484 c02c541e 2019-03-29 stsp goto done;
5486 d0eebce4 2019-03-11 stsp if (do_list)
5487 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5488 e31abbf2 2020-03-22 stsp else if (do_delete)
5489 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
5490 e31abbf2 2020-03-22 stsp else if (symref_target)
5491 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5493 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5494 e31abbf2 2020-03-22 stsp usage_ref();
5495 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5498 b2070a3f 2020-03-22 stsp free(refname);
5500 4e759de4 2019-06-26 stsp got_repo_close(repo);
5501 4e759de4 2019-06-26 stsp if (worktree)
5502 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5503 4e759de4 2019-06-26 stsp free(cwd);
5504 4e759de4 2019-06-26 stsp free(repo_path);
5505 4e759de4 2019-06-26 stsp return error;
5508 4e759de4 2019-06-26 stsp __dead static void
5509 4e759de4 2019-06-26 stsp usage_branch(void)
5511 4e759de4 2019-06-26 stsp fprintf(stderr,
5512 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5513 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5517 4e759de4 2019-06-26 stsp static const struct got_error *
5518 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5519 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5521 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5522 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5523 4e99b47e 2019-10-04 stsp char *refstr;
5525 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5526 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5527 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5528 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5530 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5532 4e99b47e 2019-10-04 stsp return err;
5533 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5534 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5535 4e99b47e 2019-10-04 stsp marker = "* ";
5537 4e99b47e 2019-10-04 stsp marker = "~ ";
5541 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5542 4e99b47e 2019-10-04 stsp refname += 11;
5543 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5544 4e99b47e 2019-10-04 stsp refname += 18;
5546 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5547 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5548 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5550 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5551 4e99b47e 2019-10-04 stsp free(refstr);
5552 4e99b47e 2019-10-04 stsp return NULL;
5555 4e99b47e 2019-10-04 stsp static const struct got_error *
5556 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5558 ad89fa31 2019-10-04 stsp const char *refname;
5560 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5561 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5563 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5565 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5566 ad89fa31 2019-10-04 stsp refname += 11;
5567 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5568 ad89fa31 2019-10-04 stsp refname += 18;
5570 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5572 ad89fa31 2019-10-04 stsp return NULL;
5575 ad89fa31 2019-10-04 stsp static const struct got_error *
5576 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5578 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5579 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5580 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5581 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5582 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5584 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5586 4e99b47e 2019-10-04 stsp if (worktree) {
5587 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5588 4e99b47e 2019-10-04 stsp worktree);
5590 4e99b47e 2019-10-04 stsp return err;
5592 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5593 4e99b47e 2019-10-04 stsp worktree);
5595 4e99b47e 2019-10-04 stsp return err;
5597 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5598 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5599 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5601 4e99b47e 2019-10-04 stsp return err;
5602 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5603 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5607 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5608 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5610 4e759de4 2019-06-26 stsp return err;
5612 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry)
5613 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5615 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5616 4e759de4 2019-06-26 stsp return NULL;
5619 4e759de4 2019-06-26 stsp static const struct got_error *
5620 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5621 45cd4e47 2019-08-25 stsp const char *branch_name)
5623 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5624 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5625 4e759de4 2019-06-26 stsp char *refname;
5627 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5628 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5630 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5632 4e759de4 2019-06-26 stsp goto done;
5634 45cd4e47 2019-08-25 stsp if (worktree &&
5635 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5636 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5637 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5638 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5639 45cd4e47 2019-08-25 stsp goto done;
5642 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5645 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5646 4e759de4 2019-06-26 stsp free(refname);
5647 4e759de4 2019-06-26 stsp return err;
5650 4e759de4 2019-06-26 stsp static const struct got_error *
5651 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5652 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5654 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5655 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5656 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5659 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5660 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5661 d3f84d51 2019-07-11 stsp * an unintended typo.
5663 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5664 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5666 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5667 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5668 62d463ca 2020-10-20 naddy goto done;
5671 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5672 4e759de4 2019-06-26 stsp if (err == NULL) {
5673 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5674 4e759de4 2019-06-26 stsp goto done;
5675 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5676 4e759de4 2019-06-26 stsp goto done;
5678 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5680 4e759de4 2019-06-26 stsp goto done;
5682 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5685 4e759de4 2019-06-26 stsp got_ref_close(ref);
5686 4e759de4 2019-06-26 stsp free(base_refname);
5687 4e759de4 2019-06-26 stsp free(refname);
5688 4e759de4 2019-06-26 stsp return err;
5691 4e759de4 2019-06-26 stsp static const struct got_error *
5692 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5694 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5695 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5696 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5697 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5698 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5699 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5700 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5701 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5702 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5703 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5704 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5706 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5708 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5709 4e759de4 2019-06-26 stsp switch (ch) {
5711 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5714 4e759de4 2019-06-26 stsp delref = optarg;
5717 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5718 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5719 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5721 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5724 4e759de4 2019-06-26 stsp do_list = 1;
5727 da76fce2 2020-02-24 stsp do_update = 0;
5730 4e759de4 2019-06-26 stsp usage_branch();
5731 4e759de4 2019-06-26 stsp /* NOTREACHED */
5735 4e759de4 2019-06-26 stsp if (do_list && delref)
5736 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
5738 4e759de4 2019-06-26 stsp argc -= optind;
5739 4e759de4 2019-06-26 stsp argv += optind;
5741 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5742 ad89fa31 2019-10-04 stsp do_show = 1;
5744 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5745 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5747 4e759de4 2019-06-26 stsp if (do_list || delref) {
5748 4e759de4 2019-06-26 stsp if (argc > 0)
5749 4e759de4 2019-06-26 stsp usage_branch();
5750 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5751 4e759de4 2019-06-26 stsp usage_branch();
5753 4e759de4 2019-06-26 stsp #ifndef PROFILE
5754 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5755 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5756 4e759de4 2019-06-26 stsp NULL) == -1)
5757 4e759de4 2019-06-26 stsp err(1, "pledge");
5759 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5760 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5761 4e759de4 2019-06-26 stsp err(1, "pledge");
5764 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5765 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5766 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5767 4e759de4 2019-06-26 stsp goto done;
5770 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5771 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5772 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5773 4e759de4 2019-06-26 stsp goto done;
5775 4e759de4 2019-06-26 stsp error = NULL;
5776 4e759de4 2019-06-26 stsp if (worktree) {
5777 4e759de4 2019-06-26 stsp repo_path =
5778 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5779 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5780 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5781 4e759de4 2019-06-26 stsp if (error)
5782 4e759de4 2019-06-26 stsp goto done;
5784 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5785 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5786 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5787 4e759de4 2019-06-26 stsp goto done;
5792 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5793 4e759de4 2019-06-26 stsp if (error != NULL)
5794 4e759de4 2019-06-26 stsp goto done;
5796 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5797 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5798 4e759de4 2019-06-26 stsp if (error)
5799 4e759de4 2019-06-26 stsp goto done;
5801 ad89fa31 2019-10-04 stsp if (do_show)
5802 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5803 ad89fa31 2019-10-04 stsp else if (do_list)
5804 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5805 4e759de4 2019-06-26 stsp else if (delref)
5806 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5808 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5809 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5810 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5812 84de9106 2020-12-26 stsp if (error)
5813 84de9106 2020-12-26 stsp goto done;
5814 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5815 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5816 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5817 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5818 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5819 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5820 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5821 a74f7e83 2019-11-10 stsp if (error)
5822 a74f7e83 2019-11-10 stsp goto done;
5823 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5824 da76fce2 2020-02-24 stsp if (error)
5825 da76fce2 2020-02-24 stsp goto done;
5826 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5827 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5828 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5830 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5831 da76fce2 2020-02-24 stsp if (error)
5832 da76fce2 2020-02-24 stsp goto done;
5833 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5834 da76fce2 2020-02-24 stsp worktree);
5835 da76fce2 2020-02-24 stsp if (error)
5836 da76fce2 2020-02-24 stsp goto done;
5837 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5839 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5840 da76fce2 2020-02-24 stsp goto done;
5842 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5843 da76fce2 2020-02-24 stsp free(branch_refname);
5844 da76fce2 2020-02-24 stsp if (error)
5845 da76fce2 2020-02-24 stsp goto done;
5846 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5848 da76fce2 2020-02-24 stsp if (error)
5849 da76fce2 2020-02-24 stsp goto done;
5850 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5851 da76fce2 2020-02-24 stsp commit_id);
5852 da76fce2 2020-02-24 stsp if (error)
5853 da76fce2 2020-02-24 stsp goto done;
5854 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5855 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5856 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5858 da76fce2 2020-02-24 stsp if (error)
5859 da76fce2 2020-02-24 stsp goto done;
5860 9627c110 2020-04-18 stsp if (upa.did_something)
5861 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5862 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5867 da76fce2 2020-02-24 stsp got_ref_close(ref);
5869 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5870 d0eebce4 2019-03-11 stsp if (worktree)
5871 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5872 d0eebce4 2019-03-11 stsp free(cwd);
5873 d0eebce4 2019-03-11 stsp free(repo_path);
5874 da76fce2 2020-02-24 stsp free(commit_id);
5875 da76fce2 2020-02-24 stsp free(commit_id_str);
5876 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5877 da76fce2 2020-02-24 stsp free((char *)pe->path);
5878 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5879 d00136be 2019-03-26 stsp return error;
5883 d00136be 2019-03-26 stsp __dead static void
5884 8e7bd50a 2019-08-22 stsp usage_tag(void)
5886 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5887 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5888 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5893 b8bad2ba 2019-08-23 stsp static const struct got_error *
5894 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5896 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5897 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5898 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5899 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5900 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5902 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5903 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5904 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5905 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5907 b8bad2ba 2019-08-23 stsp return err;
5908 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5911 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5914 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5915 b8bad2ba 2019-08-23 stsp free(re_id);
5918 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5919 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5922 b8bad2ba 2019-08-23 stsp while (se) {
5923 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5926 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5927 b8bad2ba 2019-08-23 stsp free(se_id);
5930 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5931 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5933 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5934 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5936 b8bad2ba 2019-08-23 stsp return err;
5937 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5940 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5945 b8bad2ba 2019-08-23 stsp return err;
5949 b8bad2ba 2019-08-23 stsp static const struct got_error *
5950 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5952 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5953 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5954 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5956 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5958 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5960 8e7bd50a 2019-08-22 stsp return err;
5962 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5963 8e7bd50a 2019-08-22 stsp const char *refname;
5964 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5965 8e7bd50a 2019-08-22 stsp char datebuf[26];
5966 d4efa91b 2020-01-14 stsp const char *tagger;
5967 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5968 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5969 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5970 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5972 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5973 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5975 8e7bd50a 2019-08-22 stsp refname += 10;
5976 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5977 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5978 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5981 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5982 8e7bd50a 2019-08-22 stsp free(refstr);
5984 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5987 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5988 d4efa91b 2020-01-14 stsp if (err) {
5989 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5993 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5994 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5995 d4efa91b 2020-01-14 stsp if (err) {
5999 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
6000 d4efa91b 2020-01-14 stsp tagger_time =
6001 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
6002 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
6008 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
6009 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
6010 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
6011 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
6015 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
6016 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
6017 2417344c 2019-08-23 stsp if (datestr)
6018 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
6019 d4efa91b 2020-01-14 stsp if (commit)
6020 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6022 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
6023 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
6024 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6027 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
6028 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6031 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
6032 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6035 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
6036 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6043 8e7bd50a 2019-08-22 stsp free(id_str);
6044 d4efa91b 2020-01-14 stsp if (commit) {
6045 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
6048 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
6050 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
6051 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
6052 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
6053 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
6058 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
6060 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
6062 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
6063 8e7bd50a 2019-08-22 stsp } while (line);
6064 8e7bd50a 2019-08-22 stsp free(tagmsg0);
6067 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
6068 8e7bd50a 2019-08-22 stsp return NULL;
6071 8e7bd50a 2019-08-22 stsp static const struct got_error *
6072 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6073 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
6075 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
6076 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
6077 f372d5cd 2019-10-21 stsp char *editor = NULL;
6078 1601cb9f 2020-09-11 naddy int initial_content_len;
6079 8e7bd50a 2019-08-22 stsp int fd = -1;
6081 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6082 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
6083 8e7bd50a 2019-08-22 stsp goto done;
6086 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6087 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
6088 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
6089 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
6090 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
6091 8e7bd50a 2019-08-22 stsp goto done;
6094 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6096 8e7bd50a 2019-08-22 stsp goto done;
6098 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6099 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
6100 97972933 2020-09-11 stsp goto done;
6103 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
6105 8e7bd50a 2019-08-22 stsp goto done;
6106 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6107 0d5bb276 2020-12-15 stsp initial_content_len, 1);
6109 8e7bd50a 2019-08-22 stsp free(initial_content);
6110 8e7bd50a 2019-08-22 stsp free(template);
6111 8e7bd50a 2019-08-22 stsp free(editor);
6113 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6114 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
6116 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
6117 59f86c76 2020-09-11 stsp if (err == NULL)
6118 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
6119 59f86c76 2020-09-11 stsp if (err) {
6120 59f86c76 2020-09-11 stsp free(*tagmsg);
6121 59f86c76 2020-09-11 stsp *tagmsg = NULL;
6123 8e7bd50a 2019-08-22 stsp return err;
6126 8e7bd50a 2019-08-22 stsp static const struct got_error *
6127 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
6128 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6130 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
6131 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
6132 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
6133 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
6134 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6135 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
6136 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
6137 84de9106 2020-12-26 stsp struct got_reflist_head refs;
6139 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
6142 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
6143 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
6144 8e7bd50a 2019-08-22 stsp * an unintended typo.
6146 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
6147 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6149 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
6151 8e7bd50a 2019-08-22 stsp return err;
6153 84de9106 2020-12-26 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6155 84de9106 2020-12-26 stsp goto done;
6157 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6158 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &refs, repo);
6160 8e7bd50a 2019-08-22 stsp goto done;
6162 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
6164 8e7bd50a 2019-08-22 stsp goto done;
6166 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
6167 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
6168 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
6169 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
6170 62d463ca 2020-10-20 naddy goto done;
6172 8e7bd50a 2019-08-22 stsp tag_name += 10;
6173 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6174 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
6175 62d463ca 2020-10-20 naddy goto done;
6178 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
6179 8e7bd50a 2019-08-22 stsp if (err == NULL) {
6180 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
6181 8e7bd50a 2019-08-22 stsp goto done;
6182 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
6183 8e7bd50a 2019-08-22 stsp goto done;
6185 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
6186 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6187 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
6188 f372d5cd 2019-10-21 stsp if (err) {
6189 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6190 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
6191 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6192 8e7bd50a 2019-08-22 stsp goto done;
6196 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
6197 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6198 f372d5cd 2019-10-21 stsp if (err) {
6199 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6200 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6201 8e7bd50a 2019-08-22 stsp goto done;
6204 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
6205 f372d5cd 2019-10-21 stsp if (err) {
6206 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6207 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6208 8e7bd50a 2019-08-22 stsp goto done;
6211 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, 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 f372d5cd 2019-10-21 stsp goto done;
6218 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, 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 f372d5cd 2019-10-21 stsp goto done;
6224 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6226 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6227 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6228 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6229 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6230 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6231 f372d5cd 2019-10-21 stsp free(tag_id_str);
6233 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6234 8e7bd50a 2019-08-22 stsp free(commit_id);
6235 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6236 8e7bd50a 2019-08-22 stsp free(refname);
6237 8e7bd50a 2019-08-22 stsp free(tagmsg);
6238 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6239 aba9c984 2019-09-08 stsp free(tagger);
6240 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
6241 8e7bd50a 2019-08-22 stsp return err;
6244 8e7bd50a 2019-08-22 stsp static const struct got_error *
6245 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6247 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6248 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6249 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6250 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6251 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6252 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6253 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6255 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6256 8e7bd50a 2019-08-22 stsp switch (ch) {
6258 80106605 2020-02-24 stsp commit_id_arg = optarg;
6261 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6264 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6265 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6266 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6268 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6271 8e7bd50a 2019-08-22 stsp do_list = 1;
6274 8e7bd50a 2019-08-22 stsp usage_tag();
6275 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6279 8e7bd50a 2019-08-22 stsp argc -= optind;
6280 8e7bd50a 2019-08-22 stsp argv += optind;
6282 8e7bd50a 2019-08-22 stsp if (do_list) {
6283 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6285 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6286 8e7bd50a 2019-08-22 stsp if (tagmsg)
6287 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
6288 8e7bd50a 2019-08-22 stsp if (argc > 0)
6289 8e7bd50a 2019-08-22 stsp usage_tag();
6290 80106605 2020-02-24 stsp } else if (argc != 1)
6291 8e7bd50a 2019-08-22 stsp usage_tag();
6293 a2887370 2019-08-23 stsp tag_name = argv[0];
6295 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6296 8e7bd50a 2019-08-22 stsp if (do_list) {
6297 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6298 8e7bd50a 2019-08-22 stsp NULL) == -1)
6299 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6301 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6302 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6303 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6306 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6307 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6308 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6309 8e7bd50a 2019-08-22 stsp goto done;
6312 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6313 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6314 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6315 8e7bd50a 2019-08-22 stsp goto done;
6317 8e7bd50a 2019-08-22 stsp error = NULL;
6318 8e7bd50a 2019-08-22 stsp if (worktree) {
6319 8e7bd50a 2019-08-22 stsp repo_path =
6320 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6321 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6322 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6323 8e7bd50a 2019-08-22 stsp if (error)
6324 8e7bd50a 2019-08-22 stsp goto done;
6326 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
6327 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6328 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6329 8e7bd50a 2019-08-22 stsp goto done;
6334 8e7bd50a 2019-08-22 stsp if (do_list) {
6335 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6336 c9956ddf 2019-09-08 stsp if (error != NULL)
6337 c9956ddf 2019-09-08 stsp goto done;
6338 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6339 8e7bd50a 2019-08-22 stsp if (error)
6340 8e7bd50a 2019-08-22 stsp goto done;
6341 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6343 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6344 c9956ddf 2019-09-08 stsp if (error)
6345 c9956ddf 2019-09-08 stsp goto done;
6346 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6347 c9956ddf 2019-09-08 stsp if (error != NULL)
6348 c9956ddf 2019-09-08 stsp goto done;
6350 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6351 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6352 8e7bd50a 2019-08-22 stsp if (error)
6353 8e7bd50a 2019-08-22 stsp goto done;
6356 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6357 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6358 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6359 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6360 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6361 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6362 8e7bd50a 2019-08-22 stsp if (error)
6363 8e7bd50a 2019-08-22 stsp goto done;
6364 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6365 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6366 8e7bd50a 2019-08-22 stsp if (error)
6367 8e7bd50a 2019-08-22 stsp goto done;
6368 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6369 8e7bd50a 2019-08-22 stsp free(commit_id);
6370 8e7bd50a 2019-08-22 stsp if (error)
6371 8e7bd50a 2019-08-22 stsp goto done;
6374 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6375 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6379 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
6380 8e7bd50a 2019-08-22 stsp if (worktree)
6381 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6382 8e7bd50a 2019-08-22 stsp free(cwd);
6383 8e7bd50a 2019-08-22 stsp free(repo_path);
6384 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6385 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6386 8e7bd50a 2019-08-22 stsp return error;
6389 8e7bd50a 2019-08-22 stsp __dead static void
6390 d00136be 2019-03-26 stsp usage_add(void)
6392 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6393 022fae89 2019-12-06 tracey getprogname());
6397 d00136be 2019-03-26 stsp static const struct got_error *
6398 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6400 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6402 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6403 4e68cba3 2019-11-23 stsp return NULL;
6406 4e68cba3 2019-11-23 stsp static const struct got_error *
6407 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6409 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6410 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6411 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6412 1dd54920 2019-05-11 stsp char *cwd = NULL;
6413 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6414 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6415 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6417 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6419 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6420 d00136be 2019-03-26 stsp switch (ch) {
6421 022fae89 2019-12-06 tracey case 'I':
6422 022fae89 2019-12-06 tracey no_ignores = 1;
6425 4e68cba3 2019-11-23 stsp can_recurse = 1;
6428 d00136be 2019-03-26 stsp usage_add();
6429 d00136be 2019-03-26 stsp /* NOTREACHED */
6433 d00136be 2019-03-26 stsp argc -= optind;
6434 d00136be 2019-03-26 stsp argv += optind;
6436 43012d58 2019-07-14 stsp #ifndef PROFILE
6437 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6438 43012d58 2019-07-14 stsp NULL) == -1)
6439 43012d58 2019-07-14 stsp err(1, "pledge");
6441 723c305c 2019-05-11 jcs if (argc < 1)
6442 d00136be 2019-03-26 stsp usage_add();
6444 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6445 d00136be 2019-03-26 stsp if (cwd == NULL) {
6446 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6447 d00136be 2019-03-26 stsp goto done;
6450 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6451 fa51e947 2020-03-27 stsp if (error) {
6452 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6453 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6454 d00136be 2019-03-26 stsp goto done;
6457 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6459 031a5338 2019-03-26 stsp if (error != NULL)
6460 031a5338 2019-03-26 stsp goto done;
6462 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6463 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6464 d00136be 2019-03-26 stsp if (error)
6465 d00136be 2019-03-26 stsp goto done;
6467 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6468 6d022e97 2019-08-04 stsp if (error)
6469 022fae89 2019-12-06 tracey goto done;
6471 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
6472 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6473 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
6474 6d022e97 2019-08-04 stsp goto done;
6478 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6479 4e68cba3 2019-11-23 stsp char *ondisk_path;
6480 4e68cba3 2019-11-23 stsp struct stat sb;
6481 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6482 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6483 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6484 62d463ca 2020-10-20 naddy pe->path) == -1) {
6485 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6486 4e68cba3 2019-11-23 stsp goto done;
6488 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6489 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6490 4e68cba3 2019-11-23 stsp free(ondisk_path);
6493 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6494 4e68cba3 2019-11-23 stsp ondisk_path);
6495 4e68cba3 2019-11-23 stsp free(ondisk_path);
6496 4e68cba3 2019-11-23 stsp goto done;
6498 4e68cba3 2019-11-23 stsp free(ondisk_path);
6499 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6500 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6501 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6502 4e68cba3 2019-11-23 stsp goto done;
6507 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6508 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6511 031a5338 2019-03-26 stsp got_repo_close(repo);
6512 d00136be 2019-03-26 stsp if (worktree)
6513 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6514 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6515 1dd54920 2019-05-11 stsp free((char *)pe->path);
6516 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6517 2ec1f75b 2019-03-26 stsp free(cwd);
6518 2ec1f75b 2019-03-26 stsp return error;
6521 2ec1f75b 2019-03-26 stsp __dead static void
6522 648e4ef7 2019-07-09 stsp usage_remove(void)
6524 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6525 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6529 2a06fe5f 2019-08-24 stsp static const struct got_error *
6530 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6531 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6533 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6535 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6536 2a06fe5f 2019-08-24 stsp return NULL;
6537 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6538 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6539 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6540 2a06fe5f 2019-08-24 stsp return NULL;
6543 2ec1f75b 2019-03-26 stsp static const struct got_error *
6544 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6546 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6547 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6548 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6549 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6550 17ed4618 2019-06-02 stsp char *cwd = NULL;
6551 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6552 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6553 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6555 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6557 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6558 2ec1f75b 2019-03-26 stsp switch (ch) {
6560 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6562 70e3e7f5 2019-12-13 tracey case 'k':
6563 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6565 f2a9dc41 2019-12-13 tracey case 'R':
6566 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6569 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6570 766841c2 2020-08-13 stsp switch (optarg[i]) {
6571 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6572 766841c2 2020-08-13 stsp delete_local_mods = 1;
6574 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6577 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6578 766841c2 2020-08-13 stsp optarg[i]);
6581 766841c2 2020-08-13 stsp status_codes = optarg;
6584 f2a9dc41 2019-12-13 tracey usage_remove();
6585 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6589 2ec1f75b 2019-03-26 stsp argc -= optind;
6590 2ec1f75b 2019-03-26 stsp argv += optind;
6592 43012d58 2019-07-14 stsp #ifndef PROFILE
6593 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6594 43012d58 2019-07-14 stsp NULL) == -1)
6595 43012d58 2019-07-14 stsp err(1, "pledge");
6597 17ed4618 2019-06-02 stsp if (argc < 1)
6598 648e4ef7 2019-07-09 stsp usage_remove();
6600 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
6601 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
6602 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6603 2ec1f75b 2019-03-26 stsp goto done;
6605 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6606 fa51e947 2020-03-27 stsp if (error) {
6607 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6608 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
6609 2ec1f75b 2019-03-26 stsp goto done;
6612 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6615 2ec1f75b 2019-03-26 stsp goto done;
6617 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6618 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6619 2ec1f75b 2019-03-26 stsp if (error)
6620 2ec1f75b 2019-03-26 stsp goto done;
6622 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6623 6d022e97 2019-08-04 stsp if (error)
6624 6d022e97 2019-08-04 stsp goto done;
6626 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
6627 f2a9dc41 2019-12-13 tracey char *ondisk_path;
6628 f2a9dc41 2019-12-13 tracey struct stat sb;
6629 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
6630 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6631 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6632 62d463ca 2020-10-20 naddy pe->path) == -1) {
6633 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6634 f2a9dc41 2019-12-13 tracey goto done;
6636 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6637 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6638 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6639 f2a9dc41 2019-12-13 tracey continue;
6641 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6642 f2a9dc41 2019-12-13 tracey ondisk_path);
6643 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6644 f2a9dc41 2019-12-13 tracey goto done;
6646 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6647 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6648 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6649 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6650 f2a9dc41 2019-12-13 tracey goto done;
6655 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6656 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
6657 766841c2 2020-08-13 stsp repo, keep_on_disk);
6660 a129376b 2019-03-28 stsp got_repo_close(repo);
6661 a129376b 2019-03-28 stsp if (worktree)
6662 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6663 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6664 17ed4618 2019-06-02 stsp free((char *)pe->path);
6665 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6666 a129376b 2019-03-28 stsp free(cwd);
6667 a129376b 2019-03-28 stsp return error;
6670 a129376b 2019-03-28 stsp __dead static void
6671 a129376b 2019-03-28 stsp usage_revert(void)
6673 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6674 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6678 1ee397ad 2019-07-12 stsp static const struct got_error *
6679 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6681 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6682 fb9704af 2020-01-27 stsp return NULL;
6684 a129376b 2019-03-28 stsp while (path[0] == '/')
6686 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6687 33aa809d 2019-08-08 stsp return NULL;
6690 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6691 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6692 33aa809d 2019-08-08 stsp const char *action;
6695 33aa809d 2019-08-08 stsp static const struct got_error *
6696 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6697 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6699 33aa809d 2019-08-08 stsp char *line = NULL;
6700 33aa809d 2019-08-08 stsp size_t linesize = 0;
6701 33aa809d 2019-08-08 stsp ssize_t linelen;
6703 33aa809d 2019-08-08 stsp switch (status) {
6704 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6705 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6707 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6708 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6710 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6711 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6712 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6713 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6714 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6715 33aa809d 2019-08-08 stsp printf("%s", line);
6716 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6717 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6718 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6719 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6720 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6723 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6726 33aa809d 2019-08-08 stsp return NULL;
6729 33aa809d 2019-08-08 stsp static const struct got_error *
6730 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6731 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6733 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6734 33aa809d 2019-08-08 stsp char *line = NULL;
6735 33aa809d 2019-08-08 stsp size_t linesize = 0;
6736 33aa809d 2019-08-08 stsp ssize_t linelen;
6737 33aa809d 2019-08-08 stsp int resp = ' ';
6738 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6740 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6742 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6744 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6745 33aa809d 2019-08-08 stsp a->action);
6747 33aa809d 2019-08-08 stsp return err;
6748 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6749 33aa809d 2019-08-08 stsp if (linelen == -1) {
6750 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6751 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6752 33aa809d 2019-08-08 stsp return NULL;
6754 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6756 33aa809d 2019-08-08 stsp *nl = '\0';
6757 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6758 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6759 33aa809d 2019-08-08 stsp printf("y\n");
6760 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6761 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6762 33aa809d 2019-08-08 stsp printf("n\n");
6763 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6764 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6765 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6766 33aa809d 2019-08-08 stsp printf("q\n");
6768 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6769 33aa809d 2019-08-08 stsp free(line);
6770 33aa809d 2019-08-08 stsp return NULL;
6773 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6774 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6775 33aa809d 2019-08-08 stsp a->action);
6777 33aa809d 2019-08-08 stsp return err;
6778 33aa809d 2019-08-08 stsp resp = getchar();
6779 33aa809d 2019-08-08 stsp if (resp == '\n')
6780 33aa809d 2019-08-08 stsp resp = getchar();
6781 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6782 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6783 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6784 33aa809d 2019-08-08 stsp resp = ' ';
6786 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6787 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6788 33aa809d 2019-08-08 stsp resp = ' ';
6792 33aa809d 2019-08-08 stsp if (resp == 'y')
6793 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6794 33aa809d 2019-08-08 stsp else if (resp == 'n')
6795 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6796 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6797 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6799 1ee397ad 2019-07-12 stsp return NULL;
6803 a129376b 2019-03-28 stsp static const struct got_error *
6804 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6806 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6807 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6808 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6809 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6810 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6811 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6812 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6813 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6814 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6815 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6817 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6819 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6820 a129376b 2019-03-28 stsp switch (ch) {
6822 33aa809d 2019-08-08 stsp pflag = 1;
6825 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6828 0f6d7415 2019-08-08 stsp can_recurse = 1;
6831 a129376b 2019-03-28 stsp usage_revert();
6832 a129376b 2019-03-28 stsp /* NOTREACHED */
6836 a129376b 2019-03-28 stsp argc -= optind;
6837 a129376b 2019-03-28 stsp argv += optind;
6839 43012d58 2019-07-14 stsp #ifndef PROFILE
6840 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6841 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6842 43012d58 2019-07-14 stsp err(1, "pledge");
6844 e20a8b6f 2019-06-04 stsp if (argc < 1)
6845 a129376b 2019-03-28 stsp usage_revert();
6846 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6847 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6849 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6850 a129376b 2019-03-28 stsp if (cwd == NULL) {
6851 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6852 a129376b 2019-03-28 stsp goto done;
6854 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6855 fa51e947 2020-03-27 stsp if (error) {
6856 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6857 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6858 2ec1f75b 2019-03-26 stsp goto done;
6861 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6863 a129376b 2019-03-28 stsp if (error != NULL)
6864 a129376b 2019-03-28 stsp goto done;
6866 33aa809d 2019-08-08 stsp if (patch_script_path) {
6867 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6868 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6869 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6870 33aa809d 2019-08-08 stsp patch_script_path);
6871 33aa809d 2019-08-08 stsp goto done;
6874 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6875 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6876 a129376b 2019-03-28 stsp if (error)
6877 a129376b 2019-03-28 stsp goto done;
6879 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6880 6d022e97 2019-08-04 stsp if (error)
6881 6d022e97 2019-08-04 stsp goto done;
6883 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6884 0f6d7415 2019-08-08 stsp char *ondisk_path;
6885 0f6d7415 2019-08-08 stsp struct stat sb;
6886 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6887 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6888 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6889 62d463ca 2020-10-20 naddy pe->path) == -1) {
6890 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6891 0f6d7415 2019-08-08 stsp goto done;
6893 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6894 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6895 0f6d7415 2019-08-08 stsp free(ondisk_path);
6898 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6899 0f6d7415 2019-08-08 stsp ondisk_path);
6900 0f6d7415 2019-08-08 stsp free(ondisk_path);
6901 0f6d7415 2019-08-08 stsp goto done;
6903 0f6d7415 2019-08-08 stsp free(ondisk_path);
6904 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6905 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6906 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6907 0f6d7415 2019-08-08 stsp goto done;
6912 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6913 33aa809d 2019-08-08 stsp cpa.action = "revert";
6914 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6915 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6917 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6918 33aa809d 2019-08-08 stsp error == NULL)
6919 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6921 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6922 2ec1f75b 2019-03-26 stsp if (worktree)
6923 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6924 2ec1f75b 2019-03-26 stsp free(path);
6925 d00136be 2019-03-26 stsp free(cwd);
6926 6bad629b 2019-02-04 stsp return error;
6929 c4296144 2019-05-09 stsp __dead static void
6930 c4296144 2019-05-09 stsp usage_commit(void)
6932 35213c7c 2020-07-23 stsp fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6933 5c1e53bc 2019-07-28 stsp getprogname());
6937 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6938 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6939 e2ba3d07 2019-05-13 stsp const char *editor;
6940 e0870e44 2019-05-13 stsp const char *worktree_path;
6941 76d98825 2019-06-03 stsp const char *branch_name;
6942 314a6357 2019-05-13 stsp const char *repo_path;
6943 e0870e44 2019-05-13 stsp char *logmsg_path;
6947 33ad4cbe 2019-05-12 jcs static const struct got_error *
6948 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6951 76d98825 2019-06-03 stsp char *initial_content = NULL;
6952 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6953 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6954 e0870e44 2019-05-13 stsp char *template = NULL;
6955 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6956 1601cb9f 2020-09-11 naddy int initial_content_len;
6957 97972933 2020-09-11 stsp int fd = -1;
6958 33ad4cbe 2019-05-12 jcs size_t len;
6960 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6961 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6962 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6963 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6964 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6965 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6966 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6967 33ad4cbe 2019-05-12 jcs return NULL;
6970 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6971 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6973 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6974 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6975 1601cb9f 2020-09-11 naddy a->branch_name);
6976 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
6977 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6979 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6981 e0870e44 2019-05-13 stsp goto done;
6983 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6984 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
6985 97972933 2020-09-11 stsp goto done;
6988 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6989 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6990 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6991 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6992 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6995 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6996 0d5bb276 2020-12-15 stsp initial_content_len, 1);
6998 76d98825 2019-06-03 stsp free(initial_content);
6999 e0870e44 2019-05-13 stsp free(template);
7001 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
7002 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
7004 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
7005 59f86c76 2020-09-11 stsp if (err == NULL)
7006 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
7007 59f86c76 2020-09-11 stsp if (err) {
7008 59f86c76 2020-09-11 stsp free(*logmsg);
7009 59f86c76 2020-09-11 stsp *logmsg = NULL;
7011 33ad4cbe 2019-05-12 jcs return err;
7014 c4296144 2019-05-09 stsp static const struct got_error *
7015 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
7017 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
7018 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
7019 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
7020 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
7021 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
7022 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
7023 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
7024 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7025 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7026 35213c7c 2020-07-23 stsp int allow_bad_symlinks = 0;
7027 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
7029 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
7030 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
7032 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "m:S")) != -1) {
7033 c4296144 2019-05-09 stsp switch (ch) {
7035 c4296144 2019-05-09 stsp logmsg = optarg;
7038 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
7041 c4296144 2019-05-09 stsp usage_commit();
7042 c4296144 2019-05-09 stsp /* NOTREACHED */
7046 c4296144 2019-05-09 stsp argc -= optind;
7047 c4296144 2019-05-09 stsp argv += optind;
7049 43012d58 2019-07-14 stsp #ifndef PROFILE
7050 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7051 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7052 43012d58 2019-07-14 stsp err(1, "pledge");
7054 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
7055 c4296144 2019-05-09 stsp if (cwd == NULL) {
7056 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
7057 c4296144 2019-05-09 stsp goto done;
7059 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
7060 fa51e947 2020-03-27 stsp if (error) {
7061 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7062 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
7063 7d5807f4 2019-07-11 stsp goto done;
7066 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7067 c4296144 2019-05-09 stsp if (error)
7068 a698f62e 2019-07-25 stsp goto done;
7069 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
7070 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
7071 c4296144 2019-05-09 stsp goto done;
7074 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7075 916f288c 2019-07-30 stsp worktree);
7076 5c1e53bc 2019-07-28 stsp if (error)
7077 5c1e53bc 2019-07-28 stsp goto done;
7079 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
7080 c9956ddf 2019-09-08 stsp if (error)
7081 c9956ddf 2019-09-08 stsp goto done;
7082 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7083 c9956ddf 2019-09-08 stsp gitconfig_path);
7084 c4296144 2019-05-09 stsp if (error != NULL)
7085 c4296144 2019-05-09 stsp goto done;
7087 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
7088 aba9c984 2019-09-08 stsp if (error)
7089 aba9c984 2019-09-08 stsp return error;
7092 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
7093 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
7095 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
7096 314a6357 2019-05-13 stsp error = get_editor(&editor);
7098 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7099 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7100 c4296144 2019-05-09 stsp if (error)
7101 c4296144 2019-05-09 stsp goto done;
7103 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7104 087fb88c 2019-08-04 stsp if (error)
7105 087fb88c 2019-08-04 stsp goto done;
7107 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
7108 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
7109 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7110 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7111 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
7112 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7113 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
7114 916f288c 2019-07-30 stsp goto done;
7116 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
7118 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
7119 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7120 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7121 35213c7c 2020-07-23 stsp print_status, NULL, repo);
7122 e0870e44 2019-05-13 stsp if (error) {
7123 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7124 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
7125 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
7126 c4296144 2019-05-09 stsp goto done;
7129 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
7130 c4296144 2019-05-09 stsp if (error)
7131 c4296144 2019-05-09 stsp goto done;
7132 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
7134 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
7135 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
7136 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
7137 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7138 7266f21f 2019-10-21 stsp error == NULL)
7139 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7140 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
7142 c4296144 2019-05-09 stsp got_repo_close(repo);
7143 c4296144 2019-05-09 stsp if (worktree)
7144 c4296144 2019-05-09 stsp got_worktree_close(worktree);
7145 c4296144 2019-05-09 stsp free(cwd);
7146 c4296144 2019-05-09 stsp free(id_str);
7147 c9956ddf 2019-09-08 stsp free(gitconfig_path);
7148 e2ba3d07 2019-05-13 stsp free(editor);
7149 aba9c984 2019-09-08 stsp free(author);
7150 234035bc 2019-06-01 stsp return error;
7153 234035bc 2019-06-01 stsp __dead static void
7154 234035bc 2019-06-01 stsp usage_cherrypick(void)
7156 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7160 234035bc 2019-06-01 stsp static const struct got_error *
7161 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
7163 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
7164 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
7165 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
7166 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
7167 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
7168 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
7169 234035bc 2019-06-01 stsp struct got_object_qid *pid;
7170 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
7172 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7174 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7175 234035bc 2019-06-01 stsp switch (ch) {
7177 234035bc 2019-06-01 stsp usage_cherrypick();
7178 234035bc 2019-06-01 stsp /* NOTREACHED */
7182 234035bc 2019-06-01 stsp argc -= optind;
7183 234035bc 2019-06-01 stsp argv += optind;
7185 43012d58 2019-07-14 stsp #ifndef PROFILE
7186 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7187 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7188 43012d58 2019-07-14 stsp err(1, "pledge");
7190 234035bc 2019-06-01 stsp if (argc != 1)
7191 234035bc 2019-06-01 stsp usage_cherrypick();
7193 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
7194 234035bc 2019-06-01 stsp if (cwd == NULL) {
7195 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
7196 234035bc 2019-06-01 stsp goto done;
7198 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
7199 fa51e947 2020-03-27 stsp if (error) {
7200 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7201 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
7203 234035bc 2019-06-01 stsp goto done;
7206 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7208 234035bc 2019-06-01 stsp if (error != NULL)
7209 234035bc 2019-06-01 stsp goto done;
7211 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7212 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7213 234035bc 2019-06-01 stsp if (error)
7214 234035bc 2019-06-01 stsp goto done;
7216 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7217 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7218 234035bc 2019-06-01 stsp if (error != NULL) {
7219 234035bc 2019-06-01 stsp struct got_reference *ref;
7220 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7221 234035bc 2019-06-01 stsp goto done;
7222 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7223 234035bc 2019-06-01 stsp if (error != NULL)
7224 234035bc 2019-06-01 stsp goto done;
7225 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
7226 234035bc 2019-06-01 stsp got_ref_close(ref);
7227 234035bc 2019-06-01 stsp if (error != NULL)
7228 234035bc 2019-06-01 stsp goto done;
7230 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
7231 234035bc 2019-06-01 stsp if (error)
7232 234035bc 2019-06-01 stsp goto done;
7234 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
7235 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
7236 234035bc 2019-06-01 stsp if (error != NULL)
7237 234035bc 2019-06-01 stsp goto done;
7239 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7240 234035bc 2019-06-01 stsp if (error) {
7241 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
7242 234035bc 2019-06-01 stsp goto done;
7243 234035bc 2019-06-01 stsp error = NULL;
7245 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
7246 234035bc 2019-06-01 stsp goto done;
7249 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7250 234035bc 2019-06-01 stsp if (error)
7251 234035bc 2019-06-01 stsp goto done;
7252 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7253 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7254 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7255 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
7257 234035bc 2019-06-01 stsp if (error != NULL)
7258 234035bc 2019-06-01 stsp goto done;
7260 9627c110 2020-04-18 stsp if (upa.did_something)
7261 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
7262 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7264 234035bc 2019-06-01 stsp if (commit)
7265 234035bc 2019-06-01 stsp got_object_commit_close(commit);
7266 234035bc 2019-06-01 stsp free(commit_id_str);
7267 234035bc 2019-06-01 stsp if (head_ref)
7268 234035bc 2019-06-01 stsp got_ref_close(head_ref);
7269 234035bc 2019-06-01 stsp if (worktree)
7270 234035bc 2019-06-01 stsp got_worktree_close(worktree);
7272 234035bc 2019-06-01 stsp got_repo_close(repo);
7273 c4296144 2019-05-09 stsp return error;
7276 5ef14e63 2019-06-02 stsp __dead static void
7277 5ef14e63 2019-06-02 stsp usage_backout(void)
7279 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7283 5ef14e63 2019-06-02 stsp static const struct got_error *
7284 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
7286 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
7287 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
7288 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
7289 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
7290 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
7291 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
7292 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
7293 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
7295 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7297 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7298 5ef14e63 2019-06-02 stsp switch (ch) {
7300 5ef14e63 2019-06-02 stsp usage_backout();
7301 5ef14e63 2019-06-02 stsp /* NOTREACHED */
7305 5ef14e63 2019-06-02 stsp argc -= optind;
7306 5ef14e63 2019-06-02 stsp argv += optind;
7308 43012d58 2019-07-14 stsp #ifndef PROFILE
7309 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7310 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7311 43012d58 2019-07-14 stsp err(1, "pledge");
7313 5ef14e63 2019-06-02 stsp if (argc != 1)
7314 5ef14e63 2019-06-02 stsp usage_backout();
7316 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
7317 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
7318 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
7319 5ef14e63 2019-06-02 stsp goto done;
7321 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
7322 fa51e947 2020-03-27 stsp if (error) {
7323 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7324 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
7325 5ef14e63 2019-06-02 stsp goto done;
7328 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7330 5ef14e63 2019-06-02 stsp if (error != NULL)
7331 5ef14e63 2019-06-02 stsp goto done;
7333 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7334 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7335 5ef14e63 2019-06-02 stsp if (error)
7336 5ef14e63 2019-06-02 stsp goto done;
7338 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7339 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7340 5ef14e63 2019-06-02 stsp if (error != NULL) {
7341 5ef14e63 2019-06-02 stsp struct got_reference *ref;
7342 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7343 5ef14e63 2019-06-02 stsp goto done;
7344 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7345 5ef14e63 2019-06-02 stsp if (error != NULL)
7346 5ef14e63 2019-06-02 stsp goto done;
7347 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
7348 5ef14e63 2019-06-02 stsp got_ref_close(ref);
7349 5ef14e63 2019-06-02 stsp if (error != NULL)
7350 5ef14e63 2019-06-02 stsp goto done;
7352 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
7353 5ef14e63 2019-06-02 stsp if (error)
7354 5ef14e63 2019-06-02 stsp goto done;
7356 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
7357 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
7358 5ef14e63 2019-06-02 stsp if (error != NULL)
7359 5ef14e63 2019-06-02 stsp goto done;
7361 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7362 5ef14e63 2019-06-02 stsp if (error)
7363 5ef14e63 2019-06-02 stsp goto done;
7365 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7366 5ef14e63 2019-06-02 stsp if (error)
7367 5ef14e63 2019-06-02 stsp goto done;
7368 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7369 5ef14e63 2019-06-02 stsp if (pid == NULL) {
7370 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
7371 5ef14e63 2019-06-02 stsp goto done;
7374 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7375 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7376 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7377 5ef14e63 2019-06-02 stsp if (error != NULL)
7378 5ef14e63 2019-06-02 stsp goto done;
7380 9627c110 2020-04-18 stsp if (upa.did_something)
7381 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
7382 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7384 5ef14e63 2019-06-02 stsp if (commit)
7385 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
7386 5ef14e63 2019-06-02 stsp free(commit_id_str);
7387 5ef14e63 2019-06-02 stsp if (head_ref)
7388 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
7389 818c7501 2019-07-11 stsp if (worktree)
7390 818c7501 2019-07-11 stsp got_worktree_close(worktree);
7392 818c7501 2019-07-11 stsp got_repo_close(repo);
7393 818c7501 2019-07-11 stsp return error;
7396 818c7501 2019-07-11 stsp __dead static void
7397 818c7501 2019-07-11 stsp usage_rebase(void)
7399 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7400 af54c8f8 2019-07-11 stsp getprogname());
7405 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
7408 0ebf8283 2019-07-24 stsp size_t len;
7410 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
7411 0ebf8283 2019-07-24 stsp if (len > limit)
7412 0ebf8283 2019-07-24 stsp len = limit;
7413 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
7414 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
7416 0ebf8283 2019-07-24 stsp *nl = '\0';
7419 0ebf8283 2019-07-24 stsp static const struct got_error *
7420 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7422 5943eee2 2019-08-13 stsp const struct got_error *err;
7423 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
7424 5943eee2 2019-08-13 stsp const char *s;
7426 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
7428 5943eee2 2019-08-13 stsp return err;
7430 5943eee2 2019-08-13 stsp s = logmsg0;
7431 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
7434 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
7435 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
7436 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
7437 5943eee2 2019-08-13 stsp goto done;
7440 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
7442 5943eee2 2019-08-13 stsp free(logmsg0);
7443 a0ea4fc0 2020-02-28 stsp return err;
7446 a0ea4fc0 2020-02-28 stsp static const struct got_error *
7447 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7449 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
7450 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
7451 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
7453 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
7455 a0ea4fc0 2020-02-28 stsp return err;
7457 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
7459 a0ea4fc0 2020-02-28 stsp goto done;
7461 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
7463 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
7465 a0ea4fc0 2020-02-28 stsp goto done;
7467 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
7469 a0ea4fc0 2020-02-28 stsp free(id_str);
7470 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
7471 a0ea4fc0 2020-02-28 stsp free(logmsg);
7472 5943eee2 2019-08-13 stsp return err;
7475 818c7501 2019-07-11 stsp static const struct got_error *
7476 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
7477 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
7479 818c7501 2019-07-11 stsp const struct got_error *err;
7480 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7482 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
7484 818c7501 2019-07-11 stsp goto done;
7486 ff0d2220 2019-07-11 stsp if (new_id) {
7487 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
7489 ff0d2220 2019-07-11 stsp goto done;
7492 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
7493 ff0d2220 2019-07-11 stsp if (new_id_str)
7494 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
7496 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7498 0ebf8283 2019-07-24 stsp goto done;
7500 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
7501 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7503 818c7501 2019-07-11 stsp free(old_id_str);
7504 818c7501 2019-07-11 stsp free(new_id_str);
7505 272a1371 2020-02-28 stsp free(logmsg);
7506 818c7501 2019-07-11 stsp return err;
7509 1ee397ad 2019-07-12 stsp static const struct got_error *
7510 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7511 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
7512 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
7514 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
7515 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
7516 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
7519 818c7501 2019-07-11 stsp static const struct got_error *
7520 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
7521 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7522 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
7523 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7525 ff0d2220 2019-07-11 stsp const struct got_error *error;
7526 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
7527 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
7529 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7530 ff0d2220 2019-07-11 stsp if (error)
7531 ff0d2220 2019-07-11 stsp return error;
7533 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7534 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
7535 ff0d2220 2019-07-11 stsp if (error) {
7536 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7537 ff0d2220 2019-07-11 stsp goto done;
7538 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
7540 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
7541 ff0d2220 2019-07-11 stsp free(new_commit_id);
7544 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
7545 ff0d2220 2019-07-11 stsp return error;
7548 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
7549 64c6d990 2019-07-11 stsp const char *path_prefix;
7550 64c6d990 2019-07-11 stsp size_t len;
7551 8ca9bd68 2019-07-25 stsp int errcode;
7554 64c6d990 2019-07-11 stsp static const struct got_error *
7555 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7556 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
7557 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
7558 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
7560 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
7562 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7563 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7564 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
7566 64c6d990 2019-07-11 stsp return NULL;
7569 64c6d990 2019-07-11 stsp static const struct got_error *
7570 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
7571 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
7572 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
7574 64c6d990 2019-07-11 stsp const struct got_error *err;
7575 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7576 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
7577 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
7579 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
7580 64c6d990 2019-07-11 stsp return NULL;
7582 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7584 64c6d990 2019-07-11 stsp goto done;
7586 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7588 64c6d990 2019-07-11 stsp goto done;
7590 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
7591 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
7593 64c6d990 2019-07-11 stsp goto done;
7595 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
7596 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
7598 64c6d990 2019-07-11 stsp goto done;
7600 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
7601 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
7602 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
7603 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
7604 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
7605 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
7606 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
7608 64c6d990 2019-07-11 stsp if (tree1)
7609 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
7610 64c6d990 2019-07-11 stsp if (tree2)
7611 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
7612 64c6d990 2019-07-11 stsp if (commit)
7613 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
7614 64c6d990 2019-07-11 stsp if (parent_commit)
7615 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
7616 64c6d990 2019-07-11 stsp return err;
7619 ff0d2220 2019-07-11 stsp static const struct got_error *
7620 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
7621 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
7622 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7623 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
7624 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
7626 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
7627 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
7628 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
7629 af61c510 2019-07-19 stsp struct got_object_qid *qid;
7630 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
7632 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
7634 af61c510 2019-07-19 stsp return err;
7636 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7637 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7639 af61c510 2019-07-19 stsp goto done;
7640 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7641 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
7642 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
7643 af61c510 2019-07-19 stsp if (err) {
7644 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7645 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7646 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7647 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7648 af61c510 2019-07-19 stsp "been reached?!?");
7650 ee780d5c 2020-01-04 stsp goto done;
7652 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7653 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7655 af61c510 2019-07-19 stsp goto done;
7657 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7659 af61c510 2019-07-19 stsp goto done;
7660 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7661 af61c510 2019-07-19 stsp commit_id = parent_id;
7665 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7666 af61c510 2019-07-19 stsp return err;
7669 af61c510 2019-07-19 stsp static const struct got_error *
7670 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7672 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7673 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7674 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7675 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7676 818c7501 2019-07-11 stsp char *cwd = NULL;
7677 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7678 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7679 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7680 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7681 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7682 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7683 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7684 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7685 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7686 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7687 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7688 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7689 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7691 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7692 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7694 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7695 818c7501 2019-07-11 stsp switch (ch) {
7697 818c7501 2019-07-11 stsp abort_rebase = 1;
7700 818c7501 2019-07-11 stsp continue_rebase = 1;
7703 818c7501 2019-07-11 stsp usage_rebase();
7704 818c7501 2019-07-11 stsp /* NOTREACHED */
7708 818c7501 2019-07-11 stsp argc -= optind;
7709 818c7501 2019-07-11 stsp argv += optind;
7711 43012d58 2019-07-14 stsp #ifndef PROFILE
7712 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7713 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7714 43012d58 2019-07-14 stsp err(1, "pledge");
7716 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7717 818c7501 2019-07-11 stsp usage_rebase();
7718 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7719 818c7501 2019-07-11 stsp if (argc != 0)
7720 818c7501 2019-07-11 stsp usage_rebase();
7721 818c7501 2019-07-11 stsp } else if (argc != 1)
7722 818c7501 2019-07-11 stsp usage_rebase();
7724 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7725 818c7501 2019-07-11 stsp if (cwd == NULL) {
7726 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7727 818c7501 2019-07-11 stsp goto done;
7729 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7730 fa51e947 2020-03-27 stsp if (error) {
7731 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7732 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7733 818c7501 2019-07-11 stsp goto done;
7736 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7738 818c7501 2019-07-11 stsp if (error != NULL)
7739 818c7501 2019-07-11 stsp goto done;
7741 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7742 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7743 7ef62c4e 2020-02-24 stsp if (error)
7744 7ef62c4e 2020-02-24 stsp goto done;
7746 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7747 7ef62c4e 2020-02-24 stsp worktree);
7748 818c7501 2019-07-11 stsp if (error)
7749 7ef62c4e 2020-02-24 stsp goto done;
7750 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7751 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7752 818c7501 2019-07-11 stsp goto done;
7755 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7756 818c7501 2019-07-11 stsp if (error)
7757 818c7501 2019-07-11 stsp goto done;
7759 f6794adc 2019-07-23 stsp if (abort_rebase) {
7760 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7761 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7762 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7763 f6794adc 2019-07-23 stsp goto done;
7765 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7766 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7767 3e3a69f1 2019-07-25 stsp worktree, repo);
7768 818c7501 2019-07-11 stsp if (error)
7769 818c7501 2019-07-11 stsp goto done;
7770 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7771 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7772 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7773 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7774 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7775 818c7501 2019-07-11 stsp if (error)
7776 818c7501 2019-07-11 stsp goto done;
7777 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7778 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7779 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7782 818c7501 2019-07-11 stsp if (continue_rebase) {
7783 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7784 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7785 f6794adc 2019-07-23 stsp goto done;
7787 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7788 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7789 3e3a69f1 2019-07-25 stsp worktree, repo);
7790 818c7501 2019-07-11 stsp if (error)
7791 818c7501 2019-07-11 stsp goto done;
7793 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7794 01757395 2019-07-12 stsp resume_commit_id, repo);
7795 818c7501 2019-07-11 stsp if (error)
7796 818c7501 2019-07-11 stsp goto done;
7798 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7799 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7800 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7801 818c7501 2019-07-11 stsp goto done;
7804 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7805 818c7501 2019-07-11 stsp if (error != NULL)
7806 818c7501 2019-07-11 stsp goto done;
7809 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7810 ff0d2220 2019-07-11 stsp if (error)
7811 ff0d2220 2019-07-11 stsp goto done;
7813 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7814 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7816 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7817 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7818 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7819 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7820 818c7501 2019-07-11 stsp if (error)
7821 818c7501 2019-07-11 stsp goto done;
7822 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7823 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7824 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7825 818c7501 2019-07-11 stsp "with work tree's branch");
7826 818c7501 2019-07-11 stsp goto done;
7829 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7830 a51a74b3 2019-07-27 stsp if (error) {
7831 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7832 a51a74b3 2019-07-27 stsp goto done;
7833 a51a74b3 2019-07-27 stsp error = NULL;
7835 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7836 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7837 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7838 a51a74b3 2019-07-27 stsp goto done;
7840 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7841 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7842 818c7501 2019-07-11 stsp if (error)
7843 818c7501 2019-07-11 stsp goto done;
7846 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7847 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7848 818c7501 2019-07-11 stsp if (error)
7849 818c7501 2019-07-11 stsp goto done;
7851 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7852 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7853 fc66b545 2019-08-12 stsp if (pid == NULL) {
7854 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7855 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7856 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7857 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7858 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7859 fc66b545 2019-08-12 stsp if (error)
7860 fc66b545 2019-08-12 stsp goto done;
7861 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7862 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7863 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7866 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7867 fc66b545 2019-08-12 stsp goto done;
7869 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7870 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7871 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7872 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7873 818c7501 2019-07-11 stsp commit = NULL;
7874 818c7501 2019-07-11 stsp if (error)
7875 818c7501 2019-07-11 stsp goto done;
7877 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7878 38b0338b 2019-11-29 stsp if (continue_rebase) {
7879 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7880 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7881 38b0338b 2019-11-29 stsp goto done;
7883 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7884 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7885 38b0338b 2019-11-29 stsp char *id_str;
7886 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7887 38b0338b 2019-11-29 stsp new_base_branch);
7888 38b0338b 2019-11-29 stsp if (error)
7889 38b0338b 2019-11-29 stsp goto done;
7890 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7891 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7892 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7893 38b0338b 2019-11-29 stsp free(id_str);
7894 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7895 38b0338b 2019-11-29 stsp new_head_commit_id);
7896 38b0338b 2019-11-29 stsp if (error)
7897 38b0338b 2019-11-29 stsp goto done;
7901 818c7501 2019-07-11 stsp pid = NULL;
7902 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7903 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7905 818c7501 2019-07-11 stsp commit_id = qid->id;
7906 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7907 818c7501 2019-07-11 stsp pid = qid;
7909 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7910 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7911 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7912 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7913 818c7501 2019-07-11 stsp if (error)
7914 818c7501 2019-07-11 stsp goto done;
7916 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7917 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7918 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7920 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7921 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7922 a0ea4fc0 2020-02-28 stsp if (error)
7923 a0ea4fc0 2020-02-28 stsp goto done;
7924 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7928 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7929 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7930 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7931 818c7501 2019-07-11 stsp if (error)
7932 818c7501 2019-07-11 stsp goto done;
7935 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7936 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7937 818c7501 2019-07-11 stsp if (error)
7938 818c7501 2019-07-11 stsp goto done;
7939 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7940 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7942 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7943 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7945 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7946 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7947 818c7501 2019-07-11 stsp free(resume_commit_id);
7948 818c7501 2019-07-11 stsp free(yca_id);
7949 818c7501 2019-07-11 stsp if (commit)
7950 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7951 818c7501 2019-07-11 stsp if (branch)
7952 818c7501 2019-07-11 stsp got_ref_close(branch);
7953 818c7501 2019-07-11 stsp if (new_base_branch)
7954 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7955 818c7501 2019-07-11 stsp if (tmp_branch)
7956 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7957 5ef14e63 2019-06-02 stsp if (worktree)
7958 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7960 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7961 5ef14e63 2019-06-02 stsp return error;
7964 0ebf8283 2019-07-24 stsp __dead static void
7965 0ebf8283 2019-07-24 stsp usage_histedit(void)
7967 466785b9 2020-12-10 jrick fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] [-F histedit-script] [-m]\n",
7968 0ebf8283 2019-07-24 stsp getprogname());
7972 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7973 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7974 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7975 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7976 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7978 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7979 0ebf8283 2019-07-24 stsp unsigned char code;
7980 0ebf8283 2019-07-24 stsp const char *name;
7981 0ebf8283 2019-07-24 stsp const char *desc;
7982 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7983 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7984 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7985 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7986 82997472 2020-01-29 stsp "be used" },
7987 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7988 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7989 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7992 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7993 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7994 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7995 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7996 0ebf8283 2019-07-24 stsp char *logmsg;
7998 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
8000 0ebf8283 2019-07-24 stsp static const struct got_error *
8001 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
8002 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8004 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8005 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
8006 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8009 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
8011 0ebf8283 2019-07-24 stsp goto done;
8013 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
8015 0ebf8283 2019-07-24 stsp goto done;
8017 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
8019 0ebf8283 2019-07-24 stsp goto done;
8021 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
8022 0ebf8283 2019-07-24 stsp if (n < 0)
8023 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8025 0ebf8283 2019-07-24 stsp if (commit)
8026 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8027 0ebf8283 2019-07-24 stsp free(id_str);
8028 0ebf8283 2019-07-24 stsp free(logmsg);
8029 0ebf8283 2019-07-24 stsp return err;
8032 0ebf8283 2019-07-24 stsp static const struct got_error *
8033 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
8034 466785b9 2020-12-10 jrick FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
8036 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8037 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
8038 466785b9 2020-12-10 jrick const char *histedit_cmd = NULL;
8040 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
8041 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8043 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8044 466785b9 2020-12-10 jrick histedit_cmd = got_histedit_cmds[0].name;
8045 466785b9 2020-12-10 jrick if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
8046 466785b9 2020-12-10 jrick histedit_cmd = "fold";
8047 466785b9 2020-12-10 jrick err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
8050 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
8051 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
8052 083957f4 2020-02-24 stsp if (n < 0) {
8053 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
8059 0ebf8283 2019-07-24 stsp return err;
8062 0ebf8283 2019-07-24 stsp static const struct got_error *
8063 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
8064 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
8066 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8069 514f2ffe 2020-01-29 stsp char *id_str;
8070 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
8072 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
8073 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
8075 514f2ffe 2020-01-29 stsp return err;
8077 514f2ffe 2020-01-29 stsp n = fprintf(f,
8078 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
8079 514f2ffe 2020-01-29 stsp "# commit %s\n"
8080 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
8081 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
8082 514f2ffe 2020-01-29 stsp if (n < 0) {
8083 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
8084 514f2ffe 2020-01-29 stsp goto done;
8087 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
8088 514f2ffe 2020-01-29 stsp if (n < 0) {
8089 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
8090 514f2ffe 2020-01-29 stsp goto done;
8093 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8094 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
8095 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
8096 0ebf8283 2019-07-24 stsp cmd->desc);
8097 0ebf8283 2019-07-24 stsp if (n < 0) {
8098 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8103 514f2ffe 2020-01-29 stsp free(id_str);
8104 0ebf8283 2019-07-24 stsp return err;
8107 0ebf8283 2019-07-24 stsp static const struct got_error *
8108 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
8110 0ebf8283 2019-07-24 stsp static char msg[42];
8113 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
8115 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
8116 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
8118 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
8121 0ebf8283 2019-07-24 stsp static const struct got_error *
8122 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
8123 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
8125 0ebf8283 2019-07-24 stsp const struct got_error *err;
8126 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
8127 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
8129 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8131 0ebf8283 2019-07-24 stsp return err;
8133 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
8135 0ebf8283 2019-07-24 stsp goto done;
8137 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
8139 5943eee2 2019-08-13 stsp goto done;
8140 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
8141 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
8142 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
8143 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8146 0ebf8283 2019-07-24 stsp if (folded_commit)
8147 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
8148 0ebf8283 2019-07-24 stsp free(id_str);
8149 5943eee2 2019-08-13 stsp free(folded_logmsg);
8150 0ebf8283 2019-07-24 stsp return err;
8153 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
8154 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
8156 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
8158 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
8159 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8160 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
8161 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8162 3f9de99f 2019-07-24 stsp folded = prev;
8163 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
8166 0ebf8283 2019-07-24 stsp return folded;
8169 0ebf8283 2019-07-24 stsp static const struct got_error *
8170 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8171 0ebf8283 2019-07-24 stsp struct got_repository *repo)
8173 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8174 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8175 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8176 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8177 1601cb9f 2020-09-11 naddy int logmsg_len;
8179 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
8181 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8183 0ebf8283 2019-07-24 stsp return err;
8185 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
8186 0ebf8283 2019-07-24 stsp if (folded) {
8187 0ebf8283 2019-07-24 stsp while (folded != hle) {
8188 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8189 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8192 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
8193 0ebf8283 2019-07-24 stsp logmsg, repo);
8195 0ebf8283 2019-07-24 stsp goto done;
8196 0ebf8283 2019-07-24 stsp free(logmsg);
8197 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8198 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8202 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8204 0ebf8283 2019-07-24 stsp goto done;
8205 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8207 5943eee2 2019-08-13 stsp goto done;
8208 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
8209 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
8210 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
8211 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
8212 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8213 0ebf8283 2019-07-24 stsp goto done;
8215 0ebf8283 2019-07-24 stsp free(logmsg);
8216 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8218 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8220 0ebf8283 2019-07-24 stsp goto done;
8222 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
8223 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
8225 0ebf8283 2019-07-24 stsp goto done;
8227 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
8228 0ebf8283 2019-07-24 stsp close(fd);
8230 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8232 0ebf8283 2019-07-24 stsp goto done;
8234 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8235 0d5bb276 2020-12-15 stsp logmsg_len, 0);
8236 0ebf8283 2019-07-24 stsp if (err) {
8237 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8238 0ebf8283 2019-07-24 stsp goto done;
8239 71392a05 2020-12-13 stsp err = NULL;
8240 71392a05 2020-12-13 stsp hle->logmsg = strdup(new_msg);
8241 71392a05 2020-12-13 stsp if (hle->logmsg == NULL)
8242 71392a05 2020-12-13 stsp err = got_error_from_errno("strdup");
8245 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8246 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
8247 0ebf8283 2019-07-24 stsp free(logmsg_path);
8248 0ebf8283 2019-07-24 stsp free(logmsg);
8249 5943eee2 2019-08-13 stsp free(orig_logmsg);
8250 0ebf8283 2019-07-24 stsp free(editor);
8251 0ebf8283 2019-07-24 stsp if (commit)
8252 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8253 0ebf8283 2019-07-24 stsp return err;
8256 0ebf8283 2019-07-24 stsp static const struct got_error *
8257 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
8258 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8260 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8261 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
8262 6059809a 2020-12-17 stsp size_t i, size;
8263 0ebf8283 2019-07-24 stsp ssize_t len;
8264 6059809a 2020-12-17 stsp int lineno = 0;
8265 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8266 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
8267 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
8269 0ebf8283 2019-07-24 stsp for (;;) {
8270 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
8271 0ebf8283 2019-07-24 stsp if (len == -1) {
8272 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
8273 0ebf8283 2019-07-24 stsp if (feof(f))
8275 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
8276 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
8281 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8283 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
8284 0ebf8283 2019-07-24 stsp free(line);
8285 0ebf8283 2019-07-24 stsp line = NULL;
8288 0ebf8283 2019-07-24 stsp cmd = NULL;
8289 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8290 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
8291 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8292 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
8293 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
8296 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8301 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
8302 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8305 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8307 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
8308 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
8309 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
8312 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
8313 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8317 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
8318 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
8319 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8323 0ebf8283 2019-07-24 stsp free(line);
8324 0ebf8283 2019-07-24 stsp line = NULL;
8328 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
8330 0ebf8283 2019-07-24 stsp *end = '\0';
8332 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
8333 0ebf8283 2019-07-24 stsp if (err) {
8334 0ebf8283 2019-07-24 stsp /* override error code */
8335 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8339 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
8340 0ebf8283 2019-07-24 stsp if (hle == NULL) {
8341 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
8344 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
8345 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
8346 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
8347 0ebf8283 2019-07-24 stsp commit_id = NULL;
8348 0ebf8283 2019-07-24 stsp free(line);
8349 0ebf8283 2019-07-24 stsp line = NULL;
8350 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8353 0ebf8283 2019-07-24 stsp free(line);
8354 0ebf8283 2019-07-24 stsp free(commit_id);
8355 0ebf8283 2019-07-24 stsp return err;
8358 0ebf8283 2019-07-24 stsp static const struct got_error *
8359 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
8360 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
8362 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
8363 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
8364 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8365 5b87815e 2020-03-05 stsp static char msg[92];
8366 bfce7f83 2019-07-27 stsp char *id_str;
8368 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
8369 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8370 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
8371 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
8372 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8374 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8375 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
8376 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8377 5b87815e 2020-03-05 stsp if (hle == hle2)
8379 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
8380 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
8382 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
8384 5b87815e 2020-03-05 stsp return err;
8385 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
8386 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
8387 5b87815e 2020-03-05 stsp free(id_str);
8388 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8392 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8393 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8394 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8397 bfce7f83 2019-07-27 stsp if (hle == NULL) {
8398 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
8400 bfce7f83 2019-07-27 stsp return err;
8401 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
8402 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
8403 bfce7f83 2019-07-27 stsp free(id_str);
8404 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8408 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8409 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8410 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8411 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
8413 bfce7f83 2019-07-27 stsp return NULL;
8416 bfce7f83 2019-07-27 stsp static const struct got_error *
8417 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
8418 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
8419 bfce7f83 2019-07-27 stsp struct got_repository *repo)
8421 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8422 0ebf8283 2019-07-24 stsp char *editor;
8423 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8425 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8427 0ebf8283 2019-07-24 stsp return err;
8429 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
8430 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
8431 0ebf8283 2019-07-24 stsp goto done;
8434 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8435 0ebf8283 2019-07-24 stsp if (f == NULL) {
8436 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
8437 0ebf8283 2019-07-24 stsp goto done;
8439 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8441 bfce7f83 2019-07-27 stsp goto done;
8443 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
8445 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8446 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8447 0ebf8283 2019-07-24 stsp free(editor);
8448 0ebf8283 2019-07-24 stsp return err;
8451 0ebf8283 2019-07-24 stsp static const struct got_error *
8452 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8453 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
8454 514f2ffe 2020-01-29 stsp struct got_repository *);
8456 0ebf8283 2019-07-24 stsp static const struct got_error *
8457 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
8458 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
8459 466785b9 2020-12-10 jrick int edit_logmsg_only, int fold_only, struct got_repository *repo)
8461 0ebf8283 2019-07-24 stsp const struct got_error *err;
8462 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8463 0ebf8283 2019-07-24 stsp char *path = NULL;
8465 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
8467 0ebf8283 2019-07-24 stsp return err;
8469 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
8471 0ebf8283 2019-07-24 stsp goto done;
8473 466785b9 2020-12-10 jrick err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8474 466785b9 2020-12-10 jrick fold_only, repo);
8476 0ebf8283 2019-07-24 stsp goto done;
8478 466785b9 2020-12-10 jrick if (edit_logmsg_only || fold_only) {
8479 083957f4 2020-02-24 stsp rewind(f);
8480 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8482 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
8483 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
8484 0ebf8283 2019-07-24 stsp goto done;
8487 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
8488 083957f4 2020-02-24 stsp if (err) {
8489 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8490 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8491 083957f4 2020-02-24 stsp goto done;
8492 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
8493 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
8497 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8498 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8499 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
8500 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
8501 0ebf8283 2019-07-24 stsp free(path);
8502 0ebf8283 2019-07-24 stsp return err;
8505 0ebf8283 2019-07-24 stsp static const struct got_error *
8506 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
8507 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8509 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8510 0ebf8283 2019-07-24 stsp char *path = NULL;
8511 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8512 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8513 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8515 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
8517 0ebf8283 2019-07-24 stsp return err;
8519 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
8520 0ebf8283 2019-07-24 stsp if (f == NULL) {
8521 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8522 0ebf8283 2019-07-24 stsp goto done;
8524 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8525 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8530 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8531 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
8532 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
8533 0ebf8283 2019-07-24 stsp if (n < 0) {
8534 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8540 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8541 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8542 0ebf8283 2019-07-24 stsp free(path);
8543 0ebf8283 2019-07-24 stsp if (commit)
8544 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8545 0ebf8283 2019-07-24 stsp return err;
8549 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
8551 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8553 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
8554 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
8555 bfce7f83 2019-07-27 stsp free(hle);
8559 0ebf8283 2019-07-24 stsp static const struct got_error *
8560 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
8561 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
8563 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8564 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8566 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8567 0ebf8283 2019-07-24 stsp if (f == NULL) {
8568 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8569 0ebf8283 2019-07-24 stsp goto done;
8572 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8574 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8575 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8576 0ebf8283 2019-07-24 stsp return err;
8579 0ebf8283 2019-07-24 stsp static const struct got_error *
8580 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8581 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
8582 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
8584 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
8585 0ebf8283 2019-07-24 stsp int resp = ' ';
8587 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
8588 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8589 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
8590 0ebf8283 2019-07-24 stsp resp = getchar();
8591 a61a4414 2019-08-07 stsp if (resp == '\n')
8592 a61a4414 2019-08-07 stsp resp = getchar();
8593 426ebf2e 2019-07-25 stsp if (resp == 'c') {
8594 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8595 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
8597 426ebf2e 2019-07-25 stsp if (err) {
8598 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8599 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8601 bfce7f83 2019-07-27 stsp prev_err = err;
8602 426ebf2e 2019-07-25 stsp resp = ' ';
8606 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
8607 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8608 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
8609 466785b9 2020-12-10 jrick commits, branch_name, 0, 0, repo);
8610 426ebf2e 2019-07-25 stsp if (err) {
8611 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8612 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8614 bfce7f83 2019-07-27 stsp prev_err = err;
8615 426ebf2e 2019-07-25 stsp resp = ' ';
8619 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
8620 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8623 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
8626 0ebf8283 2019-07-24 stsp return err;
8629 0ebf8283 2019-07-24 stsp static const struct got_error *
8630 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
8631 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8632 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
8634 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8635 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8636 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8637 3e3a69f1 2019-07-25 stsp branch, repo);
8640 0ebf8283 2019-07-24 stsp static const struct got_error *
8641 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
8642 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8644 0ebf8283 2019-07-24 stsp const struct got_error *err;
8645 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8647 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
8649 0ebf8283 2019-07-24 stsp goto done;
8651 0ebf8283 2019-07-24 stsp if (new_id) {
8652 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
8654 0ebf8283 2019-07-24 stsp goto done;
8657 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8658 0ebf8283 2019-07-24 stsp if (new_id_str)
8659 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8661 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8662 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8663 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8664 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8665 0ebf8283 2019-07-24 stsp goto done;
8667 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8669 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8671 0ebf8283 2019-07-24 stsp goto done;
8674 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8675 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8676 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8677 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8678 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8680 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8681 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8682 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8689 0ebf8283 2019-07-24 stsp free(old_id_str);
8690 0ebf8283 2019-07-24 stsp free(new_id_str);
8691 0ebf8283 2019-07-24 stsp return err;
8694 0ebf8283 2019-07-24 stsp static const struct got_error *
8695 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8696 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8697 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8698 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8700 0ebf8283 2019-07-24 stsp const struct got_error *err;
8701 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8702 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8704 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8705 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8706 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8708 0ebf8283 2019-07-24 stsp return err;
8711 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8713 0ebf8283 2019-07-24 stsp return err;
8715 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8716 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8717 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8718 0ebf8283 2019-07-24 stsp if (err) {
8719 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8720 0ebf8283 2019-07-24 stsp goto done;
8721 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8723 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8724 0ebf8283 2019-07-24 stsp free(new_commit_id);
8727 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
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_skip_commit(struct got_histedit_list_entry *hle,
8733 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8735 0ebf8283 2019-07-24 stsp const struct got_error *error;
8736 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8738 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8740 0ebf8283 2019-07-24 stsp if (error)
8741 0ebf8283 2019-07-24 stsp return error;
8743 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8744 0ebf8283 2019-07-24 stsp if (error)
8745 0ebf8283 2019-07-24 stsp return error;
8747 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8748 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8749 0ebf8283 2019-07-24 stsp return error;
8752 ab20a43a 2020-01-29 stsp static const struct got_error *
8753 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8754 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8755 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8756 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8758 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8760 ab20a43a 2020-01-29 stsp switch (status) {
8761 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8762 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8763 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8764 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8765 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8766 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8771 ab20a43a 2020-01-29 stsp switch (staged_status) {
8772 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8773 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8774 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8775 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8776 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8781 ab20a43a 2020-01-29 stsp return NULL;
8784 0ebf8283 2019-07-24 stsp static const struct got_error *
8785 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8787 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8788 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8789 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8790 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8791 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8792 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8793 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8794 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8795 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8796 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8797 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8798 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8799 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8800 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8801 466785b9 2020-12-10 jrick int edit_logmsg_only = 0, fold_only = 0;
8802 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8803 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8804 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8805 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8806 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8807 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8808 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8809 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8811 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8812 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8813 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8814 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8816 466785b9 2020-12-10 jrick while ((ch = getopt(argc, argv, "acfF:m")) != -1) {
8817 0ebf8283 2019-07-24 stsp switch (ch) {
8819 0ebf8283 2019-07-24 stsp abort_edit = 1;
8822 0ebf8283 2019-07-24 stsp continue_edit = 1;
8824 466785b9 2020-12-10 jrick case 'f':
8825 466785b9 2020-12-10 jrick fold_only = 1;
8828 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8831 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8834 0ebf8283 2019-07-24 stsp usage_histedit();
8835 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8839 0ebf8283 2019-07-24 stsp argc -= optind;
8840 0ebf8283 2019-07-24 stsp argv += optind;
8842 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8843 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8844 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8845 0ebf8283 2019-07-24 stsp err(1, "pledge");
8847 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8848 ff69268e 2020-12-13 stsp option_conflict('a', 'c');
8849 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8850 ff69268e 2020-12-13 stsp option_conflict('F', 'm');
8851 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8852 ff69268e 2020-12-13 stsp option_conflict('a', 'm');
8853 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8854 ff69268e 2020-12-13 stsp option_conflict('c', 'm');
8855 466785b9 2020-12-10 jrick if (abort_edit && fold_only)
8856 ff69268e 2020-12-13 stsp option_conflict('a', 'f');
8857 ff69268e 2020-12-13 stsp if (continue_edit && fold_only)
8858 ff69268e 2020-12-13 stsp option_conflict('c', 'f');
8859 466785b9 2020-12-10 jrick if (fold_only && edit_logmsg_only)
8860 ff69268e 2020-12-13 stsp option_conflict('f', 'm');
8861 b3805337 2020-12-13 stsp if (edit_script_path && fold_only)
8862 b3805337 2020-12-13 stsp option_conflict('F', 'f');
8863 0ebf8283 2019-07-24 stsp if (argc != 0)
8864 0ebf8283 2019-07-24 stsp usage_histedit();
8867 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8868 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8869 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8870 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8871 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8872 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8875 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8876 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8877 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8878 0ebf8283 2019-07-24 stsp goto done;
8880 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8881 fa51e947 2020-03-27 stsp if (error) {
8882 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8883 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8884 0ebf8283 2019-07-24 stsp goto done;
8887 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8889 0ebf8283 2019-07-24 stsp if (error != NULL)
8890 0ebf8283 2019-07-24 stsp goto done;
8892 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8893 0ebf8283 2019-07-24 stsp if (error)
8894 0ebf8283 2019-07-24 stsp goto done;
8895 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8896 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8897 0ebf8283 2019-07-24 stsp goto done;
8900 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8901 0ebf8283 2019-07-24 stsp if (error)
8902 0ebf8283 2019-07-24 stsp goto done;
8904 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8905 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8906 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8907 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8908 083957f4 2020-02-24 stsp "before the -m option can be used");
8909 083957f4 2020-02-24 stsp goto done;
8911 466785b9 2020-12-10 jrick if (edit_in_progress && fold_only) {
8912 466785b9 2020-12-10 jrick error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8913 466785b9 2020-12-10 jrick "histedit operation is in progress in this "
8914 466785b9 2020-12-10 jrick "work tree and must be continued or aborted "
8915 466785b9 2020-12-10 jrick "before the -f option can be used");
8916 466785b9 2020-12-10 jrick goto done;
8919 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8920 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8921 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8922 3e3a69f1 2019-07-25 stsp worktree, repo);
8923 0ebf8283 2019-07-24 stsp if (error)
8924 0ebf8283 2019-07-24 stsp goto done;
8925 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8926 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8927 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8928 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8929 0ebf8283 2019-07-24 stsp if (error)
8930 0ebf8283 2019-07-24 stsp goto done;
8931 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8932 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8933 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8934 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8935 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8936 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8937 0ebf8283 2019-07-24 stsp goto done;
8940 0ebf8283 2019-07-24 stsp if (continue_edit) {
8941 0ebf8283 2019-07-24 stsp char *path;
8943 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8944 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8945 0ebf8283 2019-07-24 stsp goto done;
8948 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8949 0ebf8283 2019-07-24 stsp if (error)
8950 0ebf8283 2019-07-24 stsp goto done;
8952 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8953 0ebf8283 2019-07-24 stsp free(path);
8954 0ebf8283 2019-07-24 stsp if (error)
8955 0ebf8283 2019-07-24 stsp goto done;
8957 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8958 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8959 3e3a69f1 2019-07-25 stsp worktree, repo);
8960 0ebf8283 2019-07-24 stsp if (error)
8961 0ebf8283 2019-07-24 stsp goto done;
8963 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8964 0ebf8283 2019-07-24 stsp if (error)
8965 0ebf8283 2019-07-24 stsp goto done;
8967 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8968 0ebf8283 2019-07-24 stsp head_commit_id);
8969 0ebf8283 2019-07-24 stsp if (error)
8970 0ebf8283 2019-07-24 stsp goto done;
8971 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8972 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8973 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8974 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8975 3aac7cf7 2019-07-25 stsp goto done;
8977 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8978 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8979 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8980 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8981 0ebf8283 2019-07-24 stsp commit = NULL;
8982 0ebf8283 2019-07-24 stsp if (error)
8983 0ebf8283 2019-07-24 stsp goto done;
8985 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8986 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8987 0ebf8283 2019-07-24 stsp goto done;
8990 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8991 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8992 0ebf8283 2019-07-24 stsp if (error != NULL)
8993 0ebf8283 2019-07-24 stsp goto done;
8995 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8996 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8997 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8998 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8999 c7d20a3f 2019-07-30 stsp goto done;
9002 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
9003 bfce7f83 2019-07-27 stsp got_ref_close(branch);
9004 bfce7f83 2019-07-27 stsp branch = NULL;
9005 0ebf8283 2019-07-24 stsp if (error)
9006 0ebf8283 2019-07-24 stsp goto done;
9008 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
9009 0ebf8283 2019-07-24 stsp head_commit_id);
9010 0ebf8283 2019-07-24 stsp if (error)
9011 0ebf8283 2019-07-24 stsp goto done;
9012 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9013 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
9014 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
9015 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9016 3aac7cf7 2019-07-25 stsp goto done;
9018 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
9019 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
9020 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
9021 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
9022 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9023 0ebf8283 2019-07-24 stsp commit = NULL;
9024 0ebf8283 2019-07-24 stsp if (error)
9025 0ebf8283 2019-07-24 stsp goto done;
9027 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
9028 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9029 c5996fff 2020-01-29 stsp goto done;
9032 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
9033 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
9034 bfce7f83 2019-07-27 stsp if (error)
9035 bfce7f83 2019-07-27 stsp goto done;
9037 0ebf8283 2019-07-24 stsp if (edit_script_path) {
9038 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
9039 0ebf8283 2019-07-24 stsp edit_script_path, repo);
9040 6ba2bea2 2019-07-27 stsp if (error) {
9041 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
9042 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
9043 9627c110 2020-04-18 stsp update_progress, &upa);
9044 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9045 0ebf8283 2019-07-24 stsp goto done;
9048 514f2ffe 2020-01-29 stsp const char *branch_name;
9049 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
9050 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
9051 514f2ffe 2020-01-29 stsp branch_name += 11;
9052 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
9053 466785b9 2020-12-10 jrick branch_name, edit_logmsg_only, fold_only, repo);
9054 6ba2bea2 2019-07-27 stsp if (error) {
9055 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
9056 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
9057 9627c110 2020-04-18 stsp update_progress, &upa);
9058 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9059 0ebf8283 2019-07-24 stsp goto done;
9064 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
9066 6ba2bea2 2019-07-27 stsp if (error) {
9067 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
9068 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
9069 9627c110 2020-04-18 stsp update_progress, &upa);
9070 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9071 0ebf8283 2019-07-24 stsp goto done;
9076 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
9077 4ec14e60 2019-08-28 hiltjo if (error)
9078 0ebf8283 2019-07-24 stsp goto done;
9080 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
9081 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
9082 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
9083 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
9086 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
9087 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
9088 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
9089 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
9091 ab20a43a 2020-01-29 stsp if (error)
9092 ab20a43a 2020-01-29 stsp goto done;
9094 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
9095 ab20a43a 2020-01-29 stsp int have_changes = 0;
9097 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
9098 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
9099 ab20a43a 2020-01-29 stsp if (error)
9100 ab20a43a 2020-01-29 stsp goto done;
9101 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
9102 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
9103 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
9104 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
9105 ab20a43a 2020-01-29 stsp if (error) {
9106 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
9107 ab20a43a 2020-01-29 stsp goto done;
9108 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
9109 ab20a43a 2020-01-29 stsp goto done;
9111 ab20a43a 2020-01-29 stsp if (have_changes) {
9112 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
9113 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
9114 ab20a43a 2020-01-29 stsp if (error)
9115 ab20a43a 2020-01-29 stsp goto done;
9117 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
9118 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
9119 ab20a43a 2020-01-29 stsp if (error)
9120 ab20a43a 2020-01-29 stsp goto done;
9121 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
9122 ab20a43a 2020-01-29 stsp hle, NULL);
9123 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
9124 ab20a43a 2020-01-29 stsp commit = NULL;
9125 ab20a43a 2020-01-29 stsp if (error)
9126 ab20a43a 2020-01-29 stsp goto done;
9132 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
9133 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
9134 0ebf8283 2019-07-24 stsp if (error)
9135 0ebf8283 2019-07-24 stsp goto done;
9139 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
9140 0ebf8283 2019-07-24 stsp hle->commit_id);
9141 0ebf8283 2019-07-24 stsp if (error)
9142 0ebf8283 2019-07-24 stsp goto done;
9143 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9144 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
9146 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
9147 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
9148 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
9149 0ebf8283 2019-07-24 stsp if (error)
9150 0ebf8283 2019-07-24 stsp goto done;
9151 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9152 0ebf8283 2019-07-24 stsp commit = NULL;
9154 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9155 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
9156 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
9158 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
9159 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
9161 a0ea4fc0 2020-02-28 stsp if (error)
9162 a0ea4fc0 2020-02-28 stsp goto done;
9163 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9167 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9168 0ebf8283 2019-07-24 stsp char *id_str;
9169 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
9170 0ebf8283 2019-07-24 stsp if (error)
9171 0ebf8283 2019-07-24 stsp goto done;
9172 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
9174 0ebf8283 2019-07-24 stsp free(id_str);
9175 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9176 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
9177 3e3a69f1 2019-07-25 stsp fileindex);
9178 0ebf8283 2019-07-24 stsp goto done;
9181 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9182 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
9183 0ebf8283 2019-07-24 stsp if (error)
9184 0ebf8283 2019-07-24 stsp goto done;
9188 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
9189 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
9190 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9191 0ebf8283 2019-07-24 stsp if (error)
9192 0ebf8283 2019-07-24 stsp goto done;
9195 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
9196 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
9197 0ebf8283 2019-07-24 stsp if (error)
9198 0ebf8283 2019-07-24 stsp goto done;
9199 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
9200 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
9202 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
9203 3e3a69f1 2019-07-25 stsp branch, repo);
9205 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
9206 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
9207 0ebf8283 2019-07-24 stsp free(head_commit_id);
9208 0ebf8283 2019-07-24 stsp free(base_commit_id);
9209 0ebf8283 2019-07-24 stsp free(resume_commit_id);
9210 0ebf8283 2019-07-24 stsp if (commit)
9211 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9212 0ebf8283 2019-07-24 stsp if (branch)
9213 0ebf8283 2019-07-24 stsp got_ref_close(branch);
9214 0ebf8283 2019-07-24 stsp if (tmp_branch)
9215 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
9216 0ebf8283 2019-07-24 stsp if (worktree)
9217 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
9219 2822a352 2019-10-15 stsp got_repo_close(repo);
9220 2822a352 2019-10-15 stsp return error;
9223 2822a352 2019-10-15 stsp __dead static void
9224 2822a352 2019-10-15 stsp usage_integrate(void)
9226 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9230 2822a352 2019-10-15 stsp static const struct got_error *
9231 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
9233 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
9234 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
9235 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
9236 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9237 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
9238 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9239 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
9240 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9242 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9244 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9245 2822a352 2019-10-15 stsp switch (ch) {
9247 2822a352 2019-10-15 stsp usage_integrate();
9248 2822a352 2019-10-15 stsp /* NOTREACHED */
9252 2822a352 2019-10-15 stsp argc -= optind;
9253 2822a352 2019-10-15 stsp argv += optind;
9255 2822a352 2019-10-15 stsp if (argc != 1)
9256 2822a352 2019-10-15 stsp usage_integrate();
9257 2822a352 2019-10-15 stsp branch_arg = argv[0];
9258 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
9259 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9260 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
9261 2822a352 2019-10-15 stsp err(1, "pledge");
9263 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
9264 2822a352 2019-10-15 stsp if (cwd == NULL) {
9265 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
9266 2822a352 2019-10-15 stsp goto done;
9269 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
9270 fa51e947 2020-03-27 stsp if (error) {
9271 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9272 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
9274 2822a352 2019-10-15 stsp goto done;
9277 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
9278 2822a352 2019-10-15 stsp if (error)
9279 2822a352 2019-10-15 stsp goto done;
9281 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9283 2822a352 2019-10-15 stsp if (error != NULL)
9284 2822a352 2019-10-15 stsp goto done;
9286 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9287 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
9288 2822a352 2019-10-15 stsp if (error)
9289 2822a352 2019-10-15 stsp goto done;
9291 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9292 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
9293 2822a352 2019-10-15 stsp goto done;
9296 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9297 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
9298 2822a352 2019-10-15 stsp if (error)
9299 2822a352 2019-10-15 stsp goto done;
9301 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
9302 2822a352 2019-10-15 stsp if (refname == NULL) {
9303 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9304 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9305 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9306 2822a352 2019-10-15 stsp goto done;
9308 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
9309 2822a352 2019-10-15 stsp if (base_refname == NULL) {
9310 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9311 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9312 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9313 2822a352 2019-10-15 stsp goto done;
9316 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
9317 2822a352 2019-10-15 stsp if (error)
9318 2822a352 2019-10-15 stsp goto done;
9320 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9321 2822a352 2019-10-15 stsp if (error)
9322 2822a352 2019-10-15 stsp goto done;
9324 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9325 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
9326 2822a352 2019-10-15 stsp "specified branch has already been integrated");
9327 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9328 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9329 2822a352 2019-10-15 stsp goto done;
9332 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9333 2822a352 2019-10-15 stsp if (error) {
9334 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
9335 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
9336 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9337 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9338 2822a352 2019-10-15 stsp goto done;
9341 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9342 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
9343 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
9344 2822a352 2019-10-15 stsp check_cancelled, NULL);
9345 2822a352 2019-10-15 stsp if (error)
9346 2822a352 2019-10-15 stsp goto done;
9348 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
9349 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9352 715dc77e 2019-08-03 stsp got_repo_close(repo);
9353 2822a352 2019-10-15 stsp if (worktree)
9354 2822a352 2019-10-15 stsp got_worktree_close(worktree);
9355 2822a352 2019-10-15 stsp free(cwd);
9356 2822a352 2019-10-15 stsp free(base_commit_id);
9357 2822a352 2019-10-15 stsp free(commit_id);
9358 2822a352 2019-10-15 stsp free(refname);
9359 2822a352 2019-10-15 stsp free(base_refname);
9360 715dc77e 2019-08-03 stsp return error;
9363 715dc77e 2019-08-03 stsp __dead static void
9364 715dc77e 2019-08-03 stsp usage_stage(void)
9366 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9367 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
9368 715dc77e 2019-08-03 stsp getprogname());
9372 715dc77e 2019-08-03 stsp static const struct got_error *
9373 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
9374 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
9375 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9376 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
9378 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
9379 408b4ebc 2019-08-03 stsp char *id_str = NULL;
9381 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
9382 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
9383 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
9384 408b4ebc 2019-08-03 stsp return NULL;
9386 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
9387 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
9388 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
9390 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
9392 408b4ebc 2019-08-03 stsp return err;
9394 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
9395 408b4ebc 2019-08-03 stsp free(id_str);
9396 dc424a06 2019-08-07 stsp return NULL;
9399 dc424a06 2019-08-07 stsp static const struct got_error *
9400 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
9402 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
9403 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
9404 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
9405 715dc77e 2019-08-03 stsp char *cwd = NULL;
9406 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
9407 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
9408 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9409 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
9410 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9411 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9413 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
9415 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9416 715dc77e 2019-08-03 stsp switch (ch) {
9418 408b4ebc 2019-08-03 stsp list_stage = 1;
9421 dc424a06 2019-08-07 stsp pflag = 1;
9424 dc424a06 2019-08-07 stsp patch_script_path = optarg;
9427 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
9430 715dc77e 2019-08-03 stsp usage_stage();
9431 715dc77e 2019-08-03 stsp /* NOTREACHED */
9435 715dc77e 2019-08-03 stsp argc -= optind;
9436 715dc77e 2019-08-03 stsp argv += optind;
9438 715dc77e 2019-08-03 stsp #ifndef PROFILE
9439 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9440 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
9441 715dc77e 2019-08-03 stsp err(1, "pledge");
9443 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
9444 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
9445 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
9446 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
9448 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
9449 715dc77e 2019-08-03 stsp if (cwd == NULL) {
9450 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
9451 715dc77e 2019-08-03 stsp goto done;
9454 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9455 fa51e947 2020-03-27 stsp if (error) {
9456 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9457 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
9458 715dc77e 2019-08-03 stsp goto done;
9461 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9463 715dc77e 2019-08-03 stsp if (error != NULL)
9464 715dc77e 2019-08-03 stsp goto done;
9466 dc424a06 2019-08-07 stsp if (patch_script_path) {
9467 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
9468 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
9469 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
9470 dc424a06 2019-08-07 stsp patch_script_path);
9471 dc424a06 2019-08-07 stsp goto done;
9474 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9475 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
9476 715dc77e 2019-08-03 stsp if (error)
9477 715dc77e 2019-08-03 stsp goto done;
9479 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9480 6d022e97 2019-08-04 stsp if (error)
9481 6d022e97 2019-08-04 stsp goto done;
9483 6d022e97 2019-08-04 stsp if (list_stage)
9484 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
9485 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
9487 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9488 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
9489 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
9490 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
9491 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
9492 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
9495 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9496 2e1f37b0 2019-08-08 stsp error == NULL)
9497 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9499 ad493afc 2019-08-03 stsp got_repo_close(repo);
9500 ad493afc 2019-08-03 stsp if (worktree)
9501 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
9502 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9503 ad493afc 2019-08-03 stsp free((char *)pe->path);
9504 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
9505 ad493afc 2019-08-03 stsp free(cwd);
9506 ad493afc 2019-08-03 stsp return error;
9509 ad493afc 2019-08-03 stsp __dead static void
9510 ad493afc 2019-08-03 stsp usage_unstage(void)
9512 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9513 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
9514 ad493afc 2019-08-03 stsp getprogname());
9519 ad493afc 2019-08-03 stsp static const struct got_error *
9520 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
9522 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
9523 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
9524 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
9525 ad493afc 2019-08-03 stsp char *cwd = NULL;
9526 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
9527 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9528 9627c110 2020-04-18 stsp int ch, pflag = 0;
9529 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9530 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
9531 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9532 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9534 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
9536 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
9537 ad493afc 2019-08-03 stsp switch (ch) {
9539 2e1f37b0 2019-08-08 stsp pflag = 1;
9542 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
9545 ad493afc 2019-08-03 stsp usage_unstage();
9546 ad493afc 2019-08-03 stsp /* NOTREACHED */
9550 ad493afc 2019-08-03 stsp argc -= optind;
9551 ad493afc 2019-08-03 stsp argv += optind;
9553 ad493afc 2019-08-03 stsp #ifndef PROFILE
9554 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9555 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
9556 ad493afc 2019-08-03 stsp err(1, "pledge");
9558 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
9559 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
9561 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
9562 ad493afc 2019-08-03 stsp if (cwd == NULL) {
9563 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
9564 ad493afc 2019-08-03 stsp goto done;
9567 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9568 fa51e947 2020-03-27 stsp if (error) {
9569 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9570 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
9571 ad493afc 2019-08-03 stsp goto done;
9574 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9576 ad493afc 2019-08-03 stsp if (error != NULL)
9577 ad493afc 2019-08-03 stsp goto done;
9579 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
9580 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
9581 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
9582 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
9583 2e1f37b0 2019-08-08 stsp patch_script_path);
9584 2e1f37b0 2019-08-08 stsp goto done;
9588 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9589 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
9590 ad493afc 2019-08-03 stsp if (error)
9591 ad493afc 2019-08-03 stsp goto done;
9593 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9594 ad493afc 2019-08-03 stsp if (error)
9595 ad493afc 2019-08-03 stsp goto done;
9597 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9598 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
9599 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9600 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
9601 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
9602 9627c110 2020-04-18 stsp if (!error)
9603 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9605 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9606 2e1f37b0 2019-08-08 stsp error == NULL)
9607 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9609 0ebf8283 2019-07-24 stsp got_repo_close(repo);
9610 715dc77e 2019-08-03 stsp if (worktree)
9611 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
9612 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9613 715dc77e 2019-08-03 stsp free((char *)pe->path);
9614 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
9615 715dc77e 2019-08-03 stsp free(cwd);
9616 01073a5d 2019-08-22 stsp return error;
9619 01073a5d 2019-08-22 stsp __dead static void
9620 01073a5d 2019-08-22 stsp usage_cat(void)
9622 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9623 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
9627 01073a5d 2019-08-22 stsp static const struct got_error *
9628 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9630 01073a5d 2019-08-22 stsp const struct got_error *err;
9631 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
9633 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
9635 01073a5d 2019-08-22 stsp return err;
9637 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9638 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
9639 01073a5d 2019-08-22 stsp return err;
9642 01073a5d 2019-08-22 stsp static const struct got_error *
9643 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9645 01073a5d 2019-08-22 stsp const struct got_error *err;
9646 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
9647 56e0773d 2019-11-28 stsp int nentries, i;
9649 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
9651 01073a5d 2019-08-22 stsp return err;
9653 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
9654 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
9655 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
9656 01073a5d 2019-08-22 stsp char *id_str;
9657 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
9659 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
9660 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9663 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
9664 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
9665 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
9666 01073a5d 2019-08-22 stsp free(id_str);
9669 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
9670 01073a5d 2019-08-22 stsp return err;
9673 01073a5d 2019-08-22 stsp static const struct got_error *
9674 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9676 01073a5d 2019-08-22 stsp const struct got_error *err;
9677 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
9678 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9679 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9680 01073a5d 2019-08-22 stsp char *id_str = NULL;
9681 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9683 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9685 01073a5d 2019-08-22 stsp return err;
9687 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9689 01073a5d 2019-08-22 stsp goto done;
9691 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9692 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9693 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9694 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9695 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9696 01073a5d 2019-08-22 stsp char *pid_str;
9697 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9699 01073a5d 2019-08-22 stsp goto done;
9700 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9701 01073a5d 2019-08-22 stsp free(pid_str);
9703 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9704 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9705 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
9707 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9708 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9709 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
9711 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9712 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9713 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9715 01073a5d 2019-08-22 stsp free(id_str);
9716 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9717 01073a5d 2019-08-22 stsp return err;
9720 01073a5d 2019-08-22 stsp static const struct got_error *
9721 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9723 01073a5d 2019-08-22 stsp const struct got_error *err;
9724 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9725 01073a5d 2019-08-22 stsp char *id_str = NULL;
9726 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9728 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9730 01073a5d 2019-08-22 stsp return err;
9732 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9734 01073a5d 2019-08-22 stsp goto done;
9736 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9738 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9739 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9740 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9741 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9743 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9744 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9745 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9747 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9748 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9749 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9751 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9752 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9753 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9759 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9760 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9762 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9763 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9764 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
9766 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9767 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9768 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9770 01073a5d 2019-08-22 stsp free(id_str);
9771 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
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 cmd_cat(int argc, char *argv[])
9778 01073a5d 2019-08-22 stsp const struct got_error *error;
9779 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9780 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9781 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9782 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9783 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9784 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9785 84de9106 2020-12-26 stsp struct got_reflist_head refs;
9787 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
9789 01073a5d 2019-08-22 stsp #ifndef PROFILE
9790 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9791 01073a5d 2019-08-22 stsp NULL) == -1)
9792 01073a5d 2019-08-22 stsp err(1, "pledge");
9795 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9796 01073a5d 2019-08-22 stsp switch (ch) {
9798 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9801 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9802 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9803 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9805 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9808 896e9b6f 2019-08-26 stsp force_path = 1;
9811 01073a5d 2019-08-22 stsp usage_cat();
9812 01073a5d 2019-08-22 stsp /* NOTREACHED */
9816 01073a5d 2019-08-22 stsp argc -= optind;
9817 01073a5d 2019-08-22 stsp argv += optind;
9819 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9820 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9821 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9822 01073a5d 2019-08-22 stsp goto done;
9824 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9825 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9826 01073a5d 2019-08-22 stsp goto done;
9827 01073a5d 2019-08-22 stsp if (worktree) {
9828 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9829 01073a5d 2019-08-22 stsp repo_path = strdup(
9830 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9831 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9832 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9833 01073a5d 2019-08-22 stsp goto done;
9838 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9839 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9840 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9841 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9844 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9845 01073a5d 2019-08-22 stsp free(repo_path);
9846 01073a5d 2019-08-22 stsp if (error != NULL)
9847 01073a5d 2019-08-22 stsp goto done;
9849 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9850 896e9b6f 2019-08-26 stsp if (error)
9851 896e9b6f 2019-08-26 stsp goto done;
9853 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9854 84de9106 2020-12-26 stsp if (error)
9855 84de9106 2020-12-26 stsp goto done;
9857 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9858 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9859 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9860 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
9861 01073a5d 2019-08-22 stsp if (error)
9862 01073a5d 2019-08-22 stsp goto done;
9864 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9865 896e9b6f 2019-08-26 stsp if (force_path) {
9866 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9868 896e9b6f 2019-08-26 stsp if (error)
9871 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9872 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
9874 896e9b6f 2019-08-26 stsp if (error) {
9875 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9876 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9878 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9879 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9880 896e9b6f 2019-08-26 stsp if (error)
9885 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9886 01073a5d 2019-08-22 stsp if (error)
9889 01073a5d 2019-08-22 stsp switch (obj_type) {
9890 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9891 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9893 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9894 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9896 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9897 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9899 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9900 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9903 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9906 01073a5d 2019-08-22 stsp if (error)
9908 01073a5d 2019-08-22 stsp free(label);
9909 01073a5d 2019-08-22 stsp label = NULL;
9911 01073a5d 2019-08-22 stsp id = NULL;
9914 01073a5d 2019-08-22 stsp free(label);
9916 896e9b6f 2019-08-26 stsp free(commit_id);
9917 01073a5d 2019-08-22 stsp if (worktree)
9918 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9919 01073a5d 2019-08-22 stsp if (repo) {
9920 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9921 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9922 01073a5d 2019-08-22 stsp if (error == NULL)
9923 01073a5d 2019-08-22 stsp error = repo_error;
9925 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
9926 b2118c49 2020-07-28 stsp return error;
9929 b2118c49 2020-07-28 stsp __dead static void
9930 b2118c49 2020-07-28 stsp usage_info(void)
9932 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
9933 b2118c49 2020-07-28 stsp getprogname());
9937 b2118c49 2020-07-28 stsp static const struct got_error *
9938 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9939 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9940 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
9942 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
9943 b2118c49 2020-07-28 stsp char *id_str = NULL;
9944 b2118c49 2020-07-28 stsp char datebuf[128];
9945 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
9946 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
9947 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9950 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
9951 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
9953 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
9954 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
9955 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
9956 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
9957 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
9960 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
9961 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
9962 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
9963 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
9964 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
9965 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9966 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
9967 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
9969 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
9971 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
9972 b2118c49 2020-07-28 stsp if (tm == NULL)
9973 b2118c49 2020-07-28 stsp return NULL;
9974 b2118c49 2020-07-28 stsp if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9975 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
9976 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
9978 b2118c49 2020-07-28 stsp if (blob_id) {
9979 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
9981 b2118c49 2020-07-28 stsp return err;
9982 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
9983 b2118c49 2020-07-28 stsp free(id_str);
9986 b2118c49 2020-07-28 stsp if (staged_blob_id) {
9987 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
9989 b2118c49 2020-07-28 stsp return err;
9990 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
9991 b2118c49 2020-07-28 stsp free(id_str);
9994 b2118c49 2020-07-28 stsp if (commit_id) {
9995 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
9997 b2118c49 2020-07-28 stsp return err;
9998 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
9999 b2118c49 2020-07-28 stsp free(id_str);
10002 b2118c49 2020-07-28 stsp return NULL;
10005 b2118c49 2020-07-28 stsp static const struct got_error *
10006 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
10008 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
10009 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
10010 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
10011 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
10012 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
10013 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
10014 b2118c49 2020-07-28 stsp int ch, show_files = 0;
10016 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
10018 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
10019 b2118c49 2020-07-28 stsp switch (ch) {
10021 b2118c49 2020-07-28 stsp usage_info();
10022 b2118c49 2020-07-28 stsp /* NOTREACHED */
10026 b2118c49 2020-07-28 stsp argc -= optind;
10027 b2118c49 2020-07-28 stsp argv += optind;
10029 b2118c49 2020-07-28 stsp #ifndef PROFILE
10030 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
10031 b2118c49 2020-07-28 stsp NULL) == -1)
10032 b2118c49 2020-07-28 stsp err(1, "pledge");
10034 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
10035 b2118c49 2020-07-28 stsp if (cwd == NULL) {
10036 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
10037 b2118c49 2020-07-28 stsp goto done;
10040 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
10041 b2118c49 2020-07-28 stsp if (error) {
10042 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
10043 b2118c49 2020-07-28 stsp error = wrap_not_worktree_error(error, "status", cwd);
10044 b2118c49 2020-07-28 stsp goto done;
10047 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
10048 b2118c49 2020-07-28 stsp if (error)
10049 b2118c49 2020-07-28 stsp goto done;
10051 b2118c49 2020-07-28 stsp if (argc >= 1) {
10052 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
10053 b2118c49 2020-07-28 stsp worktree);
10054 b2118c49 2020-07-28 stsp if (error)
10055 b2118c49 2020-07-28 stsp goto done;
10056 b2118c49 2020-07-28 stsp show_files = 1;
10059 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
10060 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
10061 b2118c49 2020-07-28 stsp if (error)
10062 b2118c49 2020-07-28 stsp goto done;
10064 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
10065 b2118c49 2020-07-28 stsp if (error)
10066 b2118c49 2020-07-28 stsp goto done;
10068 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
10069 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
10070 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
10071 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
10072 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
10073 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
10074 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
10075 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
10077 b2118c49 2020-07-28 stsp if (show_files) {
10078 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
10079 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
10080 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
10081 b2118c49 2020-07-28 stsp continue;
10083 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
10084 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
10086 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
10087 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
10089 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
10090 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
10091 b2118c49 2020-07-28 stsp if (error)
10092 b2118c49 2020-07-28 stsp goto done;
10093 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
10094 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
10095 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
10101 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
10102 b2118c49 2020-07-28 stsp free((char *)pe->path);
10103 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
10104 b2118c49 2020-07-28 stsp free(cwd);
10105 b2118c49 2020-07-28 stsp free(id_str);
10106 b2118c49 2020-07-28 stsp free(uuidstr);
10107 0ebf8283 2019-07-24 stsp return error;
