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 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
24 5c860e29 2018-03-12 stsp #include <err.h>
25 5c860e29 2018-03-12 stsp #include <errno.h>
26 12463d8b 2019-12-13 stsp #include <fcntl.h>
27 12ce7a6c 2019-08-12 stsp #include <limits.h>
28 5c860e29 2018-03-12 stsp #include <locale.h>
29 818c7501 2019-07-11 stsp #include <ctype.h>
30 99437157 2018-11-11 stsp #include <signal.h>
31 5c860e29 2018-03-12 stsp #include <stdio.h>
32 5c860e29 2018-03-12 stsp #include <stdlib.h>
33 5c860e29 2018-03-12 stsp #include <string.h>
34 5c860e29 2018-03-12 stsp #include <unistd.h>
35 c09a553d 2018-03-12 stsp #include <libgen.h>
36 c0768b0f 2018-06-10 stsp #include <time.h>
37 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 6841bf13 2019-11-29 kn #include <regex.h>
39 83cd27f8 2020-01-13 stsp #include <getopt.h>
40 d2cdc636 2020-03-18 stsp #include <util.h>
42 53ccebc2 2019-07-30 stsp #include "got_version.h"
43 f42b1b34 2018-03-12 stsp #include "got_error.h"
44 f42b1b34 2018-03-12 stsp #include "got_object.h"
45 5261c201 2018-04-01 stsp #include "got_reference.h"
46 f42b1b34 2018-03-12 stsp #include "got_repository.h"
47 1dd54920 2019-05-11 stsp #include "got_path.h"
48 e6209546 2019-08-22 stsp #include "got_cancel.h"
49 c09a553d 2018-03-12 stsp #include "got_worktree.h"
50 79109fed 2018-03-27 stsp #include "got_diff.h"
51 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
52 6f23baec 2020-03-18 stsp #include "got_fetch.h"
53 f8a36e22 2021-08-26 stsp #include "got_send.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"
58 d65a88a2 2021-09-05 stsp #include "got_dial.h"
60 5c860e29 2018-03-12 stsp #ifndef nitems
61 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
64 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
65 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
68 99437157 2018-11-11 stsp catch_sigint(int signo)
70 99437157 2018-11-11 stsp sigint_received = 1;
74 99437157 2018-11-11 stsp catch_sigpipe(int signo)
76 99437157 2018-11-11 stsp sigpipe_received = 1;
80 8cfb4057 2019-07-09 stsp struct got_cmd {
81 820059fa 2020-09-25 stsp const char *cmd_name;
82 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
83 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
84 97b3a7be 2019-07-09 stsp const char *cmd_alias;
87 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
88 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
89 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
90 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
91 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
92 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
93 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
94 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
95 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
96 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
97 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
98 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
99 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
100 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
101 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
102 d00136be 2019-03-26 stsp __dead static void usage_add(void);
103 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
104 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
105 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
106 f8a36e22 2021-08-26 stsp __dead static void usage_send(void);
107 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
108 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
109 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
110 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
111 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
112 f259c4c1 2021-09-24 stsp __dead static void usage_merge(void);
113 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
114 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
115 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
116 b2118c49 2020-07-28 stsp __dead static void usage_info(void);
118 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
119 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
120 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
121 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
122 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
123 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
124 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
125 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
126 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
127 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
128 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
129 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
130 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
131 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
132 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
133 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
134 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
135 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
136 f8a36e22 2021-08-26 stsp static const struct got_error* cmd_send(int, char *[]);
137 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
138 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
139 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
140 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
141 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
142 f259c4c1 2021-09-24 stsp static const struct got_error* cmd_merge(int, char *[]);
143 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
144 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
145 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
146 b2118c49 2020-07-28 stsp static const struct got_error* cmd_info(int, char *[]);
148 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
149 b2118c49 2020-07-28 stsp { "init", cmd_init, usage_init, "" },
150 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
151 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
152 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
153 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
154 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
155 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
156 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
157 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
158 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
159 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
160 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
161 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
162 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
163 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
164 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
165 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
166 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
167 f8a36e22 2021-08-26 stsp { "send", cmd_send, usage_send, "se" },
168 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
169 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
170 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
171 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
172 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
173 f259c4c1 2021-09-24 stsp { "merge", cmd_merge, usage_merge, "mg" },
174 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
175 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
176 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
177 b2118c49 2020-07-28 stsp { "info", cmd_info, usage_info, "" },
180 ce5b7c56 2019-07-09 stsp static void
181 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
185 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
186 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
187 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
188 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->cmd_name);
190 6879ba42 2020-10-01 naddy fputc('\n', fp);
193 ff69268e 2020-12-13 stsp __dead static void
194 ff69268e 2020-12-13 stsp option_conflict(char a, char b)
196 ff69268e 2020-12-13 stsp errx(1, "-%c and -%c options are mutually exclusive", a, b);
200 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
202 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
205 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
206 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
207 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
208 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0 }
211 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
213 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
214 5c860e29 2018-03-12 stsp switch (ch) {
222 6879ba42 2020-10-01 naddy usage(hflag, 1);
223 5c860e29 2018-03-12 stsp /* NOTREACHED */
227 5c860e29 2018-03-12 stsp argc -= optind;
228 5c860e29 2018-03-12 stsp argv += optind;
229 9814e6a3 2020-09-27 naddy optind = 1;
230 9814e6a3 2020-09-27 naddy optreset = 1;
232 53ccebc2 2019-07-30 stsp if (Vflag) {
233 53ccebc2 2019-07-30 stsp got_version_print_str();
237 5c860e29 2018-03-12 stsp if (argc <= 0)
238 6879ba42 2020-10-01 naddy usage(hflag, hflag ? 0 : 1);
240 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
241 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
243 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
244 d7d4f210 2018-03-12 stsp const struct got_error *error;
246 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
248 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
249 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
253 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
255 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
256 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
257 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
258 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
259 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
260 70015d7a 2019-11-08 stsp !(sigint_received &&
261 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
262 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
269 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
270 6879ba42 2020-10-01 naddy list_commands(stderr);
274 4ed7e80c 2018-05-20 stsp __dead static void
275 6879ba42 2020-10-01 naddy usage(int hflag, int status)
277 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
279 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
280 53ccebc2 2019-07-30 stsp getprogname());
282 6879ba42 2020-10-01 naddy list_commands(fp);
283 6879ba42 2020-10-01 naddy exit(status);
286 0266afb7 2019-01-04 stsp static const struct got_error *
287 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
289 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
290 e2ba3d07 2019-05-13 stsp const char *editor;
292 8920fa04 2019-08-18 stsp *abspath = NULL;
294 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
295 e2ba3d07 2019-05-13 stsp if (editor == NULL)
296 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
298 0ee7065d 2019-05-13 stsp if (editor) {
299 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
301 0ee7065d 2019-05-13 stsp return err;
304 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
305 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
306 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
307 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
310 e2ba3d07 2019-05-13 stsp return NULL;
313 e2ba3d07 2019-05-13 stsp static const struct got_error *
314 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
315 c530dc23 2019-07-23 stsp const char *worktree_path)
317 163ce85a 2019-05-13 stsp const struct got_error *err;
319 37c06ea4 2019-07-15 stsp #ifdef PROFILE
320 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
321 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
323 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
324 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
326 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
327 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
329 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
330 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
332 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
333 163ce85a 2019-05-13 stsp if (err != NULL)
334 163ce85a 2019-05-13 stsp return err;
336 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
337 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
339 0266afb7 2019-01-04 stsp return NULL;
342 2c7829a4 2019-06-17 stsp __dead static void
343 2c7829a4 2019-06-17 stsp usage_init(void)
345 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
349 2c7829a4 2019-06-17 stsp static const struct got_error *
350 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
352 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
353 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
356 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
357 2c7829a4 2019-06-17 stsp switch (ch) {
359 2c7829a4 2019-06-17 stsp usage_init();
360 2c7829a4 2019-06-17 stsp /* NOTREACHED */
364 2c7829a4 2019-06-17 stsp argc -= optind;
365 2c7829a4 2019-06-17 stsp argv += optind;
367 2c7829a4 2019-06-17 stsp #ifndef PROFILE
368 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
369 2c7829a4 2019-06-17 stsp err(1, "pledge");
371 2c7829a4 2019-06-17 stsp if (argc != 1)
372 bc20e173 2019-06-17 stsp usage_init();
374 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
375 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
376 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
378 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
380 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
381 2c7829a4 2019-06-17 stsp if (error &&
382 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
385 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
389 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
391 3ce1b845 2019-07-15 stsp free(repo_path);
392 3ce1b845 2019-07-15 stsp return error;
395 3ce1b845 2019-07-15 stsp __dead static void
396 3ce1b845 2019-07-15 stsp usage_import(void)
398 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
399 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
404 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
407 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
408 3ce1b845 2019-07-15 stsp int st = -1;
410 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
411 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
412 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
414 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
416 3ce1b845 2019-07-15 stsp goto doneediting;
418 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
419 3ce1b845 2019-07-15 stsp _exit(127);
422 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
423 3ce1b845 2019-07-15 stsp if (errno != EINTR)
426 3ce1b845 2019-07-15 stsp doneediting:
427 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
428 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
429 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
431 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
432 3ce1b845 2019-07-15 stsp errno = EINTR;
436 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
439 3ce1b845 2019-07-15 stsp static const struct got_error *
440 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
441 28cf319f 2021-01-28 stsp const char *initial_content, size_t initial_content_len,
442 28cf319f 2021-01-28 stsp int require_modification)
444 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
445 bfa12d5e 2020-09-26 stsp char *line = NULL;
446 bfa12d5e 2020-09-26 stsp size_t linesize = 0;
447 bfa12d5e 2020-09-26 stsp ssize_t linelen;
448 3ce1b845 2019-07-15 stsp struct stat st, st2;
449 bfa12d5e 2020-09-26 stsp FILE *fp = NULL;
450 bfa12d5e 2020-09-26 stsp size_t len, logmsg_len;
451 bfa12d5e 2020-09-26 stsp char *initial_content_stripped = NULL, *buf = NULL, *s;
453 3ce1b845 2019-07-15 stsp *logmsg = NULL;
455 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
456 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
458 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
459 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
461 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
462 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
464 28cf319f 2021-01-28 stsp if (require_modification &&
465 28cf319f 2021-01-28 stsp st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
466 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
467 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
470 bfa12d5e 2020-09-26 stsp * Set up a stripped version of the initial content without comments
471 bfa12d5e 2020-09-26 stsp * and blank lines. We need this in order to check if the message
472 bfa12d5e 2020-09-26 stsp * has in fact been edited.
474 bfa12d5e 2020-09-26 stsp initial_content_stripped = malloc(initial_content_len + 1);
475 bfa12d5e 2020-09-26 stsp if (initial_content_stripped == NULL)
476 bfa12d5e 2020-09-26 stsp return got_error_from_errno("malloc");
477 bfa12d5e 2020-09-26 stsp initial_content_stripped[0] = '\0';
479 bfa12d5e 2020-09-26 stsp buf = strdup(initial_content);
480 bfa12d5e 2020-09-26 stsp if (buf == NULL) {
481 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("strdup");
486 bfa12d5e 2020-09-26 stsp while ((line = strsep(&s, "\n")) != NULL) {
487 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
488 bfa12d5e 2020-09-26 stsp continue; /* remove comments and leading empty lines */
489 bfa12d5e 2020-09-26 stsp len = strlcat(initial_content_stripped, line,
490 bfa12d5e 2020-09-26 stsp initial_content_len + 1);
491 bfa12d5e 2020-09-26 stsp if (len >= initial_content_len + 1) {
492 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
496 bfa12d5e 2020-09-26 stsp while (len > 0 && initial_content_stripped[len - 1] == '\n') {
497 bfa12d5e 2020-09-26 stsp initial_content_stripped[len - 1] = '\0';
501 bfa12d5e 2020-09-26 stsp logmsg_len = st2.st_size;
502 bfa12d5e 2020-09-26 stsp *logmsg = malloc(logmsg_len + 1);
503 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
504 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
505 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
507 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
508 3ce1b845 2019-07-15 stsp if (fp == NULL) {
509 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
514 bfa12d5e 2020-09-26 stsp while ((linelen = getline(&line, &linesize, fp)) != -1) {
515 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
516 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
517 bfa12d5e 2020-09-26 stsp len = strlcat(*logmsg, line, logmsg_len + 1);
518 bfa12d5e 2020-09-26 stsp if (len >= logmsg_len + 1) {
519 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
523 bfa12d5e 2020-09-26 stsp free(line);
524 bfa12d5e 2020-09-26 stsp if (ferror(fp)) {
525 bfa12d5e 2020-09-26 stsp err = got_ferror(fp, GOT_ERR_IO);
528 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
529 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
533 bfa12d5e 2020-09-26 stsp if (len == 0) {
534 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
535 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
538 28cf319f 2021-01-28 stsp if (require_modification &&
539 28cf319f 2021-01-28 stsp strcmp(*logmsg, initial_content_stripped) == 0)
540 bfa12d5e 2020-09-26 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
541 bfa12d5e 2020-09-26 stsp "no changes made to commit message, aborting");
543 bfa12d5e 2020-09-26 stsp free(initial_content_stripped);
545 bfa12d5e 2020-09-26 stsp if (fp && fclose(fp) == EOF && err == NULL)
546 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("fclose");
548 3ce1b845 2019-07-15 stsp free(*logmsg);
549 3ce1b845 2019-07-15 stsp *logmsg = NULL;
551 3ce1b845 2019-07-15 stsp return err;
554 3ce1b845 2019-07-15 stsp static const struct got_error *
555 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
556 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
558 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
559 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
560 1601cb9f 2020-09-11 naddy int initial_content_len;
561 97972933 2020-09-11 stsp int fd = -1;
563 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
564 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
565 1601cb9f 2020-09-11 naddy branch_name);
566 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
567 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
569 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
570 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
574 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
575 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *logmsg_path);
579 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
580 0d5bb276 2020-12-15 stsp initial_content_len, 1);
582 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
583 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *logmsg_path);
584 3ce1b845 2019-07-15 stsp free(initial_content);
586 59f86c76 2020-09-11 stsp free(*logmsg_path);
587 59f86c76 2020-09-11 stsp *logmsg_path = NULL;
589 3ce1b845 2019-07-15 stsp return err;
592 3ce1b845 2019-07-15 stsp static const struct got_error *
593 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
595 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
596 3ce1b845 2019-07-15 stsp return NULL;
599 3ce1b845 2019-07-15 stsp static const struct got_error *
600 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
601 50b0790e 2020-09-11 stsp struct got_worktree *worktree)
603 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
604 50b0790e 2020-09-11 stsp const char *got_author = NULL, *name, *email;
605 50b0790e 2020-09-11 stsp const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
607 84792843 2019-08-09 stsp *author = NULL;
609 50b0790e 2020-09-11 stsp if (worktree)
610 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
611 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
614 50b0790e 2020-09-11 stsp * Priority of potential author information sources, from most
615 50b0790e 2020-09-11 stsp * significant to least significant:
616 50b0790e 2020-09-11 stsp * 1) work tree's .got/got.conf file
617 50b0790e 2020-09-11 stsp * 2) repository's got.conf file
618 50b0790e 2020-09-11 stsp * 3) repository's git config file
619 50b0790e 2020-09-11 stsp * 4) environment variables
620 50b0790e 2020-09-11 stsp * 5) global git config files (in user's home directory or /etc)
623 50b0790e 2020-09-11 stsp if (worktree_conf)
624 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(worktree_conf);
625 50b0790e 2020-09-11 stsp if (got_author == NULL)
626 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(repo_conf);
627 84792843 2019-08-09 stsp if (got_author == NULL) {
628 257add31 2020-09-09 stsp name = got_repo_get_gitconfig_author_name(repo);
629 257add31 2020-09-09 stsp email = got_repo_get_gitconfig_author_email(repo);
630 c9956ddf 2019-09-08 stsp if (name && email) {
631 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
632 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
633 c9956ddf 2019-09-08 stsp return NULL;
636 257add31 2020-09-09 stsp got_author = getenv("GOT_AUTHOR");
637 257add31 2020-09-09 stsp if (got_author == NULL) {
638 257add31 2020-09-09 stsp name = got_repo_get_global_gitconfig_author_name(repo);
639 257add31 2020-09-09 stsp email = got_repo_get_global_gitconfig_author_email(
641 257add31 2020-09-09 stsp if (name && email) {
642 257add31 2020-09-09 stsp if (asprintf(author, "%s <%s>", name, email)
644 257add31 2020-09-09 stsp return got_error_from_errno("asprintf");
645 257add31 2020-09-09 stsp return NULL;
647 257add31 2020-09-09 stsp /* TODO: Look up user in password database? */
648 257add31 2020-09-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
652 aba9c984 2019-09-08 stsp *author = strdup(got_author);
653 aba9c984 2019-09-08 stsp if (*author == NULL)
654 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
657 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
658 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
660 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
661 84792843 2019-08-09 stsp got_author++;
662 aba9c984 2019-09-08 stsp if (*got_author != '<') {
663 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
666 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
667 84792843 2019-08-09 stsp got_author++;
668 aba9c984 2019-09-08 stsp if (*got_author != '@') {
669 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
672 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
673 84792843 2019-08-09 stsp got_author++;
674 84792843 2019-08-09 stsp if (*got_author != '>')
675 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
678 aba9c984 2019-09-08 stsp free(*author);
679 aba9c984 2019-09-08 stsp *author = NULL;
681 aba9c984 2019-09-08 stsp return err;
684 c9956ddf 2019-09-08 stsp static const struct got_error *
685 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
687 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
689 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
690 c9956ddf 2019-09-08 stsp if (homedir) {
691 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
692 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
695 c9956ddf 2019-09-08 stsp return NULL;
698 84792843 2019-08-09 stsp static const struct got_error *
699 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
701 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
702 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
703 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
704 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
705 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
706 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
707 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
708 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
710 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
711 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
712 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
714 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
716 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
717 3ce1b845 2019-07-15 stsp switch (ch) {
719 3ce1b845 2019-07-15 stsp branch_name = optarg;
722 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
723 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
724 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
729 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
730 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
731 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
737 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
739 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
745 b2b65d18 2019-08-22 stsp usage_import();
746 3ce1b845 2019-07-15 stsp /* NOTREACHED */
750 3ce1b845 2019-07-15 stsp argc -= optind;
751 3ce1b845 2019-07-15 stsp argv += optind;
753 3ce1b845 2019-07-15 stsp #ifndef PROFILE
754 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
756 3ce1b845 2019-07-15 stsp NULL) == -1)
757 3ce1b845 2019-07-15 stsp err(1, "pledge");
759 3ce1b845 2019-07-15 stsp if (argc != 1)
760 3ce1b845 2019-07-15 stsp usage_import();
762 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
763 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
764 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
765 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
767 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
768 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
771 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
775 50b0790e 2020-09-11 stsp error = get_author(&author, repo, NULL);
777 aba9c984 2019-09-08 stsp return error;
780 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
781 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
782 e560b7e0 2019-11-28 stsp * an unintended typo.
784 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
785 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
787 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
788 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
792 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
793 3ce1b845 2019-07-15 stsp if (error) {
794 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
797 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
798 3ce1b845 2019-07-15 stsp "import target branch already exists");
802 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
803 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
804 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
807 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
810 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
811 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
813 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
814 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
817 8e158b01 2019-09-22 stsp free(logmsg);
818 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
819 ef293bdd 2019-10-21 stsp path_dir, refname);
820 ef293bdd 2019-10-21 stsp if (error) {
821 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
822 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
823 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
828 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
829 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
830 ef293bdd 2019-10-21 stsp if (logmsg_path)
831 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
835 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
836 ef293bdd 2019-10-21 stsp if (error) {
837 ef293bdd 2019-10-21 stsp if (logmsg_path)
838 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
842 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
843 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
844 ef293bdd 2019-10-21 stsp if (error) {
845 ef293bdd 2019-10-21 stsp if (logmsg_path)
846 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
850 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
851 ef293bdd 2019-10-21 stsp if (error) {
852 ef293bdd 2019-10-21 stsp if (logmsg_path)
853 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
857 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
858 ef293bdd 2019-10-21 stsp if (error) {
859 ef293bdd 2019-10-21 stsp if (logmsg_path)
860 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
864 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
865 ef293bdd 2019-10-21 stsp if (error) {
866 ef293bdd 2019-10-21 stsp if (logmsg_path)
867 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
871 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
872 3ce1b845 2019-07-15 stsp if (error) {
873 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
874 ef293bdd 2019-10-21 stsp if (logmsg_path)
875 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
879 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
880 3ce1b845 2019-07-15 stsp branch_ref);
881 ef293bdd 2019-10-21 stsp if (error) {
882 ef293bdd 2019-10-21 stsp if (logmsg_path)
883 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
887 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
888 ef293bdd 2019-10-21 stsp if (error) {
889 ef293bdd 2019-10-21 stsp if (logmsg_path)
890 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
895 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
896 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
898 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
899 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
900 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
901 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
902 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
903 8e158b01 2019-09-22 stsp free(logmsg);
904 ef293bdd 2019-10-21 stsp free(logmsg_path);
905 2c7829a4 2019-06-17 stsp free(repo_path);
906 3ce1b845 2019-07-15 stsp free(editor);
907 3ce1b845 2019-07-15 stsp free(refname);
908 3ce1b845 2019-07-15 stsp free(new_commit_id);
909 3ce1b845 2019-07-15 stsp free(id_str);
910 aba9c984 2019-09-08 stsp free(author);
911 c9956ddf 2019-09-08 stsp free(gitconfig_path);
912 3ce1b845 2019-07-15 stsp if (branch_ref)
913 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
914 3ce1b845 2019-07-15 stsp if (head_ref)
915 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
916 2c7829a4 2019-06-17 stsp return error;
919 93658fb9 2020-03-18 stsp __dead static void
920 93658fb9 2020-03-18 stsp usage_clone(void)
922 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
923 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
927 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
928 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
929 892ac3b6 2020-03-18 stsp int last_p_indexed;
930 892ac3b6 2020-03-18 stsp int last_p_resolved;
931 68999b92 2020-03-18 stsp int verbosity;
933 04d9a9ec 2020-09-24 stsp struct got_repository *repo;
935 04d9a9ec 2020-09-24 stsp int create_configs;
936 04d9a9ec 2020-09-24 stsp int configs_created;
938 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *symrefs;
939 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches;
940 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs;
941 04d9a9ec 2020-09-24 stsp const char *proto;
942 04d9a9ec 2020-09-24 stsp const char *host;
943 04d9a9ec 2020-09-24 stsp const char *port;
944 04d9a9ec 2020-09-24 stsp const char *remote_repo_path;
945 04d9a9ec 2020-09-24 stsp const char *git_url;
946 04d9a9ec 2020-09-24 stsp int fetch_all_branches;
947 04d9a9ec 2020-09-24 stsp int mirror_references;
948 04d9a9ec 2020-09-24 stsp } config_info;
951 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
952 93658fb9 2020-03-18 stsp static const struct got_error *
953 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
954 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
955 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
956 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_branches,
957 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, struct got_repository *repo);
959 04d9a9ec 2020-09-24 stsp static const struct got_error *
960 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
961 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
963 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
964 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
965 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
966 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
967 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
970 04d9a9ec 2020-09-24 stsp * In order to allow a failed clone to be resumed with 'got fetch'
971 04d9a9ec 2020-09-24 stsp * we try to create configuration files as soon as possible.
972 04d9a9ec 2020-09-24 stsp * Once the server has sent information about its default branch
973 04d9a9ec 2020-09-24 stsp * we have all required information.
975 04d9a9ec 2020-09-24 stsp if (a->create_configs && !a->configs_created &&
976 04d9a9ec 2020-09-24 stsp !TAILQ_EMPTY(a->config_info.symrefs)) {
977 04d9a9ec 2020-09-24 stsp err = create_config_files(a->config_info.proto,
978 62d463ca 2020-10-20 naddy a->config_info.host, a->config_info.port,
979 62d463ca 2020-10-20 naddy a->config_info.remote_repo_path,
980 62d463ca 2020-10-20 naddy a->config_info.git_url,
981 62d463ca 2020-10-20 naddy a->config_info.fetch_all_branches,
982 62d463ca 2020-10-20 naddy a->config_info.mirror_references,
983 62d463ca 2020-10-20 naddy a->config_info.symrefs,
984 99495ddb 2021-01-10 stsp a->config_info.wanted_branches,
985 99495ddb 2021-01-10 stsp a->config_info.wanted_refs, a->repo);
987 04d9a9ec 2020-09-24 stsp return err;
988 04d9a9ec 2020-09-24 stsp a->configs_created = 1;
991 68999b92 2020-03-18 stsp if (a->verbosity < 0)
992 68999b92 2020-03-18 stsp return NULL;
994 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
995 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
996 892ac3b6 2020-03-18 stsp fflush(stdout);
997 12d1281e 2020-03-19 stsp return NULL;
1000 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
1001 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1002 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
1003 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
1004 892ac3b6 2020-03-18 stsp print_size = 1;
1005 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
1006 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1007 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
1009 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
1010 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
1011 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
1012 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
1013 892ac3b6 2020-03-18 stsp print_indexed = 1;
1014 892ac3b6 2020-03-18 stsp print_size = 1;
1017 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
1018 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1019 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1020 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1021 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1022 892ac3b6 2020-03-18 stsp print_resolved = 1;
1023 892ac3b6 2020-03-18 stsp print_indexed = 1;
1024 892ac3b6 2020-03-18 stsp print_size = 1;
1029 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1030 892ac3b6 2020-03-18 stsp printf("\r");
1031 892ac3b6 2020-03-18 stsp if (print_size)
1032 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1033 d715f13e 2020-03-19 stsp if (print_indexed)
1034 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1035 d715f13e 2020-03-19 stsp if (print_resolved)
1036 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1037 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1038 892ac3b6 2020-03-18 stsp fflush(stdout);
1040 531c3985 2020-03-18 stsp return NULL;
1043 531c3985 2020-03-18 stsp static const struct got_error *
1044 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
1045 04d9a9ec 2020-09-24 stsp int verbosity, struct got_repository *repo)
1047 4ba14133 2020-03-20 stsp const struct got_error *err;
1048 04d9a9ec 2020-09-24 stsp struct got_reference *head_symref;
1050 04d9a9ec 2020-09-24 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1052 4ba14133 2020-03-20 stsp return err;
1054 04d9a9ec 2020-09-24 stsp err = got_ref_write(head_symref, repo);
1055 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
1056 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
1057 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
1059 04d9a9ec 2020-09-24 stsp got_ref_close(head_symref);
1060 4ba14133 2020-03-20 stsp return err;
1063 4ba14133 2020-03-20 stsp static const struct got_error *
1064 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
1065 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
1067 41b0de12 2020-03-21 stsp const struct got_error *err;
1068 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
1070 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1071 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1072 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
1074 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
1077 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
1078 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1079 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
1080 41b0de12 2020-03-21 stsp char *id_str;
1082 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1084 41b0de12 2020-03-21 stsp return err;
1085 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
1086 41b0de12 2020-03-21 stsp free(id_str);
1089 41b0de12 2020-03-21 stsp return NULL;
1092 6338a6a1 2020-03-21 stsp static const struct got_error *
1093 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
1094 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
1096 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
1097 6338a6a1 2020-03-21 stsp struct got_reference *ref;
1098 6338a6a1 2020-03-21 stsp char *id_str;
1100 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1102 6338a6a1 2020-03-21 stsp return err;
1104 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
1106 6338a6a1 2020-03-21 stsp goto done;
1108 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1109 6338a6a1 2020-03-21 stsp got_ref_close(ref);
1111 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
1112 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
1114 6338a6a1 2020-03-21 stsp free(id_str);
1115 6338a6a1 2020-03-21 stsp return err;
1118 0e4002ca 2020-03-21 stsp static int
1119 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
1121 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
1123 0e4002ca 2020-03-21 stsp refname += 5;
1126 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
1127 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
1129 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
1131 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
1134 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
1135 0e4002ca 2020-03-21 stsp wanted_ref += 5;
1137 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
1138 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1141 0e4002ca 2020-03-21 stsp /* Allow exact match. */
1142 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
1145 0e4002ca 2020-03-21 stsp static int
1146 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1148 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
1150 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1151 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1158 41b0de12 2020-03-21 stsp static const struct got_error *
1159 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1160 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1162 0e4002ca 2020-03-21 stsp const struct got_error *err;
1163 0e4002ca 2020-03-21 stsp char *remote_refname;
1165 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1166 0e4002ca 2020-03-21 stsp refname += 5;
1168 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1169 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1170 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1172 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1173 0e4002ca 2020-03-21 stsp free(remote_refname);
1174 7c0b7f42 2020-09-24 stsp return err;
1177 7c0b7f42 2020-09-24 stsp static const struct got_error *
1178 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
1179 15d3c221 2021-01-05 stsp const char *remote_repo_path, const char *default_branch,
1180 0c8b29c5 2021-01-05 stsp int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1181 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, int mirror_references,
1182 99495ddb 2021-01-10 stsp struct got_repository *repo)
1184 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1185 7c0b7f42 2020-09-24 stsp char *gotconfig_path = NULL;
1186 7c0b7f42 2020-09-24 stsp char *gotconfig = NULL;
1187 7c0b7f42 2020-09-24 stsp FILE *gotconfig_file = NULL;
1188 15d3c221 2021-01-05 stsp const char *branchname = NULL;
1189 99495ddb 2021-01-10 stsp char *branches = NULL, *refs = NULL;
1190 7c0b7f42 2020-09-24 stsp ssize_t n;
1192 0c8b29c5 2021-01-05 stsp if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1193 132af4a5 2021-01-05 stsp struct got_pathlist_entry *pe;
1194 132af4a5 2021-01-05 stsp TAILQ_FOREACH(pe, wanted_branches, entry) {
1196 132af4a5 2021-01-05 stsp branchname = pe->path;
1197 132af4a5 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1198 132af4a5 2021-01-05 stsp branchname += 11;
1199 132af4a5 2021-01-05 stsp if (asprintf(&s, "%s\"%s\" ",
1200 132af4a5 2021-01-05 stsp branches ? branches : "", branchname) == -1) {
1201 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1202 132af4a5 2021-01-05 stsp goto done;
1204 132af4a5 2021-01-05 stsp free(branches);
1205 132af4a5 2021-01-05 stsp branches = s;
1207 0c8b29c5 2021-01-05 stsp } else if (!fetch_all_branches && default_branch) {
1208 15d3c221 2021-01-05 stsp branchname = default_branch;
1209 15d3c221 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1210 15d3c221 2021-01-05 stsp branchname += 11;
1211 132af4a5 2021-01-05 stsp if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1212 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1213 132af4a5 2021-01-05 stsp goto done;
1216 99495ddb 2021-01-10 stsp if (!TAILQ_EMPTY(wanted_refs)) {
1217 99495ddb 2021-01-10 stsp struct got_pathlist_entry *pe;
1218 99495ddb 2021-01-10 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1220 99495ddb 2021-01-10 stsp const char *refname = pe->path;
1221 99495ddb 2021-01-10 stsp if (strncmp(refname, "refs/", 5) == 0)
1222 99495ddb 2021-01-10 stsp branchname += 5;
1223 99495ddb 2021-01-10 stsp if (asprintf(&s, "%s\"%s\" ",
1224 99495ddb 2021-01-10 stsp refs ? refs : "", refname) == -1) {
1225 99495ddb 2021-01-10 stsp err = got_error_from_errno("asprintf");
1226 99495ddb 2021-01-10 stsp goto done;
1228 99495ddb 2021-01-10 stsp free(refs);
1233 7c0b7f42 2020-09-24 stsp /* Create got.conf(5). */
1234 7c0b7f42 2020-09-24 stsp gotconfig_path = got_repo_get_path_gotconfig(repo);
1235 7c0b7f42 2020-09-24 stsp if (gotconfig_path == NULL) {
1236 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gotconfig");
1237 7c0b7f42 2020-09-24 stsp goto done;
1239 7c0b7f42 2020-09-24 stsp gotconfig_file = fopen(gotconfig_path, "a");
1240 7c0b7f42 2020-09-24 stsp if (gotconfig_file == NULL) {
1241 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gotconfig_path);
1242 7c0b7f42 2020-09-24 stsp goto done;
1244 7c0b7f42 2020-09-24 stsp if (asprintf(&gotconfig,
1245 7c0b7f42 2020-09-24 stsp "remote \"%s\" {\n"
1246 7c0b7f42 2020-09-24 stsp "\tserver %s\n"
1247 7c0b7f42 2020-09-24 stsp "\tprotocol %s\n"
1249 7c0b7f42 2020-09-24 stsp "\trepository \"%s\"\n"
1255 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1256 7c0b7f42 2020-09-24 stsp port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1257 132af4a5 2021-01-05 stsp remote_repo_path, branches ? "\tbranch { " : "",
1258 132af4a5 2021-01-05 stsp branches ? branches : "", branches ? "}\n" : "",
1259 99495ddb 2021-01-10 stsp refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1260 0c8b29c5 2021-01-05 stsp mirror_references ? "\tmirror-references yes\n" : "",
1261 0c8b29c5 2021-01-05 stsp fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1262 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1263 7c0b7f42 2020-09-24 stsp goto done;
1265 7c0b7f42 2020-09-24 stsp n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1266 7c0b7f42 2020-09-24 stsp if (n != strlen(gotconfig)) {
1267 7c0b7f42 2020-09-24 stsp err = got_ferror(gotconfig_file, GOT_ERR_IO);
1268 7c0b7f42 2020-09-24 stsp goto done;
1272 7c0b7f42 2020-09-24 stsp if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1273 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gotconfig_path);
1274 7c0b7f42 2020-09-24 stsp free(gotconfig_path);
1275 132af4a5 2021-01-05 stsp free(branches);
1276 7c0b7f42 2020-09-24 stsp return err;
1279 7c0b7f42 2020-09-24 stsp static const struct got_error *
1280 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
1281 132af4a5 2021-01-05 stsp int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1282 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, int mirror_references,
1283 99495ddb 2021-01-10 stsp struct got_repository *repo)
1285 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1286 7c0b7f42 2020-09-24 stsp char *gitconfig_path = NULL;
1287 7c0b7f42 2020-09-24 stsp char *gitconfig = NULL;
1288 7c0b7f42 2020-09-24 stsp FILE *gitconfig_file = NULL;
1289 99495ddb 2021-01-10 stsp char *branches = NULL, *refs = NULL;
1290 56d0a753 2021-01-20 stsp const char *branchname;
1291 7c0b7f42 2020-09-24 stsp ssize_t n;
1293 7c0b7f42 2020-09-24 stsp /* Create a config file Git can understand. */
1294 7c0b7f42 2020-09-24 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1295 7c0b7f42 2020-09-24 stsp if (gitconfig_path == NULL) {
1296 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gitconfig");
1297 7c0b7f42 2020-09-24 stsp goto done;
1299 7c0b7f42 2020-09-24 stsp gitconfig_file = fopen(gitconfig_path, "a");
1300 7c0b7f42 2020-09-24 stsp if (gitconfig_file == NULL) {
1301 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gitconfig_path);
1302 7c0b7f42 2020-09-24 stsp goto done;
1304 56d0a753 2021-01-20 stsp if (fetch_all_branches) {
1305 56d0a753 2021-01-20 stsp if (mirror_references) {
1306 56d0a753 2021-01-20 stsp if (asprintf(&branches,
1307 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1308 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1309 56d0a753 2021-01-20 stsp goto done;
1311 56d0a753 2021-01-20 stsp } else if (asprintf(&branches,
1312 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1313 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1314 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1315 7c0b7f42 2020-09-24 stsp goto done;
1317 132af4a5 2021-01-05 stsp } else if (!TAILQ_EMPTY(wanted_branches)) {
1318 132af4a5 2021-01-05 stsp struct got_pathlist_entry *pe;
1319 132af4a5 2021-01-05 stsp TAILQ_FOREACH(pe, wanted_branches, entry) {
1321 132af4a5 2021-01-05 stsp branchname = pe->path;
1322 132af4a5 2021-01-05 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1323 132af4a5 2021-01-05 stsp branchname += 11;
1324 56d0a753 2021-01-20 stsp if (mirror_references) {
1325 56d0a753 2021-01-20 stsp if (asprintf(&s,
1326 56d0a753 2021-01-20 stsp "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1327 56d0a753 2021-01-20 stsp branches ? branches : "",
1328 56d0a753 2021-01-20 stsp branchname, branchname) == -1) {
1329 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1330 56d0a753 2021-01-20 stsp goto done;
1332 56d0a753 2021-01-20 stsp } else if (asprintf(&s,
1333 56d0a753 2021-01-20 stsp "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1334 132af4a5 2021-01-05 stsp branches ? branches : "",
1335 132af4a5 2021-01-05 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1336 132af4a5 2021-01-05 stsp branchname) == -1) {
1337 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1338 132af4a5 2021-01-05 stsp goto done;
1340 132af4a5 2021-01-05 stsp free(branches);
1341 132af4a5 2021-01-05 stsp branches = s;
1345 7c0b7f42 2020-09-24 stsp * If the server specified a default branch, use just that one.
1346 7c0b7f42 2020-09-24 stsp * Otherwise fall back to fetching all branches on next fetch.
1348 04d9a9ec 2020-09-24 stsp if (default_branch) {
1349 04d9a9ec 2020-09-24 stsp branchname = default_branch;
1350 7c0b7f42 2020-09-24 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1351 7c0b7f42 2020-09-24 stsp branchname += 11;
1353 7c0b7f42 2020-09-24 stsp branchname = "*"; /* fall back to all branches */
1354 56d0a753 2021-01-20 stsp if (mirror_references) {
1355 56d0a753 2021-01-20 stsp if (asprintf(&branches,
1356 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/%s:refs/heads/%s\n",
1357 56d0a753 2021-01-20 stsp branchname, branchname) == -1) {
1358 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1359 56d0a753 2021-01-20 stsp goto done;
1361 56d0a753 2021-01-20 stsp } else if (asprintf(&branches,
1362 56d0a753 2021-01-20 stsp "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1363 7c0b7f42 2020-09-24 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1364 7c0b7f42 2020-09-24 stsp branchname) == -1) {
1365 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1366 7c0b7f42 2020-09-24 stsp goto done;
1369 56d0a753 2021-01-20 stsp if (!TAILQ_EMPTY(wanted_refs)) {
1370 99495ddb 2021-01-10 stsp struct got_pathlist_entry *pe;
1371 99495ddb 2021-01-10 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1373 99495ddb 2021-01-10 stsp const char *refname = pe->path;
1374 99495ddb 2021-01-10 stsp if (strncmp(refname, "refs/", 5) == 0)
1375 99495ddb 2021-01-10 stsp refname += 5;
1376 56d0a753 2021-01-20 stsp if (mirror_references) {
1377 56d0a753 2021-01-20 stsp if (asprintf(&s,
1378 56d0a753 2021-01-20 stsp "%s\tfetch = refs/%s:refs/%s\n",
1379 56d0a753 2021-01-20 stsp refs ? refs : "", refname, refname) == -1) {
1380 56d0a753 2021-01-20 stsp err = got_error_from_errno("asprintf");
1381 56d0a753 2021-01-20 stsp goto done;
1383 56d0a753 2021-01-20 stsp } else if (asprintf(&s,
1384 56d0a753 2021-01-20 stsp "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1385 99495ddb 2021-01-10 stsp refs ? refs : "",
1386 99495ddb 2021-01-10 stsp refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1387 99495ddb 2021-01-10 stsp refname) == -1) {
1388 99495ddb 2021-01-10 stsp err = got_error_from_errno("asprintf");
1389 99495ddb 2021-01-10 stsp goto done;
1391 99495ddb 2021-01-10 stsp free(refs);
1396 132af4a5 2021-01-05 stsp if (asprintf(&gitconfig,
1397 132af4a5 2021-01-05 stsp "[remote \"%s\"]\n"
1398 132af4a5 2021-01-05 stsp "\turl = %s\n"
1401 56d0a753 2021-01-20 stsp "\tfetch = refs/tags/*:refs/tags/*\n",
1402 132af4a5 2021-01-05 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1403 56d0a753 2021-01-20 stsp refs ? refs : "") == -1) {
1404 132af4a5 2021-01-05 stsp err = got_error_from_errno("asprintf");
1405 132af4a5 2021-01-05 stsp goto done;
1407 7c0b7f42 2020-09-24 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1408 7c0b7f42 2020-09-24 stsp if (n != strlen(gitconfig)) {
1409 7c0b7f42 2020-09-24 stsp err = got_ferror(gitconfig_file, GOT_ERR_IO);
1410 7c0b7f42 2020-09-24 stsp goto done;
1413 7c0b7f42 2020-09-24 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1414 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gitconfig_path);
1415 7c0b7f42 2020-09-24 stsp free(gitconfig_path);
1416 132af4a5 2021-01-05 stsp free(branches);
1417 0e4002ca 2020-03-21 stsp return err;
1420 0e4002ca 2020-03-21 stsp static const struct got_error *
1421 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
1422 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1423 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
1424 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_branches,
1425 99495ddb 2021-01-10 stsp struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1427 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
1428 04d9a9ec 2020-09-24 stsp const char *default_branch = NULL;
1429 04d9a9ec 2020-09-24 stsp struct got_pathlist_entry *pe;
1432 04d9a9ec 2020-09-24 stsp * If we asked for a set of wanted branches then use the first
1433 04d9a9ec 2020-09-24 stsp * one of those.
1435 62d463ca 2020-10-20 naddy if (!TAILQ_EMPTY(wanted_branches)) {
1436 04d9a9ec 2020-09-24 stsp pe = TAILQ_FIRST(wanted_branches);
1437 04d9a9ec 2020-09-24 stsp default_branch = pe->path;
1439 04d9a9ec 2020-09-24 stsp /* First HEAD ref listed by server is the default branch. */
1440 04d9a9ec 2020-09-24 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1441 04d9a9ec 2020-09-24 stsp const char *refname = pe->path;
1442 04d9a9ec 2020-09-24 stsp const char *target = pe->data;
1444 04d9a9ec 2020-09-24 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1447 04d9a9ec 2020-09-24 stsp default_branch = target;
1452 04d9a9ec 2020-09-24 stsp /* Create got.conf(5). */
1453 04d9a9ec 2020-09-24 stsp err = create_gotconfig(proto, host, port, remote_repo_path,
1454 0c8b29c5 2021-01-05 stsp default_branch, fetch_all_branches, wanted_branches,
1455 99495ddb 2021-01-10 stsp wanted_refs, mirror_references, repo);
1457 04d9a9ec 2020-09-24 stsp return err;
1459 04d9a9ec 2020-09-24 stsp /* Create a config file Git can understand. */
1460 04d9a9ec 2020-09-24 stsp return create_gitconfig(git_url, default_branch, fetch_all_branches,
1461 99495ddb 2021-01-10 stsp wanted_branches, wanted_refs, mirror_references, repo);
1464 04d9a9ec 2020-09-24 stsp static const struct got_error *
1465 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1467 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1468 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1469 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1470 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1471 a9c2d4c2 2020-09-24 stsp const char *repo_path;
1472 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1473 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1474 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1475 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1476 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1477 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1478 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1479 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1480 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1481 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1483 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1484 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1485 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1486 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1488 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1489 93658fb9 2020-03-18 stsp switch (ch) {
1491 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1494 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1495 4ba14133 2020-03-20 stsp optarg, NULL);
1496 4ba14133 2020-03-20 stsp if (error)
1497 4ba14133 2020-03-20 stsp return error;
1500 41b0de12 2020-03-21 stsp list_refs_only = 1;
1503 469dd726 2020-03-20 stsp mirror_references = 1;
1506 68999b92 2020-03-18 stsp if (verbosity < 0)
1507 68999b92 2020-03-18 stsp verbosity = 0;
1508 68999b92 2020-03-18 stsp else if (verbosity < 3)
1509 68999b92 2020-03-18 stsp verbosity++;
1512 68999b92 2020-03-18 stsp verbosity = -1;
1515 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1516 0e4002ca 2020-03-21 stsp optarg, NULL);
1517 0e4002ca 2020-03-21 stsp if (error)
1518 0e4002ca 2020-03-21 stsp return error;
1521 93658fb9 2020-03-18 stsp usage_clone();
1525 93658fb9 2020-03-18 stsp argc -= optind;
1526 93658fb9 2020-03-18 stsp argv += optind;
1528 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1529 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
1530 41b0de12 2020-03-21 stsp if (list_refs_only) {
1531 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1532 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
1533 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1534 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
1535 41b0de12 2020-03-21 stsp if (mirror_references)
1536 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
1537 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1538 ff69268e 2020-12-13 stsp option_conflict('l', 'R');
1541 93658fb9 2020-03-18 stsp uri = argv[0];
1543 9df6f38b 2020-03-18 stsp if (argc == 1)
1544 93658fb9 2020-03-18 stsp dirname = NULL;
1545 9df6f38b 2020-03-18 stsp else if (argc == 2)
1546 93658fb9 2020-03-18 stsp dirname = argv[1];
1548 93658fb9 2020-03-18 stsp usage_clone();
1550 5e5da8c4 2021-09-05 stsp error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1551 4dbec0a8 2020-08-27 stsp &repo_name, uri);
1552 39c64a6a 2020-03-18 stsp if (error)
1553 09f63084 2020-03-20 stsp goto done;
1555 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1556 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1557 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1558 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1559 09838ffc 2020-03-18 stsp goto done;
1562 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1563 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1564 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1565 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1566 39c64a6a 2020-03-18 stsp err(1, "pledge");
1568 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1569 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1570 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1571 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1572 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1573 39c64a6a 2020-03-18 stsp err(1, "pledge");
1575 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1576 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1577 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1578 39c64a6a 2020-03-18 stsp goto done;
1580 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1581 39c64a6a 2020-03-18 stsp goto done;
1583 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1584 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1585 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1586 bb64b798 2020-03-18 stsp goto done;
1588 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1590 bb64b798 2020-03-18 stsp repo_path = dirname;
1592 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1593 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1594 2751fe64 2020-09-24 stsp if (error &&
1595 2751fe64 2020-09-24 stsp (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1596 2751fe64 2020-09-24 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1597 41b0de12 2020-03-21 stsp goto done;
1598 2751fe64 2020-09-24 stsp if (!got_path_dir_is_empty(repo_path)) {
1599 2751fe64 2020-09-24 stsp error = got_error_path(repo_path,
1600 2751fe64 2020-09-24 stsp GOT_ERR_DIR_NOT_EMPTY);
1601 41b0de12 2020-03-21 stsp goto done;
1605 d65a88a2 2021-09-05 stsp error = got_dial_apply_unveil(proto);
1606 d65a88a2 2021-09-05 stsp if (error)
1607 d65a88a2 2021-09-05 stsp goto done;
1609 f535bcd4 2020-09-30 stsp error = apply_unveil(repo_path, 0, NULL);
1610 ee448f5f 2020-03-18 stsp if (error)
1611 ee448f5f 2020-03-18 stsp goto done;
1613 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1614 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1615 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1617 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1618 9c52365f 2020-03-21 stsp server_path, verbosity);
1619 39c64a6a 2020-03-18 stsp if (error)
1620 bb64b798 2020-03-18 stsp goto done;
1622 2751fe64 2020-09-24 stsp if (!list_refs_only) {
1623 2751fe64 2020-09-24 stsp error = got_repo_init(repo_path);
1624 2751fe64 2020-09-24 stsp if (error)
1625 2751fe64 2020-09-24 stsp goto done;
1626 2751fe64 2020-09-24 stsp error = got_repo_open(&repo, repo_path, NULL);
1627 2751fe64 2020-09-24 stsp if (error)
1628 2751fe64 2020-09-24 stsp goto done;
1631 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1632 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1633 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1634 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1635 04d9a9ec 2020-09-24 stsp fpa.create_configs = 1;
1636 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
1637 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
1638 04d9a9ec 2020-09-24 stsp fpa.config_info.symrefs = &symrefs;
1639 04d9a9ec 2020-09-24 stsp fpa.config_info.wanted_branches = &wanted_branches;
1640 99495ddb 2021-01-10 stsp fpa.config_info.wanted_refs = &wanted_refs;
1641 04d9a9ec 2020-09-24 stsp fpa.config_info.proto = proto;
1642 04d9a9ec 2020-09-24 stsp fpa.config_info.host = host;
1643 04d9a9ec 2020-09-24 stsp fpa.config_info.port = port;
1644 04d9a9ec 2020-09-24 stsp fpa.config_info.remote_repo_path = server_path;
1645 04d9a9ec 2020-09-24 stsp fpa.config_info.git_url = git_url;
1646 04d9a9ec 2020-09-24 stsp fpa.config_info.fetch_all_branches = fetch_all_branches;
1647 04d9a9ec 2020-09-24 stsp fpa.config_info.mirror_references = mirror_references;
1648 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1649 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1650 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1651 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1652 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1653 39c64a6a 2020-03-18 stsp if (error)
1654 d9b4d0c0 2020-03-18 stsp goto done;
1656 41b0de12 2020-03-21 stsp if (list_refs_only) {
1657 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1658 41b0de12 2020-03-21 stsp goto done;
1661 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1662 39c64a6a 2020-03-18 stsp if (error)
1663 d9b4d0c0 2020-03-18 stsp goto done;
1664 68999b92 2020-03-18 stsp if (verbosity >= 0)
1665 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1666 d9b4d0c0 2020-03-18 stsp free(id_str);
1668 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1669 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1670 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1671 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1672 7ebc0570 2020-03-18 stsp char *remote_refname;
1674 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1675 0e4002ca 2020-03-21 stsp !mirror_references) {
1676 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1677 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1678 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1679 0e4002ca 2020-03-21 stsp if (error)
1680 0e4002ca 2020-03-21 stsp goto done;
1684 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1685 39c64a6a 2020-03-18 stsp if (error)
1686 d9b4d0c0 2020-03-18 stsp goto done;
1688 469dd726 2020-03-20 stsp if (mirror_references)
1691 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1694 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1695 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1696 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1697 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1698 7ebc0570 2020-03-18 stsp goto done;
1700 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1701 f298ae0f 2020-03-25 stsp free(remote_refname);
1702 39c64a6a 2020-03-18 stsp if (error)
1703 d9b4d0c0 2020-03-18 stsp goto done;
1706 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1707 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1708 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1709 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1710 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1711 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1713 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1716 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1717 39c64a6a 2020-03-18 stsp if (error) {
1718 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1719 55330abe 2020-03-20 stsp error = NULL;
1722 d9b4d0c0 2020-03-18 stsp goto done;
1725 04d9a9ec 2020-09-24 stsp error = create_symref(refname, target_ref, verbosity, repo);
1726 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1727 f298ae0f 2020-03-25 stsp if (error)
1728 f298ae0f 2020-03-25 stsp goto done;
1730 f298ae0f 2020-03-25 stsp if (mirror_references)
1733 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1736 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1737 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1738 f298ae0f 2020-03-25 stsp refname) == -1) {
1739 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1740 f298ae0f 2020-03-25 stsp goto done;
1742 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1743 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1744 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1745 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1746 f298ae0f 2020-03-25 stsp free(remote_refname);
1747 f298ae0f 2020-03-25 stsp goto done;
1749 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1750 f298ae0f 2020-03-25 stsp if (error) {
1751 f298ae0f 2020-03-25 stsp free(remote_refname);
1752 f298ae0f 2020-03-25 stsp free(remote_target);
1753 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1754 f298ae0f 2020-03-25 stsp error = NULL;
1757 f298ae0f 2020-03-25 stsp goto done;
1759 04d9a9ec 2020-09-24 stsp error = create_symref(remote_refname, target_ref,
1760 04d9a9ec 2020-09-24 stsp verbosity - 1, repo);
1761 f298ae0f 2020-03-25 stsp free(remote_refname);
1762 f298ae0f 2020-03-25 stsp free(remote_target);
1763 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1764 39c64a6a 2020-03-18 stsp if (error)
1765 d9b4d0c0 2020-03-18 stsp goto done;
1767 4ba14133 2020-03-20 stsp if (pe == NULL) {
1769 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1770 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1771 4ba14133 2020-03-20 stsp * which could be fetched instead.
1773 62d463ca 2020-10-20 naddy TAILQ_FOREACH(pe, &wanted_branches, entry) {
1774 4ba14133 2020-03-20 stsp const char *target = pe->path;
1775 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1777 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1778 4ba14133 2020-03-20 stsp if (error) {
1779 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1780 4ba14133 2020-03-20 stsp error = NULL;
1783 4ba14133 2020-03-20 stsp goto done;
1786 04d9a9ec 2020-09-24 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1787 04d9a9ec 2020-09-24 stsp verbosity, repo);
1788 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1789 4ba14133 2020-03-20 stsp if (error)
1790 4ba14133 2020-03-20 stsp goto done;
1795 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1796 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1797 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1799 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1800 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1801 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1802 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1803 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1805 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1806 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1807 1d0f4054 2021-06-17 stsp if (repo) {
1808 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
1809 1d0f4054 2021-06-17 stsp if (error == NULL)
1810 1d0f4054 2021-06-17 stsp error = close_err;
1812 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1813 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1814 d9b4d0c0 2020-03-18 stsp free(pe->data);
1816 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1817 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1818 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1819 d9b4d0c0 2020-03-18 stsp free(pe->data);
1821 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1822 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1823 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1824 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1825 09838ffc 2020-03-18 stsp free(proto);
1826 09838ffc 2020-03-18 stsp free(host);
1827 09838ffc 2020-03-18 stsp free(port);
1828 09838ffc 2020-03-18 stsp free(server_path);
1829 09838ffc 2020-03-18 stsp free(repo_name);
1830 bb64b798 2020-03-18 stsp free(default_destdir);
1831 b46f3e71 2020-03-18 stsp free(git_url);
1832 39c64a6a 2020-03-18 stsp return error;
1835 7848a0e1 2020-03-19 stsp static const struct got_error *
1836 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1837 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1839 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1840 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1841 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1843 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1845 7848a0e1 2020-03-19 stsp goto done;
1847 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1848 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1849 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1851 88609724 2020-03-21 stsp goto done;
1852 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1853 88609724 2020-03-21 stsp goto done;
1854 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1855 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1856 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1858 db6d8ad8 2020-03-21 stsp goto done;
1861 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1862 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1863 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1864 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1865 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1867 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1869 7848a0e1 2020-03-19 stsp goto done;
1870 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1872 e8a967e0 2020-03-21 stsp goto done;
1874 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1876 7848a0e1 2020-03-19 stsp goto done;
1877 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1878 6338a6a1 2020-03-21 stsp goto done;
1880 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1882 6338a6a1 2020-03-21 stsp goto done;
1883 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1885 6338a6a1 2020-03-21 stsp goto done;
1888 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1889 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1890 6338a6a1 2020-03-21 stsp new_id_str);
1892 7848a0e1 2020-03-19 stsp free(old_id);
1893 7848a0e1 2020-03-19 stsp free(new_id_str);
1894 7848a0e1 2020-03-19 stsp return err;
1897 f1bcca34 2020-03-25 stsp static const struct got_error *
1898 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1899 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1901 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1902 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1903 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1905 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1906 bcf34b0e 2020-03-26 stsp if (err) {
1907 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1908 bcf34b0e 2020-03-26 stsp return err;
1909 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1911 bcf34b0e 2020-03-26 stsp goto done;
1913 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1915 bcf34b0e 2020-03-26 stsp goto done;
1917 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1918 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1919 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1920 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1922 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1924 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1925 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1926 bcf34b0e 2020-03-26 stsp goto done;
1928 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1929 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1931 bcf34b0e 2020-03-26 stsp goto done;
1933 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1935 bcf34b0e 2020-03-26 stsp goto done;
1937 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1938 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1939 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1943 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1944 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1945 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1946 bcf34b0e 2020-03-26 stsp err = unlock_err;
1948 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1949 f1bcca34 2020-03-25 stsp return err;
1952 2ab43947 2020-03-18 stsp __dead static void
1953 7848a0e1 2020-03-19 stsp usage_fetch(void)
1955 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1956 161728eb 2021-07-24 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] [-X] "
1957 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1958 13f12b09 2020-03-21 stsp getprogname());
1962 7848a0e1 2020-03-19 stsp static const struct got_error *
1963 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1964 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1966 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1967 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1968 3789fd73 2020-03-26 stsp char *id_str = NULL;
1970 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1971 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1973 3789fd73 2020-03-26 stsp return err;
1974 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1975 f9d54ee6 2021-07-16 stsp printf("Deleted %s: %s\n",
1976 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1977 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1980 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1982 3789fd73 2020-03-26 stsp return err;
1983 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1985 3789fd73 2020-03-26 stsp goto done;
1987 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1989 3789fd73 2020-03-26 stsp goto done;
1990 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1991 f9d54ee6 2021-07-16 stsp printf("Deleted %s: %s\n",
1992 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1997 3789fd73 2020-03-26 stsp free(id_str);
1998 3789fd73 2020-03-26 stsp return NULL;
2001 3789fd73 2020-03-26 stsp static const struct got_error *
2002 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
2003 50b0790e 2020-09-11 stsp struct got_pathlist_head *their_symrefs,
2004 50b0790e 2020-09-11 stsp const struct got_remote_repo *remote,
2005 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
2007 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
2008 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
2009 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
2010 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
2011 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
2012 3789fd73 2020-03-26 stsp char *local_refname = NULL;
2014 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&my_refs);
2016 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2018 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
2020 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2022 3789fd73 2020-03-26 stsp goto done;
2024 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &my_refs, entry) {
2025 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
2026 1b796c3f 2021-09-11 stsp const char *their_refname;
2028 1b796c3f 2021-09-11 stsp if (remote->mirror_references) {
2029 1b796c3f 2021-09-11 stsp their_refname = refname;
2031 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
2032 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
2033 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
2034 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
2036 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
2037 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
2038 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
2039 3789fd73 2020-03-26 stsp goto done;
2041 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
2044 1b796c3f 2021-09-11 stsp their_refname = local_refname;
2047 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
2048 1b796c3f 2021-09-11 stsp if (strcmp(their_refname, pe->path) == 0)
2051 f21ec2f0 2020-03-21 stsp if (pe != NULL)
2054 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
2055 1b796c3f 2021-09-11 stsp if (strcmp(their_refname, pe->path) == 0)
2058 3789fd73 2020-03-26 stsp if (pe != NULL)
2061 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
2065 3789fd73 2020-03-26 stsp if (local_refname) {
2066 3789fd73 2020-03-26 stsp struct got_reference *ref;
2067 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
2068 3789fd73 2020-03-26 stsp if (err) {
2069 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
2071 3789fd73 2020-03-26 stsp free(local_refname);
2072 3789fd73 2020-03-26 stsp local_refname = NULL;
2075 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
2078 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
2079 3789fd73 2020-03-26 stsp got_ref_close(ref);
2080 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
2081 3789fd73 2020-03-26 stsp err = unlock_err;
2085 3789fd73 2020-03-26 stsp free(local_refname);
2086 3789fd73 2020-03-26 stsp local_refname = NULL;
2090 3789fd73 2020-03-26 stsp free(remote_namespace);
2091 3789fd73 2020-03-26 stsp free(local_refname);
2092 0e4002ca 2020-03-21 stsp return err;
2095 0e4002ca 2020-03-21 stsp static const struct got_error *
2096 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
2097 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
2099 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
2100 0e4002ca 2020-03-21 stsp char *remote_refname;
2101 0e4002ca 2020-03-21 stsp struct got_reference *ref;
2103 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
2104 0e4002ca 2020-03-21 stsp refname += 5;
2106 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2107 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
2108 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
2110 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
2111 0e4002ca 2020-03-21 stsp if (err) {
2112 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
2113 0e4002ca 2020-03-21 stsp goto done;
2114 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
2116 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
2117 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2118 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
2119 9f142382 2020-03-21 stsp err = unlock_err;
2120 0e4002ca 2020-03-21 stsp got_ref_close(ref);
2123 0e4002ca 2020-03-21 stsp free(remote_refname);
2124 161728eb 2021-07-24 stsp return err;
2127 161728eb 2021-07-24 stsp static const struct got_error *
2128 161728eb 2021-07-24 stsp delete_ref(struct got_repository *repo, struct got_reference *ref)
2130 161728eb 2021-07-24 stsp const struct got_error *err = NULL;
2131 161728eb 2021-07-24 stsp struct got_object_id *id = NULL;
2132 161728eb 2021-07-24 stsp char *id_str = NULL;
2133 161728eb 2021-07-24 stsp const char *target;
2135 161728eb 2021-07-24 stsp if (got_ref_is_symbolic(ref)) {
2136 161728eb 2021-07-24 stsp target = got_ref_get_symref_target(ref);
2138 161728eb 2021-07-24 stsp err = got_ref_resolve(&id, repo, ref);
2140 161728eb 2021-07-24 stsp goto done;
2141 161728eb 2021-07-24 stsp err = got_object_id_str(&id_str, id);
2143 161728eb 2021-07-24 stsp goto done;
2144 161728eb 2021-07-24 stsp target = id_str;
2147 161728eb 2021-07-24 stsp err = got_ref_delete(ref, repo);
2149 161728eb 2021-07-24 stsp goto done;
2151 161728eb 2021-07-24 stsp printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2154 161728eb 2021-07-24 stsp free(id_str);
2155 f21ec2f0 2020-03-21 stsp return err;
2158 f21ec2f0 2020-03-21 stsp static const struct got_error *
2159 161728eb 2021-07-24 stsp delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2161 161728eb 2021-07-24 stsp const struct got_error *err = NULL;
2162 161728eb 2021-07-24 stsp struct got_reflist_head refs;
2163 161728eb 2021-07-24 stsp struct got_reflist_entry *re;
2164 161728eb 2021-07-24 stsp char *prefix;
2166 161728eb 2021-07-24 stsp TAILQ_INIT(&refs);
2168 161728eb 2021-07-24 stsp if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2169 161728eb 2021-07-24 stsp err = got_error_from_errno("asprintf");
2170 161728eb 2021-07-24 stsp goto done;
2172 161728eb 2021-07-24 stsp err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2174 161728eb 2021-07-24 stsp goto done;
2176 161728eb 2021-07-24 stsp TAILQ_FOREACH(re, &refs, entry)
2177 161728eb 2021-07-24 stsp delete_ref(repo, re->ref);
2179 161728eb 2021-07-24 stsp got_ref_list_free(&refs);
2180 161728eb 2021-07-24 stsp return err;
2183 161728eb 2021-07-24 stsp static const struct got_error *
2184 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
2186 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
2187 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
2188 7848a0e1 2020-03-19 stsp const char *remote_name;
2189 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
2190 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
2191 50b0790e 2020-09-11 stsp const struct got_remote_repo *remotes, *remote = NULL;
2192 7848a0e1 2020-03-19 stsp int nremotes;
2193 7848a0e1 2020-03-19 stsp char *id_str = NULL;
2194 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
2195 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
2196 50b0790e 2020-09-11 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2197 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2198 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
2199 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
2200 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
2201 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
2202 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
2203 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2204 161728eb 2021-07-24 stsp int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2206 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
2207 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
2208 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
2209 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
2211 161728eb 2021-07-24 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
2212 7848a0e1 2020-03-19 stsp switch (ch) {
2214 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
2217 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
2218 4ba14133 2020-03-20 stsp optarg, NULL);
2219 4ba14133 2020-03-20 stsp if (error)
2220 4ba14133 2020-03-20 stsp return error;
2223 f21ec2f0 2020-03-21 stsp delete_refs = 1;
2226 41b0de12 2020-03-21 stsp list_refs_only = 1;
2229 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
2230 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2231 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
2233 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
2236 db6d8ad8 2020-03-21 stsp replace_tags = 1;
2239 7848a0e1 2020-03-19 stsp if (verbosity < 0)
2240 7848a0e1 2020-03-19 stsp verbosity = 0;
2241 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
2242 7848a0e1 2020-03-19 stsp verbosity++;
2245 7848a0e1 2020-03-19 stsp verbosity = -1;
2248 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
2249 0e4002ca 2020-03-21 stsp optarg, NULL);
2250 0e4002ca 2020-03-21 stsp if (error)
2251 0e4002ca 2020-03-21 stsp return error;
2254 161728eb 2021-07-24 stsp delete_remote = 1;
2257 7848a0e1 2020-03-19 stsp usage_fetch();
2261 7848a0e1 2020-03-19 stsp argc -= optind;
2262 7848a0e1 2020-03-19 stsp argv += optind;
2264 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2265 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
2266 41b0de12 2020-03-21 stsp if (list_refs_only) {
2267 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
2268 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
2269 ff69268e 2020-12-13 stsp if (fetch_all_branches)
2270 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
2271 f21ec2f0 2020-03-21 stsp if (delete_refs)
2272 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
2273 161728eb 2021-07-24 stsp if (delete_remote)
2274 161728eb 2021-07-24 stsp option_conflict('l', 'X');
2276 161728eb 2021-07-24 stsp if (delete_remote) {
2277 161728eb 2021-07-24 stsp if (fetch_all_branches)
2278 161728eb 2021-07-24 stsp option_conflict('X', 'a');
2279 161728eb 2021-07-24 stsp if (!TAILQ_EMPTY(&wanted_branches))
2280 161728eb 2021-07-24 stsp option_conflict('X', 'b');
2281 161728eb 2021-07-24 stsp if (delete_refs)
2282 161728eb 2021-07-24 stsp option_conflict('X', 'd');
2283 161728eb 2021-07-24 stsp if (replace_tags)
2284 161728eb 2021-07-24 stsp option_conflict('X', 't');
2285 161728eb 2021-07-24 stsp if (!TAILQ_EMPTY(&wanted_refs))
2286 161728eb 2021-07-24 stsp option_conflict('X', 'R');
2289 161728eb 2021-07-24 stsp if (argc == 0) {
2290 161728eb 2021-07-24 stsp if (delete_remote)
2291 161728eb 2021-07-24 stsp errx(1, "-X option requires a remote name");
2292 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2293 161728eb 2021-07-24 stsp } else if (argc == 1)
2294 7848a0e1 2020-03-19 stsp remote_name = argv[0];
2296 7848a0e1 2020-03-19 stsp usage_fetch();
2298 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
2299 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
2300 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
2301 7848a0e1 2020-03-19 stsp goto done;
2304 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2305 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
2306 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2307 7848a0e1 2020-03-19 stsp goto done;
2309 7848a0e1 2020-03-19 stsp error = NULL;
2310 7848a0e1 2020-03-19 stsp if (worktree) {
2311 7848a0e1 2020-03-19 stsp repo_path =
2312 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
2313 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2314 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2315 7848a0e1 2020-03-19 stsp if (error)
2316 7848a0e1 2020-03-19 stsp goto done;
2318 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
2319 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2320 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2321 7848a0e1 2020-03-19 stsp goto done;
2326 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
2327 7848a0e1 2020-03-19 stsp if (error)
2328 7848a0e1 2020-03-19 stsp goto done;
2330 161728eb 2021-07-24 stsp if (delete_remote) {
2331 161728eb 2021-07-24 stsp error = delete_refs_for_remote(repo, remote_name);
2332 161728eb 2021-07-24 stsp goto done; /* nothing else to do */
2335 50b0790e 2020-09-11 stsp if (worktree) {
2336 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
2337 50b0790e 2020-09-11 stsp if (worktree_conf) {
2338 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2339 50b0790e 2020-09-11 stsp worktree_conf);
2340 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2341 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2342 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2348 50b0790e 2020-09-11 stsp if (remote == NULL) {
2349 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
2350 50b0790e 2020-09-11 stsp if (repo_conf) {
2351 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2352 50b0790e 2020-09-11 stsp repo_conf);
2353 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2354 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2355 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2361 50b0790e 2020-09-11 stsp if (remote == NULL) {
2362 257add31 2020-09-09 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2363 257add31 2020-09-09 stsp for (i = 0; i < nremotes; i++) {
2364 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2365 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2370 50b0790e 2020-09-11 stsp if (remote == NULL) {
2371 50b0790e 2020-09-11 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2372 50b0790e 2020-09-11 stsp goto done;
2375 0c8b29c5 2021-01-05 stsp if (TAILQ_EMPTY(&wanted_branches)) {
2376 0c8b29c5 2021-01-05 stsp if (!fetch_all_branches)
2377 0c8b29c5 2021-01-05 stsp fetch_all_branches = remote->fetch_all_branches;
2378 6480c871 2021-08-30 stsp for (i = 0; i < remote->nfetch_branches; i++) {
2379 b8adfa55 2020-09-25 stsp got_pathlist_append(&wanted_branches,
2380 6480c871 2021-08-30 stsp remote->fetch_branches[i], NULL);
2383 99495ddb 2021-01-10 stsp if (TAILQ_EMPTY(&wanted_refs)) {
2384 6480c871 2021-08-30 stsp for (i = 0; i < remote->nfetch_refs; i++) {
2385 99495ddb 2021-01-10 stsp got_pathlist_append(&wanted_refs,
2386 6480c871 2021-08-30 stsp remote->fetch_refs[i], NULL);
2390 5e5da8c4 2021-09-05 stsp error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2391 6480c871 2021-08-30 stsp &repo_name, remote->fetch_url);
2392 7848a0e1 2020-03-19 stsp if (error)
2393 7848a0e1 2020-03-19 stsp goto done;
2395 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
2396 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2397 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2398 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
2399 7848a0e1 2020-03-19 stsp err(1, "pledge");
2401 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
2402 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
2403 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2404 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2405 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
2406 7848a0e1 2020-03-19 stsp err(1, "pledge");
2408 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
2409 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
2410 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2411 7848a0e1 2020-03-19 stsp goto done;
2413 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2414 7848a0e1 2020-03-19 stsp goto done;
2417 d65a88a2 2021-09-05 stsp error = got_dial_apply_unveil(proto);
2418 d65a88a2 2021-09-05 stsp if (error)
2419 d65a88a2 2021-09-05 stsp goto done;
2421 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2422 7848a0e1 2020-03-19 stsp if (error)
2423 7848a0e1 2020-03-19 stsp goto done;
2425 f79e6490 2020-04-19 stsp if (verbosity >= 0)
2426 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2427 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
2429 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2430 9c52365f 2020-03-21 stsp server_path, verbosity);
2431 7848a0e1 2020-03-19 stsp if (error)
2432 7848a0e1 2020-03-19 stsp goto done;
2434 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
2435 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
2436 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
2437 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
2438 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
2439 04d9a9ec 2020-09-24 stsp fpa.create_configs = 0;
2440 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
2441 04d9a9ec 2020-09-24 stsp memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2442 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2443 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
2444 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2445 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
2446 7848a0e1 2020-03-19 stsp if (error)
2447 7848a0e1 2020-03-19 stsp goto done;
2449 41b0de12 2020-03-21 stsp if (list_refs_only) {
2450 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
2451 41b0de12 2020-03-21 stsp goto done;
2454 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
2455 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
2456 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
2457 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
2458 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
2459 984065c8 2020-03-19 stsp if (error)
2460 984065c8 2020-03-19 stsp goto done;
2461 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
2462 984065c8 2020-03-19 stsp free(id_str);
2463 984065c8 2020-03-19 stsp id_str = NULL;
2466 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
2467 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2468 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
2469 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
2470 7848a0e1 2020-03-19 stsp struct got_reference *ref;
2471 7848a0e1 2020-03-19 stsp char *remote_refname;
2473 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
2474 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
2475 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
2476 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
2477 0e4002ca 2020-03-21 stsp if (error)
2478 0e4002ca 2020-03-21 stsp goto done;
2482 1510c839 2020-03-20 stsp if (remote->mirror_references ||
2483 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
2484 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2485 7848a0e1 2020-03-19 stsp if (error) {
2486 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2487 7848a0e1 2020-03-19 stsp goto done;
2488 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2490 7848a0e1 2020-03-19 stsp if (error)
2491 7848a0e1 2020-03-19 stsp goto done;
2493 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2494 db6d8ad8 2020-03-21 stsp verbosity, repo);
2495 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2496 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2497 9f142382 2020-03-21 stsp error = unlock_err;
2498 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2499 7848a0e1 2020-03-19 stsp if (error)
2500 7848a0e1 2020-03-19 stsp goto done;
2502 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
2503 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2504 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
2505 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
2506 7848a0e1 2020-03-19 stsp goto done;
2509 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
2510 7848a0e1 2020-03-19 stsp if (error) {
2511 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2512 7848a0e1 2020-03-19 stsp goto done;
2513 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
2514 688f11b3 2020-03-21 stsp verbosity, repo);
2515 7848a0e1 2020-03-19 stsp if (error)
2516 7848a0e1 2020-03-19 stsp goto done;
2518 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2519 db6d8ad8 2020-03-21 stsp verbosity, repo);
2520 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2521 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2522 9f142382 2020-03-21 stsp error = unlock_err;
2523 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2524 7848a0e1 2020-03-19 stsp if (error)
2525 7848a0e1 2020-03-19 stsp goto done;
2528 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2529 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2530 2ec30c80 2020-03-20 stsp if (error) {
2531 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2532 2ec30c80 2020-03-20 stsp goto done;
2533 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2535 2ec30c80 2020-03-20 stsp if (error)
2536 2ec30c80 2020-03-20 stsp goto done;
2538 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2539 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2540 9f142382 2020-03-21 stsp error = unlock_err;
2541 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2545 f1bcca34 2020-03-25 stsp if (delete_refs) {
2546 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2547 3789fd73 2020-03-26 stsp verbosity, repo);
2548 f1bcca34 2020-03-25 stsp if (error)
2549 f1bcca34 2020-03-25 stsp goto done;
2552 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2553 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2554 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2555 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2556 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2557 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2558 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2560 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2563 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2566 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2567 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2568 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2569 f1bcca34 2020-03-25 stsp goto done;
2571 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2572 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2573 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2574 f1bcca34 2020-03-25 stsp free(remote_refname);
2575 f1bcca34 2020-03-25 stsp goto done;
2578 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2580 f1bcca34 2020-03-25 stsp if (error) {
2581 f1bcca34 2020-03-25 stsp free(remote_refname);
2582 f1bcca34 2020-03-25 stsp free(remote_target);
2583 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2584 f1bcca34 2020-03-25 stsp error = NULL;
2587 f1bcca34 2020-03-25 stsp goto done;
2589 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2590 f1bcca34 2020-03-25 stsp verbosity, repo);
2591 f1bcca34 2020-03-25 stsp free(remote_refname);
2592 f1bcca34 2020-03-25 stsp free(remote_target);
2593 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2594 f1bcca34 2020-03-25 stsp if (error)
2595 f1bcca34 2020-03-25 stsp goto done;
2599 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2600 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2601 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2602 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2603 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2605 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2606 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2607 1d0f4054 2021-06-17 stsp if (repo) {
2608 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
2609 1d0f4054 2021-06-17 stsp if (error == NULL)
2610 1d0f4054 2021-06-17 stsp error = close_err;
2612 7848a0e1 2020-03-19 stsp if (worktree)
2613 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2614 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2615 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2616 7848a0e1 2020-03-19 stsp free(pe->data);
2618 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2619 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2620 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2621 7848a0e1 2020-03-19 stsp free(pe->data);
2623 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2624 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2625 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2626 7848a0e1 2020-03-19 stsp free(id_str);
2627 7848a0e1 2020-03-19 stsp free(cwd);
2628 7848a0e1 2020-03-19 stsp free(repo_path);
2629 7848a0e1 2020-03-19 stsp free(pack_hash);
2630 7848a0e1 2020-03-19 stsp free(proto);
2631 7848a0e1 2020-03-19 stsp free(host);
2632 7848a0e1 2020-03-19 stsp free(port);
2633 7848a0e1 2020-03-19 stsp free(server_path);
2634 7848a0e1 2020-03-19 stsp free(repo_name);
2635 7848a0e1 2020-03-19 stsp return error;
2639 7848a0e1 2020-03-19 stsp __dead static void
2640 2ab43947 2020-03-18 stsp usage_checkout(void)
2642 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2643 4ad4a1ec 2021-09-13 tracey "[-p prefix] [-q] repository-path [worktree-path]\n",
2644 4ad4a1ec 2021-09-13 tracey getprogname());
2648 2ab43947 2020-03-18 stsp static void
2649 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2651 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2652 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2653 e6786710 2021-07-03 stsp "garbage-collected by Git or 'gotadmin cleanup'; making the "
2654 e6786710 2021-07-03 stsp "repository writable and running 'got update' will prevent this\n",
2655 2ab43947 2020-03-18 stsp getprogname());
2658 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2659 2ab43947 2020-03-18 stsp const char *worktree_path;
2660 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2661 4ad4a1ec 2021-09-13 tracey int verbosity;
2664 2ab43947 2020-03-18 stsp static const struct got_error *
2665 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2667 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2669 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2670 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2671 2ab43947 2020-03-18 stsp return NULL;
2673 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2674 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2675 2ab43947 2020-03-18 stsp return NULL;
2678 2ab43947 2020-03-18 stsp while (path[0] == '/')
2681 4ad4a1ec 2021-09-13 tracey if (a->verbosity >= 0)
2682 4ad4a1ec 2021-09-13 tracey printf("%c %s/%s\n", status, a->worktree_path, path);
2684 2ab43947 2020-03-18 stsp return NULL;
2687 2ab43947 2020-03-18 stsp static const struct got_error *
2688 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2690 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2691 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2692 2ab43947 2020-03-18 stsp return NULL;
2695 2ab43947 2020-03-18 stsp static const struct got_error *
2696 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2697 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2698 2ab43947 2020-03-18 stsp struct got_repository *repo)
2700 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2701 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2703 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2704 4e91ef15 2021-09-26 stsp commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2706 2ab43947 2020-03-18 stsp return err;
2708 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2709 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2712 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2713 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2715 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2717 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2725 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2726 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2727 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2729 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2730 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2731 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2732 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2733 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2734 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2736 2ab43947 2020-03-18 stsp free(yca_id);
2737 2ab43947 2020-03-18 stsp return NULL;
2740 2ab43947 2020-03-18 stsp static const struct got_error *
2741 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2742 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2743 2ab43947 2020-03-18 stsp struct got_repository *repo)
2745 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2746 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2747 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2748 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2750 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2752 2ab43947 2020-03-18 stsp goto done;
2754 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2755 2ab43947 2020-03-18 stsp is_same_branch = 1;
2756 2ab43947 2020-03-18 stsp goto done;
2758 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2759 2ab43947 2020-03-18 stsp is_same_branch = 1;
2760 2ab43947 2020-03-18 stsp goto done;
2763 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2765 2ab43947 2020-03-18 stsp goto done;
2767 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2768 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2770 2ab43947 2020-03-18 stsp goto done;
2772 2ab43947 2020-03-18 stsp for (;;) {
2773 2ab43947 2020-03-18 stsp struct got_object_id *id;
2774 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2775 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2776 2ab43947 2020-03-18 stsp if (err) {
2777 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2778 2ab43947 2020-03-18 stsp err = NULL;
2783 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2785 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2786 2ab43947 2020-03-18 stsp is_same_branch = 1;
2792 2ab43947 2020-03-18 stsp if (graph)
2793 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2794 2ab43947 2020-03-18 stsp free(head_commit_id);
2795 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2796 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2797 2ab43947 2020-03-18 stsp return err;
2800 4ed7e80c 2018-05-20 stsp static const struct got_error *
2801 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2803 4b6c9460 2020-03-05 stsp static char msg[512];
2804 4b6c9460 2020-03-05 stsp const char *branch_name;
2806 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2807 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2809 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2811 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2812 4b6c9460 2020-03-05 stsp branch_name += 11;
2814 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2815 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2816 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2817 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2818 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2819 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2821 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2824 4b6c9460 2020-03-05 stsp static const struct got_error *
2825 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2827 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2828 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2829 08e5873e 2021-09-14 stsp struct got_reference *head_ref = NULL, *ref = NULL;
2830 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2831 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2832 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2833 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2834 08e5873e 2021-09-14 stsp const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2835 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2836 08e5873e 2021-09-14 stsp struct got_object_id *commit_id = NULL;
2837 f0207f6a 2020-10-19 stsp char *cwd = NULL;
2838 4ad4a1ec 2021-09-13 tracey int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2839 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2840 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2842 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2844 4ad4a1ec 2021-09-13 tracey while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2845 0bb8a95e 2018-03-12 stsp switch (ch) {
2847 08573d5b 2019-05-14 stsp branch_name = optarg;
2850 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2851 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2852 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2855 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2858 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2860 4ad4a1ec 2021-09-13 tracey case 'q':
2861 4ad4a1ec 2021-09-13 tracey verbosity = -1;
2864 2deda0b9 2019-03-07 stsp usage_checkout();
2865 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2869 0bb8a95e 2018-03-12 stsp argc -= optind;
2870 0bb8a95e 2018-03-12 stsp argv += optind;
2872 6715a751 2018-03-16 stsp #ifndef PROFILE
2873 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2874 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2875 c09a553d 2018-03-12 stsp err(1, "pledge");
2877 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2878 c47340da 2020-09-20 stsp char *base, *dotgit;
2879 f0207f6a 2020-10-19 stsp const char *path;
2880 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2881 76089277 2018-04-01 stsp if (repo_path == NULL)
2882 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2883 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2884 76089277 2018-04-01 stsp if (cwd == NULL) {
2885 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2886 76089277 2018-04-01 stsp goto done;
2888 c47340da 2020-09-20 stsp if (path_prefix[0])
2889 f0207f6a 2020-10-19 stsp path = path_prefix;
2891 f0207f6a 2020-10-19 stsp path = repo_path;
2892 f0207f6a 2020-10-19 stsp error = got_path_basename(&base, path);
2893 f0207f6a 2020-10-19 stsp if (error)
2894 c47340da 2020-09-20 stsp goto done;
2895 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2896 c09a553d 2018-03-12 stsp if (dotgit)
2897 c09a553d 2018-03-12 stsp *dotgit = '\0';
2898 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2899 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2900 f0207f6a 2020-10-19 stsp free(base);
2901 76089277 2018-04-01 stsp goto done;
2903 f0207f6a 2020-10-19 stsp free(base);
2904 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2905 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2906 76089277 2018-04-01 stsp if (repo_path == NULL) {
2907 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2908 76089277 2018-04-01 stsp goto done;
2910 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2911 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2912 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2913 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2915 b4b3a7dd 2019-07-22 stsp goto done;
2917 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2918 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2919 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2920 b4b3a7dd 2019-07-22 stsp goto done;
2924 c09a553d 2018-03-12 stsp usage_checkout();
2926 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2927 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2929 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2930 c09a553d 2018-03-12 stsp if (error != NULL)
2931 c02c541e 2019-03-29 stsp goto done;
2933 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2934 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2935 c530dc23 2019-07-23 stsp if (error) {
2936 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2937 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2938 c530dc23 2019-07-23 stsp goto done;
2939 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2940 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2941 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2942 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2943 c530dc23 2019-07-23 stsp goto done;
2947 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2948 c02c541e 2019-03-29 stsp if (error)
2949 c09a553d 2018-03-12 stsp goto done;
2951 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2952 c09a553d 2018-03-12 stsp if (error != NULL)
2953 c09a553d 2018-03-12 stsp goto done;
2955 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2956 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2957 c09a553d 2018-03-12 stsp goto done;
2959 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2960 c09a553d 2018-03-12 stsp if (error != NULL)
2961 c09a553d 2018-03-12 stsp goto done;
2963 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2964 e5dc7198 2018-12-29 stsp path_prefix);
2965 e5dc7198 2018-12-29 stsp if (error != NULL)
2966 e5dc7198 2018-12-29 stsp goto done;
2967 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2968 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2969 49520a32 2018-12-29 stsp goto done;
2972 8069f636 2019-01-12 stsp if (commit_id_str) {
2973 84de9106 2020-12-26 stsp struct got_reflist_head refs;
2974 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
2975 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2977 84de9106 2020-12-26 stsp if (error)
2978 84de9106 2020-12-26 stsp goto done;
2979 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2980 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2981 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
2982 30837e32 2019-07-25 stsp if (error)
2983 8069f636 2019-01-12 stsp goto done;
2984 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2985 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2986 8069f636 2019-01-12 stsp if (error != NULL) {
2987 8069f636 2019-01-12 stsp free(commit_id);
2988 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2989 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2990 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2992 8069f636 2019-01-12 stsp goto done;
2994 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2995 4b6c9460 2020-03-05 stsp if (error) {
2996 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2997 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2998 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
3000 45d344f6 2019-05-14 stsp goto done;
3002 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3003 8069f636 2019-01-12 stsp commit_id);
3004 8069f636 2019-01-12 stsp if (error)
3005 8069f636 2019-01-12 stsp goto done;
3006 08e5873e 2021-09-14 stsp /* Expand potentially abbreviated commit ID string. */
3007 08e5873e 2021-09-14 stsp free(commit_id_str);
3008 08e5873e 2021-09-14 stsp error = got_object_id_str(&commit_id_str, commit_id);
3009 08e5873e 2021-09-14 stsp if (error)
3010 08e5873e 2021-09-14 stsp goto done;
3012 08e5873e 2021-09-14 stsp commit_id = got_object_id_dup(
3013 08e5873e 2021-09-14 stsp got_worktree_get_base_commit_id(worktree));
3014 08e5873e 2021-09-14 stsp if (commit_id == NULL) {
3015 08e5873e 2021-09-14 stsp error = got_error_from_errno("got_object_id_dup");
3016 08e5873e 2021-09-14 stsp goto done;
3018 08e5873e 2021-09-14 stsp error = got_object_id_str(&commit_id_str, commit_id);
3019 08e5873e 2021-09-14 stsp if (error)
3020 08e5873e 2021-09-14 stsp goto done;
3023 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
3024 f2ea84fa 2019-07-27 stsp if (error)
3025 f2ea84fa 2019-07-27 stsp goto done;
3026 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
3027 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
3028 4ad4a1ec 2021-09-13 tracey cpa.verbosity = verbosity;
3029 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3030 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
3031 c09a553d 2018-03-12 stsp if (error != NULL)
3032 c09a553d 2018-03-12 stsp goto done;
3034 08e5873e 2021-09-14 stsp if (got_ref_is_symbolic(head_ref)) {
3035 08e5873e 2021-09-14 stsp error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3036 08e5873e 2021-09-14 stsp if (error)
3037 08e5873e 2021-09-14 stsp goto done;
3038 08e5873e 2021-09-14 stsp refname = got_ref_get_name(ref);
3040 08e5873e 2021-09-14 stsp refname = got_ref_get_name(head_ref);
3041 08e5873e 2021-09-14 stsp printf("Checked out %s: %s\n", refname, commit_id_str);
3042 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
3043 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
3044 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
3046 08e5873e 2021-09-14 stsp if (head_ref)
3047 08e5873e 2021-09-14 stsp got_ref_close(head_ref);
3049 08e5873e 2021-09-14 stsp got_ref_close(ref);
3050 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3051 8069f636 2019-01-12 stsp free(commit_id_str);
3052 08e5873e 2021-09-14 stsp free(commit_id);
3053 76089277 2018-04-01 stsp free(repo_path);
3054 507dc3bb 2018-12-29 stsp free(worktree_path);
3055 c47340da 2020-09-20 stsp free(cwd);
3056 507dc3bb 2018-12-29 stsp return error;
3059 9627c110 2020-04-18 stsp struct got_update_progress_arg {
3060 9627c110 2020-04-18 stsp int did_something;
3061 9627c110 2020-04-18 stsp int conflicts;
3062 9627c110 2020-04-18 stsp int obstructed;
3063 9627c110 2020-04-18 stsp int not_updated;
3064 f259c4c1 2021-09-24 stsp int missing;
3065 35ca1db7 2021-09-28 stsp int not_deleted;
3066 35ca1db7 2021-09-28 stsp int unversioned;
3067 4ad4a1ec 2021-09-13 tracey int verbosity;
3071 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
3073 9627c110 2020-04-18 stsp if (!upa->did_something)
3076 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
3077 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
3078 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
3079 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
3080 9627c110 2020-04-18 stsp upa->obstructed);
3081 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
3082 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
3083 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
3087 35ca1db7 2021-09-28 stsp * The meaning of some status codes differs between merge-style operations and
3088 35ca1db7 2021-09-28 stsp * update operations. For example, the ! status code means "file was missing"
3089 35ca1db7 2021-09-28 stsp * if changes were merged into the work tree, and "missing file was restored"
3090 35ca1db7 2021-09-28 stsp * if the work tree was updated. This function should be used by any operation
3091 35ca1db7 2021-09-28 stsp * which merges changes into the work tree without updating the work tree.
3094 35ca1db7 2021-09-28 stsp print_merge_progress_stats(struct got_update_progress_arg *upa)
3096 35ca1db7 2021-09-28 stsp if (!upa->did_something)
3099 35ca1db7 2021-09-28 stsp if (upa->conflicts > 0)
3100 35ca1db7 2021-09-28 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
3101 35ca1db7 2021-09-28 stsp if (upa->obstructed > 0)
3102 35ca1db7 2021-09-28 stsp printf("File paths obstructed by a non-regular file: %d\n",
3103 35ca1db7 2021-09-28 stsp upa->obstructed);
3104 35ca1db7 2021-09-28 stsp if (upa->missing > 0)
3105 35ca1db7 2021-09-28 stsp printf("Files which had incoming changes but could not be "
3106 35ca1db7 2021-09-28 stsp "found in the work tree: %d\n", upa->missing);
3107 35ca1db7 2021-09-28 stsp if (upa->not_deleted > 0)
3108 35ca1db7 2021-09-28 stsp printf("Files not deleted due to differences in deleted "
3109 35ca1db7 2021-09-28 stsp "content: %d\n", upa->not_deleted);
3110 35ca1db7 2021-09-28 stsp if (upa->unversioned > 0)
3111 35ca1db7 2021-09-28 stsp printf("Files not merged because an unversioned file was "
3112 35ca1db7 2021-09-28 stsp "found in the work tree: %d\n", upa->unversioned);
3115 507dc3bb 2018-12-29 stsp __dead static void
3116 507dc3bb 2018-12-29 stsp usage_update(void)
3118 4ad4a1ec 2021-09-13 tracey fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
3119 4ad4a1ec 2021-09-13 tracey "[path ...]\n",
3120 507dc3bb 2018-12-29 stsp getprogname());
3124 1ee397ad 2019-07-12 stsp static const struct got_error *
3125 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
3127 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
3129 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
3130 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
3131 1ee397ad 2019-07-12 stsp return NULL;
3133 9627c110 2020-04-18 stsp upa->did_something = 1;
3135 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
3136 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
3137 1ee397ad 2019-07-12 stsp return NULL;
3139 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
3140 9627c110 2020-04-18 stsp upa->conflicts++;
3141 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
3142 9627c110 2020-04-18 stsp upa->obstructed++;
3143 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
3144 9627c110 2020-04-18 stsp upa->not_updated++;
3145 f259c4c1 2021-09-24 stsp if (status == GOT_STATUS_MISSING)
3146 f259c4c1 2021-09-24 stsp upa->missing++;
3147 35ca1db7 2021-09-28 stsp if (status == GOT_STATUS_CANNOT_DELETE)
3148 35ca1db7 2021-09-28 stsp upa->not_deleted++;
3149 35ca1db7 2021-09-28 stsp if (status == GOT_STATUS_UNVERSIONED)
3150 35ca1db7 2021-09-28 stsp upa->unversioned++;
3152 507dc3bb 2018-12-29 stsp while (path[0] == '/')
3154 4ad4a1ec 2021-09-13 tracey if (upa->verbosity >= 0)
3155 4ad4a1ec 2021-09-13 tracey printf("%c %s\n", status, path);
3157 1ee397ad 2019-07-12 stsp return NULL;
3160 be7061eb 2018-12-30 stsp static const struct got_error *
3161 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
3162 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
3163 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
3165 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
3166 a1fb16d8 2019-05-24 stsp char *base_id_str;
3167 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
3169 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
3170 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
3171 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
3172 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
3173 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
3174 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
3175 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
3178 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
3179 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3180 a1fb16d8 2019-05-24 stsp if (err) {
3181 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
3182 a1fb16d8 2019-05-24 stsp return err;
3183 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
3185 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
3186 a1fb16d8 2019-05-24 stsp return NULL;
3188 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
3189 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
3190 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
3192 a1fb16d8 2019-05-24 stsp return err;
3193 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
3194 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
3195 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
3196 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
3197 0ebf8283 2019-07-24 stsp return NULL;
3200 0ebf8283 2019-07-24 stsp static const struct got_error *
3201 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3203 0ebf8283 2019-07-24 stsp const struct got_error *err;
3204 0ebf8283 2019-07-24 stsp int in_progress;
3206 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
3208 0ebf8283 2019-07-24 stsp return err;
3209 0ebf8283 2019-07-24 stsp if (in_progress)
3210 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
3212 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
3214 0ebf8283 2019-07-24 stsp return err;
3215 0ebf8283 2019-07-24 stsp if (in_progress)
3216 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
3218 f259c4c1 2021-09-24 stsp return NULL;
3221 f259c4c1 2021-09-24 stsp static const struct got_error *
3222 f259c4c1 2021-09-24 stsp check_merge_in_progress(struct got_worktree *worktree,
3223 f259c4c1 2021-09-24 stsp struct got_repository *repo)
3225 f259c4c1 2021-09-24 stsp const struct got_error *err;
3226 f259c4c1 2021-09-24 stsp int in_progress;
3228 f259c4c1 2021-09-24 stsp err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3230 f259c4c1 2021-09-24 stsp return err;
3231 f259c4c1 2021-09-24 stsp if (in_progress)
3232 f259c4c1 2021-09-24 stsp return got_error(GOT_ERR_MERGE_BUSY);
3234 a1fb16d8 2019-05-24 stsp return NULL;
3237 a5edda0a 2019-07-27 stsp static const struct got_error *
3238 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3239 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
3241 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
3242 a5edda0a 2019-07-27 stsp char *path;
3243 10a623df 2021-10-11 stsp struct got_pathlist_entry *new;
3246 a5edda0a 2019-07-27 stsp if (argc == 0) {
3247 a5edda0a 2019-07-27 stsp path = strdup("");
3248 a5edda0a 2019-07-27 stsp if (path == NULL)
3249 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
3250 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
3253 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
3254 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
3257 10a623df 2021-10-11 stsp err = got_pathlist_insert(&new, paths, path, NULL);
3258 10a623df 2021-10-11 stsp if (err || new == NULL /* duplicate */) {
3259 a5edda0a 2019-07-27 stsp free(path);
3265 a5edda0a 2019-07-27 stsp return err;
3268 a1fb16d8 2019-05-24 stsp static const struct got_error *
3269 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
3270 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
3272 fa51e947 2020-03-27 stsp const struct got_error *err;
3273 fa51e947 2020-03-27 stsp struct got_repository *repo;
3274 fa51e947 2020-03-27 stsp static char msg[512];
3276 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
3278 fa51e947 2020-03-27 stsp return orig_err;
3280 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
3281 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
3282 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
3283 fa51e947 2020-03-27 stsp "'got checkout'.\n"
3284 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
3285 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3286 fa51e947 2020-03-27 stsp got_repo_close(repo);
3287 fa51e947 2020-03-27 stsp return err;
3290 fa51e947 2020-03-27 stsp static const struct got_error *
3291 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
3293 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
3294 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
3295 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
3296 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
3297 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
3298 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
3299 024e9686 2019-05-14 stsp const char *branch_name = NULL;
3300 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
3301 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
3302 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
3303 4ad4a1ec 2021-09-13 tracey int ch, verbosity = 0;
3304 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
3306 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
3308 4ad4a1ec 2021-09-13 tracey while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3309 507dc3bb 2018-12-29 stsp switch (ch) {
3311 024e9686 2019-05-14 stsp branch_name = optarg;
3314 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
3315 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
3316 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3318 4ad4a1ec 2021-09-13 tracey case 'q':
3319 4ad4a1ec 2021-09-13 tracey verbosity = -1;
3322 2deda0b9 2019-03-07 stsp usage_update();
3323 507dc3bb 2018-12-29 stsp /* NOTREACHED */
3327 507dc3bb 2018-12-29 stsp argc -= optind;
3328 507dc3bb 2018-12-29 stsp argv += optind;
3330 507dc3bb 2018-12-29 stsp #ifndef PROFILE
3331 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3332 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
3333 507dc3bb 2018-12-29 stsp err(1, "pledge");
3335 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
3336 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
3337 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3338 c4cdcb68 2019-04-03 stsp goto done;
3340 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
3341 fa51e947 2020-03-27 stsp if (error) {
3342 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3343 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
3344 fa51e947 2020-03-27 stsp worktree_path);
3345 7d5807f4 2019-07-11 stsp goto done;
3348 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
3349 f2ea84fa 2019-07-27 stsp if (error)
3350 f2ea84fa 2019-07-27 stsp goto done;
3352 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3354 507dc3bb 2018-12-29 stsp if (error != NULL)
3355 507dc3bb 2018-12-29 stsp goto done;
3357 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3358 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3359 087fb88c 2019-08-04 stsp if (error)
3360 087fb88c 2019-08-04 stsp goto done;
3362 f259c4c1 2021-09-24 stsp error = check_merge_in_progress(worktree, repo);
3363 f259c4c1 2021-09-24 stsp if (error)
3364 f259c4c1 2021-09-24 stsp goto done;
3366 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3367 0266afb7 2019-01-04 stsp if (error)
3368 0266afb7 2019-01-04 stsp goto done;
3370 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3371 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
3372 024e9686 2019-05-14 stsp if (error != NULL)
3373 024e9686 2019-05-14 stsp goto done;
3374 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
3375 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3376 9c4b8182 2019-01-02 stsp if (error != NULL)
3377 9c4b8182 2019-01-02 stsp goto done;
3378 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3379 507dc3bb 2018-12-29 stsp if (error != NULL)
3380 507dc3bb 2018-12-29 stsp goto done;
3382 84de9106 2020-12-26 stsp struct got_reflist_head refs;
3383 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
3384 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3386 84de9106 2020-12-26 stsp if (error)
3387 84de9106 2020-12-26 stsp goto done;
3388 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3389 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3390 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
3391 04f57cb3 2019-07-25 stsp free(commit_id_str);
3392 bb787f09 2019-07-25 stsp commit_id_str = NULL;
3393 30837e32 2019-07-25 stsp if (error)
3394 a297e751 2019-07-11 stsp goto done;
3395 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
3396 a297e751 2019-07-11 stsp if (error)
3397 507dc3bb 2018-12-29 stsp goto done;
3400 a1fb16d8 2019-05-24 stsp if (branch_name) {
3401 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
3402 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
3403 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
3405 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3406 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
3407 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
3408 024e9686 2019-05-14 stsp goto done;
3410 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
3411 024e9686 2019-05-14 stsp if (error)
3412 024e9686 2019-05-14 stsp goto done;
3413 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
3415 a367ff0f 2019-05-14 stsp free(head_commit_id);
3416 024e9686 2019-05-14 stsp if (error != NULL)
3417 024e9686 2019-05-14 stsp goto done;
3418 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3419 a367ff0f 2019-05-14 stsp if (error)
3420 a367ff0f 2019-05-14 stsp goto done;
3421 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
3422 024e9686 2019-05-14 stsp if (error)
3423 024e9686 2019-05-14 stsp goto done;
3425 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
3426 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3427 a367ff0f 2019-05-14 stsp if (error != NULL) {
3428 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
3429 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
3430 024e9686 2019-05-14 stsp goto done;
3432 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3433 a367ff0f 2019-05-14 stsp if (error)
3434 a367ff0f 2019-05-14 stsp goto done;
3437 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3438 507dc3bb 2018-12-29 stsp commit_id) != 0) {
3439 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3440 507dc3bb 2018-12-29 stsp commit_id);
3441 507dc3bb 2018-12-29 stsp if (error)
3442 507dc3bb 2018-12-29 stsp goto done;
3445 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
3446 4ad4a1ec 2021-09-13 tracey upa.verbosity = verbosity;
3447 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3448 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
3449 507dc3bb 2018-12-29 stsp if (error != NULL)
3450 507dc3bb 2018-12-29 stsp goto done;
3452 4f3c844b 2021-09-14 stsp if (upa.did_something) {
3453 4f3c844b 2021-09-14 stsp printf("Updated to %s: %s\n",
3454 4f3c844b 2021-09-14 stsp got_worktree_get_head_ref_name(worktree), commit_id_str);
3456 784955db 2019-01-12 stsp printf("Already up-to-date\n");
3457 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
3459 c09a553d 2018-03-12 stsp free(worktree_path);
3460 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3461 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
3462 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3463 507dc3bb 2018-12-29 stsp free(commit_id);
3464 9c4b8182 2019-01-02 stsp free(commit_id_str);
3465 c09a553d 2018-03-12 stsp return error;
3468 f42b1b34 2018-03-12 stsp static const struct got_error *
3469 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3470 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3471 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3473 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
3474 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3476 44392932 2019-08-25 stsp if (blob_id1) {
3477 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3479 44392932 2019-08-25 stsp goto done;
3482 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3484 44392932 2019-08-25 stsp goto done;
3486 44392932 2019-08-25 stsp while (path[0] == '/')
3488 fe621944 2020-11-10 stsp err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3489 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, stdout);
3491 44392932 2019-08-25 stsp if (blob1)
3492 44392932 2019-08-25 stsp got_object_blob_close(blob1);
3493 44392932 2019-08-25 stsp got_object_blob_close(blob2);
3494 44392932 2019-08-25 stsp return err;
3497 44392932 2019-08-25 stsp static const struct got_error *
3498 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3499 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3500 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3502 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3503 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3504 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
3506 44392932 2019-08-25 stsp if (tree_id1) {
3507 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3509 44392932 2019-08-25 stsp goto done;
3512 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3514 0f2b3dca 2018-12-22 stsp goto done;
3516 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
3517 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3518 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
3519 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3520 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
3521 fe621944 2020-11-10 stsp arg.nlines = 0;
3522 44392932 2019-08-25 stsp while (path[0] == '/')
3524 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3525 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3527 79109fed 2018-03-27 stsp if (tree1)
3528 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3529 366e0a5f 2019-10-10 stsp if (tree2)
3530 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3531 44392932 2019-08-25 stsp return err;
3534 44392932 2019-08-25 stsp static const struct got_error *
3535 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3536 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3538 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3539 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3540 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3541 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3543 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3544 0208f208 2020-05-05 stsp if (qid != NULL) {
3545 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3546 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3549 0208f208 2020-05-05 stsp return err;
3551 aa8b5dd0 2021-08-01 stsp tree_id1 = got_object_id_dup(
3552 aa8b5dd0 2021-08-01 stsp got_object_commit_get_tree_id(pcommit));
3553 aa8b5dd0 2021-08-01 stsp if (tree_id1 == NULL) {
3554 aa8b5dd0 2021-08-01 stsp got_object_commit_close(pcommit);
3555 aa8b5dd0 2021-08-01 stsp return got_error_from_errno("got_object_id_dup");
3557 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3561 0208f208 2020-05-05 stsp if (tree_id1) {
3562 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3564 0208f208 2020-05-05 stsp goto done;
3567 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3568 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3570 0208f208 2020-05-05 stsp goto done;
3572 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3573 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3575 0208f208 2020-05-05 stsp if (tree1)
3576 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3577 0208f208 2020-05-05 stsp if (tree2)
3578 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3579 aa8b5dd0 2021-08-01 stsp free(tree_id1);
3580 0208f208 2020-05-05 stsp return err;
3583 0208f208 2020-05-05 stsp static const struct got_error *
3584 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3585 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3587 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3588 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3589 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3590 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3591 44392932 2019-08-25 stsp struct got_object_qid *qid;
3593 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3594 44392932 2019-08-25 stsp if (qid != NULL) {
3595 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3598 44392932 2019-08-25 stsp return err;
3601 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3602 44392932 2019-08-25 stsp int obj_type;
3603 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3605 44392932 2019-08-25 stsp goto done;
3606 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3607 44392932 2019-08-25 stsp if (err) {
3608 44392932 2019-08-25 stsp free(obj_id2);
3609 44392932 2019-08-25 stsp goto done;
3611 44392932 2019-08-25 stsp if (pcommit) {
3612 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3613 44392932 2019-08-25 stsp qid->id, path);
3614 44392932 2019-08-25 stsp if (err) {
3615 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3616 2e8c69d1 2020-05-04 stsp free(obj_id2);
3617 2e8c69d1 2020-05-04 stsp goto done;
3620 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3621 2e8c69d1 2020-05-04 stsp if (err) {
3622 2e8c69d1 2020-05-04 stsp free(obj_id2);
3623 2e8c69d1 2020-05-04 stsp goto done;
3627 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3628 44392932 2019-08-25 stsp if (err) {
3629 44392932 2019-08-25 stsp free(obj_id2);
3630 44392932 2019-08-25 stsp goto done;
3632 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3633 44392932 2019-08-25 stsp switch (obj_type) {
3634 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3635 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3636 64453f7e 2020-11-21 stsp 0, 0, repo);
3638 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3639 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3640 64453f7e 2020-11-21 stsp 0, 0, repo);
3643 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3646 44392932 2019-08-25 stsp free(obj_id1);
3647 44392932 2019-08-25 stsp free(obj_id2);
3649 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3650 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3652 44392932 2019-08-25 stsp goto done;
3653 579bd556 2020-10-24 stsp if (pcommit) {
3654 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3655 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3657 579bd556 2020-10-24 stsp goto done;
3659 64453f7e 2020-11-21 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3661 64453f7e 2020-11-21 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3665 0f2b3dca 2018-12-22 stsp free(id_str1);
3666 0f2b3dca 2018-12-22 stsp free(id_str2);
3667 44392932 2019-08-25 stsp if (pcommit)
3668 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3669 79109fed 2018-03-27 stsp return err;
3672 4bb494d5 2018-06-16 stsp static char *
3673 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3675 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3676 09867e48 2019-08-13 stsp char *p, *s;
3678 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3679 09867e48 2019-08-13 stsp if (tm == NULL)
3680 09867e48 2019-08-13 stsp return NULL;
3681 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3682 09867e48 2019-08-13 stsp if (s == NULL)
3683 09867e48 2019-08-13 stsp return NULL;
3684 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3686 6c281f94 2018-06-11 stsp *p = '\0';
3690 6841bf13 2019-11-29 kn static const struct got_error *
3691 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3692 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3694 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3695 6841bf13 2019-11-29 kn regmatch_t regmatch;
3696 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3698 6841bf13 2019-11-29 kn *have_match = 0;
3700 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3704 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3708 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3709 6841bf13 2019-11-29 kn *have_match = 1;
3711 6841bf13 2019-11-29 kn free(id_str);
3712 6841bf13 2019-11-29 kn free(logmsg);
3716 0208f208 2020-05-05 stsp static void
3717 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3718 0208f208 2020-05-05 stsp regex_t *regex)
3720 0208f208 2020-05-05 stsp regmatch_t regmatch;
3721 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3723 0208f208 2020-05-05 stsp *have_match = 0;
3725 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3726 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3727 0208f208 2020-05-05 stsp *have_match = 1;
3733 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3735 888b7d99 2020-12-26 stsp static const struct got_error*
3736 888b7d99 2020-12-26 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
3737 888b7d99 2020-12-26 stsp struct got_object_id *id, struct got_repository *repo)
3739 888b7d99 2020-12-26 stsp static const struct got_error *err = NULL;
3740 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3742 888b7d99 2020-12-26 stsp const char *name;
3744 888b7d99 2020-12-26 stsp *refs_str = NULL;
3746 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
3747 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3748 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3751 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3752 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3754 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3755 199a4027 2019-02-02 stsp name += 5;
3756 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3758 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3759 e34f9ed6 2019-02-02 stsp name += 6;
3760 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3761 141c2bff 2019-02-04 stsp name += 8;
3762 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3763 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3766 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3769 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3770 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3771 5d844a1e 2019-08-13 stsp if (err) {
3772 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3773 48cae60d 2020-09-22 stsp free(ref_id);
3776 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3777 5d844a1e 2019-08-13 stsp err = NULL;
3778 5d844a1e 2019-08-13 stsp tag = NULL;
3781 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3782 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3783 48cae60d 2020-09-22 stsp free(ref_id);
3785 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3786 a436ad14 2019-08-13 stsp if (cmp != 0)
3788 888b7d99 2020-12-26 stsp s = *refs_str;
3789 888b7d99 2020-12-26 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
3790 888b7d99 2020-12-26 stsp s ? ", " : "", name) == -1) {
3791 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3793 888b7d99 2020-12-26 stsp *refs_str = NULL;
3799 888b7d99 2020-12-26 stsp return err;
3802 888b7d99 2020-12-26 stsp static const struct got_error *
3803 888b7d99 2020-12-26 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3804 888b7d99 2020-12-26 stsp struct got_repository *repo, const char *path,
3805 888b7d99 2020-12-26 stsp struct got_pathlist_head *changed_paths, int show_patch,
3806 e600f124 2021-03-21 stsp int diff_context, struct got_reflist_object_id_map *refs_idmap,
3807 e600f124 2021-03-21 stsp const char *custom_refs_str)
3809 888b7d99 2020-12-26 stsp const struct got_error *err = NULL;
3810 888b7d99 2020-12-26 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3811 888b7d99 2020-12-26 stsp char datebuf[26];
3812 888b7d99 2020-12-26 stsp time_t committer_time;
3813 888b7d99 2020-12-26 stsp const char *author, *committer;
3814 888b7d99 2020-12-26 stsp char *refs_str = NULL;
3816 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3818 8bf5b3c9 2018-03-17 stsp return err;
3820 e600f124 2021-03-21 stsp if (custom_refs_str == NULL) {
3821 e600f124 2021-03-21 stsp struct got_reflist_head *refs;
3822 e600f124 2021-03-21 stsp refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3823 e600f124 2021-03-21 stsp if (refs) {
3824 e600f124 2021-03-21 stsp err = build_refs_str(&refs_str, refs, id, repo);
3826 e600f124 2021-03-21 stsp goto done;
3830 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3831 e600f124 2021-03-21 stsp if (custom_refs_str)
3832 e600f124 2021-03-21 stsp printf("commit %s (%s)\n", id_str, custom_refs_str);
3834 e600f124 2021-03-21 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3835 e600f124 2021-03-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3836 832c249c 2018-06-10 stsp free(id_str);
3837 d3d493d7 2019-02-21 stsp id_str = NULL;
3838 d3d493d7 2019-02-21 stsp free(refs_str);
3839 d3d493d7 2019-02-21 stsp refs_str = NULL;
3840 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3841 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3842 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3843 09867e48 2019-08-13 stsp if (datestr)
3844 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3845 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3846 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3847 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3848 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3849 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3850 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3851 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3852 3fe1abad 2018-06-10 stsp int n = 1;
3853 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3854 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, parent_ids, entry) {
3855 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3857 888b7d99 2020-12-26 stsp goto done;
3858 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3859 a0603db2 2018-06-10 stsp free(id_str);
3860 888b7d99 2020-12-26 stsp id_str = NULL;
3864 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3866 888b7d99 2020-12-26 stsp goto done;
3868 621015ac 2018-07-23 stsp logmsg = logmsg0;
3870 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3872 832c249c 2018-06-10 stsp printf(" %s\n", line);
3873 832c249c 2018-06-10 stsp } while (line);
3874 621015ac 2018-07-23 stsp free(logmsg0);
3876 0208f208 2020-05-05 stsp if (changed_paths) {
3877 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3878 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3879 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3880 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3882 0208f208 2020-05-05 stsp printf("\n");
3884 971751ac 2018-03-27 stsp if (show_patch) {
3885 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3886 971751ac 2018-03-27 stsp if (err == 0)
3887 971751ac 2018-03-27 stsp printf("\n");
3890 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3891 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3893 888b7d99 2020-12-26 stsp free(id_str);
3894 888b7d99 2020-12-26 stsp free(refs_str);
3895 07862c20 2018-09-15 stsp return err;
3898 f42b1b34 2018-03-12 stsp static const struct got_error *
3899 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3900 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3901 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3902 888b7d99 2020-12-26 stsp int log_branches, int reverse_display_order,
3903 888b7d99 2020-12-26 stsp struct got_reflist_object_id_map *refs_idmap)
3905 f42b1b34 2018-03-12 stsp const struct got_error *err;
3906 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3907 6841bf13 2019-11-29 kn regex_t regex;
3908 6841bf13 2019-11-29 kn int have_match;
3909 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3910 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3911 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3912 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3913 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3915 dbdddfee 2021-06-23 naddy STAILQ_INIT(&reversed_commits);
3916 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3918 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3919 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3920 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3922 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3924 f42b1b34 2018-03-12 stsp return err;
3925 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3926 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3928 fcc85cad 2018-07-22 stsp goto done;
3930 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3932 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3935 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3936 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3937 372ccdbb 2018-06-10 stsp if (err) {
3938 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3939 9ba79e04 2018-06-11 stsp err = NULL;
3942 b43fbaa0 2018-06-11 stsp if (id == NULL)
3945 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3949 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3950 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3955 6841bf13 2019-11-29 kn if (search_pattern) {
3956 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3958 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3961 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3962 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3963 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3964 6841bf13 2019-11-29 kn if (have_match == 0) {
3965 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3966 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3967 0208f208 2020-05-05 stsp free((char *)pe->path);
3968 0208f208 2020-05-05 stsp free(pe->data);
3970 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3975 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3976 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3979 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3980 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3982 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3983 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3984 e600f124 2021-03-21 stsp show_patch, diff_context, refs_idmap, NULL);
3985 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3989 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3990 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3993 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3994 0208f208 2020-05-05 stsp free((char *)pe->path);
3995 0208f208 2020-05-05 stsp free(pe->data);
3997 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3999 dbec59df 2020-04-18 stsp if (reverse_display_order) {
4000 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &reversed_commits, entry) {
4001 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
4004 502b9684 2020-07-31 stsp if (show_changed_paths) {
4005 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
4006 502b9684 2020-07-31 stsp commit, repo);
4010 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
4011 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
4012 e600f124 2021-03-21 stsp show_patch, diff_context, refs_idmap, NULL);
4013 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
4016 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
4017 502b9684 2020-07-31 stsp free((char *)pe->path);
4018 502b9684 2020-07-31 stsp free(pe->data);
4020 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
4024 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&reversed_commits)) {
4025 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&reversed_commits);
4026 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4027 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
4029 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
4030 0208f208 2020-05-05 stsp free((char *)pe->path);
4031 0208f208 2020-05-05 stsp free(pe->data);
4033 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
4034 6841bf13 2019-11-29 kn if (search_pattern)
4035 6841bf13 2019-11-29 kn regfree(®ex);
4036 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
4037 f42b1b34 2018-03-12 stsp return err;
4040 4ed7e80c 2018-05-20 stsp __dead static void
4041 6f3d1eb0 2018-03-12 stsp usage_log(void)
4043 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
4044 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
4045 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
4049 b1ebc001 2019-08-13 stsp static int
4050 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
4052 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
4053 b1ebc001 2019-08-13 stsp long long n;
4054 b1ebc001 2019-08-13 stsp const char *errstr;
4056 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4057 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
4059 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4060 b1ebc001 2019-08-13 stsp if (errstr != NULL)
4065 4ed7e80c 2018-05-20 stsp static const struct got_error *
4066 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
4068 f42b1b34 2018-03-12 stsp const struct got_error *error;
4069 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
4070 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
4071 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
4072 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4073 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
4074 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
4075 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
4076 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4077 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
4078 64a96a6d 2018-04-01 stsp const char *errstr;
4079 199a4027 2019-02-02 stsp struct got_reflist_head refs;
4080 888b7d99 2020-12-26 stsp struct got_reflist_object_id_map *refs_idmap = NULL;
4082 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4084 6715a751 2018-03-16 stsp #ifndef PROFILE
4085 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4088 f42b1b34 2018-03-12 stsp err(1, "pledge");
4091 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
4093 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
4094 79109fed 2018-03-27 stsp switch (ch) {
4096 79109fed 2018-03-27 stsp show_patch = 1;
4099 0208f208 2020-05-05 stsp show_changed_paths = 1;
4102 d142fc45 2018-04-01 stsp start_commit = optarg;
4105 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4107 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4108 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4111 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
4112 64a96a6d 2018-04-01 stsp if (errstr != NULL)
4113 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
4116 48c8c60d 2020-01-27 stsp log_branches = 1;
4119 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
4120 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
4121 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4123 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4126 dbec59df 2020-04-18 stsp reverse_display_order = 1;
4129 6841bf13 2019-11-29 kn search_pattern = optarg;
4132 d1fe46f9 2020-04-18 stsp end_commit = optarg;
4135 2deda0b9 2019-03-07 stsp usage_log();
4136 79109fed 2018-03-27 stsp /* NOTREACHED */
4140 79109fed 2018-03-27 stsp argc -= optind;
4141 79109fed 2018-03-27 stsp argv += optind;
4143 dc1edbfa 2019-11-29 kn if (diff_context == -1)
4144 dc1edbfa 2019-11-29 kn diff_context = 3;
4145 dc1edbfa 2019-11-29 kn else if (!show_patch)
4146 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
4148 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
4149 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
4150 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4151 04ca23f4 2018-07-16 stsp goto done;
4154 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
4155 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
4156 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4157 50f2fada 2020-04-24 stsp goto done;
4158 50f2fada 2020-04-24 stsp error = NULL;
4161 603cdeb0 2020-10-22 stsp if (argc == 1) {
4162 e7301579 2019-03-18 stsp if (worktree) {
4163 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4165 e7301579 2019-03-18 stsp if (error)
4166 e7301579 2019-03-18 stsp goto done;
4168 e7301579 2019-03-18 stsp path = strdup(argv[0]);
4169 e7301579 2019-03-18 stsp if (path == NULL) {
4170 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4171 e7301579 2019-03-18 stsp goto done;
4174 603cdeb0 2020-10-22 stsp } else if (argc != 0)
4175 cbd1af7a 2019-03-18 stsp usage_log();
4177 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
4178 5486daa2 2019-05-11 stsp repo_path = worktree ?
4179 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4181 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
4182 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4183 cffc0aa4 2019-02-05 stsp goto done;
4186 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4187 d7d4f210 2018-03-12 stsp if (error != NULL)
4188 04ca23f4 2018-07-16 stsp goto done;
4190 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4191 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4192 c02c541e 2019-03-29 stsp if (error)
4193 c02c541e 2019-03-29 stsp goto done;
4195 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4196 84de9106 2020-12-26 stsp if (error)
4197 84de9106 2020-12-26 stsp goto done;
4199 888b7d99 2020-12-26 stsp error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4200 888b7d99 2020-12-26 stsp if (error)
4201 888b7d99 2020-12-26 stsp goto done;
4203 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
4204 3235492e 2018-04-01 stsp struct got_reference *head_ref;
4205 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
4206 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
4207 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4208 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
4209 3235492e 2018-04-01 stsp if (error != NULL)
4210 d1fe46f9 2020-04-18 stsp goto done;
4211 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
4212 3235492e 2018-04-01 stsp got_ref_close(head_ref);
4213 3235492e 2018-04-01 stsp if (error != NULL)
4214 d1fe46f9 2020-04-18 stsp goto done;
4215 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
4216 d1fe46f9 2020-04-18 stsp start_id);
4217 d1fe46f9 2020-04-18 stsp if (error != NULL)
4218 d1fe46f9 2020-04-18 stsp goto done;
4219 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
4221 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&start_id, NULL,
4222 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4223 d1fe46f9 2020-04-18 stsp if (error != NULL)
4224 d1fe46f9 2020-04-18 stsp goto done;
4226 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
4227 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&end_id, NULL,
4228 84de9106 2020-12-26 stsp end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4229 d1fe46f9 2020-04-18 stsp if (error != NULL)
4230 d1fe46f9 2020-04-18 stsp goto done;
4233 deeabeae 2019-08-27 stsp if (worktree) {
4235 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
4236 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
4237 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
4239 603cdeb0 2020-10-22 stsp if (path) {
4240 603cdeb0 2020-10-22 stsp const char *prefix;
4241 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
4242 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4243 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
4244 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
4245 603cdeb0 2020-10-22 stsp goto done;
4249 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
4250 8fa913ec 2020-11-14 stsp path ? path : "");
4251 04ca23f4 2018-07-16 stsp if (error != NULL)
4252 04ca23f4 2018-07-16 stsp goto done;
4253 04ca23f4 2018-07-16 stsp if (in_repo_path) {
4254 04ca23f4 2018-07-16 stsp free(path);
4255 04ca23f4 2018-07-16 stsp path = in_repo_path;
4258 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
4259 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
4260 888b7d99 2020-12-26 stsp limit, log_branches, reverse_display_order, refs_idmap);
4262 04ca23f4 2018-07-16 stsp free(path);
4263 04ca23f4 2018-07-16 stsp free(repo_path);
4264 04ca23f4 2018-07-16 stsp free(cwd);
4265 cffc0aa4 2019-02-05 stsp if (worktree)
4266 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
4267 ad242220 2018-09-08 stsp if (repo) {
4268 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
4269 ad242220 2018-09-08 stsp if (error == NULL)
4270 1d0f4054 2021-06-17 stsp error = close_err;
4272 888b7d99 2020-12-26 stsp if (refs_idmap)
4273 888b7d99 2020-12-26 stsp got_reflist_object_id_map_free(refs_idmap);
4274 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4275 8bf5b3c9 2018-03-17 stsp return error;
4278 4ed7e80c 2018-05-20 stsp __dead static void
4279 3f8b7d6a 2018-04-01 stsp usage_diff(void)
4281 51ed7429 2021-10-10 stsp fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4282 51ed7429 2021-10-10 stsp "[-r repository-path] [-s] [-w] [-P] "
4283 51ed7429 2021-10-10 stsp "[object1 object2 | path ...]\n", getprogname());
4287 b72f483a 2019-02-05 stsp struct print_diff_arg {
4288 b72f483a 2019-02-05 stsp struct got_repository *repo;
4289 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
4290 b72f483a 2019-02-05 stsp int diff_context;
4291 3fc0c068 2019-02-10 stsp const char *id_str;
4292 3fc0c068 2019-02-10 stsp int header_shown;
4293 98eaaa12 2019-08-03 stsp int diff_staged;
4294 63035f9f 2019-10-06 stsp int ignore_whitespace;
4295 64453f7e 2020-11-21 stsp int force_text_diff;
4299 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
4300 39449a05 2020-07-23 stsp * it as content to the diff engine.
4302 39449a05 2020-07-23 stsp static const struct got_error *
4303 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4304 39449a05 2020-07-23 stsp const char *abspath)
4306 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
4307 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
4308 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
4312 39449a05 2020-07-23 stsp if (dirfd != -1) {
4313 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4314 39449a05 2020-07-23 stsp if (target_len == -1)
4315 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
4317 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
4318 39449a05 2020-07-23 stsp if (target_len == -1)
4319 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
4322 39449a05 2020-07-23 stsp *fd = got_opentempfd();
4323 39449a05 2020-07-23 stsp if (*fd == -1)
4324 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
4326 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
4327 39449a05 2020-07-23 stsp if (outlen == -1) {
4328 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
4329 39449a05 2020-07-23 stsp goto done;
4332 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
4333 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
4334 39449a05 2020-07-23 stsp goto done;
4337 39449a05 2020-07-23 stsp if (err) {
4338 39449a05 2020-07-23 stsp close(*fd);
4341 39449a05 2020-07-23 stsp return err;
4344 4ed7e80c 2018-05-20 stsp static const struct got_error *
4345 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
4346 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4347 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4348 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4350 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
4351 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
4352 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
4353 12463d8b 2019-12-13 stsp int fd = -1;
4354 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
4355 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
4356 b72f483a 2019-02-05 stsp struct stat sb;
4358 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4359 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4360 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4361 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4362 98eaaa12 2019-08-03 stsp return NULL;
4364 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4365 98eaaa12 2019-08-03 stsp return NULL;
4366 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4367 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
4368 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4369 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
4370 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
4371 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
4372 98eaaa12 2019-08-03 stsp return NULL;
4375 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
4376 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
4377 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
4378 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
4379 3fc0c068 2019-02-10 stsp a->header_shown = 1;
4382 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4383 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
4384 98eaaa12 2019-08-03 stsp switch (staged_status) {
4385 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
4386 98eaaa12 2019-08-03 stsp label1 = path;
4387 98eaaa12 2019-08-03 stsp label2 = path;
4389 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4390 98eaaa12 2019-08-03 stsp label2 = path;
4392 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4393 98eaaa12 2019-08-03 stsp label1 = path;
4396 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4398 fe621944 2020-11-10 stsp return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4399 fe621944 2020-11-10 stsp staged_blob_id, label1, label2, a->diff_context,
4400 64453f7e 2020-11-21 stsp a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4403 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4404 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4405 4ce46740 2019-08-08 stsp char *id_str;
4406 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4409 4ce46740 2019-08-08 stsp goto done;
4410 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4412 4ce46740 2019-08-08 stsp goto done;
4413 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4414 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4415 4ce46740 2019-08-08 stsp free(id_str);
4416 4ce46740 2019-08-08 stsp goto done;
4418 4ce46740 2019-08-08 stsp free(id_str);
4419 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4420 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4422 4ce46740 2019-08-08 stsp goto done;
4425 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4426 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4427 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4428 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4429 2ec1f75b 2019-03-26 stsp goto done;
4432 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4433 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4434 12463d8b 2019-12-13 stsp if (fd == -1) {
4435 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4436 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4438 39449a05 2020-07-23 stsp goto done;
4440 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4441 39449a05 2020-07-23 stsp de_name, abspath);
4443 39449a05 2020-07-23 stsp goto done;
4446 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4447 12463d8b 2019-12-13 stsp if (fd == -1) {
4448 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4449 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4451 39449a05 2020-07-23 stsp goto done;
4453 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4454 39449a05 2020-07-23 stsp de_name, abspath);
4456 39449a05 2020-07-23 stsp goto done;
4459 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4460 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4461 2ec1f75b 2019-03-26 stsp goto done;
4463 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4464 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4465 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4466 2ec1f75b 2019-03-26 stsp goto done;
4470 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4472 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4473 64453f7e 2020-11-21 stsp a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4475 b72f483a 2019-02-05 stsp if (blob1)
4476 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4477 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4478 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4479 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4480 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4481 b72f483a 2019-02-05 stsp free(abspath);
4482 927df6b7 2019-02-10 stsp return err;
4485 927df6b7 2019-02-10 stsp static const struct got_error *
4486 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4488 b00d56cd 2018-04-01 stsp const struct got_error *error;
4489 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4490 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4491 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4492 67b631c9 2021-10-10 stsp const char *commit_args[2] = { NULL, NULL };
4493 67b631c9 2021-10-10 stsp int ncommit_args = 0;
4494 e7ffb0b0 2021-10-07 stsp struct got_object_id *ids[2] = { NULL, NULL };
4495 e7ffb0b0 2021-10-07 stsp char *labels[2] = { NULL, NULL };
4496 67b631c9 2021-10-10 stsp int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4497 e7ffb0b0 2021-10-07 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4498 e7ffb0b0 2021-10-07 stsp int force_text_diff = 0, force_path = 0, rflag = 0;
4499 c0cc5c62 2018-10-18 stsp const char *errstr;
4500 84de9106 2020-12-26 stsp struct got_reflist_head refs;
4501 e7ffb0b0 2021-10-07 stsp struct got_pathlist_head paths;
4502 e7ffb0b0 2021-10-07 stsp struct got_pathlist_entry *pe;
4504 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
4505 e7ffb0b0 2021-10-07 stsp TAILQ_INIT(&paths);
4507 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4508 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4509 25eccc22 2019-01-04 stsp NULL) == -1)
4510 b00d56cd 2018-04-01 stsp err(1, "pledge");
4513 67b631c9 2021-10-10 stsp while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4514 b00d56cd 2018-04-01 stsp switch (ch) {
4516 64453f7e 2020-11-21 stsp force_text_diff = 1;
4519 67b631c9 2021-10-10 stsp if (ncommit_args >= 2)
4520 67b631c9 2021-10-10 stsp errx(1, "too many -c options used");
4521 67b631c9 2021-10-10 stsp commit_args[ncommit_args++] = optarg;
4524 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4526 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4527 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4530 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4531 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4532 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4534 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4535 e7ffb0b0 2021-10-07 stsp rflag = 1;
4538 98eaaa12 2019-08-03 stsp diff_staged = 1;
4541 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4544 e7ffb0b0 2021-10-07 stsp force_path = 1;
4547 2deda0b9 2019-03-07 stsp usage_diff();
4548 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4552 b00d56cd 2018-04-01 stsp argc -= optind;
4553 b00d56cd 2018-04-01 stsp argv += optind;
4555 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4556 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4557 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4558 b72f483a 2019-02-05 stsp goto done;
4561 e7ffb0b0 2021-10-07 stsp if (repo_path == NULL) {
4562 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4563 e7ffb0b0 2021-10-07 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4564 1f03b8da 2020-03-20 stsp goto done;
4566 e7ffb0b0 2021-10-07 stsp error = NULL;
4567 e7ffb0b0 2021-10-07 stsp if (worktree) {
4568 e7ffb0b0 2021-10-07 stsp repo_path =
4569 e7ffb0b0 2021-10-07 stsp strdup(got_worktree_get_repo_path(worktree));
4570 e7ffb0b0 2021-10-07 stsp if (repo_path == NULL) {
4571 e7ffb0b0 2021-10-07 stsp error = got_error_from_errno("strdup");
4572 927df6b7 2019-02-10 stsp goto done;
4575 e7ffb0b0 2021-10-07 stsp repo_path = strdup(cwd);
4576 1a1242a9 2021-04-01 kn if (repo_path == NULL) {
4577 1a1242a9 2021-04-01 kn error = got_error_from_errno("strdup");
4583 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4584 76089277 2018-04-01 stsp free(repo_path);
4585 b00d56cd 2018-04-01 stsp if (error != NULL)
4586 b00d56cd 2018-04-01 stsp goto done;
4588 67b631c9 2021-10-10 stsp if (rflag || worktree == NULL || ncommit_args > 0) {
4589 67b631c9 2021-10-10 stsp if (force_path) {
4590 67b631c9 2021-10-10 stsp error = got_error_msg(GOT_ERR_NOT_IMPL,
4591 67b631c9 2021-10-10 stsp "-P option can only be used when diffing "
4592 67b631c9 2021-10-10 stsp "a work tree");
4593 67b631c9 2021-10-10 stsp goto done;
4595 67b631c9 2021-10-10 stsp if (diff_staged) {
4596 67b631c9 2021-10-10 stsp error = got_error_msg(GOT_ERR_NOT_IMPL,
4597 67b631c9 2021-10-10 stsp "-s option can only be used when diffing "
4598 67b631c9 2021-10-10 stsp "a work tree");
4599 67b631c9 2021-10-10 stsp goto done;
4603 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4604 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4605 c02c541e 2019-03-29 stsp if (error)
4606 c02c541e 2019-03-29 stsp goto done;
4608 67b631c9 2021-10-10 stsp if ((!force_path && argc == 2) || ncommit_args > 0) {
4609 67b631c9 2021-10-10 stsp int obj_type = (ncommit_args > 0 ?
4610 67b631c9 2021-10-10 stsp GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4611 e7ffb0b0 2021-10-07 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4613 e7ffb0b0 2021-10-07 stsp if (error)
4614 e7ffb0b0 2021-10-07 stsp goto done;
4615 67b631c9 2021-10-10 stsp for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4616 67b631c9 2021-10-10 stsp const char *arg;
4617 67b631c9 2021-10-10 stsp if (ncommit_args > 0)
4618 67b631c9 2021-10-10 stsp arg = commit_args[i];
4620 67b631c9 2021-10-10 stsp arg = argv[i];
4621 e7ffb0b0 2021-10-07 stsp error = got_repo_match_object_id(&ids[i], &labels[i],
4622 67b631c9 2021-10-10 stsp arg, obj_type, &refs, repo);
4623 e7ffb0b0 2021-10-07 stsp if (error) {
4624 e7ffb0b0 2021-10-07 stsp if (error->code != GOT_ERR_NOT_REF &&
4625 e7ffb0b0 2021-10-07 stsp error->code != GOT_ERR_NO_OBJ)
4626 e7ffb0b0 2021-10-07 stsp goto done;
4627 67b631c9 2021-10-10 stsp if (ncommit_args > 0)
4628 67b631c9 2021-10-10 stsp goto done;
4629 e7ffb0b0 2021-10-07 stsp error = NULL;
4635 67b631c9 2021-10-10 stsp if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4636 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4637 b72f483a 2019-02-05 stsp char *id_str;
4639 67b631c9 2021-10-10 stsp if (worktree == NULL) {
4640 67b631c9 2021-10-10 stsp if (argc == 2 && ids[0] == NULL) {
4641 67b631c9 2021-10-10 stsp error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4642 67b631c9 2021-10-10 stsp goto done;
4643 67b631c9 2021-10-10 stsp } else if (argc == 2 && ids[1] == NULL) {
4644 67b631c9 2021-10-10 stsp error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4645 67b631c9 2021-10-10 stsp goto done;
4646 67b631c9 2021-10-10 stsp } else if (argc > 0) {
4647 67b631c9 2021-10-10 stsp error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4648 67b631c9 2021-10-10 stsp "%s", "specified paths cannot be resolved");
4649 67b631c9 2021-10-10 stsp goto done;
4651 67b631c9 2021-10-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
4652 67b631c9 2021-10-10 stsp goto done;
4656 67b631c9 2021-10-10 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
4657 67b631c9 2021-10-10 stsp worktree);
4658 67b631c9 2021-10-10 stsp if (error)
4659 67b631c9 2021-10-10 stsp goto done;
4661 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4662 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4663 b72f483a 2019-02-05 stsp if (error)
4664 b72f483a 2019-02-05 stsp goto done;
4665 b72f483a 2019-02-05 stsp arg.repo = repo;
4666 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4667 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4668 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4669 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4670 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4671 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4672 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
4674 f6343036 2021-06-22 stsp error = got_worktree_status(worktree, &paths, repo, 0,
4675 f6343036 2021-06-22 stsp print_diff, &arg, check_cancelled, NULL);
4676 b72f483a 2019-02-05 stsp free(id_str);
4677 b72f483a 2019-02-05 stsp goto done;
4680 67b631c9 2021-10-10 stsp if (ncommit_args == 1) {
4681 67b631c9 2021-10-10 stsp struct got_commit_object *commit;
4682 67b631c9 2021-10-10 stsp error = got_object_open_as_commit(&commit, repo, ids[0]);
4683 67b631c9 2021-10-10 stsp if (error)
4684 e7ffb0b0 2021-10-07 stsp goto done;
4686 67b631c9 2021-10-10 stsp labels[1] = labels[0];
4687 67b631c9 2021-10-10 stsp ids[1] = ids[0];
4688 67b631c9 2021-10-10 stsp if (got_object_commit_get_nparents(commit) > 0) {
4689 67b631c9 2021-10-10 stsp const struct got_object_id_queue *pids;
4690 67b631c9 2021-10-10 stsp struct got_object_qid *pid;
4691 67b631c9 2021-10-10 stsp pids = got_object_commit_get_parent_ids(commit);
4692 67b631c9 2021-10-10 stsp pid = STAILQ_FIRST(pids);
4693 67b631c9 2021-10-10 stsp ids[0] = got_object_id_dup(pid->id);
4694 67b631c9 2021-10-10 stsp if (ids[0] == NULL) {
4695 67b631c9 2021-10-10 stsp error = got_error_from_errno(
4696 67b631c9 2021-10-10 stsp "got_object_id_dup");
4697 67b631c9 2021-10-10 stsp got_object_commit_close(commit);
4698 67b631c9 2021-10-10 stsp goto done;
4700 67b631c9 2021-10-10 stsp error = got_object_id_str(&labels[0], ids[0]);
4701 67b631c9 2021-10-10 stsp if (error) {
4702 67b631c9 2021-10-10 stsp got_object_commit_close(commit);
4703 67b631c9 2021-10-10 stsp goto done;
4706 67b631c9 2021-10-10 stsp ids[0] = NULL;
4707 67b631c9 2021-10-10 stsp labels[0] = strdup("/dev/null");
4708 67b631c9 2021-10-10 stsp if (labels[0] == NULL) {
4709 67b631c9 2021-10-10 stsp error = got_error_from_errno("strdup");
4710 67b631c9 2021-10-10 stsp got_object_commit_close(commit);
4711 67b631c9 2021-10-10 stsp goto done;
4715 67b631c9 2021-10-10 stsp got_object_commit_close(commit);
4718 67b631c9 2021-10-10 stsp if (ncommit_args == 0 && argc > 2) {
4719 67b631c9 2021-10-10 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4720 67b631c9 2021-10-10 stsp "path arguments cannot be used when diffing two objects");
4721 0adb7196 2019-08-11 stsp goto done;
4724 67b631c9 2021-10-10 stsp if (ids[0]) {
4725 67b631c9 2021-10-10 stsp error = got_object_get_type(&type1, repo, ids[0]);
4726 67b631c9 2021-10-10 stsp if (error)
4727 67b631c9 2021-10-10 stsp goto done;
4730 e7ffb0b0 2021-10-07 stsp error = got_object_get_type(&type2, repo, ids[1]);
4731 15a94983 2018-12-23 stsp if (error)
4732 15a94983 2018-12-23 stsp goto done;
4733 67b631c9 2021-10-10 stsp if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4734 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4735 b00d56cd 2018-04-01 stsp goto done;
4737 67b631c9 2021-10-10 stsp if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
4738 67b631c9 2021-10-10 stsp error = got_error_msg(GOT_ERR_OBJ_TYPE,
4739 67b631c9 2021-10-10 stsp "path arguments cannot be used when diffing blobs");
4740 67b631c9 2021-10-10 stsp goto done;
4743 67b631c9 2021-10-10 stsp for (i = 0; ncommit_args > 0 && i < argc; i++) {
4744 67b631c9 2021-10-10 stsp char *in_repo_path;
4745 67b631c9 2021-10-10 stsp struct got_pathlist_entry *new;
4746 67b631c9 2021-10-10 stsp if (worktree) {
4747 67b631c9 2021-10-10 stsp const char *prefix;
4749 67b631c9 2021-10-10 stsp error = got_worktree_resolve_path(&p, worktree,
4751 67b631c9 2021-10-10 stsp if (error)
4752 67b631c9 2021-10-10 stsp goto done;
4753 67b631c9 2021-10-10 stsp prefix = got_worktree_get_path_prefix(worktree);
4754 67b631c9 2021-10-10 stsp while (prefix[0] == '/')
4756 67b631c9 2021-10-10 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4757 67b631c9 2021-10-10 stsp (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4758 67b631c9 2021-10-10 stsp p) == -1) {
4759 67b631c9 2021-10-10 stsp error = got_error_from_errno("asprintf");
4761 67b631c9 2021-10-10 stsp goto done;
4765 67b631c9 2021-10-10 stsp char *mapped_path, *s;
4766 67b631c9 2021-10-10 stsp error = got_repo_map_path(&mapped_path, repo, argv[i]);
4767 67b631c9 2021-10-10 stsp if (error)
4768 67b631c9 2021-10-10 stsp goto done;
4769 67b631c9 2021-10-10 stsp s = mapped_path;
4770 67b631c9 2021-10-10 stsp while (s[0] == '/')
4772 67b631c9 2021-10-10 stsp in_repo_path = strdup(s);
4773 67b631c9 2021-10-10 stsp if (in_repo_path == NULL) {
4774 67b631c9 2021-10-10 stsp error = got_error_from_errno("asprintf");
4775 67b631c9 2021-10-10 stsp free(mapped_path);
4776 67b631c9 2021-10-10 stsp goto done;
4778 67b631c9 2021-10-10 stsp free(mapped_path);
4781 67b631c9 2021-10-10 stsp error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4782 67b631c9 2021-10-10 stsp if (error || new == NULL /* duplicate */)
4783 67b631c9 2021-10-10 stsp free(in_repo_path);
4784 67b631c9 2021-10-10 stsp if (error)
4785 67b631c9 2021-10-10 stsp goto done;
4788 67b631c9 2021-10-10 stsp switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4789 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4790 e7ffb0b0 2021-10-07 stsp error = got_diff_objects_as_blobs(NULL, NULL, ids[0], ids[1],
4791 64453f7e 2020-11-21 stsp NULL, NULL, diff_context, ignore_whitespace,
4792 64453f7e 2020-11-21 stsp force_text_diff, repo, stdout);
4794 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4795 e7ffb0b0 2021-10-07 stsp error = got_diff_objects_as_trees(NULL, NULL, ids[0], ids[1],
4796 67b631c9 2021-10-10 stsp &paths, "", "", diff_context, ignore_whitespace,
4797 67b631c9 2021-10-10 stsp force_text_diff, repo, stdout);
4799 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4800 e7ffb0b0 2021-10-07 stsp printf("diff %s %s\n", labels[0], labels[1]);
4801 e7ffb0b0 2021-10-07 stsp error = got_diff_objects_as_commits(NULL, NULL, ids[0], ids[1],
4802 67b631c9 2021-10-10 stsp &paths, diff_context, ignore_whitespace, force_text_diff,
4803 67b631c9 2021-10-10 stsp repo, stdout);
4806 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4809 e7ffb0b0 2021-10-07 stsp free(labels[0]);
4810 e7ffb0b0 2021-10-07 stsp free(labels[1]);
4811 e7ffb0b0 2021-10-07 stsp free(ids[0]);
4812 e7ffb0b0 2021-10-07 stsp free(ids[1]);
4813 b72f483a 2019-02-05 stsp if (worktree)
4814 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4815 ad242220 2018-09-08 stsp if (repo) {
4816 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
4817 ad242220 2018-09-08 stsp if (error == NULL)
4818 1d0f4054 2021-06-17 stsp error = close_err;
4820 e7ffb0b0 2021-10-07 stsp TAILQ_FOREACH(pe, &paths, entry)
4821 e7ffb0b0 2021-10-07 stsp free((char *)pe->path);
4822 e7ffb0b0 2021-10-07 stsp got_pathlist_free(&paths);
4823 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
4824 b00d56cd 2018-04-01 stsp return error;
4827 404c43c4 2018-06-21 stsp __dead static void
4828 404c43c4 2018-06-21 stsp usage_blame(void)
4830 9270e621 2019-02-05 stsp fprintf(stderr,
4831 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4832 404c43c4 2018-06-21 stsp getprogname());
4836 28315671 2019-08-14 stsp struct blame_line {
4837 28315671 2019-08-14 stsp int annotated;
4838 28315671 2019-08-14 stsp char *id_str;
4839 82f6abb8 2019-08-14 stsp char *committer;
4840 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4843 28315671 2019-08-14 stsp struct blame_cb_args {
4844 28315671 2019-08-14 stsp struct blame_line *lines;
4845 28315671 2019-08-14 stsp int nlines;
4846 7ef28ff8 2019-08-14 stsp int nlines_prec;
4847 28315671 2019-08-14 stsp int lineno_cur;
4848 28315671 2019-08-14 stsp off_t *line_offsets;
4850 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4853 404c43c4 2018-06-21 stsp static const struct got_error *
4854 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4856 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4857 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4858 28315671 2019-08-14 stsp struct blame_line *bline;
4859 82f6abb8 2019-08-14 stsp char *line = NULL;
4860 28315671 2019-08-14 stsp size_t linesize = 0;
4861 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4862 28315671 2019-08-14 stsp off_t offset;
4863 bcb49d15 2019-08-14 stsp struct tm tm;
4864 bcb49d15 2019-08-14 stsp time_t committer_time;
4866 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4867 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4868 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4870 28315671 2019-08-14 stsp if (sigint_received)
4871 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4873 2839f8b9 2019-08-18 stsp if (lineno == -1)
4874 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4876 28315671 2019-08-14 stsp /* Annotate this line. */
4877 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4878 28315671 2019-08-14 stsp if (bline->annotated)
4879 28315671 2019-08-14 stsp return NULL;
4880 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4882 28315671 2019-08-14 stsp return err;
4884 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4886 82f6abb8 2019-08-14 stsp goto done;
4888 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4889 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4890 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4891 bcb49d15 2019-08-14 stsp goto done;
4894 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4895 e385fc42 2021-08-30 stsp if (gmtime_r(&committer_time, &tm) == NULL)
4896 e385fc42 2021-08-30 stsp return got_error_from_errno("gmtime_r");
4897 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4898 ec6d1a36 2021-03-21 jrick &tm) == 0) {
4899 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4900 82f6abb8 2019-08-14 stsp goto done;
4902 28315671 2019-08-14 stsp bline->annotated = 1;
4904 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4905 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4906 28315671 2019-08-14 stsp if (!bline->annotated)
4907 82f6abb8 2019-08-14 stsp goto done;
4909 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4910 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4911 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4912 82f6abb8 2019-08-14 stsp goto done;
4915 28315671 2019-08-14 stsp while (bline->annotated) {
4916 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4917 82f6abb8 2019-08-14 stsp size_t len;
4919 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4920 28315671 2019-08-14 stsp if (ferror(a->f))
4921 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4925 82f6abb8 2019-08-14 stsp committer = bline->committer;
4926 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4927 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4928 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4929 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4931 82f6abb8 2019-08-14 stsp *at = '\0';
4932 82f6abb8 2019-08-14 stsp len = strlen(committer);
4933 82f6abb8 2019-08-14 stsp if (len >= 9)
4934 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4936 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4938 28315671 2019-08-14 stsp *nl = '\0';
4939 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4940 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4942 28315671 2019-08-14 stsp a->lineno_cur++;
4943 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4946 82f6abb8 2019-08-14 stsp if (commit)
4947 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4948 28315671 2019-08-14 stsp free(line);
4949 28315671 2019-08-14 stsp return err;
4952 28315671 2019-08-14 stsp static const struct got_error *
4953 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4955 404c43c4 2018-06-21 stsp const struct got_error *error;
4956 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4957 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4958 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4959 0587e10c 2020-07-23 stsp char *link_target = NULL;
4960 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4961 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4962 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4963 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4964 28315671 2019-08-14 stsp struct blame_cb_args bca;
4965 28315671 2019-08-14 stsp int ch, obj_type, i;
4966 be659d10 2020-11-18 stsp off_t filesize;
4968 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4970 404c43c4 2018-06-21 stsp #ifndef PROFILE
4971 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4972 36e2fb66 2019-01-04 stsp NULL) == -1)
4973 404c43c4 2018-06-21 stsp err(1, "pledge");
4976 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4977 404c43c4 2018-06-21 stsp switch (ch) {
4979 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4982 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4983 66bea077 2018-08-02 stsp if (repo_path == NULL)
4984 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4986 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4989 2deda0b9 2019-03-07 stsp usage_blame();
4990 404c43c4 2018-06-21 stsp /* NOTREACHED */
4994 404c43c4 2018-06-21 stsp argc -= optind;
4995 404c43c4 2018-06-21 stsp argv += optind;
4997 a39318fd 2018-08-02 stsp if (argc == 1)
4998 404c43c4 2018-06-21 stsp path = argv[0];
5000 404c43c4 2018-06-21 stsp usage_blame();
5002 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
5003 66bea077 2018-08-02 stsp if (cwd == NULL) {
5004 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5005 66bea077 2018-08-02 stsp goto done;
5007 66bea077 2018-08-02 stsp if (repo_path == NULL) {
5008 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
5009 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5010 66bea077 2018-08-02 stsp goto done;
5012 0c06baac 2019-02-05 stsp error = NULL;
5013 0c06baac 2019-02-05 stsp if (worktree) {
5014 0c06baac 2019-02-05 stsp repo_path =
5015 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5016 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
5017 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5018 1f03b8da 2020-03-20 stsp if (error)
5019 1f03b8da 2020-03-20 stsp goto done;
5022 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
5023 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
5024 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5025 0c06baac 2019-02-05 stsp goto done;
5030 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5031 c02c541e 2019-03-29 stsp if (error != NULL)
5032 404c43c4 2018-06-21 stsp goto done;
5034 0c06baac 2019-02-05 stsp if (worktree) {
5035 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
5038 01740607 2020-11-04 stsp error = got_worktree_resolve_path(&p, worktree, path);
5039 01740607 2020-11-04 stsp if (error)
5040 01740607 2020-11-04 stsp goto done;
5041 01740607 2020-11-04 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
5042 01740607 2020-11-04 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5043 01740607 2020-11-04 stsp p) == -1) {
5044 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
5046 0c06baac 2019-02-05 stsp goto done;
5049 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5051 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5052 01740607 2020-11-04 stsp if (error)
5053 01740607 2020-11-04 stsp goto done;
5054 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
5056 0c06baac 2019-02-05 stsp if (error)
5057 66bea077 2018-08-02 stsp goto done;
5059 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
5060 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
5061 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
5062 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5063 404c43c4 2018-06-21 stsp if (error != NULL)
5064 66bea077 2018-08-02 stsp goto done;
5065 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5066 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
5067 404c43c4 2018-06-21 stsp if (error != NULL)
5068 66bea077 2018-08-02 stsp goto done;
5070 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5071 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5072 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5074 84de9106 2020-12-26 stsp if (error)
5075 84de9106 2020-12-26 stsp goto done;
5076 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5077 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5078 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5079 30837e32 2019-07-25 stsp if (error)
5080 66bea077 2018-08-02 stsp goto done;
5083 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
5084 0587e10c 2020-07-23 stsp commit_id, repo);
5085 0587e10c 2020-07-23 stsp if (error)
5086 0587e10c 2020-07-23 stsp goto done;
5088 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
5089 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
5090 28315671 2019-08-14 stsp if (error)
5091 28315671 2019-08-14 stsp goto done;
5093 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
5094 28315671 2019-08-14 stsp if (error)
5095 28315671 2019-08-14 stsp goto done;
5097 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
5098 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
5099 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
5100 28315671 2019-08-14 stsp goto done;
5103 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5104 28315671 2019-08-14 stsp if (error)
5105 28315671 2019-08-14 stsp goto done;
5106 28315671 2019-08-14 stsp bca.f = got_opentemp();
5107 28315671 2019-08-14 stsp if (bca.f == NULL) {
5108 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
5109 28315671 2019-08-14 stsp goto done;
5111 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5112 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
5113 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
5114 28315671 2019-08-14 stsp goto done;
5116 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
5117 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
5118 b02560ec 2019-08-19 stsp bca.nlines--;
5120 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5121 28315671 2019-08-14 stsp if (bca.lines == NULL) {
5122 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
5123 28315671 2019-08-14 stsp goto done;
5125 28315671 2019-08-14 stsp bca.lineno_cur = 1;
5126 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
5127 7ef28ff8 2019-08-14 stsp i = bca.nlines;
5128 7ef28ff8 2019-08-14 stsp while (i > 0) {
5130 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
5132 82f6abb8 2019-08-14 stsp bca.repo = repo;
5134 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5135 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
5137 66bea077 2018-08-02 stsp free(in_repo_path);
5138 0587e10c 2020-07-23 stsp free(link_target);
5139 66bea077 2018-08-02 stsp free(repo_path);
5140 66bea077 2018-08-02 stsp free(cwd);
5141 404c43c4 2018-06-21 stsp free(commit_id);
5142 28315671 2019-08-14 stsp free(obj_id);
5144 28315671 2019-08-14 stsp got_object_blob_close(blob);
5145 0c06baac 2019-02-05 stsp if (worktree)
5146 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
5147 ad242220 2018-09-08 stsp if (repo) {
5148 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
5149 ad242220 2018-09-08 stsp if (error == NULL)
5150 1d0f4054 2021-06-17 stsp error = close_err;
5152 3affba96 2019-09-22 stsp if (bca.lines) {
5153 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
5154 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
5155 3affba96 2019-09-22 stsp free(bline->id_str);
5156 3affba96 2019-09-22 stsp free(bline->committer);
5158 3affba96 2019-09-22 stsp free(bca.lines);
5160 28315671 2019-08-14 stsp free(bca.line_offsets);
5161 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
5162 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
5163 404c43c4 2018-06-21 stsp return error;
5166 5de5890b 2018-10-18 stsp __dead static void
5167 5de5890b 2018-10-18 stsp usage_tree(void)
5169 c1669e2e 2019-01-09 stsp fprintf(stderr,
5170 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5171 5de5890b 2018-10-18 stsp getprogname());
5175 0d6c6ee3 2020-05-20 stsp static const struct got_error *
5176 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
5177 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
5179 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
5180 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
5181 848d6979 2019-08-12 stsp const char *modestr = "";
5182 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
5183 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
5185 c1669e2e 2019-01-09 stsp path += strlen(root_path);
5186 c1669e2e 2019-01-09 stsp while (path[0] == '/')
5189 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
5190 63c5ca5d 2019-08-24 stsp modestr = "$";
5191 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
5194 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5196 0d6c6ee3 2020-05-20 stsp return err;
5197 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
5198 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
5199 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
5202 848d6979 2019-08-12 stsp modestr = "@";
5204 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
5205 848d6979 2019-08-12 stsp modestr = "/";
5206 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
5207 848d6979 2019-08-12 stsp modestr = "*";
5209 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5210 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5211 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
5213 0d6c6ee3 2020-05-20 stsp free(link_target);
5214 0d6c6ee3 2020-05-20 stsp return NULL;
5217 5de5890b 2018-10-18 stsp static const struct got_error *
5218 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
5219 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
5220 c1669e2e 2019-01-09 stsp struct got_repository *repo)
5222 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
5223 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
5224 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
5225 56e0773d 2019-11-28 stsp int nentries, i;
5227 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
5229 5de5890b 2018-10-18 stsp goto done;
5231 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
5233 5de5890b 2018-10-18 stsp goto done;
5234 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
5235 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
5236 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
5237 5de5890b 2018-10-18 stsp char *id = NULL;
5239 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
5242 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
5243 5de5890b 2018-10-18 stsp if (show_ids) {
5244 5de5890b 2018-10-18 stsp char *id_str;
5245 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
5246 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
5248 5de5890b 2018-10-18 stsp goto done;
5249 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
5250 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5251 5de5890b 2018-10-18 stsp free(id_str);
5252 5de5890b 2018-10-18 stsp goto done;
5254 5de5890b 2018-10-18 stsp free(id_str);
5256 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
5259 0d6c6ee3 2020-05-20 stsp goto done;
5261 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5262 c1669e2e 2019-01-09 stsp char *child_path;
5263 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
5264 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
5265 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
5266 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5267 c1669e2e 2019-01-09 stsp goto done;
5269 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
5270 c1669e2e 2019-01-09 stsp root_path, repo);
5271 c1669e2e 2019-01-09 stsp free(child_path);
5273 c1669e2e 2019-01-09 stsp goto done;
5278 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
5279 5de5890b 2018-10-18 stsp free(tree_id);
5280 5de5890b 2018-10-18 stsp return err;
5283 5de5890b 2018-10-18 stsp static const struct got_error *
5284 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
5286 5de5890b 2018-10-18 stsp const struct got_error *error;
5287 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
5288 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
5289 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
5290 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5291 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
5292 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
5293 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
5296 5de5890b 2018-10-18 stsp #ifndef PROFILE
5297 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5298 0f8d269b 2019-01-04 stsp NULL) == -1)
5299 5de5890b 2018-10-18 stsp err(1, "pledge");
5302 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5303 5de5890b 2018-10-18 stsp switch (ch) {
5305 5de5890b 2018-10-18 stsp commit_id_str = optarg;
5308 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
5309 5de5890b 2018-10-18 stsp if (repo_path == NULL)
5310 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5312 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5315 5de5890b 2018-10-18 stsp show_ids = 1;
5318 c1669e2e 2019-01-09 stsp recurse = 1;
5321 2deda0b9 2019-03-07 stsp usage_tree();
5322 5de5890b 2018-10-18 stsp /* NOTREACHED */
5326 5de5890b 2018-10-18 stsp argc -= optind;
5327 5de5890b 2018-10-18 stsp argv += optind;
5329 5de5890b 2018-10-18 stsp if (argc == 1)
5330 5de5890b 2018-10-18 stsp path = argv[0];
5331 5de5890b 2018-10-18 stsp else if (argc > 1)
5332 5de5890b 2018-10-18 stsp usage_tree();
5334 7a2c19d6 2019-02-05 stsp path = NULL;
5336 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
5337 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
5338 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5339 9bf7a39b 2019-02-05 stsp goto done;
5341 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
5342 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
5343 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5344 7a2c19d6 2019-02-05 stsp goto done;
5346 7a2c19d6 2019-02-05 stsp error = NULL;
5347 7a2c19d6 2019-02-05 stsp if (worktree) {
5348 7a2c19d6 2019-02-05 stsp repo_path =
5349 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5350 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
5351 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5352 7a2c19d6 2019-02-05 stsp if (error)
5353 7a2c19d6 2019-02-05 stsp goto done;
5355 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
5356 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
5357 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5358 7a2c19d6 2019-02-05 stsp goto done;
5363 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5364 5de5890b 2018-10-18 stsp if (error != NULL)
5365 c02c541e 2019-03-29 stsp goto done;
5367 4fedbf4c 2020-11-07 stsp if (worktree) {
5368 4fedbf4c 2020-11-07 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
5371 4fedbf4c 2020-11-07 stsp if (path == NULL)
5372 4fedbf4c 2020-11-07 stsp path = "";
5373 4fedbf4c 2020-11-07 stsp error = got_worktree_resolve_path(&p, worktree, path);
5374 4fedbf4c 2020-11-07 stsp if (error)
5375 4fedbf4c 2020-11-07 stsp goto done;
5376 4fedbf4c 2020-11-07 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
5377 4fedbf4c 2020-11-07 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5378 4fedbf4c 2020-11-07 stsp p) == -1) {
5379 4fedbf4c 2020-11-07 stsp error = got_error_from_errno("asprintf");
5381 4fedbf4c 2020-11-07 stsp goto done;
5384 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5385 4fedbf4c 2020-11-07 stsp if (error)
5386 4fedbf4c 2020-11-07 stsp goto done;
5388 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5389 4fedbf4c 2020-11-07 stsp if (error)
5390 4fedbf4c 2020-11-07 stsp goto done;
5391 4fedbf4c 2020-11-07 stsp if (path == NULL)
5392 9bf7a39b 2019-02-05 stsp path = "/";
5393 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
5394 9bf7a39b 2019-02-05 stsp if (error != NULL)
5395 9bf7a39b 2019-02-05 stsp goto done;
5398 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
5399 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
5400 4e0a20a4 2020-03-23 tracey if (worktree)
5401 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
5403 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
5404 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
5405 5de5890b 2018-10-18 stsp if (error != NULL)
5406 5de5890b 2018-10-18 stsp goto done;
5407 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5408 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
5409 5de5890b 2018-10-18 stsp if (error != NULL)
5410 5de5890b 2018-10-18 stsp goto done;
5412 84de9106 2020-12-26 stsp struct got_reflist_head refs;
5413 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5414 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5416 84de9106 2020-12-26 stsp if (error)
5417 84de9106 2020-12-26 stsp goto done;
5418 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5419 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5420 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
5421 30837e32 2019-07-25 stsp if (error)
5422 5de5890b 2018-10-18 stsp goto done;
5425 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5426 c1669e2e 2019-01-09 stsp in_repo_path, repo);
5428 5de5890b 2018-10-18 stsp free(in_repo_path);
5429 5de5890b 2018-10-18 stsp free(repo_path);
5430 5de5890b 2018-10-18 stsp free(cwd);
5431 5de5890b 2018-10-18 stsp free(commit_id);
5432 7a2c19d6 2019-02-05 stsp if (worktree)
5433 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
5434 5de5890b 2018-10-18 stsp if (repo) {
5435 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
5436 5de5890b 2018-10-18 stsp if (error == NULL)
5437 1d0f4054 2021-06-17 stsp error = close_err;
5439 5de5890b 2018-10-18 stsp return error;
5442 6bad629b 2019-02-04 stsp __dead static void
5443 6bad629b 2019-02-04 stsp usage_status(void)
5445 00357e4d 2021-09-14 tracey fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5446 00357e4d 2021-09-14 tracey "[-S status-codes] [path ...]\n", getprogname());
5450 00357e4d 2021-09-14 tracey struct got_status_arg {
5451 00357e4d 2021-09-14 tracey char *status_codes;
5452 00357e4d 2021-09-14 tracey int suppress;
5455 b72f483a 2019-02-05 stsp static const struct got_error *
5456 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
5457 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5458 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5459 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5461 00357e4d 2021-09-14 tracey struct got_status_arg *st = arg;
5463 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5464 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
5465 00357e4d 2021-09-14 tracey if (st != NULL && st->status_codes) {
5466 00357e4d 2021-09-14 tracey size_t ncodes = strlen(st->status_codes);
5467 00357e4d 2021-09-14 tracey int i, j = 0;
5469 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
5470 00357e4d 2021-09-14 tracey if (st->suppress) {
5471 00357e4d 2021-09-14 tracey if (status == st->status_codes[i] ||
5472 00357e4d 2021-09-14 tracey staged_status == st->status_codes[i]) {
5474 00357e4d 2021-09-14 tracey continue;
5476 00357e4d 2021-09-14 tracey } else {
5477 00357e4d 2021-09-14 tracey if (status == st->status_codes[i] ||
5478 00357e4d 2021-09-14 tracey staged_status == st->status_codes[i])
5483 00357e4d 2021-09-14 tracey if (st->suppress && j == 0)
5484 00357e4d 2021-09-14 tracey goto print;
5486 081470ac 2020-08-13 stsp if (i == ncodes)
5487 081470ac 2020-08-13 stsp return NULL;
5490 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
5491 b72f483a 2019-02-05 stsp return NULL;
5494 6bad629b 2019-02-04 stsp static const struct got_error *
5495 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
5497 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
5498 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
5499 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
5500 00357e4d 2021-09-14 tracey struct got_status_arg st;
5501 00357e4d 2021-09-14 tracey char *cwd = NULL;
5502 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
5503 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
5504 f6343036 2021-06-22 stsp int ch, i, no_ignores = 0;
5506 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
5508 00357e4d 2021-09-14 tracey memset(&st, 0, sizeof(st));
5509 00357e4d 2021-09-14 tracey st.status_codes = NULL;
5510 00357e4d 2021-09-14 tracey st.suppress = 0;
5512 00357e4d 2021-09-14 tracey while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5513 6bad629b 2019-02-04 stsp switch (ch) {
5515 f6343036 2021-06-22 stsp no_ignores = 1;
5518 788d4a19 2021-09-14 stsp if (st.status_codes != NULL && st.suppress == 0)
5519 788d4a19 2021-09-14 stsp option_conflict('S', 's');
5520 788d4a19 2021-09-14 stsp st.suppress = 1;
5521 788d4a19 2021-09-14 stsp /* fallthrough */
5523 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
5524 081470ac 2020-08-13 stsp switch (optarg[i]) {
5525 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
5526 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
5527 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
5528 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
5529 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
5530 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
5531 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
5532 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
5533 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
5536 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
5537 081470ac 2020-08-13 stsp optarg[i]);
5540 788d4a19 2021-09-14 stsp if (ch == 's' && st.suppress)
5541 b043307b 2021-09-14 stsp option_conflict('s', 'S');
5542 00357e4d 2021-09-14 tracey st.status_codes = optarg;
5545 2deda0b9 2019-03-07 stsp usage_status();
5546 6bad629b 2019-02-04 stsp /* NOTREACHED */
5550 6bad629b 2019-02-04 stsp argc -= optind;
5551 6bad629b 2019-02-04 stsp argv += optind;
5553 6bad629b 2019-02-04 stsp #ifndef PROFILE
5554 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5555 6bad629b 2019-02-04 stsp NULL) == -1)
5556 6bad629b 2019-02-04 stsp err(1, "pledge");
5558 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
5559 927df6b7 2019-02-10 stsp if (cwd == NULL) {
5560 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5561 927df6b7 2019-02-10 stsp goto done;
5564 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5565 fa51e947 2020-03-27 stsp if (error) {
5566 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5567 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5568 a5edda0a 2019-07-27 stsp goto done;
5571 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5573 6bad629b 2019-02-04 stsp if (error != NULL)
5574 6bad629b 2019-02-04 stsp goto done;
5576 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5577 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5578 087fb88c 2019-08-04 stsp if (error)
5579 087fb88c 2019-08-04 stsp goto done;
5581 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5582 6bad629b 2019-02-04 stsp if (error)
5583 6bad629b 2019-02-04 stsp goto done;
5585 f6343036 2021-06-22 stsp error = got_worktree_status(worktree, &paths, repo, no_ignores,
5586 00357e4d 2021-09-14 tracey print_status, &st, check_cancelled, NULL);
5588 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5589 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5590 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5591 927df6b7 2019-02-10 stsp free(cwd);
5592 d0eebce4 2019-03-11 stsp return error;
5595 d0eebce4 2019-03-11 stsp __dead static void
5596 d0eebce4 2019-03-11 stsp usage_ref(void)
5598 d0eebce4 2019-03-11 stsp fprintf(stderr,
5599 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5600 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5601 d0eebce4 2019-03-11 stsp getprogname());
5605 d0eebce4 2019-03-11 stsp static const struct got_error *
5606 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5608 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5609 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5610 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5612 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5613 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5615 d0eebce4 2019-03-11 stsp return err;
5617 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
5618 d0eebce4 2019-03-11 stsp char *refstr;
5619 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5620 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5621 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5622 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5623 d0eebce4 2019-03-11 stsp free(refstr);
5626 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5627 d0eebce4 2019-03-11 stsp return NULL;
5630 d0eebce4 2019-03-11 stsp static const struct got_error *
5631 161728eb 2021-07-24 stsp delete_ref_by_name(struct got_repository *repo, const char *refname)
5633 161728eb 2021-07-24 stsp const struct got_error *err;
5634 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5636 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5638 d0eebce4 2019-03-11 stsp return err;
5640 161728eb 2021-07-24 stsp err = delete_ref(repo, ref);
5641 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5642 d0eebce4 2019-03-11 stsp return err;
5645 d0eebce4 2019-03-11 stsp static const struct got_error *
5646 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5648 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5649 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5650 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5653 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5654 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5655 d1644381 2019-07-14 stsp * an unintended typo.
5657 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5658 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5660 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5662 d83d9d5c 2019-05-13 stsp if (err) {
5663 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5665 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5666 d83d9d5c 2019-05-13 stsp return err;
5667 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5669 d83d9d5c 2019-05-13 stsp return err;
5670 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5671 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5673 d83d9d5c 2019-05-13 stsp return err;
5676 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5678 d0eebce4 2019-03-11 stsp goto done;
5680 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5683 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5685 d1c1ae5f 2019-08-12 stsp return err;
5688 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5689 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5691 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5692 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5693 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5696 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5697 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5698 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5700 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5701 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5703 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5705 d1c1ae5f 2019-08-12 stsp return err;
5707 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5709 d1c1ae5f 2019-08-12 stsp goto done;
5711 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5713 d1c1ae5f 2019-08-12 stsp if (target_ref)
5714 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5716 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5717 d0eebce4 2019-03-11 stsp return err;
5720 d0eebce4 2019-03-11 stsp static const struct got_error *
5721 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5723 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5724 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5725 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5726 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5727 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5728 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5729 b2070a3f 2020-03-22 stsp char *refname = NULL;
5731 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5732 d0eebce4 2019-03-11 stsp switch (ch) {
5734 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5737 e31abbf2 2020-03-22 stsp do_delete = 1;
5740 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5741 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5742 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5744 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5747 d0eebce4 2019-03-11 stsp do_list = 1;
5750 e31abbf2 2020-03-22 stsp symref_target = optarg;
5753 d0eebce4 2019-03-11 stsp usage_ref();
5754 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5758 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5759 ff69268e 2020-12-13 stsp option_conflict('c', 'l');
5760 ff69268e 2020-12-13 stsp if (obj_arg && do_delete)
5761 ff69268e 2020-12-13 stsp option_conflict('c', 'd');
5762 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5763 ff69268e 2020-12-13 stsp option_conflict('c', 's');
5764 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5765 ff69268e 2020-12-13 stsp option_conflict('s', 'd');
5766 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5767 ff69268e 2020-12-13 stsp option_conflict('s', 'l');
5768 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5769 ff69268e 2020-12-13 stsp option_conflict('d', 'l');
5771 d0eebce4 2019-03-11 stsp argc -= optind;
5772 d0eebce4 2019-03-11 stsp argv += optind;
5774 e31abbf2 2020-03-22 stsp if (do_list) {
5775 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5776 d0eebce4 2019-03-11 stsp usage_ref();
5777 b2070a3f 2020-03-22 stsp if (argc == 1) {
5778 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5779 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5780 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5781 b2070a3f 2020-03-22 stsp goto done;
5785 e31abbf2 2020-03-22 stsp if (argc != 1)
5786 e31abbf2 2020-03-22 stsp usage_ref();
5787 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5788 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5789 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5790 b2070a3f 2020-03-22 stsp goto done;
5794 b2070a3f 2020-03-22 stsp if (refname)
5795 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5797 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5798 e0b57350 2019-03-12 stsp if (do_list) {
5799 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5800 e0b57350 2019-03-12 stsp NULL) == -1)
5801 e0b57350 2019-03-12 stsp err(1, "pledge");
5803 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5804 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5805 e0b57350 2019-03-12 stsp err(1, "pledge");
5808 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5809 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5810 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5811 d0eebce4 2019-03-11 stsp goto done;
5814 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5815 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5816 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5817 d0eebce4 2019-03-11 stsp goto done;
5819 d0eebce4 2019-03-11 stsp error = NULL;
5820 d0eebce4 2019-03-11 stsp if (worktree) {
5821 d0eebce4 2019-03-11 stsp repo_path =
5822 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5823 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5824 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5825 d0eebce4 2019-03-11 stsp if (error)
5826 d0eebce4 2019-03-11 stsp goto done;
5828 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
5829 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5830 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5831 d0eebce4 2019-03-11 stsp goto done;
5836 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5837 d0eebce4 2019-03-11 stsp if (error != NULL)
5838 d0eebce4 2019-03-11 stsp goto done;
5840 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5841 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5842 c02c541e 2019-03-29 stsp if (error)
5843 c02c541e 2019-03-29 stsp goto done;
5845 d0eebce4 2019-03-11 stsp if (do_list)
5846 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5847 e31abbf2 2020-03-22 stsp else if (do_delete)
5848 161728eb 2021-07-24 stsp error = delete_ref_by_name(repo, refname);
5849 e31abbf2 2020-03-22 stsp else if (symref_target)
5850 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5852 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5853 e31abbf2 2020-03-22 stsp usage_ref();
5854 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5857 b2070a3f 2020-03-22 stsp free(refname);
5858 1d0f4054 2021-06-17 stsp if (repo) {
5859 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
5860 1d0f4054 2021-06-17 stsp if (error == NULL)
5861 1d0f4054 2021-06-17 stsp error = close_err;
5863 4e759de4 2019-06-26 stsp if (worktree)
5864 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5865 4e759de4 2019-06-26 stsp free(cwd);
5866 4e759de4 2019-06-26 stsp free(repo_path);
5867 4e759de4 2019-06-26 stsp return error;
5870 4e759de4 2019-06-26 stsp __dead static void
5871 4e759de4 2019-06-26 stsp usage_branch(void)
5873 4e759de4 2019-06-26 stsp fprintf(stderr,
5874 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5875 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5879 4e759de4 2019-06-26 stsp static const struct got_error *
5880 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5881 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5883 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5884 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5885 4e99b47e 2019-10-04 stsp char *refstr;
5887 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5888 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5889 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5890 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5892 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5894 4e99b47e 2019-10-04 stsp return err;
5895 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5896 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5897 4e99b47e 2019-10-04 stsp marker = "* ";
5899 4e99b47e 2019-10-04 stsp marker = "~ ";
5903 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5904 4e99b47e 2019-10-04 stsp refname += 11;
5905 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5906 4e99b47e 2019-10-04 stsp refname += 18;
5907 34d4e04c 2021-02-08 stsp if (strncmp(refname, "refs/remotes/", 13) == 0)
5908 34d4e04c 2021-02-08 stsp refname += 13;
5910 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5911 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5912 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5914 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5915 4e99b47e 2019-10-04 stsp free(refstr);
5916 4e99b47e 2019-10-04 stsp return NULL;
5919 4e99b47e 2019-10-04 stsp static const struct got_error *
5920 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5922 ad89fa31 2019-10-04 stsp const char *refname;
5924 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5925 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5927 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5929 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5930 ad89fa31 2019-10-04 stsp refname += 11;
5931 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5932 ad89fa31 2019-10-04 stsp refname += 18;
5934 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5936 ad89fa31 2019-10-04 stsp return NULL;
5939 ad89fa31 2019-10-04 stsp static const struct got_error *
5940 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5942 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5943 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5944 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5945 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5946 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5948 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
5950 4e99b47e 2019-10-04 stsp if (worktree) {
5951 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5952 4e99b47e 2019-10-04 stsp worktree);
5954 4e99b47e 2019-10-04 stsp return err;
5956 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5957 4e99b47e 2019-10-04 stsp worktree);
5959 4e99b47e 2019-10-04 stsp return err;
5961 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5962 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5963 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5965 4e99b47e 2019-10-04 stsp return err;
5966 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5967 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5971 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5972 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5974 4e759de4 2019-06-26 stsp return err;
5976 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry)
5977 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5979 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5981 34d4e04c 2021-02-08 stsp err = got_ref_list(&refs, repo, "refs/remotes",
5982 34d4e04c 2021-02-08 stsp got_ref_cmp_by_name, NULL);
5984 34d4e04c 2021-02-08 stsp return err;
5986 34d4e04c 2021-02-08 stsp TAILQ_FOREACH(re, &refs, entry)
5987 34d4e04c 2021-02-08 stsp list_branch(repo, worktree, re->ref);
5989 34d4e04c 2021-02-08 stsp got_ref_list_free(&refs);
5991 4e759de4 2019-06-26 stsp return NULL;
5994 4e759de4 2019-06-26 stsp static const struct got_error *
5995 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5996 45cd4e47 2019-08-25 stsp const char *branch_name)
5998 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5999 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
6000 2f1457c6 2021-08-27 stsp char *refname, *remote_refname = NULL;
6002 2f1457c6 2021-08-27 stsp if (strncmp(branch_name, "refs/", 5) == 0)
6003 2f1457c6 2021-08-27 stsp branch_name += 5;
6004 2f1457c6 2021-08-27 stsp if (strncmp(branch_name, "heads/", 6) == 0)
6005 2f1457c6 2021-08-27 stsp branch_name += 6;
6006 2f1457c6 2021-08-27 stsp else if (strncmp(branch_name, "remotes/", 8) == 0)
6007 2f1457c6 2021-08-27 stsp branch_name += 8;
6009 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6010 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
6012 2f1457c6 2021-08-27 stsp if (asprintf(&remote_refname, "refs/remotes/%s",
6013 2f1457c6 2021-08-27 stsp branch_name) == -1) {
6014 2f1457c6 2021-08-27 stsp err = got_error_from_errno("asprintf");
6015 4e759de4 2019-06-26 stsp goto done;
6018 2f1457c6 2021-08-27 stsp err = got_ref_open(&ref, repo, refname, 0);
6019 2f1457c6 2021-08-27 stsp if (err) {
6020 2f1457c6 2021-08-27 stsp const struct got_error *err2;
6021 2f1457c6 2021-08-27 stsp if (err->code != GOT_ERR_NOT_REF)
6022 2f1457c6 2021-08-27 stsp goto done;
6024 2f1457c6 2021-08-27 stsp * Keep 'err' intact such that if neither branch exists
6025 2f1457c6 2021-08-27 stsp * we report "refs/heads" rather than "refs/remotes" in
6026 2f1457c6 2021-08-27 stsp * our error message.
6028 2f1457c6 2021-08-27 stsp err2 = got_ref_open(&ref, repo, remote_refname, 0);
6030 2f1457c6 2021-08-27 stsp goto done;
6031 2f1457c6 2021-08-27 stsp err = NULL;
6034 45cd4e47 2019-08-25 stsp if (worktree &&
6035 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
6036 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
6037 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6038 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
6039 45cd4e47 2019-08-25 stsp goto done;
6042 978a28a1 2021-09-04 naddy err = delete_ref(repo, ref);
6045 45cd4e47 2019-08-25 stsp got_ref_close(ref);
6046 4e759de4 2019-06-26 stsp free(refname);
6047 2f1457c6 2021-08-27 stsp free(remote_refname);
6048 4e759de4 2019-06-26 stsp return err;
6051 4e759de4 2019-06-26 stsp static const struct got_error *
6052 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
6053 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
6055 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
6056 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
6057 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
6060 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
6061 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
6062 d3f84d51 2019-07-11 stsp * an unintended typo.
6064 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
6065 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6067 2f1457c6 2021-08-27 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
6068 2f1457c6 2021-08-27 stsp branch_name += 11;
6070 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6071 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
6072 62d463ca 2020-10-20 naddy goto done;
6075 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
6076 4e759de4 2019-06-26 stsp if (err == NULL) {
6077 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
6078 4e759de4 2019-06-26 stsp goto done;
6079 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
6080 4e759de4 2019-06-26 stsp goto done;
6082 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
6084 4e759de4 2019-06-26 stsp goto done;
6086 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
6089 4e759de4 2019-06-26 stsp got_ref_close(ref);
6090 4e759de4 2019-06-26 stsp free(base_refname);
6091 4e759de4 2019-06-26 stsp free(refname);
6092 4e759de4 2019-06-26 stsp return err;
6095 4e759de4 2019-06-26 stsp static const struct got_error *
6096 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
6098 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
6099 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
6100 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
6101 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
6102 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
6103 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
6104 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
6105 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
6106 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
6107 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
6108 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
6110 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
6112 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
6113 4e759de4 2019-06-26 stsp switch (ch) {
6115 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
6118 4e759de4 2019-06-26 stsp delref = optarg;
6121 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
6122 4e759de4 2019-06-26 stsp if (repo_path == NULL)
6123 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6125 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
6128 4e759de4 2019-06-26 stsp do_list = 1;
6131 da76fce2 2020-02-24 stsp do_update = 0;
6134 4e759de4 2019-06-26 stsp usage_branch();
6135 4e759de4 2019-06-26 stsp /* NOTREACHED */
6139 4e759de4 2019-06-26 stsp if (do_list && delref)
6140 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
6142 4e759de4 2019-06-26 stsp argc -= optind;
6143 4e759de4 2019-06-26 stsp argv += optind;
6145 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
6146 ad89fa31 2019-10-04 stsp do_show = 1;
6148 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
6149 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
6151 4e759de4 2019-06-26 stsp if (do_list || delref) {
6152 4e759de4 2019-06-26 stsp if (argc > 0)
6153 4e759de4 2019-06-26 stsp usage_branch();
6154 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
6155 4e759de4 2019-06-26 stsp usage_branch();
6157 4e759de4 2019-06-26 stsp #ifndef PROFILE
6158 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
6159 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6160 4e759de4 2019-06-26 stsp NULL) == -1)
6161 4e759de4 2019-06-26 stsp err(1, "pledge");
6163 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6164 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
6165 4e759de4 2019-06-26 stsp err(1, "pledge");
6168 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
6169 4e759de4 2019-06-26 stsp if (cwd == NULL) {
6170 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
6171 4e759de4 2019-06-26 stsp goto done;
6174 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
6175 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
6176 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6177 4e759de4 2019-06-26 stsp goto done;
6179 4e759de4 2019-06-26 stsp error = NULL;
6180 4e759de4 2019-06-26 stsp if (worktree) {
6181 4e759de4 2019-06-26 stsp repo_path =
6182 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
6183 4e759de4 2019-06-26 stsp if (repo_path == NULL)
6184 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
6185 4e759de4 2019-06-26 stsp if (error)
6186 4e759de4 2019-06-26 stsp goto done;
6188 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
6189 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
6190 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
6191 4e759de4 2019-06-26 stsp goto done;
6196 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6197 4e759de4 2019-06-26 stsp if (error != NULL)
6198 4e759de4 2019-06-26 stsp goto done;
6200 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
6201 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
6202 4e759de4 2019-06-26 stsp if (error)
6203 4e759de4 2019-06-26 stsp goto done;
6205 ad89fa31 2019-10-04 stsp if (do_show)
6206 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
6207 ad89fa31 2019-10-04 stsp else if (do_list)
6208 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
6209 4e759de4 2019-06-26 stsp else if (delref)
6210 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
6212 84de9106 2020-12-26 stsp struct got_reflist_head refs;
6213 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
6214 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6216 84de9106 2020-12-26 stsp if (error)
6217 84de9106 2020-12-26 stsp goto done;
6218 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
6219 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
6220 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
6221 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
6222 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
6223 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6224 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
6225 a74f7e83 2019-11-10 stsp if (error)
6226 a74f7e83 2019-11-10 stsp goto done;
6227 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
6228 da76fce2 2020-02-24 stsp if (error)
6229 da76fce2 2020-02-24 stsp goto done;
6230 da76fce2 2020-02-24 stsp if (worktree && do_update) {
6231 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6232 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
6234 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
6235 da76fce2 2020-02-24 stsp if (error)
6236 da76fce2 2020-02-24 stsp goto done;
6237 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
6238 da76fce2 2020-02-24 stsp worktree);
6239 da76fce2 2020-02-24 stsp if (error)
6240 da76fce2 2020-02-24 stsp goto done;
6241 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6243 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
6244 da76fce2 2020-02-24 stsp goto done;
6246 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
6247 da76fce2 2020-02-24 stsp free(branch_refname);
6248 da76fce2 2020-02-24 stsp if (error)
6249 da76fce2 2020-02-24 stsp goto done;
6250 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
6252 da76fce2 2020-02-24 stsp if (error)
6253 da76fce2 2020-02-24 stsp goto done;
6254 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
6255 da76fce2 2020-02-24 stsp commit_id);
6256 da76fce2 2020-02-24 stsp if (error)
6257 da76fce2 2020-02-24 stsp goto done;
6258 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6259 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
6260 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
6262 da76fce2 2020-02-24 stsp if (error)
6263 da76fce2 2020-02-24 stsp goto done;
6264 4f3c844b 2021-09-14 stsp if (upa.did_something) {
6265 4f3c844b 2021-09-14 stsp printf("Updated to %s: %s\n",
6266 4f3c844b 2021-09-14 stsp got_worktree_get_head_ref_name(worktree),
6267 4f3c844b 2021-09-14 stsp commit_id_str);
6269 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6274 da76fce2 2020-02-24 stsp got_ref_close(ref);
6275 1d0f4054 2021-06-17 stsp if (repo) {
6276 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6277 1d0f4054 2021-06-17 stsp if (error == NULL)
6278 1d0f4054 2021-06-17 stsp error = close_err;
6280 d0eebce4 2019-03-11 stsp if (worktree)
6281 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
6282 d0eebce4 2019-03-11 stsp free(cwd);
6283 d0eebce4 2019-03-11 stsp free(repo_path);
6284 da76fce2 2020-02-24 stsp free(commit_id);
6285 da76fce2 2020-02-24 stsp free(commit_id_str);
6286 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
6287 da76fce2 2020-02-24 stsp free((char *)pe->path);
6288 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
6289 d00136be 2019-03-26 stsp return error;
6293 d00136be 2019-03-26 stsp __dead static void
6294 8e7bd50a 2019-08-22 stsp usage_tag(void)
6296 8e7bd50a 2019-08-22 stsp fprintf(stderr,
6297 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
6298 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
6303 b8bad2ba 2019-08-23 stsp static const struct got_error *
6304 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6306 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
6307 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
6308 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
6309 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
6310 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
6312 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(re, tags, entry) {
6313 dbdddfee 2021-06-23 naddy se = STAILQ_FIRST(sorted);
6314 b8bad2ba 2019-08-23 stsp if (se == NULL) {
6315 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
6317 b8bad2ba 2019-08-23 stsp return err;
6318 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(sorted, new, entry);
6321 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
6324 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
6325 b8bad2ba 2019-08-23 stsp free(re_id);
6328 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
6329 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
6332 b8bad2ba 2019-08-23 stsp while (se) {
6333 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
6336 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
6337 b8bad2ba 2019-08-23 stsp free(se_id);
6340 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
6341 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
6343 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
6344 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
6346 b8bad2ba 2019-08-23 stsp return err;
6347 dbdddfee 2021-06-23 naddy STAILQ_INSERT_AFTER(sorted, se, new, entry);
6350 dbdddfee 2021-06-23 naddy se = STAILQ_NEXT(se, entry);
6355 b8bad2ba 2019-08-23 stsp return err;
6359 b8bad2ba 2019-08-23 stsp static const struct got_error *
6360 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
6362 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
6363 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
6364 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
6366 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
6368 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6370 8e7bd50a 2019-08-22 stsp return err;
6372 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, &refs, entry) {
6373 8e7bd50a 2019-08-22 stsp const char *refname;
6374 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6375 8e7bd50a 2019-08-22 stsp char datebuf[26];
6376 d4efa91b 2020-01-14 stsp const char *tagger;
6377 8e7bd50a 2019-08-22 stsp time_t tagger_time;
6378 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
6379 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
6380 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
6382 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
6383 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
6385 8e7bd50a 2019-08-22 stsp refname += 10;
6386 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
6387 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
6388 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
6391 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6392 8e7bd50a 2019-08-22 stsp free(refstr);
6394 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
6397 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
6398 d4efa91b 2020-01-14 stsp if (err) {
6399 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
6403 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
6404 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
6405 d4efa91b 2020-01-14 stsp if (err) {
6409 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
6410 d4efa91b 2020-01-14 stsp tagger_time =
6411 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
6412 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
6418 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
6419 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
6420 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
6421 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
6425 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
6426 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
6427 2417344c 2019-08-23 stsp if (datestr)
6428 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
6429 d4efa91b 2020-01-14 stsp if (commit)
6430 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6432 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
6433 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
6434 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6437 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
6438 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6441 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
6442 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6445 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
6446 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6453 8e7bd50a 2019-08-22 stsp free(id_str);
6454 d4efa91b 2020-01-14 stsp if (commit) {
6455 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
6458 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
6460 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
6461 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
6462 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
6463 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
6468 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
6470 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
6472 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
6473 8e7bd50a 2019-08-22 stsp } while (line);
6474 8e7bd50a 2019-08-22 stsp free(tagmsg0);
6477 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
6478 8e7bd50a 2019-08-22 stsp return NULL;
6481 8e7bd50a 2019-08-22 stsp static const struct got_error *
6482 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6483 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
6485 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
6486 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
6487 f372d5cd 2019-10-21 stsp char *editor = NULL;
6488 1601cb9f 2020-09-11 naddy int initial_content_len;
6489 8e7bd50a 2019-08-22 stsp int fd = -1;
6491 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6492 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
6493 8e7bd50a 2019-08-22 stsp goto done;
6496 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6497 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
6498 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
6499 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
6500 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
6501 8e7bd50a 2019-08-22 stsp goto done;
6504 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6506 8e7bd50a 2019-08-22 stsp goto done;
6508 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6509 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
6510 97972933 2020-09-11 stsp goto done;
6513 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
6515 8e7bd50a 2019-08-22 stsp goto done;
6516 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6517 0d5bb276 2020-12-15 stsp initial_content_len, 1);
6519 8e7bd50a 2019-08-22 stsp free(initial_content);
6520 8e7bd50a 2019-08-22 stsp free(template);
6521 8e7bd50a 2019-08-22 stsp free(editor);
6523 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6524 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
6526 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
6527 59f86c76 2020-09-11 stsp if (err == NULL)
6528 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
6529 59f86c76 2020-09-11 stsp if (err) {
6530 59f86c76 2020-09-11 stsp free(*tagmsg);
6531 59f86c76 2020-09-11 stsp *tagmsg = NULL;
6533 8e7bd50a 2019-08-22 stsp return err;
6536 8e7bd50a 2019-08-22 stsp static const struct got_error *
6537 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
6538 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6540 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
6541 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
6542 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
6543 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
6544 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6545 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
6546 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
6547 84de9106 2020-12-26 stsp struct got_reflist_head refs;
6549 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
6552 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
6553 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
6554 8e7bd50a 2019-08-22 stsp * an unintended typo.
6556 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
6557 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6559 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
6561 8e7bd50a 2019-08-22 stsp return err;
6563 84de9106 2020-12-26 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6565 84de9106 2020-12-26 stsp goto done;
6567 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6568 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &refs, repo);
6570 8e7bd50a 2019-08-22 stsp goto done;
6572 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
6574 8e7bd50a 2019-08-22 stsp goto done;
6576 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
6577 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
6578 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
6579 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
6580 62d463ca 2020-10-20 naddy goto done;
6582 8e7bd50a 2019-08-22 stsp tag_name += 10;
6583 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6584 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
6585 62d463ca 2020-10-20 naddy goto done;
6588 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
6589 8e7bd50a 2019-08-22 stsp if (err == NULL) {
6590 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
6591 8e7bd50a 2019-08-22 stsp goto done;
6592 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
6593 8e7bd50a 2019-08-22 stsp goto done;
6595 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
6596 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6597 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
6598 f372d5cd 2019-10-21 stsp if (err) {
6599 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6600 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
6601 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6602 8e7bd50a 2019-08-22 stsp goto done;
6606 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
6607 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6608 f372d5cd 2019-10-21 stsp if (err) {
6609 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6610 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6611 8e7bd50a 2019-08-22 stsp goto done;
6614 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
6615 f372d5cd 2019-10-21 stsp if (err) {
6616 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6617 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6618 8e7bd50a 2019-08-22 stsp goto done;
6621 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
6622 f372d5cd 2019-10-21 stsp if (err) {
6623 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6624 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6625 f372d5cd 2019-10-21 stsp goto done;
6628 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
6629 f372d5cd 2019-10-21 stsp if (err) {
6630 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6631 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6632 f372d5cd 2019-10-21 stsp goto done;
6634 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6636 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6637 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6638 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6639 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6640 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6641 f372d5cd 2019-10-21 stsp free(tag_id_str);
6643 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6644 8e7bd50a 2019-08-22 stsp free(commit_id);
6645 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6646 8e7bd50a 2019-08-22 stsp free(refname);
6647 8e7bd50a 2019-08-22 stsp free(tagmsg);
6648 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6649 aba9c984 2019-09-08 stsp free(tagger);
6650 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
6651 8e7bd50a 2019-08-22 stsp return err;
6654 8e7bd50a 2019-08-22 stsp static const struct got_error *
6655 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6657 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6658 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6659 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6660 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6661 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6662 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6663 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6665 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6666 8e7bd50a 2019-08-22 stsp switch (ch) {
6668 80106605 2020-02-24 stsp commit_id_arg = optarg;
6671 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6674 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6675 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6676 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6678 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6681 8e7bd50a 2019-08-22 stsp do_list = 1;
6684 8e7bd50a 2019-08-22 stsp usage_tag();
6685 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6689 8e7bd50a 2019-08-22 stsp argc -= optind;
6690 8e7bd50a 2019-08-22 stsp argv += optind;
6692 8e7bd50a 2019-08-22 stsp if (do_list) {
6693 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6695 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6696 8e7bd50a 2019-08-22 stsp if (tagmsg)
6697 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
6698 8e7bd50a 2019-08-22 stsp if (argc > 0)
6699 8e7bd50a 2019-08-22 stsp usage_tag();
6700 80106605 2020-02-24 stsp } else if (argc != 1)
6701 8e7bd50a 2019-08-22 stsp usage_tag();
6703 a2887370 2019-08-23 stsp tag_name = argv[0];
6705 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6706 8e7bd50a 2019-08-22 stsp if (do_list) {
6707 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6708 8e7bd50a 2019-08-22 stsp NULL) == -1)
6709 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6711 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6712 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6713 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6716 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6717 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6718 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6719 8e7bd50a 2019-08-22 stsp goto done;
6722 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6723 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6724 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6725 8e7bd50a 2019-08-22 stsp goto done;
6727 8e7bd50a 2019-08-22 stsp error = NULL;
6728 8e7bd50a 2019-08-22 stsp if (worktree) {
6729 8e7bd50a 2019-08-22 stsp repo_path =
6730 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6731 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6732 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6733 8e7bd50a 2019-08-22 stsp if (error)
6734 8e7bd50a 2019-08-22 stsp goto done;
6736 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
6737 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6738 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6739 8e7bd50a 2019-08-22 stsp goto done;
6744 8e7bd50a 2019-08-22 stsp if (do_list) {
6745 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6746 c9956ddf 2019-09-08 stsp if (error != NULL)
6747 c9956ddf 2019-09-08 stsp goto done;
6748 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6749 8e7bd50a 2019-08-22 stsp if (error)
6750 8e7bd50a 2019-08-22 stsp goto done;
6751 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6753 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6754 c9956ddf 2019-09-08 stsp if (error)
6755 c9956ddf 2019-09-08 stsp goto done;
6756 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6757 c9956ddf 2019-09-08 stsp if (error != NULL)
6758 c9956ddf 2019-09-08 stsp goto done;
6760 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6761 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6762 8e7bd50a 2019-08-22 stsp if (error)
6763 8e7bd50a 2019-08-22 stsp goto done;
6766 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6767 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6768 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6769 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6770 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6771 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6772 8e7bd50a 2019-08-22 stsp if (error)
6773 8e7bd50a 2019-08-22 stsp goto done;
6774 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6775 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6776 8e7bd50a 2019-08-22 stsp if (error)
6777 8e7bd50a 2019-08-22 stsp goto done;
6778 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6779 8e7bd50a 2019-08-22 stsp free(commit_id);
6780 8e7bd50a 2019-08-22 stsp if (error)
6781 8e7bd50a 2019-08-22 stsp goto done;
6784 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6785 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6788 1d0f4054 2021-06-17 stsp if (repo) {
6789 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6790 1d0f4054 2021-06-17 stsp if (error == NULL)
6791 1d0f4054 2021-06-17 stsp error = close_err;
6793 8e7bd50a 2019-08-22 stsp if (worktree)
6794 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6795 8e7bd50a 2019-08-22 stsp free(cwd);
6796 8e7bd50a 2019-08-22 stsp free(repo_path);
6797 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6798 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6799 8e7bd50a 2019-08-22 stsp return error;
6802 8e7bd50a 2019-08-22 stsp __dead static void
6803 d00136be 2019-03-26 stsp usage_add(void)
6805 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6806 022fae89 2019-12-06 tracey getprogname());
6810 d00136be 2019-03-26 stsp static const struct got_error *
6811 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6813 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6815 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6816 4e68cba3 2019-11-23 stsp return NULL;
6819 4e68cba3 2019-11-23 stsp static const struct got_error *
6820 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6822 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6823 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6824 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6825 1dd54920 2019-05-11 stsp char *cwd = NULL;
6826 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6827 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6828 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6830 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6832 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6833 d00136be 2019-03-26 stsp switch (ch) {
6834 022fae89 2019-12-06 tracey case 'I':
6835 022fae89 2019-12-06 tracey no_ignores = 1;
6838 4e68cba3 2019-11-23 stsp can_recurse = 1;
6841 d00136be 2019-03-26 stsp usage_add();
6842 d00136be 2019-03-26 stsp /* NOTREACHED */
6846 d00136be 2019-03-26 stsp argc -= optind;
6847 d00136be 2019-03-26 stsp argv += optind;
6849 43012d58 2019-07-14 stsp #ifndef PROFILE
6850 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6851 43012d58 2019-07-14 stsp NULL) == -1)
6852 43012d58 2019-07-14 stsp err(1, "pledge");
6854 723c305c 2019-05-11 jcs if (argc < 1)
6855 d00136be 2019-03-26 stsp usage_add();
6857 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6858 d00136be 2019-03-26 stsp if (cwd == NULL) {
6859 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6860 d00136be 2019-03-26 stsp goto done;
6863 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6864 fa51e947 2020-03-27 stsp if (error) {
6865 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6866 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6867 d00136be 2019-03-26 stsp goto done;
6870 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6872 031a5338 2019-03-26 stsp if (error != NULL)
6873 031a5338 2019-03-26 stsp goto done;
6875 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6876 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6877 d00136be 2019-03-26 stsp if (error)
6878 d00136be 2019-03-26 stsp goto done;
6880 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6881 6d022e97 2019-08-04 stsp if (error)
6882 022fae89 2019-12-06 tracey goto done;
6884 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6885 4e68cba3 2019-11-23 stsp char *ondisk_path;
6886 4e68cba3 2019-11-23 stsp struct stat sb;
6887 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6888 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6889 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6890 62d463ca 2020-10-20 naddy pe->path) == -1) {
6891 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6892 4e68cba3 2019-11-23 stsp goto done;
6894 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6895 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6896 4e68cba3 2019-11-23 stsp free(ondisk_path);
6899 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6900 4e68cba3 2019-11-23 stsp ondisk_path);
6901 4e68cba3 2019-11-23 stsp free(ondisk_path);
6902 4e68cba3 2019-11-23 stsp goto done;
6904 4e68cba3 2019-11-23 stsp free(ondisk_path);
6905 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6906 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6907 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6908 4e68cba3 2019-11-23 stsp goto done;
6913 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6914 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6916 1d0f4054 2021-06-17 stsp if (repo) {
6917 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6918 1d0f4054 2021-06-17 stsp if (error == NULL)
6919 1d0f4054 2021-06-17 stsp error = close_err;
6921 d00136be 2019-03-26 stsp if (worktree)
6922 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6923 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6924 1dd54920 2019-05-11 stsp free((char *)pe->path);
6925 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6926 2ec1f75b 2019-03-26 stsp free(cwd);
6927 2ec1f75b 2019-03-26 stsp return error;
6930 2ec1f75b 2019-03-26 stsp __dead static void
6931 648e4ef7 2019-07-09 stsp usage_remove(void)
6933 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6934 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6938 2a06fe5f 2019-08-24 stsp static const struct got_error *
6939 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6940 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6942 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6944 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6945 2a06fe5f 2019-08-24 stsp return NULL;
6946 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6947 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6948 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6949 2a06fe5f 2019-08-24 stsp return NULL;
6952 2ec1f75b 2019-03-26 stsp static const struct got_error *
6953 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6955 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6956 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6957 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6958 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6959 17ed4618 2019-06-02 stsp char *cwd = NULL;
6960 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6961 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6962 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6964 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6966 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6967 2ec1f75b 2019-03-26 stsp switch (ch) {
6969 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6971 70e3e7f5 2019-12-13 tracey case 'k':
6972 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6974 f2a9dc41 2019-12-13 tracey case 'R':
6975 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6978 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6979 766841c2 2020-08-13 stsp switch (optarg[i]) {
6980 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6981 766841c2 2020-08-13 stsp delete_local_mods = 1;
6983 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6986 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6987 766841c2 2020-08-13 stsp optarg[i]);
6990 766841c2 2020-08-13 stsp status_codes = optarg;
6993 f2a9dc41 2019-12-13 tracey usage_remove();
6994 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6998 2ec1f75b 2019-03-26 stsp argc -= optind;
6999 2ec1f75b 2019-03-26 stsp argv += optind;
7001 43012d58 2019-07-14 stsp #ifndef PROFILE
7002 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7003 43012d58 2019-07-14 stsp NULL) == -1)
7004 43012d58 2019-07-14 stsp err(1, "pledge");
7006 17ed4618 2019-06-02 stsp if (argc < 1)
7007 648e4ef7 2019-07-09 stsp usage_remove();
7009 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
7010 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
7011 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
7012 2ec1f75b 2019-03-26 stsp goto done;
7014 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
7015 fa51e947 2020-03-27 stsp if (error) {
7016 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7017 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
7018 2ec1f75b 2019-03-26 stsp goto done;
7021 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7024 2ec1f75b 2019-03-26 stsp goto done;
7026 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
7027 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7028 2ec1f75b 2019-03-26 stsp if (error)
7029 2ec1f75b 2019-03-26 stsp goto done;
7031 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7032 6d022e97 2019-08-04 stsp if (error)
7033 6d022e97 2019-08-04 stsp goto done;
7035 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
7036 f2a9dc41 2019-12-13 tracey char *ondisk_path;
7037 f2a9dc41 2019-12-13 tracey struct stat sb;
7038 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
7039 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
7040 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
7041 62d463ca 2020-10-20 naddy pe->path) == -1) {
7042 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
7043 f2a9dc41 2019-12-13 tracey goto done;
7045 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
7046 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
7047 f2a9dc41 2019-12-13 tracey free(ondisk_path);
7048 f2a9dc41 2019-12-13 tracey continue;
7050 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
7051 f2a9dc41 2019-12-13 tracey ondisk_path);
7052 f2a9dc41 2019-12-13 tracey free(ondisk_path);
7053 f2a9dc41 2019-12-13 tracey goto done;
7055 f2a9dc41 2019-12-13 tracey free(ondisk_path);
7056 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
7057 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
7058 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
7059 f2a9dc41 2019-12-13 tracey goto done;
7064 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
7065 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
7066 766841c2 2020-08-13 stsp repo, keep_on_disk);
7068 1d0f4054 2021-06-17 stsp if (repo) {
7069 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
7070 1d0f4054 2021-06-17 stsp if (error == NULL)
7071 1d0f4054 2021-06-17 stsp error = close_err;
7073 a129376b 2019-03-28 stsp if (worktree)
7074 a129376b 2019-03-28 stsp got_worktree_close(worktree);
7075 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
7076 17ed4618 2019-06-02 stsp free((char *)pe->path);
7077 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
7078 a129376b 2019-03-28 stsp free(cwd);
7079 a129376b 2019-03-28 stsp return error;
7082 a129376b 2019-03-28 stsp __dead static void
7083 a129376b 2019-03-28 stsp usage_revert(void)
7085 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7086 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
7090 1ee397ad 2019-07-12 stsp static const struct got_error *
7091 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
7093 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
7094 fb9704af 2020-01-27 stsp return NULL;
7096 a129376b 2019-03-28 stsp while (path[0] == '/')
7098 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
7099 33aa809d 2019-08-08 stsp return NULL;
7102 33aa809d 2019-08-08 stsp struct choose_patch_arg {
7103 33aa809d 2019-08-08 stsp FILE *patch_script_file;
7104 33aa809d 2019-08-08 stsp const char *action;
7107 33aa809d 2019-08-08 stsp static const struct got_error *
7108 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7109 33aa809d 2019-08-08 stsp int nchanges, const char *action)
7111 33aa809d 2019-08-08 stsp char *line = NULL;
7112 33aa809d 2019-08-08 stsp size_t linesize = 0;
7113 33aa809d 2019-08-08 stsp ssize_t linelen;
7115 33aa809d 2019-08-08 stsp switch (status) {
7116 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
7117 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
7119 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
7120 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
7122 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
7123 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
7124 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
7125 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
7126 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7127 33aa809d 2019-08-08 stsp printf("%s", line);
7128 33aa809d 2019-08-08 stsp if (ferror(patch_file))
7129 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
7130 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
7131 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7132 33aa809d 2019-08-08 stsp path, n, nchanges, action);
7135 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
7138 33aa809d 2019-08-08 stsp return NULL;
7141 33aa809d 2019-08-08 stsp static const struct got_error *
7142 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7143 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
7145 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
7146 33aa809d 2019-08-08 stsp char *line = NULL;
7147 33aa809d 2019-08-08 stsp size_t linesize = 0;
7148 33aa809d 2019-08-08 stsp ssize_t linelen;
7149 33aa809d 2019-08-08 stsp int resp = ' ';
7150 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
7152 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
7154 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
7156 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
7157 33aa809d 2019-08-08 stsp a->action);
7159 33aa809d 2019-08-08 stsp return err;
7160 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
7161 33aa809d 2019-08-08 stsp if (linelen == -1) {
7162 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
7163 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
7164 33aa809d 2019-08-08 stsp return NULL;
7166 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
7168 33aa809d 2019-08-08 stsp *nl = '\0';
7169 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
7170 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
7171 33aa809d 2019-08-08 stsp printf("y\n");
7172 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
7173 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
7174 33aa809d 2019-08-08 stsp printf("n\n");
7175 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
7176 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
7177 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
7178 33aa809d 2019-08-08 stsp printf("q\n");
7180 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
7181 33aa809d 2019-08-08 stsp free(line);
7182 33aa809d 2019-08-08 stsp return NULL;
7185 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
7186 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
7187 33aa809d 2019-08-08 stsp a->action);
7189 33aa809d 2019-08-08 stsp return err;
7190 33aa809d 2019-08-08 stsp resp = getchar();
7191 33aa809d 2019-08-08 stsp if (resp == '\n')
7192 33aa809d 2019-08-08 stsp resp = getchar();
7193 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
7194 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
7195 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
7196 33aa809d 2019-08-08 stsp resp = ' ';
7198 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
7199 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
7200 33aa809d 2019-08-08 stsp resp = ' ';
7204 33aa809d 2019-08-08 stsp if (resp == 'y')
7205 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
7206 33aa809d 2019-08-08 stsp else if (resp == 'n')
7207 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
7208 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7209 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
7211 1ee397ad 2019-07-12 stsp return NULL;
7215 a129376b 2019-03-28 stsp static const struct got_error *
7216 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
7218 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
7219 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
7220 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
7221 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
7222 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
7223 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
7224 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
7225 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
7226 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
7227 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
7229 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
7231 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7232 a129376b 2019-03-28 stsp switch (ch) {
7234 33aa809d 2019-08-08 stsp pflag = 1;
7237 33aa809d 2019-08-08 stsp patch_script_path = optarg;
7240 0f6d7415 2019-08-08 stsp can_recurse = 1;
7243 a129376b 2019-03-28 stsp usage_revert();
7244 a129376b 2019-03-28 stsp /* NOTREACHED */
7248 a129376b 2019-03-28 stsp argc -= optind;
7249 a129376b 2019-03-28 stsp argv += optind;
7251 43012d58 2019-07-14 stsp #ifndef PROFILE
7252 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7253 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7254 43012d58 2019-07-14 stsp err(1, "pledge");
7256 e20a8b6f 2019-06-04 stsp if (argc < 1)
7257 a129376b 2019-03-28 stsp usage_revert();
7258 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
7259 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7261 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
7262 a129376b 2019-03-28 stsp if (cwd == NULL) {
7263 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
7264 a129376b 2019-03-28 stsp goto done;
7266 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
7267 fa51e947 2020-03-27 stsp if (error) {
7268 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7269 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
7270 2ec1f75b 2019-03-26 stsp goto done;
7273 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7275 a129376b 2019-03-28 stsp if (error != NULL)
7276 a129376b 2019-03-28 stsp goto done;
7278 33aa809d 2019-08-08 stsp if (patch_script_path) {
7279 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7280 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
7281 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
7282 33aa809d 2019-08-08 stsp patch_script_path);
7283 33aa809d 2019-08-08 stsp goto done;
7286 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
7287 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7288 a129376b 2019-03-28 stsp if (error)
7289 a129376b 2019-03-28 stsp goto done;
7291 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7292 6d022e97 2019-08-04 stsp if (error)
7293 6d022e97 2019-08-04 stsp goto done;
7295 0f6d7415 2019-08-08 stsp if (!can_recurse) {
7296 0f6d7415 2019-08-08 stsp char *ondisk_path;
7297 0f6d7415 2019-08-08 stsp struct stat sb;
7298 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
7299 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
7300 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
7301 62d463ca 2020-10-20 naddy pe->path) == -1) {
7302 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
7303 0f6d7415 2019-08-08 stsp goto done;
7305 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
7306 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
7307 0f6d7415 2019-08-08 stsp free(ondisk_path);
7310 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
7311 0f6d7415 2019-08-08 stsp ondisk_path);
7312 0f6d7415 2019-08-08 stsp free(ondisk_path);
7313 0f6d7415 2019-08-08 stsp goto done;
7315 0f6d7415 2019-08-08 stsp free(ondisk_path);
7316 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
7317 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
7318 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
7319 0f6d7415 2019-08-08 stsp goto done;
7324 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7325 33aa809d 2019-08-08 stsp cpa.action = "revert";
7326 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7327 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
7329 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7330 33aa809d 2019-08-08 stsp error == NULL)
7331 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7332 1d0f4054 2021-06-17 stsp if (repo) {
7333 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
7334 1d0f4054 2021-06-17 stsp if (error == NULL)
7335 1d0f4054 2021-06-17 stsp error = close_err;
7337 2ec1f75b 2019-03-26 stsp if (worktree)
7338 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
7339 2ec1f75b 2019-03-26 stsp free(path);
7340 d00136be 2019-03-26 stsp free(cwd);
7341 6bad629b 2019-02-04 stsp return error;
7344 c4296144 2019-05-09 stsp __dead static void
7345 c4296144 2019-05-09 stsp usage_commit(void)
7347 28cf319f 2021-01-28 stsp fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
7348 28cf319f 2021-01-28 stsp "[path ...]\n", getprogname());
7352 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
7353 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
7354 28cf319f 2021-01-28 stsp const char *prepared_log;
7355 28cf319f 2021-01-28 stsp int non_interactive;
7356 e2ba3d07 2019-05-13 stsp const char *editor;
7357 e0870e44 2019-05-13 stsp const char *worktree_path;
7358 76d98825 2019-06-03 stsp const char *branch_name;
7359 314a6357 2019-05-13 stsp const char *repo_path;
7360 e0870e44 2019-05-13 stsp char *logmsg_path;
7364 28cf319f 2021-01-28 stsp static const struct got_error *
7365 28cf319f 2021-01-28 stsp read_prepared_logmsg(char **logmsg, const char *path)
7367 28cf319f 2021-01-28 stsp const struct got_error *err = NULL;
7368 28cf319f 2021-01-28 stsp FILE *f = NULL;
7369 28cf319f 2021-01-28 stsp struct stat sb;
7372 28cf319f 2021-01-28 stsp *logmsg = NULL;
7373 28cf319f 2021-01-28 stsp memset(&sb, 0, sizeof(sb));
7375 28cf319f 2021-01-28 stsp f = fopen(path, "r");
7376 28cf319f 2021-01-28 stsp if (f == NULL)
7377 28cf319f 2021-01-28 stsp return got_error_from_errno2("fopen", path);
7379 28cf319f 2021-01-28 stsp if (fstat(fileno(f), &sb) == -1) {
7380 28cf319f 2021-01-28 stsp err = got_error_from_errno2("fstat", path);
7381 28cf319f 2021-01-28 stsp goto done;
7383 28cf319f 2021-01-28 stsp if (sb.st_size == 0) {
7384 28cf319f 2021-01-28 stsp err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7385 28cf319f 2021-01-28 stsp goto done;
7388 28cf319f 2021-01-28 stsp *logmsg = malloc(sb.st_size + 1);
7389 28cf319f 2021-01-28 stsp if (*logmsg == NULL) {
7390 28cf319f 2021-01-28 stsp err = got_error_from_errno("malloc");
7391 28cf319f 2021-01-28 stsp goto done;
7394 28cf319f 2021-01-28 stsp r = fread(*logmsg, 1, sb.st_size, f);
7395 28cf319f 2021-01-28 stsp if (r != sb.st_size) {
7396 28cf319f 2021-01-28 stsp if (ferror(f))
7397 28cf319f 2021-01-28 stsp err = got_error_from_errno2("fread", path);
7399 28cf319f 2021-01-28 stsp err = got_error(GOT_ERR_IO);
7400 28cf319f 2021-01-28 stsp goto done;
7402 28cf319f 2021-01-28 stsp (*logmsg)[sb.st_size] = '\0';
7404 28cf319f 2021-01-28 stsp if (fclose(f) == EOF && err == NULL)
7405 28cf319f 2021-01-28 stsp err = got_error_from_errno2("fclose", path);
7406 28cf319f 2021-01-28 stsp if (err) {
7407 28cf319f 2021-01-28 stsp free(*logmsg);
7408 28cf319f 2021-01-28 stsp *logmsg = NULL;
7410 28cf319f 2021-01-28 stsp return err;
7414 33ad4cbe 2019-05-12 jcs static const struct got_error *
7415 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7418 76d98825 2019-06-03 stsp char *initial_content = NULL;
7419 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
7420 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
7421 e0870e44 2019-05-13 stsp char *template = NULL;
7422 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
7423 1601cb9f 2020-09-11 naddy int initial_content_len;
7424 97972933 2020-09-11 stsp int fd = -1;
7425 33ad4cbe 2019-05-12 jcs size_t len;
7427 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
7428 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7429 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
7430 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
7431 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
7432 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
7433 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
7434 33ad4cbe 2019-05-12 jcs return NULL;
7435 28cf319f 2021-01-28 stsp } else if (a->prepared_log != NULL && a->non_interactive)
7436 28cf319f 2021-01-28 stsp return read_prepared_logmsg(logmsg, a->prepared_log);
7438 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7439 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
7441 28cf319f 2021-01-28 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7443 28cf319f 2021-01-28 stsp goto done;
7445 28cf319f 2021-01-28 stsp if (a->prepared_log) {
7446 28cf319f 2021-01-28 stsp char *msg;
7447 28cf319f 2021-01-28 stsp err = read_prepared_logmsg(&msg, a->prepared_log);
7449 28cf319f 2021-01-28 stsp goto done;
7450 28cf319f 2021-01-28 stsp if (write(fd, msg, strlen(msg)) == -1) {
7451 28cf319f 2021-01-28 stsp err = got_error_from_errno2("write", a->logmsg_path);
7452 28cf319f 2021-01-28 stsp free(msg);
7453 28cf319f 2021-01-28 stsp goto done;
7455 28cf319f 2021-01-28 stsp free(msg);
7458 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
7459 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
7460 1601cb9f 2020-09-11 naddy a->branch_name);
7461 28cf319f 2021-01-28 stsp if (initial_content_len == -1) {
7462 28cf319f 2021-01-28 stsp err = got_error_from_errno("asprintf");
7463 e0870e44 2019-05-13 stsp goto done;
7466 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
7467 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
7468 97972933 2020-09-11 stsp goto done;
7471 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
7472 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
7473 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
7474 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
7475 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
7478 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7479 28cf319f 2021-01-28 stsp initial_content_len, a->prepared_log ? 0 : 1);
7481 76d98825 2019-06-03 stsp free(initial_content);
7482 e0870e44 2019-05-13 stsp free(template);
7484 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
7485 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
7487 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
7488 59f86c76 2020-09-11 stsp if (err == NULL)
7489 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
7490 59f86c76 2020-09-11 stsp if (err) {
7491 59f86c76 2020-09-11 stsp free(*logmsg);
7492 59f86c76 2020-09-11 stsp *logmsg = NULL;
7494 33ad4cbe 2019-05-12 jcs return err;
7497 c4296144 2019-05-09 stsp static const struct got_error *
7498 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
7500 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
7501 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
7502 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
7503 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
7504 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
7505 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
7506 28cf319f 2021-01-28 stsp char *prepared_logmsg = NULL;
7507 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
7508 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7509 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7510 f259c4c1 2021-09-24 stsp int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7511 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
7513 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
7514 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
7516 28cf319f 2021-01-28 stsp while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7517 c4296144 2019-05-09 stsp switch (ch) {
7519 28cf319f 2021-01-28 stsp if (logmsg != NULL)
7520 28cf319f 2021-01-28 stsp option_conflict('F', 'm');
7521 28cf319f 2021-01-28 stsp prepared_logmsg = realpath(optarg, NULL);
7522 28cf319f 2021-01-28 stsp if (prepared_logmsg == NULL)
7523 28cf319f 2021-01-28 stsp return got_error_from_errno2("realpath",
7527 28cf319f 2021-01-28 stsp if (prepared_logmsg)
7528 28cf319f 2021-01-28 stsp option_conflict('m', 'F');
7529 c4296144 2019-05-09 stsp logmsg = optarg;
7532 28cf319f 2021-01-28 stsp non_interactive = 1;
7535 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
7538 c4296144 2019-05-09 stsp usage_commit();
7539 c4296144 2019-05-09 stsp /* NOTREACHED */
7543 c4296144 2019-05-09 stsp argc -= optind;
7544 c4296144 2019-05-09 stsp argv += optind;
7546 43012d58 2019-07-14 stsp #ifndef PROFILE
7547 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7548 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7549 43012d58 2019-07-14 stsp err(1, "pledge");
7551 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
7552 c4296144 2019-05-09 stsp if (cwd == NULL) {
7553 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
7554 c4296144 2019-05-09 stsp goto done;
7556 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
7557 fa51e947 2020-03-27 stsp if (error) {
7558 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7559 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
7560 7d5807f4 2019-07-11 stsp goto done;
7563 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7564 c4296144 2019-05-09 stsp if (error)
7565 a698f62e 2019-07-25 stsp goto done;
7566 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
7567 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
7568 c4296144 2019-05-09 stsp goto done;
7571 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7572 916f288c 2019-07-30 stsp worktree);
7573 5c1e53bc 2019-07-28 stsp if (error)
7574 5c1e53bc 2019-07-28 stsp goto done;
7576 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
7577 c9956ddf 2019-09-08 stsp if (error)
7578 c9956ddf 2019-09-08 stsp goto done;
7579 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7580 c9956ddf 2019-09-08 stsp gitconfig_path);
7581 c4296144 2019-05-09 stsp if (error != NULL)
7582 c4296144 2019-05-09 stsp goto done;
7584 f259c4c1 2021-09-24 stsp error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7585 f259c4c1 2021-09-24 stsp if (error)
7586 f259c4c1 2021-09-24 stsp goto done;
7587 f259c4c1 2021-09-24 stsp if (merge_in_progress) {
7588 f259c4c1 2021-09-24 stsp error = got_error(GOT_ERR_MERGE_BUSY);
7589 f259c4c1 2021-09-24 stsp goto done;
7592 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
7593 aba9c984 2019-09-08 stsp if (error)
7594 aba9c984 2019-09-08 stsp return error;
7597 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
7598 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
7600 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
7601 314a6357 2019-05-13 stsp error = get_editor(&editor);
7603 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7604 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7605 c4296144 2019-05-09 stsp if (error)
7606 c4296144 2019-05-09 stsp goto done;
7608 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7609 087fb88c 2019-08-04 stsp if (error)
7610 087fb88c 2019-08-04 stsp goto done;
7612 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
7613 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
7614 28cf319f 2021-01-28 stsp cl_arg.prepared_log = prepared_logmsg;
7615 28cf319f 2021-01-28 stsp cl_arg.non_interactive = non_interactive;
7616 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7617 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7618 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
7619 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7620 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
7621 916f288c 2019-07-30 stsp goto done;
7623 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
7625 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
7626 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7627 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7628 35213c7c 2020-07-23 stsp print_status, NULL, repo);
7629 e0870e44 2019-05-13 stsp if (error) {
7630 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7631 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
7632 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
7633 c4296144 2019-05-09 stsp goto done;
7636 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
7637 c4296144 2019-05-09 stsp if (error)
7638 c4296144 2019-05-09 stsp goto done;
7639 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
7641 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
7642 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
7643 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
7644 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7645 7266f21f 2019-10-21 stsp error == NULL)
7646 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7647 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
7648 1d0f4054 2021-06-17 stsp if (repo) {
7649 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
7650 1d0f4054 2021-06-17 stsp if (error == NULL)
7651 1d0f4054 2021-06-17 stsp error = close_err;
7653 c4296144 2019-05-09 stsp if (worktree)
7654 c4296144 2019-05-09 stsp got_worktree_close(worktree);
7655 c4296144 2019-05-09 stsp free(cwd);
7656 c4296144 2019-05-09 stsp free(id_str);
7657 c9956ddf 2019-09-08 stsp free(gitconfig_path);
7658 e2ba3d07 2019-05-13 stsp free(editor);
7659 aba9c984 2019-09-08 stsp free(author);
7660 28cf319f 2021-01-28 stsp free(prepared_logmsg);
7661 f8a36e22 2021-08-26 stsp return error;
7664 f8a36e22 2021-08-26 stsp __dead static void
7665 f8a36e22 2021-08-26 stsp usage_send(void)
7667 f8a36e22 2021-08-26 stsp fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
7668 f8a36e22 2021-08-26 stsp "[-r repository-path] [-t tag] [-T] [-q] [-v] "
7669 f8a36e22 2021-08-26 stsp "[remote-repository]\n", getprogname());
7673 f8a36e22 2021-08-26 stsp struct got_send_progress_arg {
7674 f8a36e22 2021-08-26 stsp char last_scaled_packsize[FMT_SCALED_STRSIZE];
7675 f8a36e22 2021-08-26 stsp int verbosity;
7676 f8a36e22 2021-08-26 stsp int last_ncommits;
7677 f8a36e22 2021-08-26 stsp int last_nobj_total;
7678 f8a36e22 2021-08-26 stsp int last_p_deltify;
7679 f8a36e22 2021-08-26 stsp int last_p_written;
7680 f8a36e22 2021-08-26 stsp int last_p_sent;
7681 f8a36e22 2021-08-26 stsp int printed_something;
7682 f8a36e22 2021-08-26 stsp int sent_something;
7683 f8a36e22 2021-08-26 stsp struct got_pathlist_head *delete_branches;
7686 f8a36e22 2021-08-26 stsp static const struct got_error *
7687 f8a36e22 2021-08-26 stsp send_progress(void *arg, off_t packfile_size, int ncommits, int nobj_total,
7688 f8a36e22 2021-08-26 stsp int nobj_deltify, int nobj_written, off_t bytes_sent, const char *refname,
7689 f8a36e22 2021-08-26 stsp int success)
7691 f8a36e22 2021-08-26 stsp struct got_send_progress_arg *a = arg;
7692 f8a36e22 2021-08-26 stsp char scaled_packsize[FMT_SCALED_STRSIZE];
7693 f8a36e22 2021-08-26 stsp char scaled_sent[FMT_SCALED_STRSIZE];
7694 f8a36e22 2021-08-26 stsp int p_deltify = 0, p_written = 0, p_sent = 0;
7695 f8a36e22 2021-08-26 stsp int print_searching = 0, print_total = 0;
7696 f8a36e22 2021-08-26 stsp int print_deltify = 0, print_written = 0, print_sent = 0;
7698 f8a36e22 2021-08-26 stsp if (a->verbosity < 0)
7699 f8a36e22 2021-08-26 stsp return NULL;
7701 f8a36e22 2021-08-26 stsp if (refname) {
7702 f8a36e22 2021-08-26 stsp const char *status = success ? "accepted" : "rejected";
7704 f8a36e22 2021-08-26 stsp if (success) {
7705 f8a36e22 2021-08-26 stsp struct got_pathlist_entry *pe;
7706 f8a36e22 2021-08-26 stsp TAILQ_FOREACH(pe, a->delete_branches, entry) {
7707 f8a36e22 2021-08-26 stsp const char *branchname = pe->path;
7708 f8a36e22 2021-08-26 stsp if (got_path_cmp(branchname, refname,
7709 f8a36e22 2021-08-26 stsp strlen(branchname), strlen(refname)) == 0) {
7710 f8a36e22 2021-08-26 stsp status = "deleted";
7711 27b75514 2021-08-28 stsp a->sent_something = 1;
7717 27b75514 2021-08-28 stsp if (a->printed_something)
7718 27b75514 2021-08-28 stsp putchar('\n');
7719 27b75514 2021-08-28 stsp printf("Server has %s %s", status, refname);
7720 f8a36e22 2021-08-26 stsp a->printed_something = 1;
7721 f8a36e22 2021-08-26 stsp return NULL;
7724 f8a36e22 2021-08-26 stsp if (fmt_scaled(packfile_size, scaled_packsize) == -1)
7725 f8a36e22 2021-08-26 stsp return got_error_from_errno("fmt_scaled");
7726 f8a36e22 2021-08-26 stsp if (fmt_scaled(bytes_sent, scaled_sent) == -1)
7727 f8a36e22 2021-08-26 stsp return got_error_from_errno("fmt_scaled");
7729 f8a36e22 2021-08-26 stsp if (a->last_ncommits != ncommits) {
7730 f8a36e22 2021-08-26 stsp print_searching = 1;
7731 f8a36e22 2021-08-26 stsp a->last_ncommits = ncommits;
7734 f8a36e22 2021-08-26 stsp if (a->last_nobj_total != nobj_total) {
7735 f8a36e22 2021-08-26 stsp print_searching = 1;
7736 f8a36e22 2021-08-26 stsp print_total = 1;
7737 f8a36e22 2021-08-26 stsp a->last_nobj_total = nobj_total;
7740 f8a36e22 2021-08-26 stsp if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
7741 f8a36e22 2021-08-26 stsp strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
7742 f8a36e22 2021-08-26 stsp if (strlcpy(a->last_scaled_packsize, scaled_packsize,
7743 f8a36e22 2021-08-26 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
7744 f8a36e22 2021-08-26 stsp return got_error(GOT_ERR_NO_SPACE);
7747 f8a36e22 2021-08-26 stsp if (nobj_deltify > 0 || nobj_written > 0) {
7748 f8a36e22 2021-08-26 stsp if (nobj_deltify > 0) {
7749 f8a36e22 2021-08-26 stsp p_deltify = (nobj_deltify * 100) / nobj_total;
7750 f8a36e22 2021-08-26 stsp if (p_deltify != a->last_p_deltify) {
7751 f8a36e22 2021-08-26 stsp a->last_p_deltify = p_deltify;
7752 f8a36e22 2021-08-26 stsp print_searching = 1;
7753 f8a36e22 2021-08-26 stsp print_total = 1;
7754 f8a36e22 2021-08-26 stsp print_deltify = 1;
7757 f8a36e22 2021-08-26 stsp if (nobj_written > 0) {
7758 f8a36e22 2021-08-26 stsp p_written = (nobj_written * 100) / nobj_total;
7759 f8a36e22 2021-08-26 stsp if (p_written != a->last_p_written) {
7760 f8a36e22 2021-08-26 stsp a->last_p_written = p_written;
7761 f8a36e22 2021-08-26 stsp print_searching = 1;
7762 f8a36e22 2021-08-26 stsp print_total = 1;
7763 f8a36e22 2021-08-26 stsp print_deltify = 1;
7764 f8a36e22 2021-08-26 stsp print_written = 1;
7769 f8a36e22 2021-08-26 stsp if (bytes_sent > 0) {
7770 f8a36e22 2021-08-26 stsp p_sent = (bytes_sent * 100) / packfile_size;
7771 f8a36e22 2021-08-26 stsp if (p_sent != a->last_p_sent) {
7772 f8a36e22 2021-08-26 stsp a->last_p_sent = p_sent;
7773 f8a36e22 2021-08-26 stsp print_searching = 1;
7774 f8a36e22 2021-08-26 stsp print_total = 1;
7775 f8a36e22 2021-08-26 stsp print_deltify = 1;
7776 f8a36e22 2021-08-26 stsp print_written = 1;
7777 f8a36e22 2021-08-26 stsp print_sent = 1;
7779 f8a36e22 2021-08-26 stsp a->sent_something = 1;
7782 f8a36e22 2021-08-26 stsp if (print_searching || print_total || print_deltify || print_written ||
7783 f8a36e22 2021-08-26 stsp print_sent)
7784 f8a36e22 2021-08-26 stsp printf("\r");
7785 f8a36e22 2021-08-26 stsp if (print_searching)
7786 f8a36e22 2021-08-26 stsp printf("packing %d reference%s", ncommits,
7787 f8a36e22 2021-08-26 stsp ncommits == 1 ? "" : "s");
7788 f8a36e22 2021-08-26 stsp if (print_total)
7789 f8a36e22 2021-08-26 stsp printf("; %d object%s", nobj_total,
7790 f8a36e22 2021-08-26 stsp nobj_total == 1 ? "" : "s");
7791 f8a36e22 2021-08-26 stsp if (print_deltify)
7792 f8a36e22 2021-08-26 stsp printf("; deltify: %d%%", p_deltify);
7793 f8a36e22 2021-08-26 stsp if (print_sent)
7794 f8a36e22 2021-08-26 stsp printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE,
7795 f8a36e22 2021-08-26 stsp scaled_packsize, p_sent);
7796 f8a36e22 2021-08-26 stsp else if (print_written)
7797 f8a36e22 2021-08-26 stsp printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE,
7798 f8a36e22 2021-08-26 stsp scaled_packsize, p_written);
7799 f8a36e22 2021-08-26 stsp if (print_searching || print_total || print_deltify ||
7800 f8a36e22 2021-08-26 stsp print_written || print_sent) {
7801 f8a36e22 2021-08-26 stsp a->printed_something = 1;
7802 f8a36e22 2021-08-26 stsp fflush(stdout);
7804 f8a36e22 2021-08-26 stsp return NULL;
7807 f8a36e22 2021-08-26 stsp static const struct got_error *
7808 f8a36e22 2021-08-26 stsp cmd_send(int argc, char *argv[])
7810 f8a36e22 2021-08-26 stsp const struct got_error *error = NULL;
7811 f8a36e22 2021-08-26 stsp char *cwd = NULL, *repo_path = NULL;
7812 f8a36e22 2021-08-26 stsp const char *remote_name;
7813 f8a36e22 2021-08-26 stsp char *proto = NULL, *host = NULL, *port = NULL;
7814 f8a36e22 2021-08-26 stsp char *repo_name = NULL, *server_path = NULL;
7815 f8a36e22 2021-08-26 stsp const struct got_remote_repo *remotes, *remote = NULL;
7816 f8a36e22 2021-08-26 stsp int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
7817 f8a36e22 2021-08-26 stsp struct got_repository *repo = NULL;
7818 f8a36e22 2021-08-26 stsp struct got_worktree *worktree = NULL;
7819 f8a36e22 2021-08-26 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7820 f8a36e22 2021-08-26 stsp struct got_pathlist_head branches;
7821 f8a36e22 2021-08-26 stsp struct got_pathlist_head tags;
7822 f8a36e22 2021-08-26 stsp struct got_reflist_head all_branches;
7823 f8a36e22 2021-08-26 stsp struct got_reflist_head all_tags;
7824 f8a36e22 2021-08-26 stsp struct got_pathlist_head delete_args;
7825 f8a36e22 2021-08-26 stsp struct got_pathlist_head delete_branches;
7826 f8a36e22 2021-08-26 stsp struct got_reflist_entry *re;
7827 f8a36e22 2021-08-26 stsp struct got_pathlist_entry *pe;
7828 f8a36e22 2021-08-26 stsp int i, ch, sendfd = -1, sendstatus;
7829 f8a36e22 2021-08-26 stsp pid_t sendpid = -1;
7830 f8a36e22 2021-08-26 stsp struct got_send_progress_arg spa;
7831 f8a36e22 2021-08-26 stsp int verbosity = 0, overwrite_refs = 0;
7832 f8a36e22 2021-08-26 stsp int send_all_branches = 0, send_all_tags = 0;
7833 f8a36e22 2021-08-26 stsp struct got_reference *ref = NULL;
7835 f8a36e22 2021-08-26 stsp TAILQ_INIT(&branches);
7836 f8a36e22 2021-08-26 stsp TAILQ_INIT(&tags);
7837 f8a36e22 2021-08-26 stsp TAILQ_INIT(&all_branches);
7838 f8a36e22 2021-08-26 stsp TAILQ_INIT(&all_tags);
7839 f8a36e22 2021-08-26 stsp TAILQ_INIT(&delete_args);
7840 f8a36e22 2021-08-26 stsp TAILQ_INIT(&delete_branches);
7842 f8a36e22 2021-08-26 stsp while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
7843 f8a36e22 2021-08-26 stsp switch (ch) {
7845 f8a36e22 2021-08-26 stsp send_all_branches = 1;
7848 f8a36e22 2021-08-26 stsp error = got_pathlist_append(&branches, optarg, NULL);
7849 f8a36e22 2021-08-26 stsp if (error)
7850 f8a36e22 2021-08-26 stsp return error;
7851 f8a36e22 2021-08-26 stsp nbranches++;
7854 f8a36e22 2021-08-26 stsp error = got_pathlist_append(&delete_args, optarg, NULL);
7855 f8a36e22 2021-08-26 stsp if (error)
7856 f8a36e22 2021-08-26 stsp return error;
7859 f8a36e22 2021-08-26 stsp overwrite_refs = 1;
7862 f8a36e22 2021-08-26 stsp repo_path = realpath(optarg, NULL);
7863 f8a36e22 2021-08-26 stsp if (repo_path == NULL)
7864 f8a36e22 2021-08-26 stsp return got_error_from_errno2("realpath",
7866 f8a36e22 2021-08-26 stsp got_path_strip_trailing_slashes(repo_path);
7869 f8a36e22 2021-08-26 stsp error = got_pathlist_append(&tags, optarg, NULL);
7870 f8a36e22 2021-08-26 stsp if (error)
7871 f8a36e22 2021-08-26 stsp return error;
7875 f8a36e22 2021-08-26 stsp send_all_tags = 1;
7878 f8a36e22 2021-08-26 stsp if (verbosity < 0)
7879 f8a36e22 2021-08-26 stsp verbosity = 0;
7880 f8a36e22 2021-08-26 stsp else if (verbosity < 3)
7881 f8a36e22 2021-08-26 stsp verbosity++;
7884 f8a36e22 2021-08-26 stsp verbosity = -1;
7887 f8a36e22 2021-08-26 stsp usage_send();
7888 f8a36e22 2021-08-26 stsp /* NOTREACHED */
7891 f8a36e22 2021-08-26 stsp argc -= optind;
7892 f8a36e22 2021-08-26 stsp argv += optind;
7894 f8a36e22 2021-08-26 stsp if (send_all_branches && !TAILQ_EMPTY(&branches))
7895 f8a36e22 2021-08-26 stsp option_conflict('a', 'b');
7896 f8a36e22 2021-08-26 stsp if (send_all_tags && !TAILQ_EMPTY(&tags))
7897 f8a36e22 2021-08-26 stsp option_conflict('T', 't');
7900 f8a36e22 2021-08-26 stsp if (argc == 0)
7901 f8a36e22 2021-08-26 stsp remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
7902 f8a36e22 2021-08-26 stsp else if (argc == 1)
7903 f8a36e22 2021-08-26 stsp remote_name = argv[0];
7905 f8a36e22 2021-08-26 stsp usage_send();
7907 f8a36e22 2021-08-26 stsp cwd = getcwd(NULL, 0);
7908 f8a36e22 2021-08-26 stsp if (cwd == NULL) {
7909 f8a36e22 2021-08-26 stsp error = got_error_from_errno("getcwd");
7910 f8a36e22 2021-08-26 stsp goto done;
7913 f8a36e22 2021-08-26 stsp if (repo_path == NULL) {
7914 f8a36e22 2021-08-26 stsp error = got_worktree_open(&worktree, cwd);
7915 f8a36e22 2021-08-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7916 f8a36e22 2021-08-26 stsp goto done;
7918 f8a36e22 2021-08-26 stsp error = NULL;
7919 f8a36e22 2021-08-26 stsp if (worktree) {
7920 f8a36e22 2021-08-26 stsp repo_path =
7921 f8a36e22 2021-08-26 stsp strdup(got_worktree_get_repo_path(worktree));
7922 f8a36e22 2021-08-26 stsp if (repo_path == NULL)
7923 f8a36e22 2021-08-26 stsp error = got_error_from_errno("strdup");
7924 f8a36e22 2021-08-26 stsp if (error)
7925 f8a36e22 2021-08-26 stsp goto done;
7927 f8a36e22 2021-08-26 stsp repo_path = strdup(cwd);
7928 f8a36e22 2021-08-26 stsp if (repo_path == NULL) {
7929 f8a36e22 2021-08-26 stsp error = got_error_from_errno("strdup");
7930 f8a36e22 2021-08-26 stsp goto done;
7935 f8a36e22 2021-08-26 stsp error = got_repo_open(&repo, repo_path, NULL);
7936 f8a36e22 2021-08-26 stsp if (error)
7937 f8a36e22 2021-08-26 stsp goto done;
7939 f8a36e22 2021-08-26 stsp if (worktree) {
7940 f8a36e22 2021-08-26 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
7941 f8a36e22 2021-08-26 stsp if (worktree_conf) {
7942 f8a36e22 2021-08-26 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
7943 f8a36e22 2021-08-26 stsp worktree_conf);
7944 f8a36e22 2021-08-26 stsp for (i = 0; i < nremotes; i++) {
7945 f8a36e22 2021-08-26 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
7946 f8a36e22 2021-08-26 stsp remote = &remotes[i];
7952 f8a36e22 2021-08-26 stsp if (remote == NULL) {
7953 f8a36e22 2021-08-26 stsp repo_conf = got_repo_get_gotconfig(repo);
7954 f8a36e22 2021-08-26 stsp if (repo_conf) {
7955 f8a36e22 2021-08-26 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
7956 f8a36e22 2021-08-26 stsp repo_conf);
7957 f8a36e22 2021-08-26 stsp for (i = 0; i < nremotes; i++) {
7958 f8a36e22 2021-08-26 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
7959 f8a36e22 2021-08-26 stsp remote = &remotes[i];
7965 f8a36e22 2021-08-26 stsp if (remote == NULL) {
7966 f8a36e22 2021-08-26 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
7967 f8a36e22 2021-08-26 stsp for (i = 0; i < nremotes; i++) {
7968 f8a36e22 2021-08-26 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
7969 f8a36e22 2021-08-26 stsp remote = &remotes[i];
7974 f8a36e22 2021-08-26 stsp if (remote == NULL) {
7975 f8a36e22 2021-08-26 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
7976 f8a36e22 2021-08-26 stsp goto done;
7979 5e5da8c4 2021-09-05 stsp error = got_dial_parse_uri(&proto, &host, &port, &server_path,
7980 6480c871 2021-08-30 stsp &repo_name, remote->send_url);
7981 f8a36e22 2021-08-26 stsp if (error)
7982 f8a36e22 2021-08-26 stsp goto done;
7984 f8a36e22 2021-08-26 stsp if (strcmp(proto, "git") == 0) {
7985 f8a36e22 2021-08-26 stsp #ifndef PROFILE
7986 f8a36e22 2021-08-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7987 f8a36e22 2021-08-26 stsp "sendfd dns inet unveil", NULL) == -1)
7988 f8a36e22 2021-08-26 stsp err(1, "pledge");
7990 f8a36e22 2021-08-26 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
7991 f8a36e22 2021-08-26 stsp strcmp(proto, "ssh") == 0) {
7992 f8a36e22 2021-08-26 stsp #ifndef PROFILE
7993 f8a36e22 2021-08-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7994 f8a36e22 2021-08-26 stsp "sendfd unveil", NULL) == -1)
7995 f8a36e22 2021-08-26 stsp err(1, "pledge");
7997 f8a36e22 2021-08-26 stsp } else if (strcmp(proto, "http") == 0 ||
7998 f8a36e22 2021-08-26 stsp strcmp(proto, "git+http") == 0) {
7999 f8a36e22 2021-08-26 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8000 f8a36e22 2021-08-26 stsp goto done;
8002 f8a36e22 2021-08-26 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8003 f8a36e22 2021-08-26 stsp goto done;
8006 d65a88a2 2021-09-05 stsp error = got_dial_apply_unveil(proto);
8007 d65a88a2 2021-09-05 stsp if (error)
8008 d65a88a2 2021-09-05 stsp goto done;
8010 f8a36e22 2021-08-26 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8011 f8a36e22 2021-08-26 stsp if (error)
8012 f8a36e22 2021-08-26 stsp goto done;
8014 f8a36e22 2021-08-26 stsp if (send_all_branches) {
8015 f8a36e22 2021-08-26 stsp error = got_ref_list(&all_branches, repo, "refs/heads",
8016 f8a36e22 2021-08-26 stsp got_ref_cmp_by_name, NULL);
8017 f8a36e22 2021-08-26 stsp if (error)
8018 f8a36e22 2021-08-26 stsp goto done;
8019 f8a36e22 2021-08-26 stsp TAILQ_FOREACH(re, &all_branches, entry) {
8020 f8a36e22 2021-08-26 stsp const char *branchname = got_ref_get_name(re->ref);
8021 f8a36e22 2021-08-26 stsp error = got_pathlist_append(&branches,
8022 f8a36e22 2021-08-26 stsp branchname, NULL);
8023 f8a36e22 2021-08-26 stsp if (error)
8024 f8a36e22 2021-08-26 stsp goto done;
8025 f8a36e22 2021-08-26 stsp nbranches++;
8027 eac1df47 2021-09-01 stsp } else if (nbranches == 0) {
8028 eac1df47 2021-09-01 stsp for (i = 0; i < remote->nsend_branches; i++) {
8029 eac1df47 2021-09-01 stsp got_pathlist_append(&branches,
8030 eac1df47 2021-09-01 stsp remote->send_branches[i], NULL);
8034 f8a36e22 2021-08-26 stsp if (send_all_tags) {
8035 f8a36e22 2021-08-26 stsp error = got_ref_list(&all_tags, repo, "refs/tags",
8036 f8a36e22 2021-08-26 stsp got_ref_cmp_by_name, NULL);
8037 f8a36e22 2021-08-26 stsp if (error)
8038 f8a36e22 2021-08-26 stsp goto done;
8039 f8a36e22 2021-08-26 stsp TAILQ_FOREACH(re, &all_tags, entry) {
8040 f8a36e22 2021-08-26 stsp const char *tagname = got_ref_get_name(re->ref);
8041 f8a36e22 2021-08-26 stsp error = got_pathlist_append(&tags,
8042 f8a36e22 2021-08-26 stsp tagname, NULL);
8043 f8a36e22 2021-08-26 stsp if (error)
8044 f8a36e22 2021-08-26 stsp goto done;
8050 f8a36e22 2021-08-26 stsp * To prevent accidents only branches in refs/heads/ can be deleted
8051 f8a36e22 2021-08-26 stsp * with 'got send -d'.
8052 f8a36e22 2021-08-26 stsp * Deleting anything else requires local repository access or Git.
8054 f8a36e22 2021-08-26 stsp TAILQ_FOREACH(pe, &delete_args, entry) {
8055 f8a36e22 2021-08-26 stsp const char *branchname = pe->path;
8057 f8a36e22 2021-08-26 stsp struct got_pathlist_entry *new;
8058 f8a36e22 2021-08-26 stsp if (strncmp(branchname, "refs/heads/", 11) == 0) {
8059 f8a36e22 2021-08-26 stsp s = strdup(branchname);
8060 f8a36e22 2021-08-26 stsp if (s == NULL) {
8061 f8a36e22 2021-08-26 stsp error = got_error_from_errno("strdup");
8062 f8a36e22 2021-08-26 stsp goto done;
8065 f8a36e22 2021-08-26 stsp if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8066 f8a36e22 2021-08-26 stsp error = got_error_from_errno("asprintf");
8067 f8a36e22 2021-08-26 stsp goto done;
8070 f8a36e22 2021-08-26 stsp error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8071 f8a36e22 2021-08-26 stsp if (error || new == NULL /* duplicate */)
8073 f8a36e22 2021-08-26 stsp if (error)
8074 f8a36e22 2021-08-26 stsp goto done;
8075 f8a36e22 2021-08-26 stsp ndelete_branches++;
8078 f8a36e22 2021-08-26 stsp if (nbranches == 0 && ndelete_branches == 0) {
8079 f8a36e22 2021-08-26 stsp struct got_reference *head_ref;
8080 f8a36e22 2021-08-26 stsp if (worktree)
8081 f8a36e22 2021-08-26 stsp error = got_ref_open(&head_ref, repo,
8082 f8a36e22 2021-08-26 stsp got_worktree_get_head_ref_name(worktree), 0);
8084 f8a36e22 2021-08-26 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8085 f8a36e22 2021-08-26 stsp if (error)
8086 f8a36e22 2021-08-26 stsp goto done;
8087 f8a36e22 2021-08-26 stsp if (got_ref_is_symbolic(head_ref)) {
8088 f8a36e22 2021-08-26 stsp error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8089 f8a36e22 2021-08-26 stsp got_ref_close(head_ref);
8090 f8a36e22 2021-08-26 stsp if (error)
8091 f8a36e22 2021-08-26 stsp goto done;
8093 f8a36e22 2021-08-26 stsp ref = head_ref;
8094 f8a36e22 2021-08-26 stsp error = got_pathlist_append(&branches, got_ref_get_name(ref),
8096 f8a36e22 2021-08-26 stsp if (error)
8097 f8a36e22 2021-08-26 stsp goto done;
8098 f8a36e22 2021-08-26 stsp nbranches++;
8101 f8a36e22 2021-08-26 stsp if (verbosity >= 0)
8102 f8a36e22 2021-08-26 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8103 f8a36e22 2021-08-26 stsp port ? ":" : "", port ? port : "");
8105 f8a36e22 2021-08-26 stsp error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8106 f8a36e22 2021-08-26 stsp server_path, verbosity);
8107 f8a36e22 2021-08-26 stsp if (error)
8108 f8a36e22 2021-08-26 stsp goto done;
8110 f8a36e22 2021-08-26 stsp memset(&spa, 0, sizeof(spa));
8111 f8a36e22 2021-08-26 stsp spa.last_scaled_packsize[0] = '\0';
8112 f8a36e22 2021-08-26 stsp spa.last_p_deltify = -1;
8113 f8a36e22 2021-08-26 stsp spa.last_p_written = -1;
8114 f8a36e22 2021-08-26 stsp spa.verbosity = verbosity;
8115 f8a36e22 2021-08-26 stsp spa.delete_branches = &delete_branches;
8116 f8a36e22 2021-08-26 stsp error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8117 f8a36e22 2021-08-26 stsp verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8118 f8a36e22 2021-08-26 stsp check_cancelled, NULL);
8119 f8a36e22 2021-08-26 stsp if (spa.printed_something)
8120 f8a36e22 2021-08-26 stsp putchar('\n');
8121 f8a36e22 2021-08-26 stsp if (error)
8122 f8a36e22 2021-08-26 stsp goto done;
8123 f8a36e22 2021-08-26 stsp if (!spa.sent_something && verbosity >= 0)
8124 f8a36e22 2021-08-26 stsp printf("Already up-to-date\n");
8126 f8a36e22 2021-08-26 stsp if (sendpid > 0) {
8127 f8a36e22 2021-08-26 stsp if (kill(sendpid, SIGTERM) == -1)
8128 f8a36e22 2021-08-26 stsp error = got_error_from_errno("kill");
8129 f8a36e22 2021-08-26 stsp if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8130 f8a36e22 2021-08-26 stsp error = got_error_from_errno("waitpid");
8132 f8a36e22 2021-08-26 stsp if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8133 f8a36e22 2021-08-26 stsp error = got_error_from_errno("close");
8134 f8a36e22 2021-08-26 stsp if (repo) {
8135 f8a36e22 2021-08-26 stsp const struct got_error *close_err = got_repo_close(repo);
8136 f8a36e22 2021-08-26 stsp if (error == NULL)
8137 f8a36e22 2021-08-26 stsp error = close_err;
8139 f8a36e22 2021-08-26 stsp if (worktree)
8140 f8a36e22 2021-08-26 stsp got_worktree_close(worktree);
8142 f8a36e22 2021-08-26 stsp got_ref_close(ref);
8143 f8a36e22 2021-08-26 stsp got_pathlist_free(&branches);
8144 f8a36e22 2021-08-26 stsp got_pathlist_free(&tags);
8145 f8a36e22 2021-08-26 stsp got_ref_list_free(&all_branches);
8146 f8a36e22 2021-08-26 stsp got_ref_list_free(&all_tags);
8147 f8a36e22 2021-08-26 stsp got_pathlist_free(&delete_args);
8148 f8a36e22 2021-08-26 stsp TAILQ_FOREACH(pe, &delete_branches, entry)
8149 f8a36e22 2021-08-26 stsp free((char *)pe->path);
8150 f8a36e22 2021-08-26 stsp got_pathlist_free(&delete_branches);
8151 f8a36e22 2021-08-26 stsp free(cwd);
8152 f8a36e22 2021-08-26 stsp free(repo_path);
8153 f8a36e22 2021-08-26 stsp free(proto);
8154 f8a36e22 2021-08-26 stsp free(host);
8155 f8a36e22 2021-08-26 stsp free(port);
8156 f8a36e22 2021-08-26 stsp free(server_path);
8157 f8a36e22 2021-08-26 stsp free(repo_name);
8158 234035bc 2019-06-01 stsp return error;
8161 234035bc 2019-06-01 stsp __dead static void
8162 234035bc 2019-06-01 stsp usage_cherrypick(void)
8164 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8168 234035bc 2019-06-01 stsp static const struct got_error *
8169 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
8171 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
8172 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
8173 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
8174 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
8175 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
8176 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
8177 234035bc 2019-06-01 stsp struct got_object_qid *pid;
8179 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8181 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8182 234035bc 2019-06-01 stsp switch (ch) {
8184 234035bc 2019-06-01 stsp usage_cherrypick();
8185 234035bc 2019-06-01 stsp /* NOTREACHED */
8189 234035bc 2019-06-01 stsp argc -= optind;
8190 234035bc 2019-06-01 stsp argv += optind;
8192 43012d58 2019-07-14 stsp #ifndef PROFILE
8193 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8194 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
8195 43012d58 2019-07-14 stsp err(1, "pledge");
8197 234035bc 2019-06-01 stsp if (argc != 1)
8198 234035bc 2019-06-01 stsp usage_cherrypick();
8200 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
8201 234035bc 2019-06-01 stsp if (cwd == NULL) {
8202 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
8203 234035bc 2019-06-01 stsp goto done;
8205 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
8206 fa51e947 2020-03-27 stsp if (error) {
8207 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8208 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
8210 234035bc 2019-06-01 stsp goto done;
8213 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8215 234035bc 2019-06-01 stsp if (error != NULL)
8216 234035bc 2019-06-01 stsp goto done;
8218 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8219 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
8220 234035bc 2019-06-01 stsp if (error)
8221 234035bc 2019-06-01 stsp goto done;
8223 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
8224 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
8225 234035bc 2019-06-01 stsp if (error != NULL) {
8226 234035bc 2019-06-01 stsp struct got_reference *ref;
8227 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
8228 234035bc 2019-06-01 stsp goto done;
8229 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
8230 234035bc 2019-06-01 stsp if (error != NULL)
8231 234035bc 2019-06-01 stsp goto done;
8232 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
8233 234035bc 2019-06-01 stsp got_ref_close(ref);
8234 234035bc 2019-06-01 stsp if (error != NULL)
8235 234035bc 2019-06-01 stsp goto done;
8237 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
8238 234035bc 2019-06-01 stsp if (error)
8239 234035bc 2019-06-01 stsp goto done;
8241 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
8242 234035bc 2019-06-01 stsp if (error)
8243 234035bc 2019-06-01 stsp goto done;
8244 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8245 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8246 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
8247 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
8249 234035bc 2019-06-01 stsp if (error != NULL)
8250 234035bc 2019-06-01 stsp goto done;
8252 9627c110 2020-04-18 stsp if (upa.did_something)
8253 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
8254 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
8256 234035bc 2019-06-01 stsp if (commit)
8257 234035bc 2019-06-01 stsp got_object_commit_close(commit);
8258 234035bc 2019-06-01 stsp free(commit_id_str);
8259 234035bc 2019-06-01 stsp if (worktree)
8260 234035bc 2019-06-01 stsp got_worktree_close(worktree);
8261 1d0f4054 2021-06-17 stsp if (repo) {
8262 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
8263 1d0f4054 2021-06-17 stsp if (error == NULL)
8264 1d0f4054 2021-06-17 stsp error = close_err;
8266 c4296144 2019-05-09 stsp return error;
8269 5ef14e63 2019-06-02 stsp __dead static void
8270 5ef14e63 2019-06-02 stsp usage_backout(void)
8272 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
8276 5ef14e63 2019-06-02 stsp static const struct got_error *
8277 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
8279 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
8280 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
8281 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
8282 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
8283 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
8284 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
8285 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
8287 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8289 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8290 5ef14e63 2019-06-02 stsp switch (ch) {
8292 5ef14e63 2019-06-02 stsp usage_backout();
8293 5ef14e63 2019-06-02 stsp /* NOTREACHED */
8297 5ef14e63 2019-06-02 stsp argc -= optind;
8298 5ef14e63 2019-06-02 stsp argv += optind;
8300 43012d58 2019-07-14 stsp #ifndef PROFILE
8301 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8302 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
8303 43012d58 2019-07-14 stsp err(1, "pledge");
8305 5ef14e63 2019-06-02 stsp if (argc != 1)
8306 5ef14e63 2019-06-02 stsp usage_backout();
8308 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
8309 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
8310 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
8311 5ef14e63 2019-06-02 stsp goto done;
8313 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
8314 fa51e947 2020-03-27 stsp if (error) {
8315 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8316 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
8317 5ef14e63 2019-06-02 stsp goto done;
8320 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8322 5ef14e63 2019-06-02 stsp if (error != NULL)
8323 5ef14e63 2019-06-02 stsp goto done;
8325 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8326 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
8327 5ef14e63 2019-06-02 stsp if (error)
8328 5ef14e63 2019-06-02 stsp goto done;
8330 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
8331 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
8332 5ef14e63 2019-06-02 stsp if (error != NULL) {
8333 5ef14e63 2019-06-02 stsp struct got_reference *ref;
8334 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
8335 5ef14e63 2019-06-02 stsp goto done;
8336 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
8337 5ef14e63 2019-06-02 stsp if (error != NULL)
8338 5ef14e63 2019-06-02 stsp goto done;
8339 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
8340 5ef14e63 2019-06-02 stsp got_ref_close(ref);
8341 5ef14e63 2019-06-02 stsp if (error != NULL)
8342 5ef14e63 2019-06-02 stsp goto done;
8344 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
8345 5ef14e63 2019-06-02 stsp if (error)
8346 5ef14e63 2019-06-02 stsp goto done;
8348 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
8349 5ef14e63 2019-06-02 stsp if (error)
8350 5ef14e63 2019-06-02 stsp goto done;
8351 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8352 5ef14e63 2019-06-02 stsp if (pid == NULL) {
8353 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
8354 5ef14e63 2019-06-02 stsp goto done;
8357 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8358 f259c4c1 2021-09-24 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id,
8359 f259c4c1 2021-09-24 stsp repo, update_progress, &upa, check_cancelled, NULL);
8360 5ef14e63 2019-06-02 stsp if (error != NULL)
8361 5ef14e63 2019-06-02 stsp goto done;
8363 9627c110 2020-04-18 stsp if (upa.did_something)
8364 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
8365 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
8367 5ef14e63 2019-06-02 stsp if (commit)
8368 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
8369 5ef14e63 2019-06-02 stsp free(commit_id_str);
8370 818c7501 2019-07-11 stsp if (worktree)
8371 818c7501 2019-07-11 stsp got_worktree_close(worktree);
8372 1d0f4054 2021-06-17 stsp if (repo) {
8373 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
8374 1d0f4054 2021-06-17 stsp if (error == NULL)
8375 1d0f4054 2021-06-17 stsp error = close_err;
8377 818c7501 2019-07-11 stsp return error;
8380 818c7501 2019-07-11 stsp __dead static void
8381 818c7501 2019-07-11 stsp usage_rebase(void)
8383 643b85bc 2021-07-16 stsp fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
8384 af54c8f8 2019-07-11 stsp getprogname());
8389 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
8392 0ebf8283 2019-07-24 stsp size_t len;
8394 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
8395 0ebf8283 2019-07-24 stsp if (len > limit)
8396 0ebf8283 2019-07-24 stsp len = limit;
8397 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
8398 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
8400 0ebf8283 2019-07-24 stsp *nl = '\0';
8403 0ebf8283 2019-07-24 stsp static const struct got_error *
8404 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
8406 5943eee2 2019-08-13 stsp const struct got_error *err;
8407 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
8408 5943eee2 2019-08-13 stsp const char *s;
8410 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
8412 5943eee2 2019-08-13 stsp return err;
8414 5943eee2 2019-08-13 stsp s = logmsg0;
8415 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
8418 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
8419 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
8420 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
8421 5943eee2 2019-08-13 stsp goto done;
8424 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
8426 5943eee2 2019-08-13 stsp free(logmsg0);
8427 a0ea4fc0 2020-02-28 stsp return err;
8430 a0ea4fc0 2020-02-28 stsp static const struct got_error *
8431 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
8433 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
8434 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
8435 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
8437 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
8439 a0ea4fc0 2020-02-28 stsp return err;
8441 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
8443 a0ea4fc0 2020-02-28 stsp goto done;
8445 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
8447 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
8449 a0ea4fc0 2020-02-28 stsp goto done;
8451 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
8453 a0ea4fc0 2020-02-28 stsp free(id_str);
8454 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
8455 a0ea4fc0 2020-02-28 stsp free(logmsg);
8456 5943eee2 2019-08-13 stsp return err;
8459 818c7501 2019-07-11 stsp static const struct got_error *
8460 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
8461 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
8463 818c7501 2019-07-11 stsp const struct got_error *err;
8464 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8466 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
8468 818c7501 2019-07-11 stsp goto done;
8470 ff0d2220 2019-07-11 stsp if (new_id) {
8471 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
8473 ff0d2220 2019-07-11 stsp goto done;
8476 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
8477 ff0d2220 2019-07-11 stsp if (new_id_str)
8478 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
8480 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8482 0ebf8283 2019-07-24 stsp goto done;
8484 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
8485 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8487 818c7501 2019-07-11 stsp free(old_id_str);
8488 818c7501 2019-07-11 stsp free(new_id_str);
8489 272a1371 2020-02-28 stsp free(logmsg);
8490 818c7501 2019-07-11 stsp return err;
8493 1ee397ad 2019-07-12 stsp static const struct got_error *
8494 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
8495 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
8496 e600f124 2021-03-21 stsp struct got_reference *tmp_branch, struct got_repository *repo,
8497 e600f124 2021-03-21 stsp int create_backup)
8499 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
8500 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
8501 e600f124 2021-03-21 stsp new_base_branch, tmp_branch, branch, repo, create_backup);
8504 818c7501 2019-07-11 stsp static const struct got_error *
8505 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
8506 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8507 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
8508 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
8510 ff0d2220 2019-07-11 stsp const struct got_error *error;
8511 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
8512 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
8514 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
8515 ff0d2220 2019-07-11 stsp if (error)
8516 ff0d2220 2019-07-11 stsp return error;
8518 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
8519 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
8520 ff0d2220 2019-07-11 stsp if (error) {
8521 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
8522 ff0d2220 2019-07-11 stsp goto done;
8523 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
8525 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
8526 ff0d2220 2019-07-11 stsp free(new_commit_id);
8529 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
8530 ff0d2220 2019-07-11 stsp return error;
8533 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
8534 64c6d990 2019-07-11 stsp const char *path_prefix;
8535 64c6d990 2019-07-11 stsp size_t len;
8536 8ca9bd68 2019-07-25 stsp int errcode;
8539 64c6d990 2019-07-11 stsp static const struct got_error *
8540 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
8541 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
8542 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
8543 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
8545 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
8547 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
8548 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
8549 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
8551 64c6d990 2019-07-11 stsp return NULL;
8554 64c6d990 2019-07-11 stsp static const struct got_error *
8555 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
8556 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
8557 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
8559 64c6d990 2019-07-11 stsp const struct got_error *err;
8560 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
8561 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
8562 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
8564 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
8565 64c6d990 2019-07-11 stsp return NULL;
8567 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
8569 64c6d990 2019-07-11 stsp goto done;
8571 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
8573 64c6d990 2019-07-11 stsp goto done;
8575 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
8576 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
8578 64c6d990 2019-07-11 stsp goto done;
8580 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
8581 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
8583 64c6d990 2019-07-11 stsp goto done;
8585 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
8586 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
8587 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
8588 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
8589 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
8590 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
8591 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
8593 64c6d990 2019-07-11 stsp if (tree1)
8594 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
8595 64c6d990 2019-07-11 stsp if (tree2)
8596 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
8597 64c6d990 2019-07-11 stsp if (commit)
8598 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
8599 64c6d990 2019-07-11 stsp if (parent_commit)
8600 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
8601 64c6d990 2019-07-11 stsp return err;
8604 ff0d2220 2019-07-11 stsp static const struct got_error *
8605 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
8606 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
8607 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
8608 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
8609 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
8611 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
8612 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
8613 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
8614 af61c510 2019-07-19 stsp struct got_object_qid *qid;
8615 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
8617 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
8619 af61c510 2019-07-19 stsp return err;
8621 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
8622 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
8624 af61c510 2019-07-19 stsp goto done;
8625 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
8626 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
8627 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
8628 af61c510 2019-07-19 stsp if (err) {
8629 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
8630 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
8631 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
8632 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
8633 af61c510 2019-07-19 stsp "been reached?!?");
8635 ee780d5c 2020-01-04 stsp goto done;
8637 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
8638 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
8640 af61c510 2019-07-19 stsp goto done;
8642 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
8644 af61c510 2019-07-19 stsp goto done;
8645 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(commits, qid, entry);
8646 af61c510 2019-07-19 stsp commit_id = parent_id;
8650 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
8651 af61c510 2019-07-19 stsp return err;
8654 e600f124 2021-03-21 stsp static const struct got_error *
8655 e600f124 2021-03-21 stsp get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
8657 e600f124 2021-03-21 stsp const struct got_error *err = NULL;
8658 e600f124 2021-03-21 stsp time_t committer_time;
8659 e600f124 2021-03-21 stsp struct tm tm;
8660 e600f124 2021-03-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
8661 e600f124 2021-03-21 stsp char *author0 = NULL, *author, *smallerthan;
8662 e600f124 2021-03-21 stsp char *logmsg0 = NULL, *logmsg, *newline;
8664 e600f124 2021-03-21 stsp committer_time = got_object_commit_get_committer_time(commit);
8665 e385fc42 2021-08-30 stsp if (gmtime_r(&committer_time, &tm) == NULL)
8666 e385fc42 2021-08-30 stsp return got_error_from_errno("gmtime_r");
8667 e3199de8 2021-03-21 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
8668 e600f124 2021-03-21 stsp return got_error(GOT_ERR_NO_SPACE);
8670 e600f124 2021-03-21 stsp author0 = strdup(got_object_commit_get_author(commit));
8671 e600f124 2021-03-21 stsp if (author0 == NULL)
8672 e600f124 2021-03-21 stsp return got_error_from_errno("strdup");
8673 e600f124 2021-03-21 stsp author = author0;
8674 e600f124 2021-03-21 stsp smallerthan = strchr(author, '<');
8675 e600f124 2021-03-21 stsp if (smallerthan && smallerthan[1] != '\0')
8676 e600f124 2021-03-21 stsp author = smallerthan + 1;
8677 e600f124 2021-03-21 stsp author[strcspn(author, "@>")] = '\0';
8679 e600f124 2021-03-21 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
8681 e600f124 2021-03-21 stsp goto done;
8682 e600f124 2021-03-21 stsp logmsg = logmsg0;
8683 e600f124 2021-03-21 stsp while (*logmsg == '\n')
8685 e600f124 2021-03-21 stsp newline = strchr(logmsg, '\n');
8686 e600f124 2021-03-21 stsp if (newline)
8687 e600f124 2021-03-21 stsp *newline = '\0';
8689 e600f124 2021-03-21 stsp if (asprintf(brief_str, "%s %s %s",
8690 e600f124 2021-03-21 stsp datebuf, author, logmsg) == -1)
8691 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
8693 e600f124 2021-03-21 stsp free(author0);
8694 e600f124 2021-03-21 stsp free(logmsg0);
8695 643b85bc 2021-07-16 stsp return err;
8698 643b85bc 2021-07-16 stsp static const struct got_error *
8699 643b85bc 2021-07-16 stsp delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
8700 643b85bc 2021-07-16 stsp struct got_repository *repo)
8702 643b85bc 2021-07-16 stsp const struct got_error *err;
8703 643b85bc 2021-07-16 stsp char *id_str;
8705 643b85bc 2021-07-16 stsp err = got_object_id_str(&id_str, id);
8707 643b85bc 2021-07-16 stsp return err;
8709 643b85bc 2021-07-16 stsp err = got_ref_delete(ref, repo);
8711 643b85bc 2021-07-16 stsp goto done;
8713 643b85bc 2021-07-16 stsp printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
8715 643b85bc 2021-07-16 stsp free(id_str);
8716 e600f124 2021-03-21 stsp return err;
8719 e600f124 2021-03-21 stsp static const struct got_error *
8720 e600f124 2021-03-21 stsp print_backup_ref(const char *branch_name, const char *new_id_str,
8721 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
8722 e600f124 2021-03-21 stsp struct got_reflist_object_id_map *refs_idmap,
8723 e600f124 2021-03-21 stsp struct got_repository *repo)
8725 e600f124 2021-03-21 stsp const struct got_error *err = NULL;
8726 e600f124 2021-03-21 stsp struct got_reflist_head *refs;
8727 e600f124 2021-03-21 stsp char *refs_str = NULL;
8728 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id = NULL;
8729 e600f124 2021-03-21 stsp struct got_commit_object *new_commit = NULL;
8730 e600f124 2021-03-21 stsp char *new_commit_brief_str = NULL;
8731 e600f124 2021-03-21 stsp struct got_object_id *yca_id = NULL;
8732 e600f124 2021-03-21 stsp struct got_commit_object *yca_commit = NULL;
8733 e600f124 2021-03-21 stsp char *yca_id_str = NULL, *yca_brief_str = NULL;
8734 e600f124 2021-03-21 stsp char *custom_refs_str;
8736 e600f124 2021-03-21 stsp if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
8737 e600f124 2021-03-21 stsp return got_error_from_errno("asprintf");
8739 e600f124 2021-03-21 stsp err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
8740 e600f124 2021-03-21 stsp 0, 0, refs_idmap, custom_refs_str);
8742 e600f124 2021-03-21 stsp goto done;
8744 e600f124 2021-03-21 stsp err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
8746 e600f124 2021-03-21 stsp goto done;
8748 e600f124 2021-03-21 stsp refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
8749 e600f124 2021-03-21 stsp if (refs) {
8750 e600f124 2021-03-21 stsp err = build_refs_str(&refs_str, refs, new_commit_id, repo);
8752 e600f124 2021-03-21 stsp goto done;
8755 e600f124 2021-03-21 stsp err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
8757 e600f124 2021-03-21 stsp goto done;
8759 e600f124 2021-03-21 stsp err = get_commit_brief_str(&new_commit_brief_str, new_commit);
8761 e600f124 2021-03-21 stsp goto done;
8763 e600f124 2021-03-21 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
8764 4e91ef15 2021-09-26 stsp old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
8766 e600f124 2021-03-21 stsp goto done;
8768 e600f124 2021-03-21 stsp printf("has become commit %s%s%s%s\n %s\n", new_id_str,
8769 e600f124 2021-03-21 stsp refs_str ? " (" : "", refs_str ? refs_str : "",
8770 e600f124 2021-03-21 stsp refs_str ? ")" : "", new_commit_brief_str);
8771 e600f124 2021-03-21 stsp if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
8772 e600f124 2021-03-21 stsp got_object_id_cmp(yca_id, old_commit_id) != 0) {
8773 e600f124 2021-03-21 stsp free(refs_str);
8774 e600f124 2021-03-21 stsp refs_str = NULL;
8776 e600f124 2021-03-21 stsp err = got_object_open_as_commit(&yca_commit, repo, yca_id);
8778 e600f124 2021-03-21 stsp goto done;
8780 e600f124 2021-03-21 stsp err = get_commit_brief_str(&yca_brief_str, yca_commit);
8782 e600f124 2021-03-21 stsp goto done;
8784 e600f124 2021-03-21 stsp err = got_object_id_str(&yca_id_str, yca_id);
8786 e600f124 2021-03-21 stsp goto done;
8788 e600f124 2021-03-21 stsp refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
8789 e600f124 2021-03-21 stsp if (refs) {
8790 e600f124 2021-03-21 stsp err = build_refs_str(&refs_str, refs, yca_id, repo);
8792 e600f124 2021-03-21 stsp goto done;
8794 e600f124 2021-03-21 stsp printf("history forked at %s%s%s%s\n %s\n",
8795 e600f124 2021-03-21 stsp yca_id_str,
8796 e600f124 2021-03-21 stsp refs_str ? " (" : "", refs_str ? refs_str : "",
8797 e600f124 2021-03-21 stsp refs_str ? ")" : "", yca_brief_str);
8800 e600f124 2021-03-21 stsp free(custom_refs_str);
8801 e600f124 2021-03-21 stsp free(new_commit_id);
8802 e600f124 2021-03-21 stsp free(refs_str);
8803 e600f124 2021-03-21 stsp free(yca_id);
8804 e600f124 2021-03-21 stsp free(yca_id_str);
8805 e600f124 2021-03-21 stsp free(yca_brief_str);
8806 e600f124 2021-03-21 stsp if (new_commit)
8807 e600f124 2021-03-21 stsp got_object_commit_close(new_commit);
8808 e600f124 2021-03-21 stsp if (yca_commit)
8809 e600f124 2021-03-21 stsp got_object_commit_close(yca_commit);
8811 e600f124 2021-03-21 stsp return NULL;
8814 af61c510 2019-07-19 stsp static const struct got_error *
8815 643b85bc 2021-07-16 stsp process_backup_refs(const char *backup_ref_prefix, const char *wanted_branch_name,
8816 643b85bc 2021-07-16 stsp int delete, struct got_repository *repo)
8818 e600f124 2021-03-21 stsp const struct got_error *err;
8819 e600f124 2021-03-21 stsp struct got_reflist_head refs, backup_refs;
8820 e600f124 2021-03-21 stsp struct got_reflist_entry *re;
8821 e600f124 2021-03-21 stsp const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
8822 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
8823 e600f124 2021-03-21 stsp char *branch_name = NULL;
8824 e600f124 2021-03-21 stsp struct got_commit_object *old_commit = NULL;
8825 e600f124 2021-03-21 stsp struct got_reflist_object_id_map *refs_idmap = NULL;
8826 9e822917 2021-03-23 stsp int wanted_branch_found = 0;
8828 e600f124 2021-03-21 stsp TAILQ_INIT(&refs);
8829 e600f124 2021-03-21 stsp TAILQ_INIT(&backup_refs);
8831 e600f124 2021-03-21 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8833 e600f124 2021-03-21 stsp return err;
8835 e600f124 2021-03-21 stsp err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8837 e600f124 2021-03-21 stsp goto done;
8839 e600f124 2021-03-21 stsp if (wanted_branch_name) {
8840 e600f124 2021-03-21 stsp if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
8841 e600f124 2021-03-21 stsp wanted_branch_name += 11;
8844 e600f124 2021-03-21 stsp err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
8845 e600f124 2021-03-21 stsp got_ref_cmp_by_commit_timestamp_descending, repo);
8847 e600f124 2021-03-21 stsp goto done;
8849 e600f124 2021-03-21 stsp TAILQ_FOREACH(re, &backup_refs, entry) {
8850 e600f124 2021-03-21 stsp const char *refname = got_ref_get_name(re->ref);
8851 e600f124 2021-03-21 stsp char *slash;
8853 643b85bc 2021-07-16 stsp err = check_cancelled(NULL);
8857 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, re->ref);
8861 e600f124 2021-03-21 stsp err = got_object_open_as_commit(&old_commit, repo,
8862 e600f124 2021-03-21 stsp old_commit_id);
8866 e600f124 2021-03-21 stsp if (strncmp(backup_ref_prefix, refname,
8867 e600f124 2021-03-21 stsp backup_ref_prefix_len) == 0)
8868 e600f124 2021-03-21 stsp refname += backup_ref_prefix_len;
8870 e600f124 2021-03-21 stsp while (refname[0] == '/')
8871 e600f124 2021-03-21 stsp refname++;
8873 e600f124 2021-03-21 stsp branch_name = strdup(refname);
8874 e600f124 2021-03-21 stsp if (branch_name == NULL) {
8875 e600f124 2021-03-21 stsp err = got_error_from_errno("strdup");
8878 e600f124 2021-03-21 stsp slash = strrchr(branch_name, '/');
8879 e600f124 2021-03-21 stsp if (slash) {
8880 e600f124 2021-03-21 stsp *slash = '\0';
8881 e600f124 2021-03-21 stsp refname += strlen(branch_name) + 1;
8884 e600f124 2021-03-21 stsp if (wanted_branch_name == NULL ||
8885 e600f124 2021-03-21 stsp strcmp(wanted_branch_name, branch_name) == 0) {
8886 9e822917 2021-03-23 stsp wanted_branch_found = 1;
8887 643b85bc 2021-07-16 stsp if (delete) {
8888 643b85bc 2021-07-16 stsp err = delete_backup_ref(re->ref,
8889 643b85bc 2021-07-16 stsp old_commit_id, repo);
8891 643b85bc 2021-07-16 stsp err = print_backup_ref(branch_name, refname,
8892 abc59930 2021-09-05 naddy old_commit_id, old_commit, refs_idmap,
8899 e600f124 2021-03-21 stsp free(old_commit_id);
8900 e600f124 2021-03-21 stsp old_commit_id = NULL;
8901 e600f124 2021-03-21 stsp free(branch_name);
8902 e600f124 2021-03-21 stsp branch_name = NULL;
8903 e600f124 2021-03-21 stsp got_object_commit_close(old_commit);
8904 e600f124 2021-03-21 stsp old_commit = NULL;
8907 9e822917 2021-03-23 stsp if (wanted_branch_name && !wanted_branch_found) {
8908 9e822917 2021-03-23 stsp err = got_error_fmt(GOT_ERR_NOT_REF,
8909 9e822917 2021-03-23 stsp "%s/%s/", backup_ref_prefix, wanted_branch_name);
8912 e600f124 2021-03-21 stsp if (refs_idmap)
8913 e600f124 2021-03-21 stsp got_reflist_object_id_map_free(refs_idmap);
8914 e600f124 2021-03-21 stsp got_ref_list_free(&refs);
8915 e600f124 2021-03-21 stsp got_ref_list_free(&backup_refs);
8916 e600f124 2021-03-21 stsp free(old_commit_id);
8917 e600f124 2021-03-21 stsp free(branch_name);
8918 e600f124 2021-03-21 stsp if (old_commit)
8919 e600f124 2021-03-21 stsp got_object_commit_close(old_commit);
8920 e600f124 2021-03-21 stsp return err;
8923 e600f124 2021-03-21 stsp static const struct got_error *
8924 41f061b2 2021-10-05 stsp abort_progress(void *arg, unsigned char status, const char *path)
8927 41f061b2 2021-10-05 stsp * Unversioned files should not clutter progress output when
8928 41f061b2 2021-10-05 stsp * an operation is aborted.
8930 41f061b2 2021-10-05 stsp if (status == GOT_STATUS_UNVERSIONED)
8931 41f061b2 2021-10-05 stsp return NULL;
8933 41f061b2 2021-10-05 stsp return update_progress(arg, status, path);
8936 41f061b2 2021-10-05 stsp static const struct got_error *
8937 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
8939 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
8940 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
8941 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
8942 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8943 818c7501 2019-07-11 stsp char *cwd = NULL;
8944 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
8945 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
8946 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
8947 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
8948 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
8949 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
8950 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
8951 f259c4c1 2021-09-24 stsp int histedit_in_progress = 0, merge_in_progress = 0;
8952 f259c4c1 2021-09-24 stsp int create_backup = 1, list_backups = 0, delete_backups = 0;
8953 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
8954 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
8955 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
8956 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
8957 1fa49072 2021-09-28 stsp struct got_update_progress_arg upa;
8959 dbdddfee 2021-06-23 naddy STAILQ_INIT(&commits);
8960 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
8961 1fa49072 2021-09-28 stsp memset(&upa, 0, sizeof(upa));
8963 643b85bc 2021-07-16 stsp while ((ch = getopt(argc, argv, "aclX")) != -1) {
8964 818c7501 2019-07-11 stsp switch (ch) {
8966 818c7501 2019-07-11 stsp abort_rebase = 1;
8969 818c7501 2019-07-11 stsp continue_rebase = 1;
8972 e600f124 2021-03-21 stsp list_backups = 1;
8975 643b85bc 2021-07-16 stsp delete_backups = 1;
8978 818c7501 2019-07-11 stsp usage_rebase();
8979 818c7501 2019-07-11 stsp /* NOTREACHED */
8983 818c7501 2019-07-11 stsp argc -= optind;
8984 818c7501 2019-07-11 stsp argv += optind;
8986 43012d58 2019-07-14 stsp #ifndef PROFILE
8987 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8988 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
8989 43012d58 2019-07-14 stsp err(1, "pledge");
8991 e600f124 2021-03-21 stsp if (list_backups) {
8992 e600f124 2021-03-21 stsp if (abort_rebase)
8993 e600f124 2021-03-21 stsp option_conflict('l', 'a');
8994 e600f124 2021-03-21 stsp if (continue_rebase)
8995 e600f124 2021-03-21 stsp option_conflict('l', 'c');
8996 643b85bc 2021-07-16 stsp if (delete_backups)
8997 643b85bc 2021-07-16 stsp option_conflict('l', 'X');
8998 643b85bc 2021-07-16 stsp if (argc != 0 && argc != 1)
8999 643b85bc 2021-07-16 stsp usage_rebase();
9000 643b85bc 2021-07-16 stsp } else if (delete_backups) {
9001 643b85bc 2021-07-16 stsp if (abort_rebase)
9002 643b85bc 2021-07-16 stsp option_conflict('X', 'a');
9003 643b85bc 2021-07-16 stsp if (continue_rebase)
9004 643b85bc 2021-07-16 stsp option_conflict('X', 'c');
9005 643b85bc 2021-07-16 stsp if (list_backups)
9006 643b85bc 2021-07-16 stsp option_conflict('l', 'X');
9007 e600f124 2021-03-21 stsp if (argc != 0 && argc != 1)
9008 818c7501 2019-07-11 stsp usage_rebase();
9010 e600f124 2021-03-21 stsp if (abort_rebase && continue_rebase)
9011 e600f124 2021-03-21 stsp usage_rebase();
9012 e600f124 2021-03-21 stsp else if (abort_rebase || continue_rebase) {
9013 e600f124 2021-03-21 stsp if (argc != 0)
9014 e600f124 2021-03-21 stsp usage_rebase();
9015 e600f124 2021-03-21 stsp } else if (argc != 1)
9016 e600f124 2021-03-21 stsp usage_rebase();
9019 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
9020 818c7501 2019-07-11 stsp if (cwd == NULL) {
9021 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
9022 818c7501 2019-07-11 stsp goto done;
9024 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
9025 fa51e947 2020-03-27 stsp if (error) {
9026 643b85bc 2021-07-16 stsp if (list_backups || delete_backups) {
9027 e600f124 2021-03-21 stsp if (error->code != GOT_ERR_NOT_WORKTREE)
9028 e600f124 2021-03-21 stsp goto done;
9030 e600f124 2021-03-21 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9031 e600f124 2021-03-21 stsp error = wrap_not_worktree_error(error,
9032 e600f124 2021-03-21 stsp "rebase", cwd);
9033 e600f124 2021-03-21 stsp goto done;
9037 e600f124 2021-03-21 stsp error = got_repo_open(&repo,
9038 e600f124 2021-03-21 stsp worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
9039 818c7501 2019-07-11 stsp if (error != NULL)
9040 818c7501 2019-07-11 stsp goto done;
9042 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9043 e600f124 2021-03-21 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
9044 7ef62c4e 2020-02-24 stsp if (error)
9045 7ef62c4e 2020-02-24 stsp goto done;
9047 643b85bc 2021-07-16 stsp if (list_backups || delete_backups) {
9048 643b85bc 2021-07-16 stsp error = process_backup_refs(
9049 643b85bc 2021-07-16 stsp GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9050 643b85bc 2021-07-16 stsp argc == 1 ? argv[0] : NULL, delete_backups, repo);
9051 e600f124 2021-03-21 stsp goto done; /* nothing else to do */
9054 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
9055 7ef62c4e 2020-02-24 stsp worktree);
9056 818c7501 2019-07-11 stsp if (error)
9057 7ef62c4e 2020-02-24 stsp goto done;
9058 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
9059 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
9060 f259c4c1 2021-09-24 stsp goto done;
9063 f259c4c1 2021-09-24 stsp error = got_worktree_merge_in_progress(&merge_in_progress,
9064 f259c4c1 2021-09-24 stsp worktree, repo);
9065 f259c4c1 2021-09-24 stsp if (error)
9066 f259c4c1 2021-09-24 stsp goto done;
9067 f259c4c1 2021-09-24 stsp if (merge_in_progress) {
9068 f259c4c1 2021-09-24 stsp error = got_error(GOT_ERR_MERGE_BUSY);
9069 818c7501 2019-07-11 stsp goto done;
9072 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9073 818c7501 2019-07-11 stsp if (error)
9074 818c7501 2019-07-11 stsp goto done;
9076 f6794adc 2019-07-23 stsp if (abort_rebase) {
9077 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
9078 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
9079 f6794adc 2019-07-23 stsp goto done;
9081 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
9082 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
9083 3e3a69f1 2019-07-25 stsp worktree, repo);
9084 818c7501 2019-07-11 stsp if (error)
9085 818c7501 2019-07-11 stsp goto done;
9086 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
9087 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
9088 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
9089 41f061b2 2021-10-05 stsp new_base_branch, abort_progress, &upa);
9090 818c7501 2019-07-11 stsp if (error)
9091 818c7501 2019-07-11 stsp goto done;
9092 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9093 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
9094 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
9097 818c7501 2019-07-11 stsp if (continue_rebase) {
9098 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
9099 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
9100 f6794adc 2019-07-23 stsp goto done;
9102 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
9103 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
9104 3e3a69f1 2019-07-25 stsp worktree, repo);
9105 818c7501 2019-07-11 stsp if (error)
9106 818c7501 2019-07-11 stsp goto done;
9108 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9109 01757395 2019-07-12 stsp resume_commit_id, repo);
9110 818c7501 2019-07-11 stsp if (error)
9111 818c7501 2019-07-11 stsp goto done;
9113 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
9114 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
9115 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
9116 818c7501 2019-07-11 stsp goto done;
9119 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
9120 818c7501 2019-07-11 stsp if (error != NULL)
9121 818c7501 2019-07-11 stsp goto done;
9124 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9125 ff0d2220 2019-07-11 stsp if (error)
9126 ff0d2220 2019-07-11 stsp goto done;
9128 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
9129 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
9131 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
9132 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9133 4e91ef15 2021-09-26 stsp base_commit_id, branch_head_commit_id, 1, repo,
9134 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
9135 818c7501 2019-07-11 stsp if (error)
9136 818c7501 2019-07-11 stsp goto done;
9137 818c7501 2019-07-11 stsp if (yca_id == NULL) {
9138 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
9139 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
9140 818c7501 2019-07-11 stsp "with work tree's branch");
9141 818c7501 2019-07-11 stsp goto done;
9144 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
9145 a51a74b3 2019-07-27 stsp if (error) {
9146 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
9147 a51a74b3 2019-07-27 stsp goto done;
9148 a51a74b3 2019-07-27 stsp error = NULL;
9150 df3ed485 2021-01-31 stsp static char msg[128];
9151 df3ed485 2021-01-31 stsp snprintf(msg, sizeof(msg),
9152 df3ed485 2021-01-31 stsp "%s is already based on %s",
9153 df3ed485 2021-01-31 stsp got_ref_get_name(branch),
9154 df3ed485 2021-01-31 stsp got_worktree_get_head_ref_name(worktree));
9155 df3ed485 2021-01-31 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
9156 a51a74b3 2019-07-27 stsp goto done;
9158 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
9159 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
9160 818c7501 2019-07-11 stsp if (error)
9161 818c7501 2019-07-11 stsp goto done;
9164 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
9165 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
9166 818c7501 2019-07-11 stsp if (error)
9167 818c7501 2019-07-11 stsp goto done;
9169 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9170 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
9171 fc66b545 2019-08-12 stsp if (pid == NULL) {
9172 fc66b545 2019-08-12 stsp if (!continue_rebase) {
9173 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
9174 41f061b2 2021-10-05 stsp repo, new_base_branch, abort_progress, &upa);
9175 fc66b545 2019-08-12 stsp if (error)
9176 fc66b545 2019-08-12 stsp goto done;
9177 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
9178 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
9179 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
9182 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
9183 fc66b545 2019-08-12 stsp goto done;
9185 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
9186 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
9187 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
9188 818c7501 2019-07-11 stsp got_object_commit_close(commit);
9189 818c7501 2019-07-11 stsp commit = NULL;
9190 818c7501 2019-07-11 stsp if (error)
9191 818c7501 2019-07-11 stsp goto done;
9193 dbdddfee 2021-06-23 naddy if (STAILQ_EMPTY(&commits)) {
9194 38b0338b 2019-11-29 stsp if (continue_rebase) {
9195 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
9196 e600f124 2021-03-21 stsp branch, new_base_branch, tmp_branch, repo,
9197 e600f124 2021-03-21 stsp create_backup);
9198 38b0338b 2019-11-29 stsp goto done;
9200 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
9201 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
9202 38b0338b 2019-11-29 stsp char *id_str;
9203 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
9204 38b0338b 2019-11-29 stsp new_base_branch);
9205 38b0338b 2019-11-29 stsp if (error)
9206 38b0338b 2019-11-29 stsp goto done;
9207 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
9208 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
9209 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
9210 38b0338b 2019-11-29 stsp free(id_str);
9211 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
9212 38b0338b 2019-11-29 stsp new_head_commit_id);
9213 38b0338b 2019-11-29 stsp if (error)
9214 38b0338b 2019-11-29 stsp goto done;
9215 e600f124 2021-03-21 stsp /* No backup needed since objects did not change. */
9216 e600f124 2021-03-21 stsp create_backup = 0;
9220 818c7501 2019-07-11 stsp pid = NULL;
9221 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commits, entry) {
9223 818c7501 2019-07-11 stsp commit_id = qid->id;
9224 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
9225 818c7501 2019-07-11 stsp pid = qid;
9227 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9228 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
9229 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
9230 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
9231 818c7501 2019-07-11 stsp if (error)
9232 818c7501 2019-07-11 stsp goto done;
9234 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
9235 1fa49072 2021-09-28 stsp if (upa.conflicts > 0 || upa.missing > 0 ||
9236 1fa49072 2021-09-28 stsp upa.not_deleted > 0 || upa.unversioned > 0) {
9237 1fa49072 2021-09-28 stsp if (upa.conflicts > 0) {
9238 1fa49072 2021-09-28 stsp error = show_rebase_merge_conflict(qid->id,
9240 1fa49072 2021-09-28 stsp if (error)
9241 1fa49072 2021-09-28 stsp goto done;
9243 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9247 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
9248 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
9249 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
9250 818c7501 2019-07-11 stsp if (error)
9251 818c7501 2019-07-11 stsp goto done;
9254 1fa49072 2021-09-28 stsp if (upa.conflicts > 0 || upa.missing > 0 ||
9255 1fa49072 2021-09-28 stsp upa.not_deleted > 0 || upa.unversioned > 0) {
9256 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
9257 818c7501 2019-07-11 stsp if (error)
9258 818c7501 2019-07-11 stsp goto done;
9259 1fa49072 2021-09-28 stsp if (upa.conflicts > 0 && upa.missing == 0 &&
9260 1fa49072 2021-09-28 stsp upa.not_deleted == 0 && upa.unversioned == 0) {
9261 1fa49072 2021-09-28 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
9262 1fa49072 2021-09-28 stsp "conflicts must be resolved before rebasing "
9263 1fa49072 2021-09-28 stsp "can continue");
9264 1fa49072 2021-09-28 stsp } else if (upa.conflicts > 0) {
9265 1fa49072 2021-09-28 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
9266 1fa49072 2021-09-28 stsp "conflicts must be resolved before rebasing "
9267 1fa49072 2021-09-28 stsp "can continue; changes destined for some "
9268 1fa49072 2021-09-28 stsp "files were not yet merged and should be "
9269 1fa49072 2021-09-28 stsp "merged manually if required before the "
9270 1fa49072 2021-09-28 stsp "rebase operation is continued");
9272 1fa49072 2021-09-28 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
9273 1fa49072 2021-09-28 stsp "changes destined for some files were not "
9274 1fa49072 2021-09-28 stsp "yet merged and should be merged manually "
9275 1fa49072 2021-09-28 stsp "if required before the rebase operation "
9276 1fa49072 2021-09-28 stsp "is continued");
9279 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
9280 e600f124 2021-03-21 stsp new_base_branch, tmp_branch, repo, create_backup);
9282 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
9283 818c7501 2019-07-11 stsp free(branch_head_commit_id);
9284 818c7501 2019-07-11 stsp free(resume_commit_id);
9285 818c7501 2019-07-11 stsp free(yca_id);
9286 818c7501 2019-07-11 stsp if (commit)
9287 818c7501 2019-07-11 stsp got_object_commit_close(commit);
9288 818c7501 2019-07-11 stsp if (branch)
9289 818c7501 2019-07-11 stsp got_ref_close(branch);
9290 818c7501 2019-07-11 stsp if (new_base_branch)
9291 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
9292 818c7501 2019-07-11 stsp if (tmp_branch)
9293 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
9294 5ef14e63 2019-06-02 stsp if (worktree)
9295 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
9296 1d0f4054 2021-06-17 stsp if (repo) {
9297 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
9298 1d0f4054 2021-06-17 stsp if (error == NULL)
9299 1d0f4054 2021-06-17 stsp error = close_err;
9301 5ef14e63 2019-06-02 stsp return error;
9304 0ebf8283 2019-07-24 stsp __dead static void
9305 0ebf8283 2019-07-24 stsp usage_histedit(void)
9307 b93c7142 2021-10-01 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
9308 643b85bc 2021-07-16 stsp "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
9309 643b85bc 2021-07-16 stsp getprogname());
9313 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
9314 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
9315 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
9316 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
9317 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
9319 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
9320 0ebf8283 2019-07-24 stsp unsigned char code;
9321 0ebf8283 2019-07-24 stsp const char *name;
9322 0ebf8283 2019-07-24 stsp const char *desc;
9323 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
9324 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
9325 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
9326 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
9327 82997472 2020-01-29 stsp "be used" },
9328 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
9329 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
9330 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
9333 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
9334 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
9335 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
9336 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
9337 0ebf8283 2019-07-24 stsp char *logmsg;
9339 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
9341 0ebf8283 2019-07-24 stsp static const struct got_error *
9342 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
9343 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
9345 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9346 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
9347 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
9350 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
9352 0ebf8283 2019-07-24 stsp goto done;
9354 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
9356 0ebf8283 2019-07-24 stsp goto done;
9358 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
9360 0ebf8283 2019-07-24 stsp goto done;
9362 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
9363 0ebf8283 2019-07-24 stsp if (n < 0)
9364 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
9366 0ebf8283 2019-07-24 stsp if (commit)
9367 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9368 0ebf8283 2019-07-24 stsp free(id_str);
9369 0ebf8283 2019-07-24 stsp free(logmsg);
9370 0ebf8283 2019-07-24 stsp return err;
9373 0ebf8283 2019-07-24 stsp static const struct got_error *
9374 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
9375 b93c7142 2021-10-01 stsp FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
9376 b93c7142 2021-10-01 stsp struct got_repository *repo)
9378 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9379 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
9380 466785b9 2020-12-10 jrick const char *histedit_cmd = NULL;
9382 dbdddfee 2021-06-23 naddy if (STAILQ_EMPTY(commits))
9383 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
9385 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, commits, entry) {
9386 466785b9 2020-12-10 jrick histedit_cmd = got_histedit_cmds[0].name;
9387 b93c7142 2021-10-01 stsp if (edit_only)
9388 b93c7142 2021-10-01 stsp histedit_cmd = "edit";
9389 b93c7142 2021-10-01 stsp else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
9390 466785b9 2020-12-10 jrick histedit_cmd = "fold";
9391 466785b9 2020-12-10 jrick err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
9394 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
9395 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
9396 083957f4 2020-02-24 stsp if (n < 0) {
9397 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
9403 0ebf8283 2019-07-24 stsp return err;
9406 0ebf8283 2019-07-24 stsp static const struct got_error *
9407 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
9408 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
9410 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9413 514f2ffe 2020-01-29 stsp char *id_str;
9414 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
9416 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(commits);
9417 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
9419 514f2ffe 2020-01-29 stsp return err;
9421 514f2ffe 2020-01-29 stsp n = fprintf(f,
9422 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
9423 514f2ffe 2020-01-29 stsp "# commit %s\n"
9424 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
9425 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
9426 514f2ffe 2020-01-29 stsp if (n < 0) {
9427 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
9428 514f2ffe 2020-01-29 stsp goto done;
9431 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
9432 514f2ffe 2020-01-29 stsp if (n < 0) {
9433 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
9434 514f2ffe 2020-01-29 stsp goto done;
9437 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
9438 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
9439 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
9440 0ebf8283 2019-07-24 stsp cmd->desc);
9441 0ebf8283 2019-07-24 stsp if (n < 0) {
9442 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
9447 514f2ffe 2020-01-29 stsp free(id_str);
9448 0ebf8283 2019-07-24 stsp return err;
9451 0ebf8283 2019-07-24 stsp static const struct got_error *
9452 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
9454 0ebf8283 2019-07-24 stsp static char msg[42];
9457 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
9459 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
9460 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
9462 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
9465 0ebf8283 2019-07-24 stsp static const struct got_error *
9466 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
9467 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
9469 0ebf8283 2019-07-24 stsp const struct got_error *err;
9470 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
9471 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
9473 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
9475 0ebf8283 2019-07-24 stsp return err;
9477 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
9479 0ebf8283 2019-07-24 stsp goto done;
9481 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
9483 5943eee2 2019-08-13 stsp goto done;
9484 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
9485 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
9486 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
9487 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
9490 0ebf8283 2019-07-24 stsp if (folded_commit)
9491 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
9492 0ebf8283 2019-07-24 stsp free(id_str);
9493 5943eee2 2019-08-13 stsp free(folded_logmsg);
9494 0ebf8283 2019-07-24 stsp return err;
9497 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
9498 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
9500 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
9502 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
9503 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
9504 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
9505 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
9506 3f9de99f 2019-07-24 stsp folded = prev;
9507 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
9510 0ebf8283 2019-07-24 stsp return folded;
9513 0ebf8283 2019-07-24 stsp static const struct got_error *
9514 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
9515 0ebf8283 2019-07-24 stsp struct got_repository *repo)
9517 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
9518 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
9519 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9520 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
9521 1601cb9f 2020-09-11 naddy int logmsg_len;
9523 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
9525 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9527 0ebf8283 2019-07-24 stsp return err;
9529 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
9530 0ebf8283 2019-07-24 stsp if (folded) {
9531 0ebf8283 2019-07-24 stsp while (folded != hle) {
9532 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
9533 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
9536 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
9537 0ebf8283 2019-07-24 stsp logmsg, repo);
9539 0ebf8283 2019-07-24 stsp goto done;
9540 0ebf8283 2019-07-24 stsp free(logmsg);
9541 0ebf8283 2019-07-24 stsp logmsg = new_msg;
9542 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
9546 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
9548 0ebf8283 2019-07-24 stsp goto done;
9549 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
9551 5943eee2 2019-08-13 stsp goto done;
9552 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
9553 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
9554 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
9555 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
9556 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
9557 0ebf8283 2019-07-24 stsp goto done;
9559 0ebf8283 2019-07-24 stsp free(logmsg);
9560 0ebf8283 2019-07-24 stsp logmsg = new_msg;
9562 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
9564 0ebf8283 2019-07-24 stsp goto done;
9566 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
9567 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
9569 0ebf8283 2019-07-24 stsp goto done;
9571 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
9572 0ebf8283 2019-07-24 stsp close(fd);
9574 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
9576 0ebf8283 2019-07-24 stsp goto done;
9578 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
9579 0d5bb276 2020-12-15 stsp logmsg_len, 0);
9580 0ebf8283 2019-07-24 stsp if (err) {
9581 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
9582 0ebf8283 2019-07-24 stsp goto done;
9583 71392a05 2020-12-13 stsp err = NULL;
9584 71392a05 2020-12-13 stsp hle->logmsg = strdup(new_msg);
9585 71392a05 2020-12-13 stsp if (hle->logmsg == NULL)
9586 71392a05 2020-12-13 stsp err = got_error_from_errno("strdup");
9589 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
9590 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
9591 0ebf8283 2019-07-24 stsp free(logmsg_path);
9592 0ebf8283 2019-07-24 stsp free(logmsg);
9593 5943eee2 2019-08-13 stsp free(orig_logmsg);
9594 0ebf8283 2019-07-24 stsp free(editor);
9595 0ebf8283 2019-07-24 stsp if (commit)
9596 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9597 0ebf8283 2019-07-24 stsp return err;
9600 0ebf8283 2019-07-24 stsp static const struct got_error *
9601 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
9602 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
9604 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9605 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
9606 6059809a 2020-12-17 stsp size_t i, size;
9607 0ebf8283 2019-07-24 stsp ssize_t len;
9608 6059809a 2020-12-17 stsp int lineno = 0;
9609 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
9610 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
9611 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
9613 0ebf8283 2019-07-24 stsp for (;;) {
9614 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
9615 0ebf8283 2019-07-24 stsp if (len == -1) {
9616 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
9617 0ebf8283 2019-07-24 stsp if (feof(f))
9619 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
9620 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
9625 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
9627 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
9628 0ebf8283 2019-07-24 stsp free(line);
9629 0ebf8283 2019-07-24 stsp line = NULL;
9632 0ebf8283 2019-07-24 stsp cmd = NULL;
9633 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
9634 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
9635 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
9636 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
9637 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
9640 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
9645 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
9646 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
9649 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
9651 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
9652 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
9653 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
9656 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
9657 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
9661 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
9662 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
9663 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
9667 0ebf8283 2019-07-24 stsp free(line);
9668 0ebf8283 2019-07-24 stsp line = NULL;
9672 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
9674 0ebf8283 2019-07-24 stsp *end = '\0';
9676 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
9677 0ebf8283 2019-07-24 stsp if (err) {
9678 0ebf8283 2019-07-24 stsp /* override error code */
9679 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
9683 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
9684 0ebf8283 2019-07-24 stsp if (hle == NULL) {
9685 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
9688 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
9689 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
9690 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
9691 0ebf8283 2019-07-24 stsp commit_id = NULL;
9692 0ebf8283 2019-07-24 stsp free(line);
9693 0ebf8283 2019-07-24 stsp line = NULL;
9694 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
9697 0ebf8283 2019-07-24 stsp free(line);
9698 0ebf8283 2019-07-24 stsp free(commit_id);
9699 0ebf8283 2019-07-24 stsp return err;
9702 0ebf8283 2019-07-24 stsp static const struct got_error *
9703 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
9704 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
9706 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
9707 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
9708 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
9709 5b87815e 2020-03-05 stsp static char msg[92];
9710 bfce7f83 2019-07-27 stsp char *id_str;
9712 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
9713 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
9714 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
9715 dbdddfee 2021-06-23 naddy if (STAILQ_EMPTY(commits))
9716 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
9718 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
9719 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
9720 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
9721 5b87815e 2020-03-05 stsp if (hle == hle2)
9723 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
9724 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
9726 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
9728 5b87815e 2020-03-05 stsp return err;
9729 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
9730 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
9731 5b87815e 2020-03-05 stsp free(id_str);
9732 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
9736 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, commits, entry) {
9737 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
9738 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
9741 bfce7f83 2019-07-27 stsp if (hle == NULL) {
9742 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
9744 bfce7f83 2019-07-27 stsp return err;
9745 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
9746 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
9747 bfce7f83 2019-07-27 stsp free(id_str);
9748 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
9752 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
9753 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
9754 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
9755 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
9757 bfce7f83 2019-07-27 stsp return NULL;
9760 bfce7f83 2019-07-27 stsp static const struct got_error *
9761 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
9762 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
9763 bfce7f83 2019-07-27 stsp struct got_repository *repo)
9765 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9766 0ebf8283 2019-07-24 stsp char *editor;
9767 0ebf8283 2019-07-24 stsp FILE *f = NULL;
9769 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
9771 0ebf8283 2019-07-24 stsp return err;
9773 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
9774 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
9775 0ebf8283 2019-07-24 stsp goto done;
9778 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
9779 0ebf8283 2019-07-24 stsp if (f == NULL) {
9780 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
9781 0ebf8283 2019-07-24 stsp goto done;
9783 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
9785 bfce7f83 2019-07-27 stsp goto done;
9787 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
9789 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
9790 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
9791 0ebf8283 2019-07-24 stsp free(editor);
9792 0ebf8283 2019-07-24 stsp return err;
9795 0ebf8283 2019-07-24 stsp static const struct got_error *
9796 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
9797 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
9798 514f2ffe 2020-01-29 stsp struct got_repository *);
9800 0ebf8283 2019-07-24 stsp static const struct got_error *
9801 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
9802 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
9803 b93c7142 2021-10-01 stsp int edit_logmsg_only, int fold_only, int edit_only,
9804 b93c7142 2021-10-01 stsp struct got_repository *repo)
9806 0ebf8283 2019-07-24 stsp const struct got_error *err;
9807 0ebf8283 2019-07-24 stsp FILE *f = NULL;
9808 0ebf8283 2019-07-24 stsp char *path = NULL;
9810 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
9812 0ebf8283 2019-07-24 stsp return err;
9814 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
9816 0ebf8283 2019-07-24 stsp goto done;
9818 466785b9 2020-12-10 jrick err = histedit_write_commit_list(commits, f, edit_logmsg_only,
9819 b93c7142 2021-10-01 stsp fold_only, edit_only, repo);
9821 0ebf8283 2019-07-24 stsp goto done;
9823 b93c7142 2021-10-01 stsp if (edit_logmsg_only || fold_only || edit_only) {
9824 083957f4 2020-02-24 stsp rewind(f);
9825 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
9827 56b63ca4 2021-01-22 stsp if (fclose(f) == EOF) {
9828 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
9829 0ebf8283 2019-07-24 stsp goto done;
9832 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
9833 083957f4 2020-02-24 stsp if (err) {
9834 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
9835 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
9836 083957f4 2020-02-24 stsp goto done;
9837 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
9838 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
9842 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
9843 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
9844 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
9845 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
9846 0ebf8283 2019-07-24 stsp free(path);
9847 0ebf8283 2019-07-24 stsp return err;
9850 0ebf8283 2019-07-24 stsp static const struct got_error *
9851 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
9852 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
9854 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9855 0ebf8283 2019-07-24 stsp char *path = NULL;
9856 0ebf8283 2019-07-24 stsp FILE *f = NULL;
9857 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
9858 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
9860 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
9862 0ebf8283 2019-07-24 stsp return err;
9864 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
9865 0ebf8283 2019-07-24 stsp if (f == NULL) {
9866 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
9867 0ebf8283 2019-07-24 stsp goto done;
9869 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
9870 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
9875 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
9876 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
9877 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
9878 0ebf8283 2019-07-24 stsp if (n < 0) {
9879 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
9885 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
9886 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
9887 0ebf8283 2019-07-24 stsp free(path);
9888 0ebf8283 2019-07-24 stsp if (commit)
9889 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9890 0ebf8283 2019-07-24 stsp return err;
9894 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
9896 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
9898 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
9899 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
9900 bfce7f83 2019-07-27 stsp free(hle);
9904 0ebf8283 2019-07-24 stsp static const struct got_error *
9905 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
9906 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
9908 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
9909 0ebf8283 2019-07-24 stsp FILE *f = NULL;
9911 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
9912 0ebf8283 2019-07-24 stsp if (f == NULL) {
9913 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
9914 0ebf8283 2019-07-24 stsp goto done;
9917 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
9919 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
9920 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
9921 0ebf8283 2019-07-24 stsp return err;
9924 0ebf8283 2019-07-24 stsp static const struct got_error *
9925 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
9926 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
9927 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
9929 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
9930 0ebf8283 2019-07-24 stsp int resp = ' ';
9932 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
9933 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
9934 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
9935 0ebf8283 2019-07-24 stsp resp = getchar();
9936 a61a4414 2019-08-07 stsp if (resp == '\n')
9937 a61a4414 2019-08-07 stsp resp = getchar();
9938 426ebf2e 2019-07-25 stsp if (resp == 'c') {
9939 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
9940 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
9942 426ebf2e 2019-07-25 stsp if (err) {
9943 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
9944 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
9946 bfce7f83 2019-07-27 stsp prev_err = err;
9947 426ebf2e 2019-07-25 stsp resp = ' ';
9951 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
9952 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
9953 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
9954 b93c7142 2021-10-01 stsp commits, branch_name, 0, 0, 0, repo);
9955 426ebf2e 2019-07-25 stsp if (err) {
9956 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
9957 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
9959 bfce7f83 2019-07-27 stsp prev_err = err;
9960 426ebf2e 2019-07-25 stsp resp = ' ';
9964 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
9965 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
9968 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
9971 0ebf8283 2019-07-24 stsp return err;
9974 0ebf8283 2019-07-24 stsp static const struct got_error *
9975 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
9976 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
9977 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
9979 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
9980 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
9981 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
9982 3e3a69f1 2019-07-25 stsp branch, repo);
9985 0ebf8283 2019-07-24 stsp static const struct got_error *
9986 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
9987 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
9989 0ebf8283 2019-07-24 stsp const struct got_error *err;
9990 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9992 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
9994 0ebf8283 2019-07-24 stsp goto done;
9996 0ebf8283 2019-07-24 stsp if (new_id) {
9997 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
9999 0ebf8283 2019-07-24 stsp goto done;
10002 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
10003 0ebf8283 2019-07-24 stsp if (new_id_str)
10004 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
10006 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
10007 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
10008 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
10009 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
10010 0ebf8283 2019-07-24 stsp goto done;
10012 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
10014 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
10016 0ebf8283 2019-07-24 stsp goto done;
10019 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
10020 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
10021 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
10022 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
10023 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
10025 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
10026 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
10027 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10034 0ebf8283 2019-07-24 stsp free(old_id_str);
10035 0ebf8283 2019-07-24 stsp free(new_id_str);
10036 0ebf8283 2019-07-24 stsp return err;
10039 0ebf8283 2019-07-24 stsp static const struct got_error *
10040 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
10041 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
10042 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10043 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
10045 0ebf8283 2019-07-24 stsp const struct got_error *err;
10046 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
10047 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
10049 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10050 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
10051 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
10053 0ebf8283 2019-07-24 stsp return err;
10056 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10058 0ebf8283 2019-07-24 stsp return err;
10060 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10061 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
10062 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
10063 0ebf8283 2019-07-24 stsp if (err) {
10064 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10065 0ebf8283 2019-07-24 stsp goto done;
10066 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
10068 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
10069 0ebf8283 2019-07-24 stsp free(new_commit_id);
10072 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
10073 0ebf8283 2019-07-24 stsp return err;
10076 0ebf8283 2019-07-24 stsp static const struct got_error *
10077 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
10078 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
10080 0ebf8283 2019-07-24 stsp const struct got_error *error;
10081 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
10083 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10085 0ebf8283 2019-07-24 stsp if (error)
10086 0ebf8283 2019-07-24 stsp return error;
10088 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10089 0ebf8283 2019-07-24 stsp if (error)
10090 0ebf8283 2019-07-24 stsp return error;
10092 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
10093 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
10094 0ebf8283 2019-07-24 stsp return error;
10097 ab20a43a 2020-01-29 stsp static const struct got_error *
10098 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
10099 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
10100 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10101 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
10103 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
10105 ab20a43a 2020-01-29 stsp switch (status) {
10106 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
10107 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
10108 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
10109 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
10110 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
10111 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
10116 ab20a43a 2020-01-29 stsp switch (staged_status) {
10117 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
10118 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
10119 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
10120 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
10121 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
10126 ab20a43a 2020-01-29 stsp return NULL;
10129 0ebf8283 2019-07-24 stsp static const struct got_error *
10130 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
10132 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
10133 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
10134 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
10135 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
10136 0ebf8283 2019-07-24 stsp char *cwd = NULL;
10137 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
10138 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
10139 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
10140 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
10141 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
10142 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
10143 f259c4c1 2021-09-24 stsp int ch, rebase_in_progress = 0, merge_in_progress = 0;
10144 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
10145 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10146 b93c7142 2021-10-01 stsp int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10147 643b85bc 2021-07-16 stsp int list_backups = 0, delete_backups = 0;
10148 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
10149 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
10150 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
10151 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
10152 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
10153 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
10154 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
10156 dbdddfee 2021-06-23 naddy STAILQ_INIT(&commits);
10157 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
10158 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
10159 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
10161 b93c7142 2021-10-01 stsp while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10162 0ebf8283 2019-07-24 stsp switch (ch) {
10163 0ebf8283 2019-07-24 stsp case 'a':
10164 0ebf8283 2019-07-24 stsp abort_edit = 1;
10166 0ebf8283 2019-07-24 stsp case 'c':
10167 0ebf8283 2019-07-24 stsp continue_edit = 1;
10169 b93c7142 2021-10-01 stsp case 'e':
10170 b93c7142 2021-10-01 stsp edit_only = 1;
10172 466785b9 2020-12-10 jrick case 'f':
10173 466785b9 2020-12-10 jrick fold_only = 1;
10175 0ebf8283 2019-07-24 stsp case 'F':
10176 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
10178 083957f4 2020-02-24 stsp case 'm':
10179 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
10181 e600f124 2021-03-21 stsp case 'l':
10182 e600f124 2021-03-21 stsp list_backups = 1;
10184 643b85bc 2021-07-16 stsp case 'X':
10185 643b85bc 2021-07-16 stsp delete_backups = 1;
10188 0ebf8283 2019-07-24 stsp usage_histedit();
10189 0ebf8283 2019-07-24 stsp /* NOTREACHED */
10193 0ebf8283 2019-07-24 stsp argc -= optind;
10194 0ebf8283 2019-07-24 stsp argv += optind;
10196 0ebf8283 2019-07-24 stsp #ifndef PROFILE
10197 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10198 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
10199 0ebf8283 2019-07-24 stsp err(1, "pledge");
10201 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
10202 ff69268e 2020-12-13 stsp option_conflict('a', 'c');
10203 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
10204 ff69268e 2020-12-13 stsp option_conflict('F', 'm');
10205 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
10206 ff69268e 2020-12-13 stsp option_conflict('a', 'm');
10207 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
10208 ff69268e 2020-12-13 stsp option_conflict('c', 'm');
10209 466785b9 2020-12-10 jrick if (abort_edit && fold_only)
10210 ff69268e 2020-12-13 stsp option_conflict('a', 'f');
10211 ff69268e 2020-12-13 stsp if (continue_edit && fold_only)
10212 ff69268e 2020-12-13 stsp option_conflict('c', 'f');
10213 466785b9 2020-12-10 jrick if (fold_only && edit_logmsg_only)
10214 ff69268e 2020-12-13 stsp option_conflict('f', 'm');
10215 b3805337 2020-12-13 stsp if (edit_script_path && fold_only)
10216 b3805337 2020-12-13 stsp option_conflict('F', 'f');
10217 b93c7142 2021-10-01 stsp if (abort_edit && edit_only)
10218 b93c7142 2021-10-01 stsp option_conflict('a', 'e');
10219 b93c7142 2021-10-01 stsp if (continue_edit && edit_only)
10220 b93c7142 2021-10-01 stsp option_conflict('c', 'e');
10221 b93c7142 2021-10-01 stsp if (edit_only && edit_logmsg_only)
10222 b93c7142 2021-10-01 stsp option_conflict('e', 'm');
10223 b93c7142 2021-10-01 stsp if (edit_script_path && edit_only)
10224 b93c7142 2021-10-01 stsp option_conflict('F', 'e');
10225 e600f124 2021-03-21 stsp if (list_backups) {
10226 e600f124 2021-03-21 stsp if (abort_edit)
10227 e600f124 2021-03-21 stsp option_conflict('l', 'a');
10228 e600f124 2021-03-21 stsp if (continue_edit)
10229 e600f124 2021-03-21 stsp option_conflict('l', 'c');
10230 e600f124 2021-03-21 stsp if (edit_script_path)
10231 e600f124 2021-03-21 stsp option_conflict('l', 'F');
10232 e600f124 2021-03-21 stsp if (edit_logmsg_only)
10233 e600f124 2021-03-21 stsp option_conflict('l', 'm');
10234 e600f124 2021-03-21 stsp if (fold_only)
10235 e600f124 2021-03-21 stsp option_conflict('l', 'f');
10236 b93c7142 2021-10-01 stsp if (edit_only)
10237 b93c7142 2021-10-01 stsp option_conflict('l', 'e');
10238 643b85bc 2021-07-16 stsp if (delete_backups)
10239 643b85bc 2021-07-16 stsp option_conflict('l', 'X');
10240 e600f124 2021-03-21 stsp if (argc != 0 && argc != 1)
10241 e600f124 2021-03-21 stsp usage_histedit();
10242 643b85bc 2021-07-16 stsp } else if (delete_backups) {
10243 643b85bc 2021-07-16 stsp if (abort_edit)
10244 643b85bc 2021-07-16 stsp option_conflict('X', 'a');
10245 643b85bc 2021-07-16 stsp if (continue_edit)
10246 643b85bc 2021-07-16 stsp option_conflict('X', 'c');
10247 643b85bc 2021-07-16 stsp if (edit_script_path)
10248 643b85bc 2021-07-16 stsp option_conflict('X', 'F');
10249 643b85bc 2021-07-16 stsp if (edit_logmsg_only)
10250 643b85bc 2021-07-16 stsp option_conflict('X', 'm');
10251 643b85bc 2021-07-16 stsp if (fold_only)
10252 643b85bc 2021-07-16 stsp option_conflict('X', 'f');
10253 b93c7142 2021-10-01 stsp if (edit_only)
10254 b93c7142 2021-10-01 stsp option_conflict('X', 'e');
10255 643b85bc 2021-07-16 stsp if (list_backups)
10256 643b85bc 2021-07-16 stsp option_conflict('X', 'l');
10257 643b85bc 2021-07-16 stsp if (argc != 0 && argc != 1)
10258 643b85bc 2021-07-16 stsp usage_histedit();
10259 e600f124 2021-03-21 stsp } else if (argc != 0)
10260 0ebf8283 2019-07-24 stsp usage_histedit();
10263 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
10264 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
10265 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
10266 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
10267 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
10268 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
10271 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
10272 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
10273 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
10274 0ebf8283 2019-07-24 stsp goto done;
10276 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
10277 fa51e947 2020-03-27 stsp if (error) {
10278 643b85bc 2021-07-16 stsp if (list_backups || delete_backups) {
10279 e600f124 2021-03-21 stsp if (error->code != GOT_ERR_NOT_WORKTREE)
10280 e600f124 2021-03-21 stsp goto done;
10282 e600f124 2021-03-21 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
10283 e600f124 2021-03-21 stsp error = wrap_not_worktree_error(error,
10284 e600f124 2021-03-21 stsp "histedit", cwd);
10285 e600f124 2021-03-21 stsp goto done;
10289 643b85bc 2021-07-16 stsp if (list_backups || delete_backups) {
10290 e600f124 2021-03-21 stsp error = got_repo_open(&repo,
10291 e600f124 2021-03-21 stsp worktree ? got_worktree_get_repo_path(worktree) : cwd,
10293 e600f124 2021-03-21 stsp if (error != NULL)
10294 e600f124 2021-03-21 stsp goto done;
10295 e600f124 2021-03-21 stsp error = apply_unveil(got_repo_get_path(repo), 0,
10296 e600f124 2021-03-21 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
10297 e600f124 2021-03-21 stsp if (error)
10298 e600f124 2021-03-21 stsp goto done;
10299 643b85bc 2021-07-16 stsp error = process_backup_refs(
10300 e600f124 2021-03-21 stsp GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10301 643b85bc 2021-07-16 stsp argc == 1 ? argv[0] : NULL, delete_backups, repo);
10302 e600f124 2021-03-21 stsp goto done; /* nothing else to do */
10305 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10307 0ebf8283 2019-07-24 stsp if (error != NULL)
10308 0ebf8283 2019-07-24 stsp goto done;
10310 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10311 0ebf8283 2019-07-24 stsp if (error)
10312 0ebf8283 2019-07-24 stsp goto done;
10313 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
10314 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
10315 f259c4c1 2021-09-24 stsp goto done;
10318 f259c4c1 2021-09-24 stsp error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10320 f259c4c1 2021-09-24 stsp if (error)
10321 f259c4c1 2021-09-24 stsp goto done;
10322 f259c4c1 2021-09-24 stsp if (merge_in_progress) {
10323 f259c4c1 2021-09-24 stsp error = got_error(GOT_ERR_MERGE_BUSY);
10324 0ebf8283 2019-07-24 stsp goto done;
10327 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10328 0ebf8283 2019-07-24 stsp if (error)
10329 0ebf8283 2019-07-24 stsp goto done;
10331 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
10332 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10333 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
10334 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
10335 083957f4 2020-02-24 stsp "before the -m option can be used");
10336 083957f4 2020-02-24 stsp goto done;
10338 466785b9 2020-12-10 jrick if (edit_in_progress && fold_only) {
10339 466785b9 2020-12-10 jrick error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10340 466785b9 2020-12-10 jrick "histedit operation is in progress in this "
10341 466785b9 2020-12-10 jrick "work tree and must be continued or aborted "
10342 466785b9 2020-12-10 jrick "before the -f option can be used");
10343 466785b9 2020-12-10 jrick goto done;
10345 b93c7142 2021-10-01 stsp if (edit_in_progress && edit_only) {
10346 b93c7142 2021-10-01 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10347 b93c7142 2021-10-01 stsp "histedit operation is in progress in this "
10348 b93c7142 2021-10-01 stsp "work tree and must be continued or aborted "
10349 b93c7142 2021-10-01 stsp "before the -e option can be used");
10350 b93c7142 2021-10-01 stsp goto done;
10353 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
10354 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
10355 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
10356 3e3a69f1 2019-07-25 stsp worktree, repo);
10357 0ebf8283 2019-07-24 stsp if (error)
10358 0ebf8283 2019-07-24 stsp goto done;
10359 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
10360 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
10361 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
10362 41f061b2 2021-10-05 stsp branch, base_commit_id, abort_progress, &upa);
10363 0ebf8283 2019-07-24 stsp if (error)
10364 0ebf8283 2019-07-24 stsp goto done;
10365 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
10366 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
10367 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
10368 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
10369 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
10370 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
10371 0ebf8283 2019-07-24 stsp goto done;
10374 0ebf8283 2019-07-24 stsp if (continue_edit) {
10375 0ebf8283 2019-07-24 stsp char *path;
10377 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
10378 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
10379 0ebf8283 2019-07-24 stsp goto done;
10382 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
10383 0ebf8283 2019-07-24 stsp if (error)
10384 0ebf8283 2019-07-24 stsp goto done;
10386 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
10387 0ebf8283 2019-07-24 stsp free(path);
10388 0ebf8283 2019-07-24 stsp if (error)
10389 0ebf8283 2019-07-24 stsp goto done;
10391 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
10392 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
10393 3e3a69f1 2019-07-25 stsp worktree, repo);
10394 0ebf8283 2019-07-24 stsp if (error)
10395 0ebf8283 2019-07-24 stsp goto done;
10397 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
10398 0ebf8283 2019-07-24 stsp if (error)
10399 0ebf8283 2019-07-24 stsp goto done;
10401 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
10402 0ebf8283 2019-07-24 stsp head_commit_id);
10403 0ebf8283 2019-07-24 stsp if (error)
10404 0ebf8283 2019-07-24 stsp goto done;
10405 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
10406 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
10407 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
10408 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10409 3aac7cf7 2019-07-25 stsp goto done;
10411 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
10412 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
10413 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
10414 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
10415 0ebf8283 2019-07-24 stsp commit = NULL;
10416 0ebf8283 2019-07-24 stsp if (error)
10417 0ebf8283 2019-07-24 stsp goto done;
10419 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
10420 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
10421 0ebf8283 2019-07-24 stsp goto done;
10424 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
10425 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
10426 0ebf8283 2019-07-24 stsp if (error != NULL)
10427 0ebf8283 2019-07-24 stsp goto done;
10429 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10430 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10431 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
10432 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
10433 c7d20a3f 2019-07-30 stsp goto done;
10436 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
10437 bfce7f83 2019-07-27 stsp got_ref_close(branch);
10438 bfce7f83 2019-07-27 stsp branch = NULL;
10439 0ebf8283 2019-07-24 stsp if (error)
10440 0ebf8283 2019-07-24 stsp goto done;
10442 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
10443 0ebf8283 2019-07-24 stsp head_commit_id);
10444 0ebf8283 2019-07-24 stsp if (error)
10445 0ebf8283 2019-07-24 stsp goto done;
10446 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
10447 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
10448 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
10449 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10450 3aac7cf7 2019-07-25 stsp goto done;
10452 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
10453 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
10454 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
10455 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
10456 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
10457 0ebf8283 2019-07-24 stsp commit = NULL;
10458 0ebf8283 2019-07-24 stsp if (error)
10459 0ebf8283 2019-07-24 stsp goto done;
10461 dbdddfee 2021-06-23 naddy if (STAILQ_EMPTY(&commits)) {
10462 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10463 c5996fff 2020-01-29 stsp goto done;
10466 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10467 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
10468 bfce7f83 2019-07-27 stsp if (error)
10469 bfce7f83 2019-07-27 stsp goto done;
10471 0ebf8283 2019-07-24 stsp if (edit_script_path) {
10472 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
10473 0ebf8283 2019-07-24 stsp edit_script_path, repo);
10474 6ba2bea2 2019-07-27 stsp if (error) {
10475 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
10476 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
10477 41f061b2 2021-10-05 stsp abort_progress, &upa);
10478 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
10479 0ebf8283 2019-07-24 stsp goto done;
10482 514f2ffe 2020-01-29 stsp const char *branch_name;
10483 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
10484 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
10485 514f2ffe 2020-01-29 stsp branch_name += 11;
10486 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
10487 b93c7142 2021-10-01 stsp branch_name, edit_logmsg_only, fold_only,
10488 b93c7142 2021-10-01 stsp edit_only, repo);
10489 6ba2bea2 2019-07-27 stsp if (error) {
10490 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
10491 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
10492 41f061b2 2021-10-05 stsp abort_progress, &upa);
10493 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
10494 0ebf8283 2019-07-24 stsp goto done;
10499 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
10501 6ba2bea2 2019-07-27 stsp if (error) {
10502 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
10503 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
10504 41f061b2 2021-10-05 stsp abort_progress, &upa);
10505 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
10506 0ebf8283 2019-07-24 stsp goto done;
10511 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
10512 4ec14e60 2019-08-28 hiltjo if (error)
10513 0ebf8283 2019-07-24 stsp goto done;
10515 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10516 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
10517 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
10518 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
10519 0ebf8283 2019-07-24 stsp continue;
10521 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
10522 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10523 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
10524 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
10526 ab20a43a 2020-01-29 stsp if (error)
10527 ab20a43a 2020-01-29 stsp goto done;
10529 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
10530 ab20a43a 2020-01-29 stsp int have_changes = 0;
10532 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
10533 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
10534 ab20a43a 2020-01-29 stsp if (error)
10535 ab20a43a 2020-01-29 stsp goto done;
10536 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
10537 f6343036 2021-06-22 stsp repo, 0, check_local_changes, &have_changes,
10538 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
10539 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
10540 ab20a43a 2020-01-29 stsp if (error) {
10541 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
10542 ab20a43a 2020-01-29 stsp goto done;
10543 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
10544 ab20a43a 2020-01-29 stsp goto done;
10546 ab20a43a 2020-01-29 stsp if (have_changes) {
10547 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
10548 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
10549 ab20a43a 2020-01-29 stsp if (error)
10550 ab20a43a 2020-01-29 stsp goto done;
10552 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
10553 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
10554 ab20a43a 2020-01-29 stsp if (error)
10555 ab20a43a 2020-01-29 stsp goto done;
10556 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
10557 ab20a43a 2020-01-29 stsp hle, NULL);
10558 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
10559 ab20a43a 2020-01-29 stsp commit = NULL;
10560 ab20a43a 2020-01-29 stsp if (error)
10561 ab20a43a 2020-01-29 stsp goto done;
10564 0ebf8283 2019-07-24 stsp continue;
10567 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10568 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
10569 0ebf8283 2019-07-24 stsp if (error)
10570 0ebf8283 2019-07-24 stsp goto done;
10571 0ebf8283 2019-07-24 stsp continue;
10574 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
10575 0ebf8283 2019-07-24 stsp hle->commit_id);
10576 0ebf8283 2019-07-24 stsp if (error)
10577 0ebf8283 2019-07-24 stsp goto done;
10578 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
10579 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
10581 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
10582 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
10583 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
10584 0ebf8283 2019-07-24 stsp if (error)
10585 0ebf8283 2019-07-24 stsp goto done;
10586 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
10587 0ebf8283 2019-07-24 stsp commit = NULL;
10589 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
10590 cd33da48 2021-09-28 stsp if (upa.conflicts > 0 || upa.missing > 0 ||
10591 cd33da48 2021-09-28 stsp upa.not_deleted > 0 || upa.unversioned > 0) {
10592 cd33da48 2021-09-28 stsp if (upa.conflicts > 0) {
10593 cd33da48 2021-09-28 stsp error = show_rebase_merge_conflict(
10594 cd33da48 2021-09-28 stsp hle->commit_id, repo);
10595 cd33da48 2021-09-28 stsp if (error)
10596 cd33da48 2021-09-28 stsp goto done;
10598 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
10602 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10603 0ebf8283 2019-07-24 stsp char *id_str;
10604 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
10605 0ebf8283 2019-07-24 stsp if (error)
10606 0ebf8283 2019-07-24 stsp goto done;
10607 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
10609 0ebf8283 2019-07-24 stsp free(id_str);
10610 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
10611 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
10612 3e3a69f1 2019-07-25 stsp fileindex);
10613 0ebf8283 2019-07-24 stsp goto done;
10616 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
10617 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
10618 0ebf8283 2019-07-24 stsp if (error)
10619 0ebf8283 2019-07-24 stsp goto done;
10620 0ebf8283 2019-07-24 stsp continue;
10623 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
10624 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
10625 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
10626 0ebf8283 2019-07-24 stsp if (error)
10627 0ebf8283 2019-07-24 stsp goto done;
10630 cd33da48 2021-09-28 stsp if (upa.conflicts > 0 || upa.missing > 0 ||
10631 cd33da48 2021-09-28 stsp upa.not_deleted > 0 || upa.unversioned > 0) {
10632 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
10633 0ebf8283 2019-07-24 stsp if (error)
10634 0ebf8283 2019-07-24 stsp goto done;
10635 cd33da48 2021-09-28 stsp if (upa.conflicts > 0 && upa.missing == 0 &&
10636 cd33da48 2021-09-28 stsp upa.not_deleted == 0 && upa.unversioned == 0) {
10637 cd33da48 2021-09-28 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
10638 cd33da48 2021-09-28 stsp "conflicts must be resolved before histedit "
10639 cd33da48 2021-09-28 stsp "can continue");
10640 cd33da48 2021-09-28 stsp } else if (upa.conflicts > 0) {
10641 cd33da48 2021-09-28 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
10642 cd33da48 2021-09-28 stsp "conflicts must be resolved before histedit "
10643 cd33da48 2021-09-28 stsp "can continue; changes destined for some "
10644 cd33da48 2021-09-28 stsp "files were not yet merged and should be "
10645 cd33da48 2021-09-28 stsp "merged manually if required before the "
10646 cd33da48 2021-09-28 stsp "histedit operation is continued");
10648 cd33da48 2021-09-28 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
10649 cd33da48 2021-09-28 stsp "changes destined for some files were not "
10650 cd33da48 2021-09-28 stsp "yet merged and should be merged manually "
10651 cd33da48 2021-09-28 stsp "if required before the histedit operation "
10652 cd33da48 2021-09-28 stsp "is continued");
10655 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
10656 3e3a69f1 2019-07-25 stsp branch, repo);
10658 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
10659 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
10660 0ebf8283 2019-07-24 stsp free(head_commit_id);
10661 0ebf8283 2019-07-24 stsp free(base_commit_id);
10662 0ebf8283 2019-07-24 stsp free(resume_commit_id);
10663 0ebf8283 2019-07-24 stsp if (commit)
10664 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
10665 0ebf8283 2019-07-24 stsp if (branch)
10666 0ebf8283 2019-07-24 stsp got_ref_close(branch);
10667 0ebf8283 2019-07-24 stsp if (tmp_branch)
10668 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
10669 0ebf8283 2019-07-24 stsp if (worktree)
10670 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
10671 1d0f4054 2021-06-17 stsp if (repo) {
10672 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
10673 1d0f4054 2021-06-17 stsp if (error == NULL)
10674 1d0f4054 2021-06-17 stsp error = close_err;
10676 2822a352 2019-10-15 stsp return error;
10679 2822a352 2019-10-15 stsp __dead static void
10680 2822a352 2019-10-15 stsp usage_integrate(void)
10682 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
10686 2822a352 2019-10-15 stsp static const struct got_error *
10687 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
10689 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
10690 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
10691 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
10692 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
10693 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
10694 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
10695 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
10696 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
10698 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
10700 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
10701 2822a352 2019-10-15 stsp switch (ch) {
10703 2822a352 2019-10-15 stsp usage_integrate();
10704 2822a352 2019-10-15 stsp /* NOTREACHED */
10708 2822a352 2019-10-15 stsp argc -= optind;
10709 2822a352 2019-10-15 stsp argv += optind;
10711 2822a352 2019-10-15 stsp if (argc != 1)
10712 2822a352 2019-10-15 stsp usage_integrate();
10713 2822a352 2019-10-15 stsp branch_arg = argv[0];
10714 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
10715 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10716 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
10717 2822a352 2019-10-15 stsp err(1, "pledge");
10719 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
10720 2822a352 2019-10-15 stsp if (cwd == NULL) {
10721 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
10722 2822a352 2019-10-15 stsp goto done;
10725 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
10726 fa51e947 2020-03-27 stsp if (error) {
10727 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
10728 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
10730 2822a352 2019-10-15 stsp goto done;
10733 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
10734 2822a352 2019-10-15 stsp if (error)
10735 2822a352 2019-10-15 stsp goto done;
10737 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10739 2822a352 2019-10-15 stsp if (error != NULL)
10740 2822a352 2019-10-15 stsp goto done;
10742 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
10743 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
10744 2822a352 2019-10-15 stsp if (error)
10745 2822a352 2019-10-15 stsp goto done;
10747 f259c4c1 2021-09-24 stsp error = check_merge_in_progress(worktree, repo);
10748 f259c4c1 2021-09-24 stsp if (error)
10749 f259c4c1 2021-09-24 stsp goto done;
10751 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
10752 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
10753 2822a352 2019-10-15 stsp goto done;
10756 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
10757 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
10758 2822a352 2019-10-15 stsp if (error)
10759 2822a352 2019-10-15 stsp goto done;
10761 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
10762 2822a352 2019-10-15 stsp if (refname == NULL) {
10763 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
10764 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
10765 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
10766 2822a352 2019-10-15 stsp goto done;
10768 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
10769 2822a352 2019-10-15 stsp if (base_refname == NULL) {
10770 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
10771 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
10772 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
10773 2822a352 2019-10-15 stsp goto done;
10776 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
10777 2822a352 2019-10-15 stsp if (error)
10778 2822a352 2019-10-15 stsp goto done;
10780 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
10781 2822a352 2019-10-15 stsp if (error)
10782 2822a352 2019-10-15 stsp goto done;
10784 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
10785 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
10786 2822a352 2019-10-15 stsp "specified branch has already been integrated");
10787 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
10788 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
10789 2822a352 2019-10-15 stsp goto done;
10792 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
10793 2822a352 2019-10-15 stsp if (error) {
10794 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
10795 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
10796 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
10797 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
10798 2822a352 2019-10-15 stsp goto done;
10801 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
10802 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
10803 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
10804 2822a352 2019-10-15 stsp check_cancelled, NULL);
10805 2822a352 2019-10-15 stsp if (error)
10806 2822a352 2019-10-15 stsp goto done;
10808 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
10809 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
10811 1d0f4054 2021-06-17 stsp if (repo) {
10812 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
10813 1d0f4054 2021-06-17 stsp if (error == NULL)
10814 1d0f4054 2021-06-17 stsp error = close_err;
10816 2822a352 2019-10-15 stsp if (worktree)
10817 2822a352 2019-10-15 stsp got_worktree_close(worktree);
10818 2822a352 2019-10-15 stsp free(cwd);
10819 2822a352 2019-10-15 stsp free(base_commit_id);
10820 2822a352 2019-10-15 stsp free(commit_id);
10821 2822a352 2019-10-15 stsp free(refname);
10822 2822a352 2019-10-15 stsp free(base_refname);
10823 f259c4c1 2021-09-24 stsp return error;
10826 f259c4c1 2021-09-24 stsp __dead static void
10827 f259c4c1 2021-09-24 stsp usage_merge(void)
10829 088449d3 2021-09-26 stsp fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
10830 f259c4c1 2021-09-24 stsp getprogname());
10834 f259c4c1 2021-09-24 stsp static const struct got_error *
10835 f259c4c1 2021-09-24 stsp cmd_merge(int argc, char *argv[])
10837 f259c4c1 2021-09-24 stsp const struct got_error *error = NULL;
10838 f259c4c1 2021-09-24 stsp struct got_worktree *worktree = NULL;
10839 f259c4c1 2021-09-24 stsp struct got_repository *repo = NULL;
10840 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex = NULL;
10841 f259c4c1 2021-09-24 stsp char *cwd = NULL, *id_str = NULL, *author = NULL;
10842 f259c4c1 2021-09-24 stsp struct got_reference *branch = NULL, *wt_branch = NULL;
10843 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *yca_id = NULL;
10844 f259c4c1 2021-09-24 stsp struct got_object_id *wt_branch_tip = NULL;
10845 f259c4c1 2021-09-24 stsp int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
10846 088449d3 2021-09-26 stsp int interrupt_merge = 0;
10847 f259c4c1 2021-09-24 stsp struct got_update_progress_arg upa;
10848 f259c4c1 2021-09-24 stsp struct got_object_id *merge_commit_id = NULL;
10849 f259c4c1 2021-09-24 stsp char *branch_name = NULL;
10851 f259c4c1 2021-09-24 stsp memset(&upa, 0, sizeof(upa));
10853 088449d3 2021-09-26 stsp while ((ch = getopt(argc, argv, "acn")) != -1) {
10854 f259c4c1 2021-09-24 stsp switch (ch) {
10855 f259c4c1 2021-09-24 stsp case 'a':
10856 f259c4c1 2021-09-24 stsp abort_merge = 1;
10858 f259c4c1 2021-09-24 stsp case 'c':
10859 f259c4c1 2021-09-24 stsp continue_merge = 1;
10861 088449d3 2021-09-26 stsp case 'n':
10862 088449d3 2021-09-26 stsp interrupt_merge = 1;
10865 f259c4c1 2021-09-24 stsp usage_rebase();
10866 f259c4c1 2021-09-24 stsp /* NOTREACHED */
10870 f259c4c1 2021-09-24 stsp argc -= optind;
10871 f259c4c1 2021-09-24 stsp argv += optind;
10873 f259c4c1 2021-09-24 stsp #ifndef PROFILE
10874 f259c4c1 2021-09-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10875 f259c4c1 2021-09-24 stsp "unveil", NULL) == -1)
10876 f259c4c1 2021-09-24 stsp err(1, "pledge");
10879 f259c4c1 2021-09-24 stsp if (abort_merge && continue_merge)
10880 f259c4c1 2021-09-24 stsp option_conflict('a', 'c');
10881 f259c4c1 2021-09-24 stsp if (abort_merge || continue_merge) {
10882 f259c4c1 2021-09-24 stsp if (argc != 0)
10883 f259c4c1 2021-09-24 stsp usage_merge();
10884 f259c4c1 2021-09-24 stsp } else if (argc != 1)
10885 f259c4c1 2021-09-24 stsp usage_merge();
10887 f259c4c1 2021-09-24 stsp cwd = getcwd(NULL, 0);
10888 f259c4c1 2021-09-24 stsp if (cwd == NULL) {
10889 f259c4c1 2021-09-24 stsp error = got_error_from_errno("getcwd");
10890 f259c4c1 2021-09-24 stsp goto done;
10893 f259c4c1 2021-09-24 stsp error = got_worktree_open(&worktree, cwd);
10894 f259c4c1 2021-09-24 stsp if (error) {
10895 f259c4c1 2021-09-24 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
10896 f259c4c1 2021-09-24 stsp error = wrap_not_worktree_error(error,
10897 f259c4c1 2021-09-24 stsp "merge", cwd);
10898 f259c4c1 2021-09-24 stsp goto done;
10901 f259c4c1 2021-09-24 stsp error = got_repo_open(&repo,
10902 f259c4c1 2021-09-24 stsp worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
10903 f259c4c1 2021-09-24 stsp if (error != NULL)
10904 f259c4c1 2021-09-24 stsp goto done;
10906 f259c4c1 2021-09-24 stsp error = apply_unveil(got_repo_get_path(repo), 0,
10907 f259c4c1 2021-09-24 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
10908 f259c4c1 2021-09-24 stsp if (error)
10909 f259c4c1 2021-09-24 stsp goto done;
10911 f259c4c1 2021-09-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
10912 f259c4c1 2021-09-24 stsp if (error)
10913 f259c4c1 2021-09-24 stsp goto done;
10915 f259c4c1 2021-09-24 stsp error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10917 f259c4c1 2021-09-24 stsp if (error)
10918 f259c4c1 2021-09-24 stsp goto done;
10920 f259c4c1 2021-09-24 stsp if (abort_merge) {
10921 f259c4c1 2021-09-24 stsp if (!merge_in_progress) {
10922 f259c4c1 2021-09-24 stsp error = got_error(GOT_ERR_NOT_MERGING);
10923 f259c4c1 2021-09-24 stsp goto done;
10925 f259c4c1 2021-09-24 stsp error = got_worktree_merge_continue(&branch_name,
10926 f259c4c1 2021-09-24 stsp &branch_tip, &fileindex, worktree, repo);
10927 f259c4c1 2021-09-24 stsp if (error)
10928 f259c4c1 2021-09-24 stsp goto done;
10929 f259c4c1 2021-09-24 stsp error = got_worktree_merge_abort(worktree, fileindex, repo,
10930 41f061b2 2021-10-05 stsp abort_progress, &upa);
10931 f259c4c1 2021-09-24 stsp if (error)
10932 f259c4c1 2021-09-24 stsp goto done;
10933 f259c4c1 2021-09-24 stsp printf("Merge of %s aborted\n", branch_name);
10934 f259c4c1 2021-09-24 stsp goto done; /* nothing else to do */
10937 f259c4c1 2021-09-24 stsp error = get_author(&author, repo, worktree);
10938 f259c4c1 2021-09-24 stsp if (error)
10939 f259c4c1 2021-09-24 stsp goto done;
10941 f259c4c1 2021-09-24 stsp if (continue_merge) {
10942 f259c4c1 2021-09-24 stsp if (!merge_in_progress) {
10943 f259c4c1 2021-09-24 stsp error = got_error(GOT_ERR_NOT_MERGING);
10944 f259c4c1 2021-09-24 stsp goto done;
10946 f259c4c1 2021-09-24 stsp error = got_worktree_merge_continue(&branch_name,
10947 f259c4c1 2021-09-24 stsp &branch_tip, &fileindex, worktree, repo);
10948 f259c4c1 2021-09-24 stsp if (error)
10949 f259c4c1 2021-09-24 stsp goto done;
10951 f259c4c1 2021-09-24 stsp error = got_ref_open(&branch, repo, argv[0], 0);
10952 f259c4c1 2021-09-24 stsp if (error != NULL)
10953 f259c4c1 2021-09-24 stsp goto done;
10954 f259c4c1 2021-09-24 stsp branch_name = strdup(got_ref_get_name(branch));
10955 f259c4c1 2021-09-24 stsp if (branch_name == NULL) {
10956 f259c4c1 2021-09-24 stsp error = got_error_from_errno("strdup");
10957 f259c4c1 2021-09-24 stsp goto done;
10959 f259c4c1 2021-09-24 stsp error = got_ref_resolve(&branch_tip, repo, branch);
10960 f259c4c1 2021-09-24 stsp if (error)
10961 f259c4c1 2021-09-24 stsp goto done;
10964 f259c4c1 2021-09-24 stsp error = got_ref_open(&wt_branch, repo,
10965 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(worktree), 0);
10966 f259c4c1 2021-09-24 stsp if (error)
10967 f259c4c1 2021-09-24 stsp goto done;
10968 f259c4c1 2021-09-24 stsp error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
10969 f259c4c1 2021-09-24 stsp if (error)
10970 f259c4c1 2021-09-24 stsp goto done;
10971 f259c4c1 2021-09-24 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10972 4e91ef15 2021-09-26 stsp wt_branch_tip, branch_tip, 0, repo,
10973 f259c4c1 2021-09-24 stsp check_cancelled, NULL);
10974 4e91ef15 2021-09-26 stsp if (error && error->code != GOT_ERR_ANCESTRY)
10975 f259c4c1 2021-09-24 stsp goto done;
10977 f259c4c1 2021-09-24 stsp if (!continue_merge) {
10978 f259c4c1 2021-09-24 stsp error = check_path_prefix(wt_branch_tip, branch_tip,
10979 f259c4c1 2021-09-24 stsp got_worktree_get_path_prefix(worktree),
10980 f259c4c1 2021-09-24 stsp GOT_ERR_MERGE_PATH, repo);
10981 f259c4c1 2021-09-24 stsp if (error)
10982 f259c4c1 2021-09-24 stsp goto done;
10983 4e91ef15 2021-09-26 stsp if (yca_id) {
10984 4e91ef15 2021-09-26 stsp error = check_same_branch(wt_branch_tip, branch,
10985 4e91ef15 2021-09-26 stsp yca_id, repo);
10986 4e91ef15 2021-09-26 stsp if (error) {
10987 4e91ef15 2021-09-26 stsp if (error->code != GOT_ERR_ANCESTRY)
10988 4e91ef15 2021-09-26 stsp goto done;
10989 4e91ef15 2021-09-26 stsp error = NULL;
10991 4e91ef15 2021-09-26 stsp static char msg[512];
10992 4e91ef15 2021-09-26 stsp snprintf(msg, sizeof(msg),
10993 4e91ef15 2021-09-26 stsp "cannot create a merge commit because "
10994 4e91ef15 2021-09-26 stsp "%s is based on %s; %s can be integrated "
10995 4e91ef15 2021-09-26 stsp "with 'got integrate' instead", branch_name,
10996 4e91ef15 2021-09-26 stsp got_worktree_get_head_ref_name(worktree),
10997 4e91ef15 2021-09-26 stsp branch_name);
10998 4e91ef15 2021-09-26 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
10999 f259c4c1 2021-09-24 stsp goto done;
11002 f259c4c1 2021-09-24 stsp error = got_worktree_merge_prepare(&fileindex, worktree,
11003 f259c4c1 2021-09-24 stsp branch, repo);
11004 f259c4c1 2021-09-24 stsp if (error)
11005 f259c4c1 2021-09-24 stsp goto done;
11007 f259c4c1 2021-09-24 stsp error = got_worktree_merge_branch(worktree, fileindex,
11008 f259c4c1 2021-09-24 stsp yca_id, branch_tip, repo, update_progress, &upa,
11009 f259c4c1 2021-09-24 stsp check_cancelled, NULL);
11010 f259c4c1 2021-09-24 stsp if (error)
11011 f259c4c1 2021-09-24 stsp goto done;
11012 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
11013 4e91ef15 2021-09-26 stsp if (!upa.did_something) {
11014 4e91ef15 2021-09-26 stsp error = got_worktree_merge_abort(worktree, fileindex,
11015 41f061b2 2021-10-05 stsp repo, abort_progress, &upa);
11016 4e91ef15 2021-09-26 stsp if (error)
11017 4e91ef15 2021-09-26 stsp goto done;
11018 4e91ef15 2021-09-26 stsp printf("Already up-to-date\n");
11019 4e91ef15 2021-09-26 stsp goto done;
11023 088449d3 2021-09-26 stsp if (interrupt_merge) {
11024 f259c4c1 2021-09-24 stsp error = got_worktree_merge_postpone(worktree, fileindex);
11025 f259c4c1 2021-09-24 stsp if (error)
11026 f259c4c1 2021-09-24 stsp goto done;
11027 088449d3 2021-09-26 stsp printf("Merge of %s interrupted on request\n", branch_name);
11028 c1b05723 2021-09-28 stsp } else if (upa.conflicts > 0 || upa.missing > 0 ||
11029 c1b05723 2021-09-28 stsp upa.not_deleted > 0 || upa.unversioned > 0) {
11030 088449d3 2021-09-26 stsp error = got_worktree_merge_postpone(worktree, fileindex);
11031 088449d3 2021-09-26 stsp if (error)
11032 088449d3 2021-09-26 stsp goto done;
11033 c1b05723 2021-09-28 stsp if (upa.conflicts > 0 && upa.missing == 0 &&
11034 c1b05723 2021-09-28 stsp upa.not_deleted == 0 && upa.unversioned == 0) {
11035 f259c4c1 2021-09-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
11036 f259c4c1 2021-09-24 stsp "conflicts must be resolved before merging "
11037 f259c4c1 2021-09-24 stsp "can continue");
11038 f259c4c1 2021-09-24 stsp } else if (upa.conflicts > 0) {
11039 f259c4c1 2021-09-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
11040 f259c4c1 2021-09-24 stsp "conflicts must be resolved before merging "
11041 c1b05723 2021-09-28 stsp "can continue; changes destined for some "
11042 1acd48bc 2021-09-24 stsp "files were not yet merged and "
11043 f259c4c1 2021-09-24 stsp "should be merged manually if required before the "
11044 f259c4c1 2021-09-24 stsp "merge operation is continued");
11046 f259c4c1 2021-09-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
11047 c1b05723 2021-09-28 stsp "changes destined for some "
11048 f259c4c1 2021-09-24 stsp "files were not yet merged and should be "
11049 f259c4c1 2021-09-24 stsp "merged manually if required before the "
11050 f259c4c1 2021-09-24 stsp "merge operation is continued");
11052 f259c4c1 2021-09-24 stsp goto done;
11054 f259c4c1 2021-09-24 stsp error = got_worktree_merge_commit(&merge_commit_id, worktree,
11055 0ff8d236 2021-09-28 stsp fileindex, author, NULL, 1, branch_tip, branch_name,
11056 0ff8d236 2021-09-28 stsp repo, continue_merge ? print_status : NULL, NULL);
11057 f259c4c1 2021-09-24 stsp if (error)
11058 f259c4c1 2021-09-24 stsp goto done;
11059 f259c4c1 2021-09-24 stsp error = got_worktree_merge_complete(worktree, fileindex, repo);
11060 f259c4c1 2021-09-24 stsp if (error)
11061 f259c4c1 2021-09-24 stsp goto done;
11062 f259c4c1 2021-09-24 stsp error = got_object_id_str(&id_str, merge_commit_id);
11063 f259c4c1 2021-09-24 stsp if (error)
11064 f259c4c1 2021-09-24 stsp goto done;
11065 f259c4c1 2021-09-24 stsp printf("Merged %s into %s: %s\n", branch_name,
11066 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(worktree),
11071 f259c4c1 2021-09-24 stsp free(id_str);
11072 f259c4c1 2021-09-24 stsp free(merge_commit_id);
11073 f259c4c1 2021-09-24 stsp free(author);
11074 f259c4c1 2021-09-24 stsp free(branch_tip);
11075 f259c4c1 2021-09-24 stsp free(branch_name);
11076 f259c4c1 2021-09-24 stsp free(yca_id);
11077 f259c4c1 2021-09-24 stsp if (branch)
11078 f259c4c1 2021-09-24 stsp got_ref_close(branch);
11079 f259c4c1 2021-09-24 stsp if (wt_branch)
11080 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
11081 f259c4c1 2021-09-24 stsp if (worktree)
11082 f259c4c1 2021-09-24 stsp got_worktree_close(worktree);
11083 f259c4c1 2021-09-24 stsp if (repo) {
11084 f259c4c1 2021-09-24 stsp const struct got_error *close_err = got_repo_close(repo);
11085 f259c4c1 2021-09-24 stsp if (error == NULL)
11086 f259c4c1 2021-09-24 stsp error = close_err;
11088 715dc77e 2019-08-03 stsp return error;
11091 715dc77e 2019-08-03 stsp __dead static void
11092 715dc77e 2019-08-03 stsp usage_stage(void)
11094 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11095 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
11096 715dc77e 2019-08-03 stsp getprogname());
11100 715dc77e 2019-08-03 stsp static const struct got_error *
11101 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
11102 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
11103 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11104 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
11106 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
11107 408b4ebc 2019-08-03 stsp char *id_str = NULL;
11109 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
11110 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
11111 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
11112 408b4ebc 2019-08-03 stsp return NULL;
11114 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
11115 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
11116 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
11118 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
11120 408b4ebc 2019-08-03 stsp return err;
11122 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
11123 408b4ebc 2019-08-03 stsp free(id_str);
11124 dc424a06 2019-08-07 stsp return NULL;
11127 dc424a06 2019-08-07 stsp static const struct got_error *
11128 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
11130 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
11131 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
11132 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
11133 715dc77e 2019-08-03 stsp char *cwd = NULL;
11134 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
11135 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
11136 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11137 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
11138 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
11139 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
11141 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
11143 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11144 715dc77e 2019-08-03 stsp switch (ch) {
11145 408b4ebc 2019-08-03 stsp case 'l':
11146 408b4ebc 2019-08-03 stsp list_stage = 1;
11148 dc424a06 2019-08-07 stsp case 'p':
11149 dc424a06 2019-08-07 stsp pflag = 1;
11151 dc424a06 2019-08-07 stsp case 'F':
11152 dc424a06 2019-08-07 stsp patch_script_path = optarg;
11154 35213c7c 2020-07-23 stsp case 'S':
11155 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
11158 715dc77e 2019-08-03 stsp usage_stage();
11159 715dc77e 2019-08-03 stsp /* NOTREACHED */
11163 715dc77e 2019-08-03 stsp argc -= optind;
11164 715dc77e 2019-08-03 stsp argv += optind;
11166 715dc77e 2019-08-03 stsp #ifndef PROFILE
11167 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11168 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
11169 715dc77e 2019-08-03 stsp err(1, "pledge");
11171 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
11172 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
11173 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
11174 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
11176 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
11177 715dc77e 2019-08-03 stsp if (cwd == NULL) {
11178 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
11179 715dc77e 2019-08-03 stsp goto done;
11182 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
11183 fa51e947 2020-03-27 stsp if (error) {
11184 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
11185 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
11186 715dc77e 2019-08-03 stsp goto done;
11189 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11191 715dc77e 2019-08-03 stsp if (error != NULL)
11192 715dc77e 2019-08-03 stsp goto done;
11194 dc424a06 2019-08-07 stsp if (patch_script_path) {
11195 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
11196 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
11197 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
11198 dc424a06 2019-08-07 stsp patch_script_path);
11199 dc424a06 2019-08-07 stsp goto done;
11202 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
11203 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
11204 715dc77e 2019-08-03 stsp if (error)
11205 715dc77e 2019-08-03 stsp goto done;
11207 f259c4c1 2021-09-24 stsp error = check_merge_in_progress(worktree, repo);
11208 f259c4c1 2021-09-24 stsp if (error)
11209 f259c4c1 2021-09-24 stsp goto done;
11211 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11212 6d022e97 2019-08-04 stsp if (error)
11213 6d022e97 2019-08-04 stsp goto done;
11215 6d022e97 2019-08-04 stsp if (list_stage)
11216 f6343036 2021-06-22 stsp error = got_worktree_status(worktree, &paths, repo, 0,
11217 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
11219 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
11220 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
11221 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
11222 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
11223 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
11224 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
11227 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
11228 2e1f37b0 2019-08-08 stsp error == NULL)
11229 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
11230 1d0f4054 2021-06-17 stsp if (repo) {
11231 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
11232 1d0f4054 2021-06-17 stsp if (error == NULL)
11233 1d0f4054 2021-06-17 stsp error = close_err;
11235 ad493afc 2019-08-03 stsp if (worktree)
11236 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
11237 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
11238 ad493afc 2019-08-03 stsp free((char *)pe->path);
11239 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
11240 ad493afc 2019-08-03 stsp free(cwd);
11241 ad493afc 2019-08-03 stsp return error;
11244 ad493afc 2019-08-03 stsp __dead static void
11245 ad493afc 2019-08-03 stsp usage_unstage(void)
11247 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11248 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
11249 ad493afc 2019-08-03 stsp getprogname());
11254 ad493afc 2019-08-03 stsp static const struct got_error *
11255 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
11257 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
11258 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
11259 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
11260 ad493afc 2019-08-03 stsp char *cwd = NULL;
11261 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
11262 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
11263 9627c110 2020-04-18 stsp int ch, pflag = 0;
11264 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
11265 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
11266 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
11267 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
11269 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
11271 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
11272 ad493afc 2019-08-03 stsp switch (ch) {
11273 2e1f37b0 2019-08-08 stsp case 'p':
11274 2e1f37b0 2019-08-08 stsp pflag = 1;
11276 2e1f37b0 2019-08-08 stsp case 'F':
11277 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
11280 ad493afc 2019-08-03 stsp usage_unstage();
11281 ad493afc 2019-08-03 stsp /* NOTREACHED */
11285 ad493afc 2019-08-03 stsp argc -= optind;
11286 ad493afc 2019-08-03 stsp argv += optind;
11288 ad493afc 2019-08-03 stsp #ifndef PROFILE
11289 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11290 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
11291 ad493afc 2019-08-03 stsp err(1, "pledge");
11293 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
11294 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
11296 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
11297 ad493afc 2019-08-03 stsp if (cwd == NULL) {
11298 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
11299 ad493afc 2019-08-03 stsp goto done;
11302 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
11303 fa51e947 2020-03-27 stsp if (error) {
11304 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
11305 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
11306 ad493afc 2019-08-03 stsp goto done;
11309 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11311 ad493afc 2019-08-03 stsp if (error != NULL)
11312 ad493afc 2019-08-03 stsp goto done;
11314 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
11315 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
11316 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
11317 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
11318 2e1f37b0 2019-08-08 stsp patch_script_path);
11319 2e1f37b0 2019-08-08 stsp goto done;
11323 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
11324 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
11325 ad493afc 2019-08-03 stsp if (error)
11326 ad493afc 2019-08-03 stsp goto done;
11328 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11329 ad493afc 2019-08-03 stsp if (error)
11330 ad493afc 2019-08-03 stsp goto done;
11332 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
11333 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
11334 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
11335 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
11336 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
11337 9627c110 2020-04-18 stsp if (!error)
11338 35ca1db7 2021-09-28 stsp print_merge_progress_stats(&upa);
11340 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
11341 2e1f37b0 2019-08-08 stsp error == NULL)
11342 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
11343 1d0f4054 2021-06-17 stsp if (repo) {
11344 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
11345 1d0f4054 2021-06-17 stsp if (error == NULL)
11346 1d0f4054 2021-06-17 stsp error = close_err;
11348 715dc77e 2019-08-03 stsp if (worktree)
11349 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
11350 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
11351 715dc77e 2019-08-03 stsp free((char *)pe->path);
11352 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
11353 715dc77e 2019-08-03 stsp free(cwd);
11354 01073a5d 2019-08-22 stsp return error;
11357 01073a5d 2019-08-22 stsp __dead static void
11358 01073a5d 2019-08-22 stsp usage_cat(void)
11360 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11361 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
11365 01073a5d 2019-08-22 stsp static const struct got_error *
11366 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11368 01073a5d 2019-08-22 stsp const struct got_error *err;
11369 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
11371 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
11373 01073a5d 2019-08-22 stsp return err;
11375 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11376 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
11377 01073a5d 2019-08-22 stsp return err;
11380 01073a5d 2019-08-22 stsp static const struct got_error *
11381 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11383 01073a5d 2019-08-22 stsp const struct got_error *err;
11384 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
11385 56e0773d 2019-11-28 stsp int nentries, i;
11387 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
11389 01073a5d 2019-08-22 stsp return err;
11391 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
11392 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
11393 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
11394 01073a5d 2019-08-22 stsp char *id_str;
11395 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
11397 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
11398 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11401 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
11402 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
11403 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
11404 01073a5d 2019-08-22 stsp free(id_str);
11407 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
11408 01073a5d 2019-08-22 stsp return err;
11411 01073a5d 2019-08-22 stsp static const struct got_error *
11412 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11414 01073a5d 2019-08-22 stsp const struct got_error *err;
11415 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
11416 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
11417 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
11418 01073a5d 2019-08-22 stsp char *id_str = NULL;
11419 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
11421 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
11423 01073a5d 2019-08-22 stsp return err;
11425 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11427 01073a5d 2019-08-22 stsp goto done;
11429 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11430 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
11431 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
11432 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
11433 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(pid, parent_ids, entry) {
11434 01073a5d 2019-08-22 stsp char *pid_str;
11435 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
11437 01073a5d 2019-08-22 stsp goto done;
11438 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11439 01073a5d 2019-08-22 stsp free(pid_str);
11441 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
11442 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
11443 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
11445 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
11446 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
11447 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
11449 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
11450 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11451 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
11453 01073a5d 2019-08-22 stsp free(id_str);
11454 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
11455 01073a5d 2019-08-22 stsp return err;
11458 01073a5d 2019-08-22 stsp static const struct got_error *
11459 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11461 01073a5d 2019-08-22 stsp const struct got_error *err;
11462 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
11463 01073a5d 2019-08-22 stsp char *id_str = NULL;
11464 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
11466 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
11468 01073a5d 2019-08-22 stsp return err;
11470 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11472 01073a5d 2019-08-22 stsp goto done;
11474 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11476 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
11477 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
11478 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11479 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
11481 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
11482 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11483 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
11485 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
11486 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11487 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
11489 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
11490 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11491 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
11497 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11498 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
11500 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
11501 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
11502 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
11504 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
11505 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11506 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
11508 01073a5d 2019-08-22 stsp free(id_str);
11509 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
11510 01073a5d 2019-08-22 stsp return err;
11513 01073a5d 2019-08-22 stsp static const struct got_error *
11514 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
11516 01073a5d 2019-08-22 stsp const struct got_error *error;
11517 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
11518 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
11519 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
11520 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
11521 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
11522 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
11523 84de9106 2020-12-26 stsp struct got_reflist_head refs;
11525 d9dff0e5 2020-12-26 stsp TAILQ_INIT(&refs);
11527 01073a5d 2019-08-22 stsp #ifndef PROFILE
11528 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11529 01073a5d 2019-08-22 stsp NULL) == -1)
11530 01073a5d 2019-08-22 stsp err(1, "pledge");
11533 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11534 01073a5d 2019-08-22 stsp switch (ch) {
11535 896e9b6f 2019-08-26 stsp case 'c':
11536 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
11538 01073a5d 2019-08-22 stsp case 'r':
11539 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
11540 01073a5d 2019-08-22 stsp if (repo_path == NULL)
11541 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
11543 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
11545 896e9b6f 2019-08-26 stsp case 'P':
11546 896e9b6f 2019-08-26 stsp force_path = 1;
11549 01073a5d 2019-08-22 stsp usage_cat();
11550 01073a5d 2019-08-22 stsp /* NOTREACHED */
11554 01073a5d 2019-08-22 stsp argc -= optind;
11555 01073a5d 2019-08-22 stsp argv += optind;
11557 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
11558 01073a5d 2019-08-22 stsp if (cwd == NULL) {
11559 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
11560 01073a5d 2019-08-22 stsp goto done;
11562 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
11563 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
11564 01073a5d 2019-08-22 stsp goto done;
11565 01073a5d 2019-08-22 stsp if (worktree) {
11566 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
11567 01073a5d 2019-08-22 stsp repo_path = strdup(
11568 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
11569 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
11570 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
11571 01073a5d 2019-08-22 stsp goto done;
11576 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
11577 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
11578 01073a5d 2019-08-22 stsp if (repo_path == NULL)
11579 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
11582 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
11583 01073a5d 2019-08-22 stsp free(repo_path);
11584 01073a5d 2019-08-22 stsp if (error != NULL)
11585 01073a5d 2019-08-22 stsp goto done;
11587 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
11588 896e9b6f 2019-08-26 stsp if (error)
11589 896e9b6f 2019-08-26 stsp goto done;
11591 84de9106 2020-12-26 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11592 84de9106 2020-12-26 stsp if (error)
11593 84de9106 2020-12-26 stsp goto done;
11595 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
11596 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
11597 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
11598 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
11599 01073a5d 2019-08-22 stsp if (error)
11600 01073a5d 2019-08-22 stsp goto done;
11602 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
11603 896e9b6f 2019-08-26 stsp if (force_path) {
11604 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
11605 896e9b6f 2019-08-26 stsp argv[i]);
11606 896e9b6f 2019-08-26 stsp if (error)
11609 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
11610 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
11612 896e9b6f 2019-08-26 stsp if (error) {
11613 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
11614 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
11616 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
11617 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
11618 896e9b6f 2019-08-26 stsp if (error)
11623 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
11624 01073a5d 2019-08-22 stsp if (error)
11627 01073a5d 2019-08-22 stsp switch (obj_type) {
11628 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
11629 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
11631 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
11632 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
11634 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
11635 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
11637 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
11638 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
11641 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
11644 01073a5d 2019-08-22 stsp if (error)
11646 01073a5d 2019-08-22 stsp free(label);
11647 01073a5d 2019-08-22 stsp label = NULL;
11648 01073a5d 2019-08-22 stsp free(id);
11649 01073a5d 2019-08-22 stsp id = NULL;
11652 01073a5d 2019-08-22 stsp free(label);
11653 01073a5d 2019-08-22 stsp free(id);
11654 896e9b6f 2019-08-26 stsp free(commit_id);
11655 01073a5d 2019-08-22 stsp if (worktree)
11656 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
11657 01073a5d 2019-08-22 stsp if (repo) {
11658 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
11659 01073a5d 2019-08-22 stsp if (error == NULL)
11660 1d0f4054 2021-06-17 stsp error = close_err;
11662 84de9106 2020-12-26 stsp got_ref_list_free(&refs);
11663 b2118c49 2020-07-28 stsp return error;
11666 b2118c49 2020-07-28 stsp __dead static void
11667 b2118c49 2020-07-28 stsp usage_info(void)
11669 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
11670 b2118c49 2020-07-28 stsp getprogname());
11674 b2118c49 2020-07-28 stsp static const struct got_error *
11675 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
11676 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11677 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
11679 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
11680 b2118c49 2020-07-28 stsp char *id_str = NULL;
11681 b2118c49 2020-07-28 stsp char datebuf[128];
11682 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
11683 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
11684 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
11687 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
11688 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
11690 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
11691 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
11692 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
11693 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
11694 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
11697 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
11698 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
11699 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
11700 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
11701 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
11702 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
11703 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
11704 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
11706 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
11708 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
11709 b2118c49 2020-07-28 stsp if (tm == NULL)
11710 b2118c49 2020-07-28 stsp return NULL;
11711 ec6d1a36 2021-03-21 jrick if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
11712 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
11713 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
11715 b2118c49 2020-07-28 stsp if (blob_id) {
11716 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
11718 b2118c49 2020-07-28 stsp return err;
11719 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
11720 b2118c49 2020-07-28 stsp free(id_str);
11723 b2118c49 2020-07-28 stsp if (staged_blob_id) {
11724 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
11726 b2118c49 2020-07-28 stsp return err;
11727 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
11728 b2118c49 2020-07-28 stsp free(id_str);
11731 b2118c49 2020-07-28 stsp if (commit_id) {
11732 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
11734 b2118c49 2020-07-28 stsp return err;
11735 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
11736 b2118c49 2020-07-28 stsp free(id_str);
11739 b2118c49 2020-07-28 stsp return NULL;
11742 b2118c49 2020-07-28 stsp static const struct got_error *
11743 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
11745 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
11746 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
11747 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
11748 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
11749 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
11750 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
11751 b2118c49 2020-07-28 stsp int ch, show_files = 0;
11753 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
11755 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
11756 b2118c49 2020-07-28 stsp switch (ch) {
11758 b2118c49 2020-07-28 stsp usage_info();
11759 b2118c49 2020-07-28 stsp /* NOTREACHED */
11763 b2118c49 2020-07-28 stsp argc -= optind;
11764 b2118c49 2020-07-28 stsp argv += optind;
11766 b2118c49 2020-07-28 stsp #ifndef PROFILE
11767 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
11768 b2118c49 2020-07-28 stsp NULL) == -1)
11769 b2118c49 2020-07-28 stsp err(1, "pledge");
11771 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
11772 b2118c49 2020-07-28 stsp if (cwd == NULL) {
11773 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
11774 b2118c49 2020-07-28 stsp goto done;
11777 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
11778 b2118c49 2020-07-28 stsp if (error) {
11779 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
11780 8ea5c997 2021-02-07 naddy error = wrap_not_worktree_error(error, "info", cwd);
11781 b2118c49 2020-07-28 stsp goto done;
11784 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
11785 b2118c49 2020-07-28 stsp if (error)
11786 b2118c49 2020-07-28 stsp goto done;
11788 b2118c49 2020-07-28 stsp if (argc >= 1) {
11789 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
11790 b2118c49 2020-07-28 stsp worktree);
11791 b2118c49 2020-07-28 stsp if (error)
11792 b2118c49 2020-07-28 stsp goto done;
11793 b2118c49 2020-07-28 stsp show_files = 1;
11796 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
11797 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
11798 b2118c49 2020-07-28 stsp if (error)
11799 b2118c49 2020-07-28 stsp goto done;
11801 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
11802 b2118c49 2020-07-28 stsp if (error)
11803 b2118c49 2020-07-28 stsp goto done;
11805 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
11806 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
11807 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
11808 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
11809 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
11810 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
11811 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
11812 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
11814 b2118c49 2020-07-28 stsp if (show_files) {
11815 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
11816 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
11817 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
11818 b2118c49 2020-07-28 stsp continue;
11820 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
11821 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
11823 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
11824 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
11826 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
11827 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
11828 b2118c49 2020-07-28 stsp if (error)
11829 b2118c49 2020-07-28 stsp goto done;
11830 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
11831 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
11832 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
11838 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
11839 b2118c49 2020-07-28 stsp free((char *)pe->path);
11840 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
11841 b2118c49 2020-07-28 stsp free(cwd);
11842 b2118c49 2020-07-28 stsp free(id_str);
11843 b2118c49 2020-07-28 stsp free(uuidstr);
11844 0ebf8283 2019-07-24 stsp return error;
