2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 93658fb9 2020-03-18 stsp * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
7 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
8 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
10 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 12463d8b 2019-12-13 stsp #include <fcntl.h>
28 12ce7a6c 2019-08-12 stsp #include <limits.h>
29 5c860e29 2018-03-12 stsp #include <locale.h>
30 818c7501 2019-07-11 stsp #include <ctype.h>
31 99437157 2018-11-11 stsp #include <signal.h>
32 5c860e29 2018-03-12 stsp #include <stdio.h>
33 5c860e29 2018-03-12 stsp #include <stdlib.h>
34 5c860e29 2018-03-12 stsp #include <string.h>
35 5c860e29 2018-03-12 stsp #include <unistd.h>
36 c09a553d 2018-03-12 stsp #include <libgen.h>
37 c0768b0f 2018-06-10 stsp #include <time.h>
38 33ad4cbe 2019-05-12 jcs #include <paths.h>
39 6841bf13 2019-11-29 kn #include <regex.h>
40 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 d2cdc636 2020-03-18 stsp #include <util.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 f42b1b34 2018-03-12 stsp #include "got_error.h"
45 f42b1b34 2018-03-12 stsp #include "got_object.h"
46 5261c201 2018-04-01 stsp #include "got_reference.h"
47 f42b1b34 2018-03-12 stsp #include "got_repository.h"
48 1dd54920 2019-05-11 stsp #include "got_path.h"
49 e6209546 2019-08-22 stsp #include "got_cancel.h"
50 c09a553d 2018-03-12 stsp #include "got_worktree.h"
51 79109fed 2018-03-27 stsp #include "got_diff.h"
52 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
53 6f23baec 2020-03-18 stsp #include "got_fetch.h"
54 404c43c4 2018-06-21 stsp #include "got_blame.h"
55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
57 50b0790e 2020-09-11 stsp #include "got_gotconfig.h"
59 5c860e29 2018-03-12 stsp #ifndef nitems
60 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
64 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
67 99437157 2018-11-11 stsp catch_sigint(int signo)
69 99437157 2018-11-11 stsp sigint_received = 1;
73 99437157 2018-11-11 stsp catch_sigpipe(int signo)
75 99437157 2018-11-11 stsp sigpipe_received = 1;
79 8cfb4057 2019-07-09 stsp struct got_cmd {
80 820059fa 2020-09-25 stsp const char *cmd_name;
81 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
82 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
83 97b3a7be 2019-07-09 stsp const char *cmd_alias;
86 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
87 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
88 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
89 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
90 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
91 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
92 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
93 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
94 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
95 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
96 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
97 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
98 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
99 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
100 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
101 d00136be 2019-03-26 stsp __dead static void usage_add(void);
102 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
103 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
104 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
105 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
106 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
107 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
108 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
109 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
110 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
111 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
112 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
113 b2118c49 2020-07-28 stsp __dead static void usage_info(void);
115 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
116 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
117 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
118 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
119 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
120 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
121 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
122 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
123 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
124 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
125 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
126 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
127 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
128 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
129 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
130 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
131 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
132 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
133 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
134 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
135 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
136 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
137 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
138 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
139 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
140 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
141 b2118c49 2020-07-28 stsp static const struct got_error* cmd_info(int, char *[]);
143 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
144 b2118c49 2020-07-28 stsp { "init", cmd_init, usage_init, "" },
145 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
146 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
147 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
148 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
149 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
150 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
151 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
152 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
153 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
154 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
155 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
156 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
157 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
158 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
159 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
160 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
161 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
162 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
163 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
164 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
165 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
166 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
167 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
168 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
169 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
170 b2118c49 2020-07-28 stsp { "info", cmd_info, usage_info, "" },
173 ce5b7c56 2019-07-09 stsp static void
174 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
178 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
179 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
180 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
181 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->cmd_name);
183 6879ba42 2020-10-01 naddy fputc('\n', fp);
186 ff69268e 2020-12-13 stsp __dead static void
187 ff69268e 2020-12-13 stsp option_conflict(char a, char b)
189 ff69268e 2020-12-13 stsp errx(1, "-%c and -%c options are mutually exclusive", a, b);
193 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
195 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
196 5c860e29 2018-03-12 stsp unsigned int i;
198 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
199 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
200 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
201 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0 }
204 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
206 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
207 5c860e29 2018-03-12 stsp switch (ch) {
215 6879ba42 2020-10-01 naddy usage(hflag, 1);
216 5c860e29 2018-03-12 stsp /* NOTREACHED */
220 5c860e29 2018-03-12 stsp argc -= optind;
221 5c860e29 2018-03-12 stsp argv += optind;
222 9814e6a3 2020-09-27 naddy optind = 1;
223 9814e6a3 2020-09-27 naddy optreset = 1;
225 53ccebc2 2019-07-30 stsp if (Vflag) {
226 53ccebc2 2019-07-30 stsp got_version_print_str();
230 5c860e29 2018-03-12 stsp if (argc <= 0)
231 6879ba42 2020-10-01 naddy usage(hflag, hflag ? 0 : 1);
233 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
234 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
236 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
237 d7d4f210 2018-03-12 stsp const struct got_error *error;
239 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
241 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
242 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
246 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
248 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
249 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
250 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
251 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
252 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
253 70015d7a 2019-11-08 stsp !(sigint_received &&
254 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
255 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
262 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
263 6879ba42 2020-10-01 naddy list_commands(stderr);
267 4ed7e80c 2018-05-20 stsp __dead static void
268 6879ba42 2020-10-01 naddy usage(int hflag, int status)
270 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
272 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
273 53ccebc2 2019-07-30 stsp getprogname());
275 6879ba42 2020-10-01 naddy list_commands(fp);
276 6879ba42 2020-10-01 naddy exit(status);
279 0266afb7 2019-01-04 stsp static const struct got_error *
280 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
282 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
283 e2ba3d07 2019-05-13 stsp const char *editor;
285 8920fa04 2019-08-18 stsp *abspath = NULL;
287 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
288 e2ba3d07 2019-05-13 stsp if (editor == NULL)
289 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
291 0ee7065d 2019-05-13 stsp if (editor) {
292 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
294 0ee7065d 2019-05-13 stsp return err;
297 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
298 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
299 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
300 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
303 e2ba3d07 2019-05-13 stsp return NULL;
306 e2ba3d07 2019-05-13 stsp static const struct got_error *
307 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
308 c530dc23 2019-07-23 stsp const char *worktree_path)
310 163ce85a 2019-05-13 stsp const struct got_error *err;
312 37c06ea4 2019-07-15 stsp #ifdef PROFILE
313 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
314 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
316 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
317 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
319 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
320 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
322 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
323 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
325 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
326 163ce85a 2019-05-13 stsp if (err != NULL)
327 163ce85a 2019-05-13 stsp return err;
329 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
330 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
332 0266afb7 2019-01-04 stsp return NULL;
335 2c7829a4 2019-06-17 stsp __dead static void
336 2c7829a4 2019-06-17 stsp usage_init(void)
338 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
342 2c7829a4 2019-06-17 stsp static const struct got_error *
343 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
345 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
346 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
349 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
350 2c7829a4 2019-06-17 stsp switch (ch) {
352 2c7829a4 2019-06-17 stsp usage_init();
353 2c7829a4 2019-06-17 stsp /* NOTREACHED */
357 2c7829a4 2019-06-17 stsp argc -= optind;
358 2c7829a4 2019-06-17 stsp argv += optind;
360 2c7829a4 2019-06-17 stsp #ifndef PROFILE
361 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
362 2c7829a4 2019-06-17 stsp err(1, "pledge");
364 2c7829a4 2019-06-17 stsp if (argc != 1)
365 bc20e173 2019-06-17 stsp usage_init();
367 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
368 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
369 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
371 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
373 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
374 2c7829a4 2019-06-17 stsp if (error &&
375 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
378 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
382 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
384 3ce1b845 2019-07-15 stsp free(repo_path);
385 3ce1b845 2019-07-15 stsp return error;
388 3ce1b845 2019-07-15 stsp __dead static void
389 3ce1b845 2019-07-15 stsp usage_import(void)
391 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
392 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
397 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
400 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
401 3ce1b845 2019-07-15 stsp int st = -1;
403 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
404 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
405 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
407 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
409 3ce1b845 2019-07-15 stsp goto doneediting;
411 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
412 3ce1b845 2019-07-15 stsp _exit(127);
415 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
416 3ce1b845 2019-07-15 stsp if (errno != EINTR)
419 3ce1b845 2019-07-15 stsp doneediting:
420 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
421 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
422 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
424 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
425 3ce1b845 2019-07-15 stsp errno = EINTR;
429 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
432 3ce1b845 2019-07-15 stsp static const struct got_error *
433 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
434 0d5bb276 2020-12-15 stsp const char *initial_content, size_t initial_content_len, int check_comments)
436 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
437 bfa12d5e 2020-09-26 stsp char *line = NULL;
438 bfa12d5e 2020-09-26 stsp size_t linesize = 0;
439 bfa12d5e 2020-09-26 stsp ssize_t linelen;
440 3ce1b845 2019-07-15 stsp struct stat st, st2;
441 bfa12d5e 2020-09-26 stsp FILE *fp = NULL;
442 bfa12d5e 2020-09-26 stsp size_t len, logmsg_len;
443 bfa12d5e 2020-09-26 stsp char *initial_content_stripped = NULL, *buf = NULL, *s;
445 3ce1b845 2019-07-15 stsp *logmsg = NULL;
447 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
448 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
450 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
451 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
453 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
454 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
456 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
457 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
458 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
461 bfa12d5e 2020-09-26 stsp * Set up a stripped version of the initial content without comments
462 bfa12d5e 2020-09-26 stsp * and blank lines. We need this in order to check if the message
463 bfa12d5e 2020-09-26 stsp * has in fact been edited.
465 bfa12d5e 2020-09-26 stsp initial_content_stripped = malloc(initial_content_len + 1);
466 bfa12d5e 2020-09-26 stsp if (initial_content_stripped == NULL)
467 bfa12d5e 2020-09-26 stsp return got_error_from_errno("malloc");
468 bfa12d5e 2020-09-26 stsp initial_content_stripped[0] = '\0';
470 bfa12d5e 2020-09-26 stsp buf = strdup(initial_content);
471 bfa12d5e 2020-09-26 stsp if (buf == NULL) {
472 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("strdup");
477 bfa12d5e 2020-09-26 stsp while ((line = strsep(&s, "\n")) != NULL) {
478 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
479 bfa12d5e 2020-09-26 stsp continue; /* remove comments and leading empty lines */
480 bfa12d5e 2020-09-26 stsp len = strlcat(initial_content_stripped, line,
481 bfa12d5e 2020-09-26 stsp initial_content_len + 1);
482 bfa12d5e 2020-09-26 stsp if (len >= initial_content_len + 1) {
483 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
487 bfa12d5e 2020-09-26 stsp while (len > 0 && initial_content_stripped[len - 1] == '\n') {
488 bfa12d5e 2020-09-26 stsp initial_content_stripped[len - 1] = '\0';
492 bfa12d5e 2020-09-26 stsp logmsg_len = st2.st_size;
493 bfa12d5e 2020-09-26 stsp *logmsg = malloc(logmsg_len + 1);
494 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
495 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
496 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
498 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
499 3ce1b845 2019-07-15 stsp if (fp == NULL) {
500 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
505 bfa12d5e 2020-09-26 stsp while ((linelen = getline(&line, &linesize, fp)) != -1) {
506 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
507 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
508 bfa12d5e 2020-09-26 stsp len = strlcat(*logmsg, line, logmsg_len + 1);
509 bfa12d5e 2020-09-26 stsp if (len >= logmsg_len + 1) {
510 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
514 bfa12d5e 2020-09-26 stsp free(line);
515 bfa12d5e 2020-09-26 stsp if (ferror(fp)) {
516 bfa12d5e 2020-09-26 stsp err = got_ferror(fp, GOT_ERR_IO);
519 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
520 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
524 bfa12d5e 2020-09-26 stsp if (len == 0) {
525 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
526 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
529 0d5bb276 2020-12-15 stsp if (check_comments && strcmp(*logmsg, initial_content_stripped) == 0)
530 bfa12d5e 2020-09-26 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
531 bfa12d5e 2020-09-26 stsp "no changes made to commit message, aborting");
533 bfa12d5e 2020-09-26 stsp free(initial_content_stripped);
535 bfa12d5e 2020-09-26 stsp if (fp && fclose(fp) == EOF && err == NULL)
536 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("fclose");
538 3ce1b845 2019-07-15 stsp free(*logmsg);
539 3ce1b845 2019-07-15 stsp *logmsg = NULL;
541 3ce1b845 2019-07-15 stsp return err;
544 3ce1b845 2019-07-15 stsp static const struct got_error *
545 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
546 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
548 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
549 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
550 1601cb9f 2020-09-11 naddy int initial_content_len;
551 97972933 2020-09-11 stsp int fd = -1;
553 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
554 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
555 1601cb9f 2020-09-11 naddy branch_name);
556 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
557 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
559 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
560 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
564 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
565 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *logmsg_path);
569 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
570 0d5bb276 2020-12-15 stsp initial_content_len, 1);
572 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
573 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *logmsg_path);
574 3ce1b845 2019-07-15 stsp free(initial_content);
576 59f86c76 2020-09-11 stsp free(*logmsg_path);
577 59f86c76 2020-09-11 stsp *logmsg_path = NULL;
579 3ce1b845 2019-07-15 stsp return err;
582 3ce1b845 2019-07-15 stsp static const struct got_error *
583 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
585 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
586 3ce1b845 2019-07-15 stsp return NULL;
589 3ce1b845 2019-07-15 stsp static const struct got_error *
590 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
591 50b0790e 2020-09-11 stsp struct got_worktree *worktree)
593 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
594 50b0790e 2020-09-11 stsp const char *got_author = NULL, *name, *email;
595 50b0790e 2020-09-11 stsp const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
597 84792843 2019-08-09 stsp *author = NULL;
599 50b0790e 2020-09-11 stsp if (worktree)
600 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
601 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
604 50b0790e 2020-09-11 stsp * Priority of potential author information sources, from most
605 50b0790e 2020-09-11 stsp * significant to least significant:
606 50b0790e 2020-09-11 stsp * 1) work tree's .got/got.conf file
607 50b0790e 2020-09-11 stsp * 2) repository's got.conf file
608 50b0790e 2020-09-11 stsp * 3) repository's git config file
609 50b0790e 2020-09-11 stsp * 4) environment variables
610 50b0790e 2020-09-11 stsp * 5) global git config files (in user's home directory or /etc)
613 50b0790e 2020-09-11 stsp if (worktree_conf)
614 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(worktree_conf);
615 50b0790e 2020-09-11 stsp if (got_author == NULL)
616 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(repo_conf);
617 84792843 2019-08-09 stsp if (got_author == NULL) {
618 257add31 2020-09-09 stsp name = got_repo_get_gitconfig_author_name(repo);
619 257add31 2020-09-09 stsp email = got_repo_get_gitconfig_author_email(repo);
620 c9956ddf 2019-09-08 stsp if (name && email) {
621 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
622 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
623 c9956ddf 2019-09-08 stsp return NULL;
626 257add31 2020-09-09 stsp got_author = getenv("GOT_AUTHOR");
627 257add31 2020-09-09 stsp if (got_author == NULL) {
628 257add31 2020-09-09 stsp name = got_repo_get_global_gitconfig_author_name(repo);
629 257add31 2020-09-09 stsp email = got_repo_get_global_gitconfig_author_email(
631 257add31 2020-09-09 stsp if (name && email) {
632 257add31 2020-09-09 stsp if (asprintf(author, "%s <%s>", name, email)
634 257add31 2020-09-09 stsp return got_error_from_errno("asprintf");
635 257add31 2020-09-09 stsp return NULL;
637 257add31 2020-09-09 stsp /* TODO: Look up user in password database? */
638 257add31 2020-09-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
642 aba9c984 2019-09-08 stsp *author = strdup(got_author);
643 aba9c984 2019-09-08 stsp if (*author == NULL)
644 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
647 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
648 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
650 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
651 84792843 2019-08-09 stsp got_author++;
652 aba9c984 2019-09-08 stsp if (*got_author != '<') {
653 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
656 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
657 84792843 2019-08-09 stsp got_author++;
658 aba9c984 2019-09-08 stsp if (*got_author != '@') {
659 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
662 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
663 84792843 2019-08-09 stsp got_author++;
664 84792843 2019-08-09 stsp if (*got_author != '>')
665 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
668 aba9c984 2019-09-08 stsp free(*author);
669 aba9c984 2019-09-08 stsp *author = NULL;
671 aba9c984 2019-09-08 stsp return err;
674 c9956ddf 2019-09-08 stsp static const struct got_error *
675 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
677 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
679 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
680 c9956ddf 2019-09-08 stsp if (homedir) {
681 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
682 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
685 c9956ddf 2019-09-08 stsp return NULL;
688 84792843 2019-08-09 stsp static const struct got_error *
689 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
691 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
692 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
693 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
694 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
695 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
696 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
697 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
698 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
700 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
701 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
702 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
704 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
706 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
707 3ce1b845 2019-07-15 stsp switch (ch) {
709 3ce1b845 2019-07-15 stsp branch_name = optarg;
712 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
713 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
714 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
719 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
720 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
721 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
727 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
729 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
735 b2b65d18 2019-08-22 stsp usage_import();
736 3ce1b845 2019-07-15 stsp /* NOTREACHED */
740 3ce1b845 2019-07-15 stsp argc -= optind;
741 3ce1b845 2019-07-15 stsp argv += optind;
743 3ce1b845 2019-07-15 stsp #ifndef PROFILE
744 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
746 3ce1b845 2019-07-15 stsp NULL) == -1)
747 3ce1b845 2019-07-15 stsp err(1, "pledge");
749 3ce1b845 2019-07-15 stsp if (argc != 1)
750 3ce1b845 2019-07-15 stsp usage_import();
752 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
753 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
754 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
755 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
757 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
758 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
761 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
765 50b0790e 2020-09-11 stsp error = get_author(&author, repo, NULL);
767 aba9c984 2019-09-08 stsp return error;
770 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
771 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
772 e560b7e0 2019-11-28 stsp * an unintended typo.
774 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
775 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
777 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
778 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
782 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
783 3ce1b845 2019-07-15 stsp if (error) {
784 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
787 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
788 3ce1b845 2019-07-15 stsp "import target branch already exists");
792 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
793 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
794 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
797 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
800 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
801 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
803 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
804 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
807 8e158b01 2019-09-22 stsp free(logmsg);
808 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
809 ef293bdd 2019-10-21 stsp path_dir, refname);
810 ef293bdd 2019-10-21 stsp if (error) {
811 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
812 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
813 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
818 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
819 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
820 ef293bdd 2019-10-21 stsp if (logmsg_path)
821 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
825 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
826 ef293bdd 2019-10-21 stsp if (error) {
827 ef293bdd 2019-10-21 stsp if (logmsg_path)
828 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
832 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
833 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
834 ef293bdd 2019-10-21 stsp if (error) {
835 ef293bdd 2019-10-21 stsp if (logmsg_path)
836 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
840 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
841 ef293bdd 2019-10-21 stsp if (error) {
842 ef293bdd 2019-10-21 stsp if (logmsg_path)
843 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
847 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
848 ef293bdd 2019-10-21 stsp if (error) {
849 ef293bdd 2019-10-21 stsp if (logmsg_path)
850 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
854 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
855 ef293bdd 2019-10-21 stsp if (error) {
856 ef293bdd 2019-10-21 stsp if (logmsg_path)
857 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
861 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
862 3ce1b845 2019-07-15 stsp if (error) {
863 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
864 ef293bdd 2019-10-21 stsp if (logmsg_path)
865 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
869 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
870 3ce1b845 2019-07-15 stsp branch_ref);
871 ef293bdd 2019-10-21 stsp if (error) {
872 ef293bdd 2019-10-21 stsp if (logmsg_path)
873 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
877 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
878 ef293bdd 2019-10-21 stsp if (error) {
879 ef293bdd 2019-10-21 stsp if (logmsg_path)
880 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
885 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
886 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
888 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
889 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
890 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
891 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
892 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
893 8e158b01 2019-09-22 stsp free(logmsg);
894 ef293bdd 2019-10-21 stsp free(logmsg_path);
895 2c7829a4 2019-06-17 stsp free(repo_path);
896 3ce1b845 2019-07-15 stsp free(editor);
897 3ce1b845 2019-07-15 stsp free(refname);
898 3ce1b845 2019-07-15 stsp free(new_commit_id);
899 3ce1b845 2019-07-15 stsp free(id_str);
900 aba9c984 2019-09-08 stsp free(author);
901 c9956ddf 2019-09-08 stsp free(gitconfig_path);
902 3ce1b845 2019-07-15 stsp if (branch_ref)
903 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
904 3ce1b845 2019-07-15 stsp if (head_ref)
905 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
906 2c7829a4 2019-06-17 stsp return error;
909 93658fb9 2020-03-18 stsp __dead static void
910 93658fb9 2020-03-18 stsp usage_clone(void)
912 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
913 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
917 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
918 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
919 892ac3b6 2020-03-18 stsp int last_p_indexed;
920 892ac3b6 2020-03-18 stsp int last_p_resolved;
921 68999b92 2020-03-18 stsp int verbosity;
923 04d9a9ec 2020-09-24 stsp struct got_repository *repo;
925 04d9a9ec 2020-09-24 stsp int create_configs;
926 04d9a9ec 2020-09-24 stsp int configs_created;
928 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *symrefs;
929 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches;
930 04d9a9ec 2020-09-24 stsp const char *proto;
931 04d9a9ec 2020-09-24 stsp const char *host;
932 04d9a9ec 2020-09-24 stsp const char *port;
933 04d9a9ec 2020-09-24 stsp const char *remote_repo_path;
934 04d9a9ec 2020-09-24 stsp const char *git_url;
935 04d9a9ec 2020-09-24 stsp int fetch_all_branches;
936 04d9a9ec 2020-09-24 stsp int mirror_references;
937 04d9a9ec 2020-09-24 stsp } config_info;
940 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
941 93658fb9 2020-03-18 stsp static const struct got_error *
942 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
943 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
944 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
945 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches, struct got_repository *repo);
947 04d9a9ec 2020-09-24 stsp static const struct got_error *
948 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
949 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
951 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
952 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
953 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
954 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
955 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
958 04d9a9ec 2020-09-24 stsp * In order to allow a failed clone to be resumed with 'got fetch'
959 04d9a9ec 2020-09-24 stsp * we try to create configuration files as soon as possible.
960 04d9a9ec 2020-09-24 stsp * Once the server has sent information about its default branch
961 04d9a9ec 2020-09-24 stsp * we have all required information.
963 04d9a9ec 2020-09-24 stsp if (a->create_configs && !a->configs_created &&
964 04d9a9ec 2020-09-24 stsp !TAILQ_EMPTY(a->config_info.symrefs)) {
965 04d9a9ec 2020-09-24 stsp err = create_config_files(a->config_info.proto,
966 62d463ca 2020-10-20 naddy a->config_info.host, a->config_info.port,
967 62d463ca 2020-10-20 naddy a->config_info.remote_repo_path,
968 62d463ca 2020-10-20 naddy a->config_info.git_url,
969 62d463ca 2020-10-20 naddy a->config_info.fetch_all_branches,
970 62d463ca 2020-10-20 naddy a->config_info.mirror_references,
971 62d463ca 2020-10-20 naddy a->config_info.symrefs,
972 62d463ca 2020-10-20 naddy a->config_info.wanted_branches, a->repo);
974 04d9a9ec 2020-09-24 stsp return err;
975 04d9a9ec 2020-09-24 stsp a->configs_created = 1;
978 68999b92 2020-03-18 stsp if (a->verbosity < 0)
979 68999b92 2020-03-18 stsp return NULL;
981 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
982 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
983 892ac3b6 2020-03-18 stsp fflush(stdout);
984 12d1281e 2020-03-19 stsp return NULL;
987 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
988 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
989 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
990 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
991 892ac3b6 2020-03-18 stsp print_size = 1;
992 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
993 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
994 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
996 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
997 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
998 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
999 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
1000 892ac3b6 2020-03-18 stsp print_indexed = 1;
1001 892ac3b6 2020-03-18 stsp print_size = 1;
1004 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
1005 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1006 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1007 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1008 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1009 892ac3b6 2020-03-18 stsp print_resolved = 1;
1010 892ac3b6 2020-03-18 stsp print_indexed = 1;
1011 892ac3b6 2020-03-18 stsp print_size = 1;
1016 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1017 892ac3b6 2020-03-18 stsp printf("\r");
1018 892ac3b6 2020-03-18 stsp if (print_size)
1019 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1020 d715f13e 2020-03-19 stsp if (print_indexed)
1021 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1022 d715f13e 2020-03-19 stsp if (print_resolved)
1023 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1024 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1025 892ac3b6 2020-03-18 stsp fflush(stdout);
1027 531c3985 2020-03-18 stsp return NULL;
1030 531c3985 2020-03-18 stsp static const struct got_error *
1031 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
1032 04d9a9ec 2020-09-24 stsp int verbosity, struct got_repository *repo)
1034 4ba14133 2020-03-20 stsp const struct got_error *err;
1035 04d9a9ec 2020-09-24 stsp struct got_reference *head_symref;
1037 04d9a9ec 2020-09-24 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1039 4ba14133 2020-03-20 stsp return err;
1041 04d9a9ec 2020-09-24 stsp err = got_ref_write(head_symref, repo);
1042 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
1043 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
1044 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
1046 04d9a9ec 2020-09-24 stsp got_ref_close(head_symref);
1047 4ba14133 2020-03-20 stsp return err;
1050 4ba14133 2020-03-20 stsp static const struct got_error *
1051 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
1052 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
1054 41b0de12 2020-03-21 stsp const struct got_error *err;
1055 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
1057 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1058 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1059 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
1061 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
1064 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
1065 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1066 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
1067 41b0de12 2020-03-21 stsp char *id_str;
1069 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1071 41b0de12 2020-03-21 stsp return err;
1072 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
1073 41b0de12 2020-03-21 stsp free(id_str);
1076 41b0de12 2020-03-21 stsp return NULL;
1079 6338a6a1 2020-03-21 stsp static const struct got_error *
1080 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
1081 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
1083 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
1084 6338a6a1 2020-03-21 stsp struct got_reference *ref;
1085 6338a6a1 2020-03-21 stsp char *id_str;
1087 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1089 6338a6a1 2020-03-21 stsp return err;
1091 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
1093 6338a6a1 2020-03-21 stsp goto done;
1095 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1096 6338a6a1 2020-03-21 stsp got_ref_close(ref);
1098 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
1099 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
1101 6338a6a1 2020-03-21 stsp free(id_str);
1102 6338a6a1 2020-03-21 stsp return err;
1105 0e4002ca 2020-03-21 stsp static int
1106 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
1108 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
1110 0e4002ca 2020-03-21 stsp refname += 5;
1113 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
1114 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
1116 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
1118 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
1121 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
1122 0e4002ca 2020-03-21 stsp wanted_ref += 5;
1124 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
1125 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1128 0e4002ca 2020-03-21 stsp /* Allow exact match. */
1129 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
1132 0e4002ca 2020-03-21 stsp static int
1133 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1135 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
1137 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1138 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1145 41b0de12 2020-03-21 stsp static const struct got_error *
1146 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1147 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1149 0e4002ca 2020-03-21 stsp const struct got_error *err;
1150 0e4002ca 2020-03-21 stsp char *remote_refname;
1152 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1153 0e4002ca 2020-03-21 stsp refname += 5;
1155 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1156 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1157 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1159 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1160 0e4002ca 2020-03-21 stsp free(remote_refname);
1161 7c0b7f42 2020-09-24 stsp return err;
1164 7c0b7f42 2020-09-24 stsp static const struct got_error *
1165 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
1166 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, int fetch_all_branches, int mirror_references,
1167 7c0b7f42 2020-09-24 stsp struct got_repository *repo)
1169 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1170 7c0b7f42 2020-09-24 stsp char *gotconfig_path = NULL;
1171 7c0b7f42 2020-09-24 stsp char *gotconfig = NULL;
1172 7c0b7f42 2020-09-24 stsp FILE *gotconfig_file = NULL;
1173 7c0b7f42 2020-09-24 stsp ssize_t n;
1175 7c0b7f42 2020-09-24 stsp /* Create got.conf(5). */
1176 7c0b7f42 2020-09-24 stsp gotconfig_path = got_repo_get_path_gotconfig(repo);
1177 7c0b7f42 2020-09-24 stsp if (gotconfig_path == NULL) {
1178 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gotconfig");
1179 7c0b7f42 2020-09-24 stsp goto done;
1181 7c0b7f42 2020-09-24 stsp gotconfig_file = fopen(gotconfig_path, "a");
1182 7c0b7f42 2020-09-24 stsp if (gotconfig_file == NULL) {
1183 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gotconfig_path);
1184 7c0b7f42 2020-09-24 stsp goto done;
1186 7c0b7f42 2020-09-24 stsp if (asprintf(&gotconfig,
1187 7c0b7f42 2020-09-24 stsp "remote \"%s\" {\n"
1188 7c0b7f42 2020-09-24 stsp "\tserver %s\n"
1189 7c0b7f42 2020-09-24 stsp "\tprotocol %s\n"
1191 7c0b7f42 2020-09-24 stsp "\trepository \"%s\"\n"
1194 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1195 7c0b7f42 2020-09-24 stsp port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1196 7c0b7f42 2020-09-24 stsp remote_repo_path,
1197 7c0b7f42 2020-09-24 stsp mirror_references ? "\tmirror-references yes\n" : "") == -1) {
1198 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1199 7c0b7f42 2020-09-24 stsp goto done;
1201 7c0b7f42 2020-09-24 stsp n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1202 7c0b7f42 2020-09-24 stsp if (n != strlen(gotconfig)) {
1203 7c0b7f42 2020-09-24 stsp err = got_ferror(gotconfig_file, GOT_ERR_IO);
1204 7c0b7f42 2020-09-24 stsp goto done;
1208 7c0b7f42 2020-09-24 stsp if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1209 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gotconfig_path);
1210 7c0b7f42 2020-09-24 stsp free(gotconfig_path);
1211 7c0b7f42 2020-09-24 stsp return err;
1214 7c0b7f42 2020-09-24 stsp static const struct got_error *
1215 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
1216 7c0b7f42 2020-09-24 stsp int fetch_all_branches, int mirror_references, struct got_repository *repo)
1218 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1219 7c0b7f42 2020-09-24 stsp char *gitconfig_path = NULL;
1220 7c0b7f42 2020-09-24 stsp char *gitconfig = NULL;
1221 7c0b7f42 2020-09-24 stsp FILE *gitconfig_file = NULL;
1222 7c0b7f42 2020-09-24 stsp ssize_t n;
1224 7c0b7f42 2020-09-24 stsp /* Create a config file Git can understand. */
1225 7c0b7f42 2020-09-24 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1226 7c0b7f42 2020-09-24 stsp if (gitconfig_path == NULL) {
1227 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gitconfig");
1228 7c0b7f42 2020-09-24 stsp goto done;
1230 7c0b7f42 2020-09-24 stsp gitconfig_file = fopen(gitconfig_path, "a");
1231 7c0b7f42 2020-09-24 stsp if (gitconfig_file == NULL) {
1232 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gitconfig_path);
1233 7c0b7f42 2020-09-24 stsp goto done;
1235 7c0b7f42 2020-09-24 stsp if (mirror_references) {
1236 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1237 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1238 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1239 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/*:refs/*\n"
1240 7c0b7f42 2020-09-24 stsp "\tmirror = true\n",
1241 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1242 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1243 7c0b7f42 2020-09-24 stsp goto done;
1245 7c0b7f42 2020-09-24 stsp } else if (fetch_all_branches) {
1246 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1247 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1248 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1249 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1250 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1251 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1252 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1253 7c0b7f42 2020-09-24 stsp goto done;
1256 7c0b7f42 2020-09-24 stsp const char *branchname;
1259 7c0b7f42 2020-09-24 stsp * If the server specified a default branch, use just that one.
1260 7c0b7f42 2020-09-24 stsp * Otherwise fall back to fetching all branches on next fetch.
1262 04d9a9ec 2020-09-24 stsp if (default_branch) {
1263 04d9a9ec 2020-09-24 stsp branchname = default_branch;
1264 7c0b7f42 2020-09-24 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1265 7c0b7f42 2020-09-24 stsp branchname += 11;
1267 7c0b7f42 2020-09-24 stsp branchname = "*"; /* fall back to all branches */
1268 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1269 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1270 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1271 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1272 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1273 7c0b7f42 2020-09-24 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1274 7c0b7f42 2020-09-24 stsp branchname) == -1) {
1275 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1276 7c0b7f42 2020-09-24 stsp goto done;
1279 7c0b7f42 2020-09-24 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1280 7c0b7f42 2020-09-24 stsp if (n != strlen(gitconfig)) {
1281 7c0b7f42 2020-09-24 stsp err = got_ferror(gitconfig_file, GOT_ERR_IO);
1282 7c0b7f42 2020-09-24 stsp goto done;
1285 7c0b7f42 2020-09-24 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1286 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gitconfig_path);
1287 7c0b7f42 2020-09-24 stsp free(gitconfig_path);
1288 0e4002ca 2020-03-21 stsp return err;
1291 0e4002ca 2020-03-21 stsp static const struct got_error *
1292 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
1293 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1294 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
1295 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches, struct got_repository *repo)
1297 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
1298 04d9a9ec 2020-09-24 stsp const char *default_branch = NULL;
1299 04d9a9ec 2020-09-24 stsp struct got_pathlist_entry *pe;
1302 04d9a9ec 2020-09-24 stsp * If we asked for a set of wanted branches then use the first
1303 04d9a9ec 2020-09-24 stsp * one of those.
1305 62d463ca 2020-10-20 naddy if (!TAILQ_EMPTY(wanted_branches)) {
1306 04d9a9ec 2020-09-24 stsp pe = TAILQ_FIRST(wanted_branches);
1307 04d9a9ec 2020-09-24 stsp default_branch = pe->path;
1309 04d9a9ec 2020-09-24 stsp /* First HEAD ref listed by server is the default branch. */
1310 04d9a9ec 2020-09-24 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1311 04d9a9ec 2020-09-24 stsp const char *refname = pe->path;
1312 04d9a9ec 2020-09-24 stsp const char *target = pe->data;
1314 04d9a9ec 2020-09-24 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1317 04d9a9ec 2020-09-24 stsp default_branch = target;
1322 04d9a9ec 2020-09-24 stsp /* Create got.conf(5). */
1323 04d9a9ec 2020-09-24 stsp err = create_gotconfig(proto, host, port, remote_repo_path,
1324 04d9a9ec 2020-09-24 stsp fetch_all_branches, mirror_references, repo);
1326 04d9a9ec 2020-09-24 stsp return err;
1328 04d9a9ec 2020-09-24 stsp /* Create a config file Git can understand. */
1329 04d9a9ec 2020-09-24 stsp return create_gitconfig(git_url, default_branch, fetch_all_branches,
1330 04d9a9ec 2020-09-24 stsp mirror_references, repo);
1333 04d9a9ec 2020-09-24 stsp static const struct got_error *
1334 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1336 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1337 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1338 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1339 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1340 a9c2d4c2 2020-09-24 stsp const char *repo_path;
1341 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1342 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1343 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1344 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1345 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1346 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1347 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1348 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1349 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1350 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1352 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1353 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1354 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1355 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1357 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1358 93658fb9 2020-03-18 stsp switch (ch) {
1360 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1363 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1364 4ba14133 2020-03-20 stsp optarg, NULL);
1365 4ba14133 2020-03-20 stsp if (error)
1366 4ba14133 2020-03-20 stsp return error;
1369 41b0de12 2020-03-21 stsp list_refs_only = 1;
1372 469dd726 2020-03-20 stsp mirror_references = 1;
1375 68999b92 2020-03-18 stsp if (verbosity < 0)
1376 68999b92 2020-03-18 stsp verbosity = 0;
1377 68999b92 2020-03-18 stsp else if (verbosity < 3)
1378 68999b92 2020-03-18 stsp verbosity++;
1381 68999b92 2020-03-18 stsp verbosity = -1;
1384 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1385 0e4002ca 2020-03-21 stsp optarg, NULL);
1386 0e4002ca 2020-03-21 stsp if (error)
1387 0e4002ca 2020-03-21 stsp return error;
1390 93658fb9 2020-03-18 stsp usage_clone();
1394 93658fb9 2020-03-18 stsp argc -= optind;
1395 93658fb9 2020-03-18 stsp argv += optind;
1397 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1398 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
1399 41b0de12 2020-03-21 stsp if (list_refs_only) {
1400 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1401 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
1402 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1403 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
1404 41b0de12 2020-03-21 stsp if (mirror_references)
1405 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
1406 41b0de12 2020-03-21 stsp if (verbosity == -1)
1407 ff69268e 2020-12-13 stsp option_conflict('l', 'q');
1408 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1409 ff69268e 2020-12-13 stsp option_conflict('l', 'R');
1412 93658fb9 2020-03-18 stsp uri = argv[0];
1414 9df6f38b 2020-03-18 stsp if (argc == 1)
1415 93658fb9 2020-03-18 stsp dirname = NULL;
1416 9df6f38b 2020-03-18 stsp else if (argc == 2)
1417 93658fb9 2020-03-18 stsp dirname = argv[1];
1419 93658fb9 2020-03-18 stsp usage_clone();
1421 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1422 4dbec0a8 2020-08-27 stsp &repo_name, uri);
1423 39c64a6a 2020-03-18 stsp if (error)
1424 09f63084 2020-03-20 stsp goto done;
1426 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1427 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1428 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1429 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1430 09838ffc 2020-03-18 stsp goto done;
1433 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1434 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1435 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1436 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1437 39c64a6a 2020-03-18 stsp err(1, "pledge");
1439 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1440 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1441 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1442 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1443 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1444 39c64a6a 2020-03-18 stsp err(1, "pledge");
1446 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1447 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1448 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1449 39c64a6a 2020-03-18 stsp goto done;
1451 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1452 39c64a6a 2020-03-18 stsp goto done;
1454 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1455 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1456 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1457 bb64b798 2020-03-18 stsp goto done;
1459 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1461 bb64b798 2020-03-18 stsp repo_path = dirname;
1463 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1464 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1465 2751fe64 2020-09-24 stsp if (error &&
1466 2751fe64 2020-09-24 stsp (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1467 2751fe64 2020-09-24 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1468 41b0de12 2020-03-21 stsp goto done;
1469 2751fe64 2020-09-24 stsp if (!got_path_dir_is_empty(repo_path)) {
1470 2751fe64 2020-09-24 stsp error = got_error_path(repo_path,
1471 2751fe64 2020-09-24 stsp GOT_ERR_DIR_NOT_EMPTY);
1472 41b0de12 2020-03-21 stsp goto done;
1476 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1477 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1478 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1479 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1480 ee448f5f 2020-03-18 stsp goto done;
1483 f535bcd4 2020-09-30 stsp error = apply_unveil(repo_path, 0, NULL);
1484 ee448f5f 2020-03-18 stsp if (error)
1485 ee448f5f 2020-03-18 stsp goto done;
1487 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1488 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1489 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1491 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1492 9c52365f 2020-03-21 stsp server_path, verbosity);
1493 39c64a6a 2020-03-18 stsp if (error)
1494 bb64b798 2020-03-18 stsp goto done;
1496 2751fe64 2020-09-24 stsp if (!list_refs_only) {
1497 2751fe64 2020-09-24 stsp error = got_repo_init(repo_path);
1498 2751fe64 2020-09-24 stsp if (error)
1499 2751fe64 2020-09-24 stsp goto done;
1500 2751fe64 2020-09-24 stsp error = got_repo_open(&repo, repo_path, NULL);
1501 2751fe64 2020-09-24 stsp if (error)
1502 2751fe64 2020-09-24 stsp goto done;
1505 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1506 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1507 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1508 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1509 04d9a9ec 2020-09-24 stsp fpa.create_configs = 1;
1510 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
1511 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
1512 04d9a9ec 2020-09-24 stsp fpa.config_info.symrefs = &symrefs;
1513 04d9a9ec 2020-09-24 stsp fpa.config_info.wanted_branches = &wanted_branches;
1514 04d9a9ec 2020-09-24 stsp fpa.config_info.proto = proto;
1515 04d9a9ec 2020-09-24 stsp fpa.config_info.host = host;
1516 04d9a9ec 2020-09-24 stsp fpa.config_info.port = port;
1517 04d9a9ec 2020-09-24 stsp fpa.config_info.remote_repo_path = server_path;
1518 04d9a9ec 2020-09-24 stsp fpa.config_info.git_url = git_url;
1519 04d9a9ec 2020-09-24 stsp fpa.config_info.fetch_all_branches = fetch_all_branches;
1520 04d9a9ec 2020-09-24 stsp fpa.config_info.mirror_references = mirror_references;
1521 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1522 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1523 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1524 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1525 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1526 39c64a6a 2020-03-18 stsp if (error)
1527 d9b4d0c0 2020-03-18 stsp goto done;
1529 41b0de12 2020-03-21 stsp if (list_refs_only) {
1530 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1531 41b0de12 2020-03-21 stsp goto done;
1534 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1535 39c64a6a 2020-03-18 stsp if (error)
1536 d9b4d0c0 2020-03-18 stsp goto done;
1537 68999b92 2020-03-18 stsp if (verbosity >= 0)
1538 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1539 d9b4d0c0 2020-03-18 stsp free(id_str);
1541 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1542 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1543 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1544 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1545 7ebc0570 2020-03-18 stsp char *remote_refname;
1547 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1548 0e4002ca 2020-03-21 stsp !mirror_references) {
1549 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1550 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1551 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1552 0e4002ca 2020-03-21 stsp if (error)
1553 0e4002ca 2020-03-21 stsp goto done;
1557 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1558 39c64a6a 2020-03-18 stsp if (error)
1559 d9b4d0c0 2020-03-18 stsp goto done;
1561 469dd726 2020-03-20 stsp if (mirror_references)
1564 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1567 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1568 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1569 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1570 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1571 7ebc0570 2020-03-18 stsp goto done;
1573 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1574 f298ae0f 2020-03-25 stsp free(remote_refname);
1575 39c64a6a 2020-03-18 stsp if (error)
1576 d9b4d0c0 2020-03-18 stsp goto done;
1579 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1580 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1581 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1582 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1583 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1584 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1586 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1589 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1590 39c64a6a 2020-03-18 stsp if (error) {
1591 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1592 55330abe 2020-03-20 stsp error = NULL;
1595 d9b4d0c0 2020-03-18 stsp goto done;
1598 04d9a9ec 2020-09-24 stsp error = create_symref(refname, target_ref, verbosity, repo);
1599 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1600 f298ae0f 2020-03-25 stsp if (error)
1601 f298ae0f 2020-03-25 stsp goto done;
1603 f298ae0f 2020-03-25 stsp if (mirror_references)
1606 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1609 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1610 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1611 f298ae0f 2020-03-25 stsp refname) == -1) {
1612 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1613 f298ae0f 2020-03-25 stsp goto done;
1615 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1616 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1617 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1618 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1619 f298ae0f 2020-03-25 stsp free(remote_refname);
1620 f298ae0f 2020-03-25 stsp goto done;
1622 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1623 f298ae0f 2020-03-25 stsp if (error) {
1624 f298ae0f 2020-03-25 stsp free(remote_refname);
1625 f298ae0f 2020-03-25 stsp free(remote_target);
1626 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1627 f298ae0f 2020-03-25 stsp error = NULL;
1630 f298ae0f 2020-03-25 stsp goto done;
1632 04d9a9ec 2020-09-24 stsp error = create_symref(remote_refname, target_ref,
1633 04d9a9ec 2020-09-24 stsp verbosity - 1, repo);
1634 f298ae0f 2020-03-25 stsp free(remote_refname);
1635 f298ae0f 2020-03-25 stsp free(remote_target);
1636 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1637 39c64a6a 2020-03-18 stsp if (error)
1638 d9b4d0c0 2020-03-18 stsp goto done;
1640 4ba14133 2020-03-20 stsp if (pe == NULL) {
1642 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1643 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1644 4ba14133 2020-03-20 stsp * which could be fetched instead.
1646 62d463ca 2020-10-20 naddy TAILQ_FOREACH(pe, &wanted_branches, entry) {
1647 4ba14133 2020-03-20 stsp const char *target = pe->path;
1648 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1650 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1651 4ba14133 2020-03-20 stsp if (error) {
1652 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1653 4ba14133 2020-03-20 stsp error = NULL;
1656 4ba14133 2020-03-20 stsp goto done;
1659 04d9a9ec 2020-09-24 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1660 04d9a9ec 2020-09-24 stsp verbosity, repo);
1661 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1662 4ba14133 2020-03-20 stsp if (error)
1663 4ba14133 2020-03-20 stsp goto done;
1668 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1669 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1670 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1672 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1673 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1674 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1675 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1676 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1678 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1679 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1681 bb64b798 2020-03-18 stsp got_repo_close(repo);
1682 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1683 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1684 d9b4d0c0 2020-03-18 stsp free(pe->data);
1686 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1687 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1688 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1689 d9b4d0c0 2020-03-18 stsp free(pe->data);
1691 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1692 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1693 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1694 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1695 09838ffc 2020-03-18 stsp free(proto);
1696 09838ffc 2020-03-18 stsp free(host);
1697 09838ffc 2020-03-18 stsp free(port);
1698 09838ffc 2020-03-18 stsp free(server_path);
1699 09838ffc 2020-03-18 stsp free(repo_name);
1700 bb64b798 2020-03-18 stsp free(default_destdir);
1701 b46f3e71 2020-03-18 stsp free(git_url);
1702 39c64a6a 2020-03-18 stsp return error;
1705 7848a0e1 2020-03-19 stsp static const struct got_error *
1706 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1707 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1709 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1710 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1711 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1713 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1715 7848a0e1 2020-03-19 stsp goto done;
1717 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1718 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1719 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1721 88609724 2020-03-21 stsp goto done;
1722 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1723 88609724 2020-03-21 stsp goto done;
1724 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1725 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1726 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1728 db6d8ad8 2020-03-21 stsp goto done;
1731 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1732 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1733 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1734 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1735 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1737 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1739 7848a0e1 2020-03-19 stsp goto done;
1740 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1742 e8a967e0 2020-03-21 stsp goto done;
1744 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1746 7848a0e1 2020-03-19 stsp goto done;
1747 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1748 6338a6a1 2020-03-21 stsp goto done;
1750 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1752 6338a6a1 2020-03-21 stsp goto done;
1753 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1755 6338a6a1 2020-03-21 stsp goto done;
1758 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1759 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1760 6338a6a1 2020-03-21 stsp new_id_str);
1762 7848a0e1 2020-03-19 stsp free(old_id);
1763 7848a0e1 2020-03-19 stsp free(new_id_str);
1764 7848a0e1 2020-03-19 stsp return err;
1767 f1bcca34 2020-03-25 stsp static const struct got_error *
1768 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1769 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1771 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1772 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1773 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1775 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1776 bcf34b0e 2020-03-26 stsp if (err) {
1777 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1778 bcf34b0e 2020-03-26 stsp return err;
1779 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1781 bcf34b0e 2020-03-26 stsp goto done;
1783 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1785 bcf34b0e 2020-03-26 stsp goto done;
1787 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1788 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1789 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1790 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1792 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1794 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1795 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1796 bcf34b0e 2020-03-26 stsp goto done;
1798 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1799 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1801 bcf34b0e 2020-03-26 stsp goto done;
1803 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1805 bcf34b0e 2020-03-26 stsp goto done;
1807 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1808 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1809 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1813 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1814 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1815 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1816 bcf34b0e 2020-03-26 stsp err = unlock_err;
1818 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1819 f1bcca34 2020-03-25 stsp return err;
1822 2ab43947 2020-03-18 stsp __dead static void
1823 7848a0e1 2020-03-19 stsp usage_fetch(void)
1825 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1826 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1827 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1828 13f12b09 2020-03-21 stsp getprogname());
1832 7848a0e1 2020-03-19 stsp static const struct got_error *
1833 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1834 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1836 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1837 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1838 3789fd73 2020-03-26 stsp char *id_str = NULL;
1840 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1841 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1843 3789fd73 2020-03-26 stsp return err;
1844 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1845 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1846 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1847 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1850 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1852 3789fd73 2020-03-26 stsp return err;
1853 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1855 3789fd73 2020-03-26 stsp goto done;
1857 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1859 3789fd73 2020-03-26 stsp goto done;
1860 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1861 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1862 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1867 3789fd73 2020-03-26 stsp free(id_str);
1868 3789fd73 2020-03-26 stsp return NULL;
1871 3789fd73 2020-03-26 stsp static const struct got_error *
1872 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1873 50b0790e 2020-09-11 stsp struct got_pathlist_head *their_symrefs,
1874 50b0790e 2020-09-11 stsp const struct got_remote_repo *remote,
1875 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1877 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
1878 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1879 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1880 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1881 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
1882 3789fd73 2020-03-26 stsp char *local_refname = NULL;
1884 f21ec2f0 2020-03-21 stsp SIMPLEQ_INIT(&my_refs);
1886 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1888 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
1890 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1892 3789fd73 2020-03-26 stsp goto done;
1894 f21ec2f0 2020-03-21 stsp SIMPLEQ_FOREACH(re, &my_refs, entry) {
1895 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1897 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
1898 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
1899 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
1900 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
1901 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
1903 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
1904 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
1905 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
1906 3789fd73 2020-03-26 stsp goto done;
1908 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
1912 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1913 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1916 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1919 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
1920 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1923 3789fd73 2020-03-26 stsp if (pe != NULL)
1926 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
1930 3789fd73 2020-03-26 stsp if (local_refname) {
1931 3789fd73 2020-03-26 stsp struct got_reference *ref;
1932 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
1933 3789fd73 2020-03-26 stsp if (err) {
1934 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1936 3789fd73 2020-03-26 stsp free(local_refname);
1937 3789fd73 2020-03-26 stsp local_refname = NULL;
1940 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
1943 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
1944 3789fd73 2020-03-26 stsp got_ref_close(ref);
1945 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
1946 3789fd73 2020-03-26 stsp err = unlock_err;
1950 3789fd73 2020-03-26 stsp free(local_refname);
1951 3789fd73 2020-03-26 stsp local_refname = NULL;
1955 3789fd73 2020-03-26 stsp free(remote_namespace);
1956 3789fd73 2020-03-26 stsp free(local_refname);
1957 0e4002ca 2020-03-21 stsp return err;
1960 0e4002ca 2020-03-21 stsp static const struct got_error *
1961 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1962 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1964 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1965 0e4002ca 2020-03-21 stsp char *remote_refname;
1966 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1968 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1969 0e4002ca 2020-03-21 stsp refname += 5;
1971 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1972 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1973 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1975 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1976 0e4002ca 2020-03-21 stsp if (err) {
1977 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1978 0e4002ca 2020-03-21 stsp goto done;
1979 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1981 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1982 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1983 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1984 9f142382 2020-03-21 stsp err = unlock_err;
1985 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1988 0e4002ca 2020-03-21 stsp free(remote_refname);
1989 f21ec2f0 2020-03-21 stsp return err;
1992 f21ec2f0 2020-03-21 stsp static const struct got_error *
1993 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1995 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1996 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1997 7848a0e1 2020-03-19 stsp const char *remote_name;
1998 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1999 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
2000 50b0790e 2020-09-11 stsp const struct got_remote_repo *remotes, *remote = NULL;
2001 7848a0e1 2020-03-19 stsp int nremotes;
2002 7848a0e1 2020-03-19 stsp char *id_str = NULL;
2003 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
2004 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
2005 50b0790e 2020-09-11 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2006 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2007 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
2008 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
2009 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
2010 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
2011 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
2012 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2013 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
2015 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
2016 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
2017 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
2018 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
2020 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2021 7848a0e1 2020-03-19 stsp switch (ch) {
2023 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
2026 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
2027 4ba14133 2020-03-20 stsp optarg, NULL);
2028 4ba14133 2020-03-20 stsp if (error)
2029 4ba14133 2020-03-20 stsp return error;
2032 f21ec2f0 2020-03-21 stsp delete_refs = 1;
2035 41b0de12 2020-03-21 stsp list_refs_only = 1;
2038 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
2039 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2040 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
2042 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
2045 db6d8ad8 2020-03-21 stsp replace_tags = 1;
2048 7848a0e1 2020-03-19 stsp if (verbosity < 0)
2049 7848a0e1 2020-03-19 stsp verbosity = 0;
2050 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
2051 7848a0e1 2020-03-19 stsp verbosity++;
2054 7848a0e1 2020-03-19 stsp verbosity = -1;
2057 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
2058 0e4002ca 2020-03-21 stsp optarg, NULL);
2059 0e4002ca 2020-03-21 stsp if (error)
2060 0e4002ca 2020-03-21 stsp return error;
2063 7848a0e1 2020-03-19 stsp usage_fetch();
2067 7848a0e1 2020-03-19 stsp argc -= optind;
2068 7848a0e1 2020-03-19 stsp argv += optind;
2070 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2071 ff69268e 2020-12-13 stsp option_conflict('a', 'b');
2072 41b0de12 2020-03-21 stsp if (list_refs_only) {
2073 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
2074 ff69268e 2020-12-13 stsp option_conflict('l', 'b');
2075 ff69268e 2020-12-13 stsp if (fetch_all_branches)
2076 ff69268e 2020-12-13 stsp option_conflict('l', 'a');
2077 f21ec2f0 2020-03-21 stsp if (delete_refs)
2078 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
2079 41b0de12 2020-03-21 stsp if (verbosity == -1)
2080 ff69268e 2020-12-13 stsp option_conflict('l', 'q');
2083 7848a0e1 2020-03-19 stsp if (argc == 0)
2084 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2085 7848a0e1 2020-03-19 stsp else if (argc == 1)
2086 7848a0e1 2020-03-19 stsp remote_name = argv[0];
2088 7848a0e1 2020-03-19 stsp usage_fetch();
2090 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
2091 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
2092 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
2093 7848a0e1 2020-03-19 stsp goto done;
2096 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2097 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
2098 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2099 7848a0e1 2020-03-19 stsp goto done;
2101 7848a0e1 2020-03-19 stsp error = NULL;
2102 7848a0e1 2020-03-19 stsp if (worktree) {
2103 7848a0e1 2020-03-19 stsp repo_path =
2104 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
2105 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2106 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2107 7848a0e1 2020-03-19 stsp if (error)
2108 7848a0e1 2020-03-19 stsp goto done;
2110 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
2111 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2112 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2113 7848a0e1 2020-03-19 stsp goto done;
2118 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
2119 7848a0e1 2020-03-19 stsp if (error)
2120 7848a0e1 2020-03-19 stsp goto done;
2122 50b0790e 2020-09-11 stsp if (worktree) {
2123 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
2124 50b0790e 2020-09-11 stsp if (worktree_conf) {
2125 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2126 50b0790e 2020-09-11 stsp worktree_conf);
2127 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2128 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2129 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2135 50b0790e 2020-09-11 stsp if (remote == NULL) {
2136 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
2137 50b0790e 2020-09-11 stsp if (repo_conf) {
2138 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2139 50b0790e 2020-09-11 stsp repo_conf);
2140 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2141 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2142 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2148 50b0790e 2020-09-11 stsp if (remote == NULL) {
2149 257add31 2020-09-09 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2150 257add31 2020-09-09 stsp for (i = 0; i < nremotes; i++) {
2151 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2152 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2157 50b0790e 2020-09-11 stsp if (remote == NULL) {
2158 50b0790e 2020-09-11 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2159 50b0790e 2020-09-11 stsp goto done;
2162 b8adfa55 2020-09-25 stsp if (TAILQ_EMPTY(&wanted_branches) && remote->nbranches > 0) {
2163 b8adfa55 2020-09-25 stsp for (i = 0; i < remote->nbranches; i++) {
2164 b8adfa55 2020-09-25 stsp got_pathlist_append(&wanted_branches,
2165 b8adfa55 2020-09-25 stsp remote->branches[i], NULL);
2170 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2171 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
2172 7848a0e1 2020-03-19 stsp if (error)
2173 7848a0e1 2020-03-19 stsp goto done;
2175 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
2176 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2177 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2178 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
2179 7848a0e1 2020-03-19 stsp err(1, "pledge");
2181 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
2182 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
2183 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2184 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2185 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
2186 7848a0e1 2020-03-19 stsp err(1, "pledge");
2188 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
2189 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
2190 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2191 7848a0e1 2020-03-19 stsp goto done;
2193 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2194 7848a0e1 2020-03-19 stsp goto done;
2197 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2198 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2199 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
2200 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
2201 7848a0e1 2020-03-19 stsp goto done;
2204 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2205 7848a0e1 2020-03-19 stsp if (error)
2206 7848a0e1 2020-03-19 stsp goto done;
2208 f79e6490 2020-04-19 stsp if (verbosity >= 0)
2209 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2210 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
2212 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2213 9c52365f 2020-03-21 stsp server_path, verbosity);
2214 7848a0e1 2020-03-19 stsp if (error)
2215 7848a0e1 2020-03-19 stsp goto done;
2217 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
2218 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
2219 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
2220 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
2221 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
2222 04d9a9ec 2020-09-24 stsp fpa.create_configs = 0;
2223 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
2224 04d9a9ec 2020-09-24 stsp memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2225 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2226 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
2227 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2228 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
2229 7848a0e1 2020-03-19 stsp if (error)
2230 7848a0e1 2020-03-19 stsp goto done;
2232 41b0de12 2020-03-21 stsp if (list_refs_only) {
2233 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
2234 41b0de12 2020-03-21 stsp goto done;
2237 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
2238 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
2239 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
2240 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
2241 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
2242 984065c8 2020-03-19 stsp if (error)
2243 984065c8 2020-03-19 stsp goto done;
2244 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
2245 984065c8 2020-03-19 stsp free(id_str);
2246 984065c8 2020-03-19 stsp id_str = NULL;
2249 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
2250 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2251 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
2252 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
2253 7848a0e1 2020-03-19 stsp struct got_reference *ref;
2254 7848a0e1 2020-03-19 stsp char *remote_refname;
2256 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
2257 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
2258 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
2259 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
2260 0e4002ca 2020-03-21 stsp if (error)
2261 0e4002ca 2020-03-21 stsp goto done;
2265 1510c839 2020-03-20 stsp if (remote->mirror_references ||
2266 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
2267 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2268 7848a0e1 2020-03-19 stsp if (error) {
2269 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2270 7848a0e1 2020-03-19 stsp goto done;
2271 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2273 7848a0e1 2020-03-19 stsp if (error)
2274 7848a0e1 2020-03-19 stsp goto done;
2276 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2277 db6d8ad8 2020-03-21 stsp verbosity, repo);
2278 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2279 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2280 9f142382 2020-03-21 stsp error = unlock_err;
2281 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2282 7848a0e1 2020-03-19 stsp if (error)
2283 7848a0e1 2020-03-19 stsp goto done;
2285 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
2286 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2287 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
2288 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
2289 7848a0e1 2020-03-19 stsp goto done;
2292 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
2293 7848a0e1 2020-03-19 stsp if (error) {
2294 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2295 7848a0e1 2020-03-19 stsp goto done;
2296 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
2297 688f11b3 2020-03-21 stsp verbosity, repo);
2298 7848a0e1 2020-03-19 stsp if (error)
2299 7848a0e1 2020-03-19 stsp goto done;
2301 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2302 db6d8ad8 2020-03-21 stsp verbosity, repo);
2303 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2304 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2305 9f142382 2020-03-21 stsp error = unlock_err;
2306 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2307 7848a0e1 2020-03-19 stsp if (error)
2308 7848a0e1 2020-03-19 stsp goto done;
2311 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2312 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2313 2ec30c80 2020-03-20 stsp if (error) {
2314 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2315 2ec30c80 2020-03-20 stsp goto done;
2316 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2318 2ec30c80 2020-03-20 stsp if (error)
2319 2ec30c80 2020-03-20 stsp goto done;
2321 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2322 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2323 9f142382 2020-03-21 stsp error = unlock_err;
2324 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2328 f1bcca34 2020-03-25 stsp if (delete_refs) {
2329 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2330 3789fd73 2020-03-26 stsp verbosity, repo);
2331 f1bcca34 2020-03-25 stsp if (error)
2332 f1bcca34 2020-03-25 stsp goto done;
2335 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2336 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2337 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2338 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2339 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2340 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2341 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2343 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2346 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2349 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2350 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2351 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2352 f1bcca34 2020-03-25 stsp goto done;
2354 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2355 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2356 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2357 f1bcca34 2020-03-25 stsp free(remote_refname);
2358 f1bcca34 2020-03-25 stsp goto done;
2361 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2363 f1bcca34 2020-03-25 stsp if (error) {
2364 f1bcca34 2020-03-25 stsp free(remote_refname);
2365 f1bcca34 2020-03-25 stsp free(remote_target);
2366 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2367 f1bcca34 2020-03-25 stsp error = NULL;
2370 f1bcca34 2020-03-25 stsp goto done;
2372 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2373 f1bcca34 2020-03-25 stsp verbosity, repo);
2374 f1bcca34 2020-03-25 stsp free(remote_refname);
2375 f1bcca34 2020-03-25 stsp free(remote_target);
2376 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2377 f1bcca34 2020-03-25 stsp if (error)
2378 f1bcca34 2020-03-25 stsp goto done;
2382 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2383 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2384 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2385 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2386 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2388 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2389 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2391 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2392 7848a0e1 2020-03-19 stsp if (worktree)
2393 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2394 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2395 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2396 7848a0e1 2020-03-19 stsp free(pe->data);
2398 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2399 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2400 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2401 7848a0e1 2020-03-19 stsp free(pe->data);
2403 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2404 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2405 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2406 7848a0e1 2020-03-19 stsp free(id_str);
2407 7848a0e1 2020-03-19 stsp free(cwd);
2408 7848a0e1 2020-03-19 stsp free(repo_path);
2409 7848a0e1 2020-03-19 stsp free(pack_hash);
2410 7848a0e1 2020-03-19 stsp free(proto);
2411 7848a0e1 2020-03-19 stsp free(host);
2412 7848a0e1 2020-03-19 stsp free(port);
2413 7848a0e1 2020-03-19 stsp free(server_path);
2414 7848a0e1 2020-03-19 stsp free(repo_name);
2415 7848a0e1 2020-03-19 stsp return error;
2419 7848a0e1 2020-03-19 stsp __dead static void
2420 2ab43947 2020-03-18 stsp usage_checkout(void)
2422 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2423 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2427 2ab43947 2020-03-18 stsp static void
2428 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2430 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2431 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2432 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2433 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2434 2ab43947 2020-03-18 stsp getprogname());
2437 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2438 2ab43947 2020-03-18 stsp const char *worktree_path;
2439 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2442 2ab43947 2020-03-18 stsp static const struct got_error *
2443 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2445 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2447 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2448 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2449 2ab43947 2020-03-18 stsp return NULL;
2451 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2452 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2453 2ab43947 2020-03-18 stsp return NULL;
2456 2ab43947 2020-03-18 stsp while (path[0] == '/')
2459 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2460 2ab43947 2020-03-18 stsp return NULL;
2463 2ab43947 2020-03-18 stsp static const struct got_error *
2464 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2466 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2467 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2468 2ab43947 2020-03-18 stsp return NULL;
2471 2ab43947 2020-03-18 stsp static const struct got_error *
2472 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2473 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2474 2ab43947 2020-03-18 stsp struct got_repository *repo)
2476 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2477 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2479 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2480 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2482 2ab43947 2020-03-18 stsp return err;
2484 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2485 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2488 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2489 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2491 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2493 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2501 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2502 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2503 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2505 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2506 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2507 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2508 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2509 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2510 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2512 2ab43947 2020-03-18 stsp free(yca_id);
2513 2ab43947 2020-03-18 stsp return NULL;
2516 2ab43947 2020-03-18 stsp static const struct got_error *
2517 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2518 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2519 2ab43947 2020-03-18 stsp struct got_repository *repo)
2521 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2522 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2523 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2524 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2526 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2528 2ab43947 2020-03-18 stsp goto done;
2530 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2531 2ab43947 2020-03-18 stsp is_same_branch = 1;
2532 2ab43947 2020-03-18 stsp goto done;
2534 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2535 2ab43947 2020-03-18 stsp is_same_branch = 1;
2536 2ab43947 2020-03-18 stsp goto done;
2539 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2541 2ab43947 2020-03-18 stsp goto done;
2543 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2544 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2546 2ab43947 2020-03-18 stsp goto done;
2548 2ab43947 2020-03-18 stsp for (;;) {
2549 2ab43947 2020-03-18 stsp struct got_object_id *id;
2550 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2551 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2552 2ab43947 2020-03-18 stsp if (err) {
2553 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2554 2ab43947 2020-03-18 stsp err = NULL;
2559 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2561 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2562 2ab43947 2020-03-18 stsp is_same_branch = 1;
2568 2ab43947 2020-03-18 stsp if (graph)
2569 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2570 2ab43947 2020-03-18 stsp free(head_commit_id);
2571 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2572 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2573 2ab43947 2020-03-18 stsp return err;
2576 4ed7e80c 2018-05-20 stsp static const struct got_error *
2577 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2579 4b6c9460 2020-03-05 stsp static char msg[512];
2580 4b6c9460 2020-03-05 stsp const char *branch_name;
2582 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2583 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2585 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2587 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2588 4b6c9460 2020-03-05 stsp branch_name += 11;
2590 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2591 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2592 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2593 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2594 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2595 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2597 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2600 4b6c9460 2020-03-05 stsp static const struct got_error *
2601 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2603 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2604 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2605 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2606 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2607 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2608 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2609 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2610 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2611 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2612 f0207f6a 2020-10-19 stsp char *cwd = NULL;
2613 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2614 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2615 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2617 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2619 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2620 0bb8a95e 2018-03-12 stsp switch (ch) {
2622 08573d5b 2019-05-14 stsp branch_name = optarg;
2625 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2626 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2627 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2630 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2633 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2636 2deda0b9 2019-03-07 stsp usage_checkout();
2637 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2641 0bb8a95e 2018-03-12 stsp argc -= optind;
2642 0bb8a95e 2018-03-12 stsp argv += optind;
2644 6715a751 2018-03-16 stsp #ifndef PROFILE
2645 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2646 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2647 c09a553d 2018-03-12 stsp err(1, "pledge");
2649 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2650 c47340da 2020-09-20 stsp char *base, *dotgit;
2651 f0207f6a 2020-10-19 stsp const char *path;
2652 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2653 76089277 2018-04-01 stsp if (repo_path == NULL)
2654 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2655 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2656 76089277 2018-04-01 stsp if (cwd == NULL) {
2657 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2658 76089277 2018-04-01 stsp goto done;
2660 c47340da 2020-09-20 stsp if (path_prefix[0])
2661 f0207f6a 2020-10-19 stsp path = path_prefix;
2663 f0207f6a 2020-10-19 stsp path = repo_path;
2664 f0207f6a 2020-10-19 stsp error = got_path_basename(&base, path);
2665 f0207f6a 2020-10-19 stsp if (error)
2666 c47340da 2020-09-20 stsp goto done;
2667 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2668 c09a553d 2018-03-12 stsp if (dotgit)
2669 c09a553d 2018-03-12 stsp *dotgit = '\0';
2670 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2671 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2672 f0207f6a 2020-10-19 stsp free(base);
2673 76089277 2018-04-01 stsp goto done;
2675 f0207f6a 2020-10-19 stsp free(base);
2676 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2677 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2678 76089277 2018-04-01 stsp if (repo_path == NULL) {
2679 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2680 76089277 2018-04-01 stsp goto done;
2682 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2683 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2684 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2685 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2687 b4b3a7dd 2019-07-22 stsp goto done;
2689 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2690 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2691 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2692 b4b3a7dd 2019-07-22 stsp goto done;
2696 c09a553d 2018-03-12 stsp usage_checkout();
2698 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2699 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2701 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2702 c09a553d 2018-03-12 stsp if (error != NULL)
2703 c02c541e 2019-03-29 stsp goto done;
2705 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2706 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2707 c530dc23 2019-07-23 stsp if (error) {
2708 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2709 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2710 c530dc23 2019-07-23 stsp goto done;
2711 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2712 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2713 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2714 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2715 c530dc23 2019-07-23 stsp goto done;
2719 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2720 c02c541e 2019-03-29 stsp if (error)
2721 c09a553d 2018-03-12 stsp goto done;
2723 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2724 c09a553d 2018-03-12 stsp if (error != NULL)
2725 c09a553d 2018-03-12 stsp goto done;
2727 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2728 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2729 c09a553d 2018-03-12 stsp goto done;
2731 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2732 c09a553d 2018-03-12 stsp if (error != NULL)
2733 c09a553d 2018-03-12 stsp goto done;
2735 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2736 e5dc7198 2018-12-29 stsp path_prefix);
2737 e5dc7198 2018-12-29 stsp if (error != NULL)
2738 e5dc7198 2018-12-29 stsp goto done;
2739 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2740 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2741 49520a32 2018-12-29 stsp goto done;
2744 8069f636 2019-01-12 stsp if (commit_id_str) {
2745 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2746 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2747 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2748 30837e32 2019-07-25 stsp if (error)
2749 8069f636 2019-01-12 stsp goto done;
2750 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2751 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2752 8069f636 2019-01-12 stsp if (error != NULL) {
2753 8069f636 2019-01-12 stsp free(commit_id);
2754 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2755 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2756 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2758 8069f636 2019-01-12 stsp goto done;
2760 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2761 4b6c9460 2020-03-05 stsp if (error) {
2762 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2763 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2764 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2766 45d344f6 2019-05-14 stsp goto done;
2768 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2769 8069f636 2019-01-12 stsp commit_id);
2770 8069f636 2019-01-12 stsp free(commit_id);
2771 8069f636 2019-01-12 stsp if (error)
2772 8069f636 2019-01-12 stsp goto done;
2775 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2776 f2ea84fa 2019-07-27 stsp if (error)
2777 f2ea84fa 2019-07-27 stsp goto done;
2778 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2779 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2780 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2781 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2782 c09a553d 2018-03-12 stsp if (error != NULL)
2783 c09a553d 2018-03-12 stsp goto done;
2785 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2786 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2787 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2789 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2790 8069f636 2019-01-12 stsp free(commit_id_str);
2791 76089277 2018-04-01 stsp free(repo_path);
2792 507dc3bb 2018-12-29 stsp free(worktree_path);
2793 c47340da 2020-09-20 stsp free(cwd);
2794 507dc3bb 2018-12-29 stsp return error;
2797 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2798 9627c110 2020-04-18 stsp int did_something;
2799 9627c110 2020-04-18 stsp int conflicts;
2800 9627c110 2020-04-18 stsp int obstructed;
2801 9627c110 2020-04-18 stsp int not_updated;
2805 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2807 9627c110 2020-04-18 stsp if (!upa->did_something)
2810 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2811 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2812 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2813 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2814 9627c110 2020-04-18 stsp upa->obstructed);
2815 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2816 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2817 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2820 507dc3bb 2018-12-29 stsp __dead static void
2821 507dc3bb 2018-12-29 stsp usage_update(void)
2823 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2824 507dc3bb 2018-12-29 stsp getprogname());
2828 1ee397ad 2019-07-12 stsp static const struct got_error *
2829 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2831 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2833 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2834 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2835 1ee397ad 2019-07-12 stsp return NULL;
2837 9627c110 2020-04-18 stsp upa->did_something = 1;
2839 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2840 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2841 1ee397ad 2019-07-12 stsp return NULL;
2843 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2844 9627c110 2020-04-18 stsp upa->conflicts++;
2845 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2846 9627c110 2020-04-18 stsp upa->obstructed++;
2847 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2848 9627c110 2020-04-18 stsp upa->not_updated++;
2850 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2852 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2853 1ee397ad 2019-07-12 stsp return NULL;
2856 be7061eb 2018-12-30 stsp static const struct got_error *
2857 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2858 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2859 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2861 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2862 a1fb16d8 2019-05-24 stsp char *base_id_str;
2863 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2865 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2866 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2867 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2868 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2869 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2870 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2871 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2874 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2875 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2876 a1fb16d8 2019-05-24 stsp if (err) {
2877 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2878 a1fb16d8 2019-05-24 stsp return err;
2879 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2881 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2882 a1fb16d8 2019-05-24 stsp return NULL;
2884 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2885 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2886 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2888 a1fb16d8 2019-05-24 stsp return err;
2889 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2890 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2891 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2892 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2893 0ebf8283 2019-07-24 stsp return NULL;
2896 0ebf8283 2019-07-24 stsp static const struct got_error *
2897 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2899 0ebf8283 2019-07-24 stsp const struct got_error *err;
2900 0ebf8283 2019-07-24 stsp int in_progress;
2902 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2904 0ebf8283 2019-07-24 stsp return err;
2905 0ebf8283 2019-07-24 stsp if (in_progress)
2906 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2908 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2910 0ebf8283 2019-07-24 stsp return err;
2911 0ebf8283 2019-07-24 stsp if (in_progress)
2912 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2914 a1fb16d8 2019-05-24 stsp return NULL;
2917 a5edda0a 2019-07-27 stsp static const struct got_error *
2918 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2919 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2921 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2922 a5edda0a 2019-07-27 stsp char *path;
2925 a5edda0a 2019-07-27 stsp if (argc == 0) {
2926 a5edda0a 2019-07-27 stsp path = strdup("");
2927 a5edda0a 2019-07-27 stsp if (path == NULL)
2928 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2929 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2932 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2933 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2936 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2937 a5edda0a 2019-07-27 stsp if (err) {
2938 a5edda0a 2019-07-27 stsp free(path);
2943 a5edda0a 2019-07-27 stsp return err;
2946 a1fb16d8 2019-05-24 stsp static const struct got_error *
2947 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2948 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2950 fa51e947 2020-03-27 stsp const struct got_error *err;
2951 fa51e947 2020-03-27 stsp struct got_repository *repo;
2952 fa51e947 2020-03-27 stsp static char msg[512];
2954 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2956 fa51e947 2020-03-27 stsp return orig_err;
2958 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2959 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2960 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2961 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2962 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2963 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2964 fa51e947 2020-03-27 stsp got_repo_close(repo);
2965 fa51e947 2020-03-27 stsp return err;
2968 fa51e947 2020-03-27 stsp static const struct got_error *
2969 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2971 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2972 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2973 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2974 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2975 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2976 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2977 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2978 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2979 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2980 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2982 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
2984 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2986 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2987 507dc3bb 2018-12-29 stsp switch (ch) {
2989 024e9686 2019-05-14 stsp branch_name = optarg;
2992 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2993 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2994 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2997 2deda0b9 2019-03-07 stsp usage_update();
2998 507dc3bb 2018-12-29 stsp /* NOTREACHED */
3002 507dc3bb 2018-12-29 stsp argc -= optind;
3003 507dc3bb 2018-12-29 stsp argv += optind;
3005 507dc3bb 2018-12-29 stsp #ifndef PROFILE
3006 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3007 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
3008 507dc3bb 2018-12-29 stsp err(1, "pledge");
3010 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
3011 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
3012 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3013 c4cdcb68 2019-04-03 stsp goto done;
3015 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
3016 fa51e947 2020-03-27 stsp if (error) {
3017 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3018 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
3019 fa51e947 2020-03-27 stsp worktree_path);
3020 7d5807f4 2019-07-11 stsp goto done;
3023 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
3024 f2ea84fa 2019-07-27 stsp if (error)
3025 f2ea84fa 2019-07-27 stsp goto done;
3027 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3029 507dc3bb 2018-12-29 stsp if (error != NULL)
3030 507dc3bb 2018-12-29 stsp goto done;
3032 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3033 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3034 087fb88c 2019-08-04 stsp if (error)
3035 087fb88c 2019-08-04 stsp goto done;
3037 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3038 0266afb7 2019-01-04 stsp if (error)
3039 0266afb7 2019-01-04 stsp goto done;
3041 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3042 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
3043 024e9686 2019-05-14 stsp if (error != NULL)
3044 024e9686 2019-05-14 stsp goto done;
3045 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
3046 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3047 9c4b8182 2019-01-02 stsp if (error != NULL)
3048 9c4b8182 2019-01-02 stsp goto done;
3049 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3050 507dc3bb 2018-12-29 stsp if (error != NULL)
3051 507dc3bb 2018-12-29 stsp goto done;
3053 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3054 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3055 04f57cb3 2019-07-25 stsp free(commit_id_str);
3056 bb787f09 2019-07-25 stsp commit_id_str = NULL;
3057 30837e32 2019-07-25 stsp if (error)
3058 a297e751 2019-07-11 stsp goto done;
3059 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
3060 a297e751 2019-07-11 stsp if (error)
3061 507dc3bb 2018-12-29 stsp goto done;
3064 a1fb16d8 2019-05-24 stsp if (branch_name) {
3065 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
3066 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
3067 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
3069 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3070 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
3071 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
3072 024e9686 2019-05-14 stsp goto done;
3074 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
3075 024e9686 2019-05-14 stsp if (error)
3076 024e9686 2019-05-14 stsp goto done;
3077 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
3079 a367ff0f 2019-05-14 stsp free(head_commit_id);
3080 024e9686 2019-05-14 stsp if (error != NULL)
3081 024e9686 2019-05-14 stsp goto done;
3082 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3083 a367ff0f 2019-05-14 stsp if (error)
3084 a367ff0f 2019-05-14 stsp goto done;
3085 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
3086 024e9686 2019-05-14 stsp if (error)
3087 024e9686 2019-05-14 stsp goto done;
3089 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
3090 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3091 a367ff0f 2019-05-14 stsp if (error != NULL) {
3092 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
3093 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
3094 024e9686 2019-05-14 stsp goto done;
3096 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3097 a367ff0f 2019-05-14 stsp if (error)
3098 a367ff0f 2019-05-14 stsp goto done;
3101 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3102 507dc3bb 2018-12-29 stsp commit_id) != 0) {
3103 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3104 507dc3bb 2018-12-29 stsp commit_id);
3105 507dc3bb 2018-12-29 stsp if (error)
3106 507dc3bb 2018-12-29 stsp goto done;
3109 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
3110 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3111 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
3112 507dc3bb 2018-12-29 stsp if (error != NULL)
3113 507dc3bb 2018-12-29 stsp goto done;
3115 9627c110 2020-04-18 stsp if (upa.did_something)
3116 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
3118 784955db 2019-01-12 stsp printf("Already up-to-date\n");
3119 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
3121 c09a553d 2018-03-12 stsp free(worktree_path);
3122 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3123 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
3124 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3125 507dc3bb 2018-12-29 stsp free(commit_id);
3126 9c4b8182 2019-01-02 stsp free(commit_id_str);
3127 c09a553d 2018-03-12 stsp return error;
3130 f42b1b34 2018-03-12 stsp static const struct got_error *
3131 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3132 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3133 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3135 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
3136 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3138 44392932 2019-08-25 stsp if (blob_id1) {
3139 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3141 44392932 2019-08-25 stsp goto done;
3144 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3146 44392932 2019-08-25 stsp goto done;
3148 44392932 2019-08-25 stsp while (path[0] == '/')
3150 fe621944 2020-11-10 stsp err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3151 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, stdout);
3153 44392932 2019-08-25 stsp if (blob1)
3154 44392932 2019-08-25 stsp got_object_blob_close(blob1);
3155 44392932 2019-08-25 stsp got_object_blob_close(blob2);
3156 44392932 2019-08-25 stsp return err;
3159 44392932 2019-08-25 stsp static const struct got_error *
3160 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3161 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3162 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3164 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3165 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3166 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
3168 44392932 2019-08-25 stsp if (tree_id1) {
3169 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3171 44392932 2019-08-25 stsp goto done;
3174 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3176 0f2b3dca 2018-12-22 stsp goto done;
3178 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
3179 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3180 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
3181 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3182 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
3183 fe621944 2020-11-10 stsp arg.nlines = 0;
3184 44392932 2019-08-25 stsp while (path[0] == '/')
3186 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3187 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3189 79109fed 2018-03-27 stsp if (tree1)
3190 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3191 366e0a5f 2019-10-10 stsp if (tree2)
3192 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3193 44392932 2019-08-25 stsp return err;
3196 44392932 2019-08-25 stsp static const struct got_error *
3197 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3198 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3200 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3201 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3202 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3203 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3205 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3206 0208f208 2020-05-05 stsp if (qid != NULL) {
3207 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3208 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3211 0208f208 2020-05-05 stsp return err;
3213 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3214 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3218 0208f208 2020-05-05 stsp if (tree_id1) {
3219 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3221 0208f208 2020-05-05 stsp goto done;
3224 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3225 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3227 0208f208 2020-05-05 stsp goto done;
3229 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3230 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3232 0208f208 2020-05-05 stsp if (tree1)
3233 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3234 0208f208 2020-05-05 stsp if (tree2)
3235 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3236 0208f208 2020-05-05 stsp return err;
3239 0208f208 2020-05-05 stsp static const struct got_error *
3240 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3241 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3243 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3244 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3245 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3246 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3247 44392932 2019-08-25 stsp struct got_object_qid *qid;
3249 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3250 44392932 2019-08-25 stsp if (qid != NULL) {
3251 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3254 44392932 2019-08-25 stsp return err;
3257 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3258 44392932 2019-08-25 stsp int obj_type;
3259 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3261 44392932 2019-08-25 stsp goto done;
3262 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3263 44392932 2019-08-25 stsp if (err) {
3264 44392932 2019-08-25 stsp free(obj_id2);
3265 44392932 2019-08-25 stsp goto done;
3267 44392932 2019-08-25 stsp if (pcommit) {
3268 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3269 44392932 2019-08-25 stsp qid->id, path);
3270 44392932 2019-08-25 stsp if (err) {
3271 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3272 2e8c69d1 2020-05-04 stsp free(obj_id2);
3273 2e8c69d1 2020-05-04 stsp goto done;
3276 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3277 2e8c69d1 2020-05-04 stsp if (err) {
3278 2e8c69d1 2020-05-04 stsp free(obj_id2);
3279 2e8c69d1 2020-05-04 stsp goto done;
3283 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3284 44392932 2019-08-25 stsp if (err) {
3285 44392932 2019-08-25 stsp free(obj_id2);
3286 44392932 2019-08-25 stsp goto done;
3288 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3289 44392932 2019-08-25 stsp switch (obj_type) {
3290 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3291 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3292 64453f7e 2020-11-21 stsp 0, 0, repo);
3294 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3295 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3296 64453f7e 2020-11-21 stsp 0, 0, repo);
3299 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3302 44392932 2019-08-25 stsp free(obj_id1);
3303 44392932 2019-08-25 stsp free(obj_id2);
3305 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3306 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3308 44392932 2019-08-25 stsp goto done;
3309 579bd556 2020-10-24 stsp if (pcommit) {
3310 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3311 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3313 579bd556 2020-10-24 stsp goto done;
3315 64453f7e 2020-11-21 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3317 64453f7e 2020-11-21 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3321 0f2b3dca 2018-12-22 stsp free(id_str1);
3322 0f2b3dca 2018-12-22 stsp free(id_str2);
3323 44392932 2019-08-25 stsp if (pcommit)
3324 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3325 79109fed 2018-03-27 stsp return err;
3328 4bb494d5 2018-06-16 stsp static char *
3329 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3331 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3332 09867e48 2019-08-13 stsp char *p, *s;
3334 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3335 09867e48 2019-08-13 stsp if (tm == NULL)
3336 09867e48 2019-08-13 stsp return NULL;
3337 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3338 09867e48 2019-08-13 stsp if (s == NULL)
3339 09867e48 2019-08-13 stsp return NULL;
3340 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3342 6c281f94 2018-06-11 stsp *p = '\0';
3346 6841bf13 2019-11-29 kn static const struct got_error *
3347 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3348 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3350 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3351 6841bf13 2019-11-29 kn regmatch_t regmatch;
3352 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3354 6841bf13 2019-11-29 kn *have_match = 0;
3356 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3360 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3364 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3365 6841bf13 2019-11-29 kn *have_match = 1;
3367 6841bf13 2019-11-29 kn free(id_str);
3368 6841bf13 2019-11-29 kn free(logmsg);
3372 0208f208 2020-05-05 stsp static void
3373 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3374 0208f208 2020-05-05 stsp regex_t *regex)
3376 0208f208 2020-05-05 stsp regmatch_t regmatch;
3377 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3379 0208f208 2020-05-05 stsp *have_match = 0;
3381 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3382 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3383 0208f208 2020-05-05 stsp *have_match = 1;
3389 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3391 79109fed 2018-03-27 stsp static const struct got_error *
3392 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3393 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path,
3394 0208f208 2020-05-05 stsp struct got_pathlist_head *changed_paths, int show_patch,
3395 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3397 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3398 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3399 6c281f94 2018-06-11 stsp char datebuf[26];
3400 45d799e2 2018-12-23 stsp time_t committer_time;
3401 45d799e2 2018-12-23 stsp const char *author, *committer;
3402 199a4027 2019-02-02 stsp char *refs_str = NULL;
3403 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3405 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3407 199a4027 2019-02-02 stsp const char *name;
3408 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3409 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3412 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3413 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3415 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3416 199a4027 2019-02-02 stsp name += 5;
3417 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3419 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3420 e34f9ed6 2019-02-02 stsp name += 6;
3421 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3422 141c2bff 2019-02-04 stsp name += 8;
3423 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3424 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3427 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3429 48cae60d 2020-09-22 stsp return err;
3430 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3431 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3432 5d844a1e 2019-08-13 stsp if (err) {
3433 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3434 48cae60d 2020-09-22 stsp free(ref_id);
3435 5d844a1e 2019-08-13 stsp return err;
3437 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3438 5d844a1e 2019-08-13 stsp err = NULL;
3439 5d844a1e 2019-08-13 stsp tag = NULL;
3442 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3443 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3444 48cae60d 2020-09-22 stsp free(ref_id);
3446 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3447 a436ad14 2019-08-13 stsp if (cmp != 0)
3449 199a4027 2019-02-02 stsp s = refs_str;
3450 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3451 199a4027 2019-02-02 stsp name) == -1) {
3452 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3454 34ca4898 2019-08-13 stsp return err;
3458 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3460 8bf5b3c9 2018-03-17 stsp return err;
3462 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3463 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3464 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3465 832c249c 2018-06-10 stsp free(id_str);
3466 d3d493d7 2019-02-21 stsp id_str = NULL;
3467 d3d493d7 2019-02-21 stsp free(refs_str);
3468 d3d493d7 2019-02-21 stsp refs_str = NULL;
3469 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3470 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3471 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3472 09867e48 2019-08-13 stsp if (datestr)
3473 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3474 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3475 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3476 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3477 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3478 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3479 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3480 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3481 3fe1abad 2018-06-10 stsp int n = 1;
3482 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3483 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3484 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3486 a0603db2 2018-06-10 stsp return err;
3487 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3488 a0603db2 2018-06-10 stsp free(id_str);
3492 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3494 5943eee2 2019-08-13 stsp return err;
3496 621015ac 2018-07-23 stsp logmsg = logmsg0;
3498 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3500 832c249c 2018-06-10 stsp printf(" %s\n", line);
3501 832c249c 2018-06-10 stsp } while (line);
3502 621015ac 2018-07-23 stsp free(logmsg0);
3504 0208f208 2020-05-05 stsp if (changed_paths) {
3505 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3506 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3507 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3508 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3510 0208f208 2020-05-05 stsp printf("\n");
3512 971751ac 2018-03-27 stsp if (show_patch) {
3513 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3514 971751ac 2018-03-27 stsp if (err == 0)
3515 971751ac 2018-03-27 stsp printf("\n");
3518 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3519 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3520 07862c20 2018-09-15 stsp return err;
3523 f42b1b34 2018-03-12 stsp static const struct got_error *
3524 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3525 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3526 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3527 0208f208 2020-05-05 stsp int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3529 f42b1b34 2018-03-12 stsp const struct got_error *err;
3530 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3531 6841bf13 2019-11-29 kn regex_t regex;
3532 6841bf13 2019-11-29 kn int have_match;
3533 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3534 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3535 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3536 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3537 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3539 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3540 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3542 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3543 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3544 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3546 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3548 f42b1b34 2018-03-12 stsp return err;
3549 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3550 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3552 fcc85cad 2018-07-22 stsp goto done;
3554 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3556 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3559 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3560 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3561 372ccdbb 2018-06-10 stsp if (err) {
3562 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3563 9ba79e04 2018-06-11 stsp err = NULL;
3566 b43fbaa0 2018-06-11 stsp if (id == NULL)
3569 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3573 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3574 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3579 6841bf13 2019-11-29 kn if (search_pattern) {
3580 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3582 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3585 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3586 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3587 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3588 6841bf13 2019-11-29 kn if (have_match == 0) {
3589 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3590 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3591 0208f208 2020-05-05 stsp free((char *)pe->path);
3592 0208f208 2020-05-05 stsp free(pe->data);
3594 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3599 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3600 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3603 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3604 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3606 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3607 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3608 0208f208 2020-05-05 stsp show_patch, diff_context, refs);
3609 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3613 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3614 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3617 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3618 0208f208 2020-05-05 stsp free((char *)pe->path);
3619 0208f208 2020-05-05 stsp free(pe->data);
3621 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3623 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3624 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3625 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3628 502b9684 2020-07-31 stsp if (show_changed_paths) {
3629 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
3630 502b9684 2020-07-31 stsp commit, repo);
3634 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3635 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3636 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3637 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3640 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3641 502b9684 2020-07-31 stsp free((char *)pe->path);
3642 502b9684 2020-07-31 stsp free(pe->data);
3644 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
3648 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3649 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3650 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3651 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3653 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3654 0208f208 2020-05-05 stsp free((char *)pe->path);
3655 0208f208 2020-05-05 stsp free(pe->data);
3657 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3658 6841bf13 2019-11-29 kn if (search_pattern)
3659 6841bf13 2019-11-29 kn regfree(®ex);
3660 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3661 f42b1b34 2018-03-12 stsp return err;
3664 4ed7e80c 2018-05-20 stsp __dead static void
3665 6f3d1eb0 2018-03-12 stsp usage_log(void)
3667 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3668 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3669 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3673 b1ebc001 2019-08-13 stsp static int
3674 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3676 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3677 b1ebc001 2019-08-13 stsp long long n;
3678 b1ebc001 2019-08-13 stsp const char *errstr;
3680 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3681 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3683 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3684 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3689 4ed7e80c 2018-05-20 stsp static const struct got_error *
3690 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3692 f42b1b34 2018-03-12 stsp const struct got_error *error;
3693 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3694 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3695 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3696 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3697 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3698 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3699 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3700 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3701 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3702 64a96a6d 2018-04-01 stsp const char *errstr;
3703 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3705 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3707 6715a751 2018-03-16 stsp #ifndef PROFILE
3708 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3711 f42b1b34 2018-03-12 stsp err(1, "pledge");
3714 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3716 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3717 79109fed 2018-03-27 stsp switch (ch) {
3719 79109fed 2018-03-27 stsp show_patch = 1;
3722 0208f208 2020-05-05 stsp show_changed_paths = 1;
3725 d142fc45 2018-04-01 stsp start_commit = optarg;
3728 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3730 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3731 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3734 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3735 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3736 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3739 48c8c60d 2020-01-27 stsp log_branches = 1;
3742 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3743 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3744 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3746 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3749 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3752 6841bf13 2019-11-29 kn search_pattern = optarg;
3755 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3758 2deda0b9 2019-03-07 stsp usage_log();
3759 79109fed 2018-03-27 stsp /* NOTREACHED */
3763 79109fed 2018-03-27 stsp argc -= optind;
3764 79109fed 2018-03-27 stsp argv += optind;
3766 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3767 dc1edbfa 2019-11-29 kn diff_context = 3;
3768 dc1edbfa 2019-11-29 kn else if (!show_patch)
3769 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
3771 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3772 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3773 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3774 04ca23f4 2018-07-16 stsp goto done;
3777 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3778 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3779 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3780 50f2fada 2020-04-24 stsp goto done;
3781 50f2fada 2020-04-24 stsp error = NULL;
3784 603cdeb0 2020-10-22 stsp if (argc == 1) {
3785 e7301579 2019-03-18 stsp if (worktree) {
3786 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3788 e7301579 2019-03-18 stsp if (error)
3789 e7301579 2019-03-18 stsp goto done;
3791 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3792 e7301579 2019-03-18 stsp if (path == NULL) {
3793 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3794 e7301579 2019-03-18 stsp goto done;
3797 603cdeb0 2020-10-22 stsp } else if (argc != 0)
3798 cbd1af7a 2019-03-18 stsp usage_log();
3800 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3801 5486daa2 2019-05-11 stsp repo_path = worktree ?
3802 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3804 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3805 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3806 cffc0aa4 2019-02-05 stsp goto done;
3809 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3810 d7d4f210 2018-03-12 stsp if (error != NULL)
3811 04ca23f4 2018-07-16 stsp goto done;
3813 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3814 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3815 c02c541e 2019-03-29 stsp if (error)
3816 c02c541e 2019-03-29 stsp goto done;
3818 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3819 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3820 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3821 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3822 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3823 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3824 3235492e 2018-04-01 stsp if (error != NULL)
3825 d1fe46f9 2020-04-18 stsp goto done;
3826 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3827 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3828 3235492e 2018-04-01 stsp if (error != NULL)
3829 d1fe46f9 2020-04-18 stsp goto done;
3830 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3831 d1fe46f9 2020-04-18 stsp start_id);
3832 d1fe46f9 2020-04-18 stsp if (error != NULL)
3833 d1fe46f9 2020-04-18 stsp goto done;
3834 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3836 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&start_id, NULL,
3837 7f9bfb31 2020-11-01 stsp start_commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
3838 d1fe46f9 2020-04-18 stsp if (error != NULL)
3839 d1fe46f9 2020-04-18 stsp goto done;
3841 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3842 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&end_id, NULL,
3843 7f9bfb31 2020-11-01 stsp end_commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
3844 d1fe46f9 2020-04-18 stsp if (error != NULL)
3845 d1fe46f9 2020-04-18 stsp goto done;
3848 deeabeae 2019-08-27 stsp if (worktree) {
3850 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
3851 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
3852 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
3854 603cdeb0 2020-10-22 stsp if (path) {
3855 603cdeb0 2020-10-22 stsp const char *prefix;
3856 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
3857 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
3858 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
3859 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
3860 603cdeb0 2020-10-22 stsp goto done;
3864 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
3865 8fa913ec 2020-11-14 stsp path ? path : "");
3866 04ca23f4 2018-07-16 stsp if (error != NULL)
3867 04ca23f4 2018-07-16 stsp goto done;
3868 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3869 04ca23f4 2018-07-16 stsp free(path);
3870 04ca23f4 2018-07-16 stsp path = in_repo_path;
3873 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3874 199a4027 2019-02-02 stsp if (error)
3875 199a4027 2019-02-02 stsp goto done;
3877 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
3878 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
3879 603cdeb0 2020-10-22 stsp limit, log_branches, reverse_display_order, &refs);
3881 04ca23f4 2018-07-16 stsp free(path);
3882 04ca23f4 2018-07-16 stsp free(repo_path);
3883 04ca23f4 2018-07-16 stsp free(cwd);
3884 cffc0aa4 2019-02-05 stsp if (worktree)
3885 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3886 ad242220 2018-09-08 stsp if (repo) {
3887 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3888 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3889 ad242220 2018-09-08 stsp if (error == NULL)
3890 ad242220 2018-09-08 stsp error = repo_error;
3892 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3893 8bf5b3c9 2018-03-17 stsp return error;
3896 4ed7e80c 2018-05-20 stsp __dead static void
3897 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3899 64453f7e 2020-11-21 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
3900 64453f7e 2020-11-21 stsp "[-s] [-w] [object1 object2 | path]\n", getprogname());
3904 b72f483a 2019-02-05 stsp struct print_diff_arg {
3905 b72f483a 2019-02-05 stsp struct got_repository *repo;
3906 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3907 b72f483a 2019-02-05 stsp int diff_context;
3908 3fc0c068 2019-02-10 stsp const char *id_str;
3909 3fc0c068 2019-02-10 stsp int header_shown;
3910 98eaaa12 2019-08-03 stsp int diff_staged;
3911 63035f9f 2019-10-06 stsp int ignore_whitespace;
3912 64453f7e 2020-11-21 stsp int force_text_diff;
3916 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
3917 39449a05 2020-07-23 stsp * it as content to the diff engine.
3919 39449a05 2020-07-23 stsp static const struct got_error *
3920 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3921 39449a05 2020-07-23 stsp const char *abspath)
3923 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
3924 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
3925 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
3929 39449a05 2020-07-23 stsp if (dirfd != -1) {
3930 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3931 39449a05 2020-07-23 stsp if (target_len == -1)
3932 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
3934 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
3935 39449a05 2020-07-23 stsp if (target_len == -1)
3936 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
3939 39449a05 2020-07-23 stsp *fd = got_opentempfd();
3940 39449a05 2020-07-23 stsp if (*fd == -1)
3941 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
3943 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
3944 39449a05 2020-07-23 stsp if (outlen == -1) {
3945 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
3946 39449a05 2020-07-23 stsp goto done;
3949 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
3950 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
3951 39449a05 2020-07-23 stsp goto done;
3954 39449a05 2020-07-23 stsp if (err) {
3955 39449a05 2020-07-23 stsp close(*fd);
3958 39449a05 2020-07-23 stsp return err;
3961 4ed7e80c 2018-05-20 stsp static const struct got_error *
3962 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3963 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3964 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3965 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3967 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3968 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3969 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3970 12463d8b 2019-12-13 stsp int fd = -1;
3971 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3972 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3973 b72f483a 2019-02-05 stsp struct stat sb;
3975 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3976 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3977 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3978 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3979 98eaaa12 2019-08-03 stsp return NULL;
3981 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3982 98eaaa12 2019-08-03 stsp return NULL;
3983 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3984 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3985 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3986 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3987 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3988 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3989 98eaaa12 2019-08-03 stsp return NULL;
3992 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3993 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3994 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3995 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3996 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3999 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4000 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
4001 98eaaa12 2019-08-03 stsp switch (staged_status) {
4002 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
4003 98eaaa12 2019-08-03 stsp label1 = path;
4004 98eaaa12 2019-08-03 stsp label2 = path;
4006 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4007 98eaaa12 2019-08-03 stsp label2 = path;
4009 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4010 98eaaa12 2019-08-03 stsp label1 = path;
4013 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4015 fe621944 2020-11-10 stsp return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4016 fe621944 2020-11-10 stsp staged_blob_id, label1, label2, a->diff_context,
4017 64453f7e 2020-11-21 stsp a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4020 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4021 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4022 4ce46740 2019-08-08 stsp char *id_str;
4023 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4026 4ce46740 2019-08-08 stsp goto done;
4027 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4029 4ce46740 2019-08-08 stsp goto done;
4030 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4031 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4032 4ce46740 2019-08-08 stsp free(id_str);
4033 4ce46740 2019-08-08 stsp goto done;
4035 4ce46740 2019-08-08 stsp free(id_str);
4036 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4037 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4039 4ce46740 2019-08-08 stsp goto done;
4042 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4043 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4044 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4045 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4046 2ec1f75b 2019-03-26 stsp goto done;
4049 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4050 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4051 12463d8b 2019-12-13 stsp if (fd == -1) {
4052 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4053 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4055 39449a05 2020-07-23 stsp goto done;
4057 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4058 39449a05 2020-07-23 stsp de_name, abspath);
4060 39449a05 2020-07-23 stsp goto done;
4063 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4064 12463d8b 2019-12-13 stsp if (fd == -1) {
4065 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4066 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4068 39449a05 2020-07-23 stsp goto done;
4070 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4071 39449a05 2020-07-23 stsp de_name, abspath);
4073 39449a05 2020-07-23 stsp goto done;
4076 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4077 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4078 2ec1f75b 2019-03-26 stsp goto done;
4080 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4081 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4082 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4083 2ec1f75b 2019-03-26 stsp goto done;
4087 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4089 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4090 64453f7e 2020-11-21 stsp a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4092 b72f483a 2019-02-05 stsp if (blob1)
4093 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4094 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4095 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4096 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4097 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4098 b72f483a 2019-02-05 stsp free(abspath);
4099 927df6b7 2019-02-10 stsp return err;
4102 927df6b7 2019-02-10 stsp static const struct got_error *
4103 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4105 b00d56cd 2018-04-01 stsp const struct got_error *error;
4106 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4107 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4108 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4109 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4110 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
4111 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
4112 15a94983 2018-12-23 stsp int type1, type2;
4113 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4114 64453f7e 2020-11-21 stsp int force_text_diff = 0;
4115 c0cc5c62 2018-10-18 stsp const char *errstr;
4116 927df6b7 2019-02-10 stsp char *path = NULL;
4118 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4119 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4120 25eccc22 2019-01-04 stsp NULL) == -1)
4121 b00d56cd 2018-04-01 stsp err(1, "pledge");
4124 64453f7e 2020-11-21 stsp while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4125 b00d56cd 2018-04-01 stsp switch (ch) {
4127 64453f7e 2020-11-21 stsp force_text_diff = 1;
4130 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4132 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4133 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4136 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4137 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4138 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4140 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4143 98eaaa12 2019-08-03 stsp diff_staged = 1;
4146 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4149 2deda0b9 2019-03-07 stsp usage_diff();
4150 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4154 b00d56cd 2018-04-01 stsp argc -= optind;
4155 b00d56cd 2018-04-01 stsp argv += optind;
4157 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4158 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4159 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4160 b72f483a 2019-02-05 stsp goto done;
4162 927df6b7 2019-02-10 stsp if (argc <= 1) {
4163 b72f483a 2019-02-05 stsp if (repo_path)
4165 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
4166 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4167 fa51e947 2020-03-27 stsp if (error) {
4168 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4169 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
4171 1f03b8da 2020-03-20 stsp goto done;
4173 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
4174 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
4175 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4176 927df6b7 2019-02-10 stsp goto done;
4178 927df6b7 2019-02-10 stsp if (argc == 1) {
4179 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4181 927df6b7 2019-02-10 stsp if (error)
4182 927df6b7 2019-02-10 stsp goto done;
4184 927df6b7 2019-02-10 stsp path = strdup("");
4185 927df6b7 2019-02-10 stsp if (path == NULL) {
4186 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4187 927df6b7 2019-02-10 stsp goto done;
4190 b72f483a 2019-02-05 stsp } else if (argc == 2) {
4191 98eaaa12 2019-08-03 stsp if (diff_staged)
4192 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
4193 98eaaa12 2019-08-03 stsp "objects in repository");
4194 15a94983 2018-12-23 stsp id_str1 = argv[0];
4195 15a94983 2018-12-23 stsp id_str2 = argv[1];
4196 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4197 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4198 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4199 30db809c 2019-06-05 stsp goto done;
4200 1f03b8da 2020-03-20 stsp if (worktree) {
4201 1f03b8da 2020-03-20 stsp repo_path = strdup(
4202 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
4203 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4204 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4205 1f03b8da 2020-03-20 stsp goto done;
4208 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
4209 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4210 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4211 1f03b8da 2020-03-20 stsp goto done;
4216 b00d56cd 2018-04-01 stsp usage_diff();
4218 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4219 76089277 2018-04-01 stsp free(repo_path);
4220 b00d56cd 2018-04-01 stsp if (error != NULL)
4221 b00d56cd 2018-04-01 stsp goto done;
4223 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4224 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4225 c02c541e 2019-03-29 stsp if (error)
4226 c02c541e 2019-03-29 stsp goto done;
4228 30db809c 2019-06-05 stsp if (argc <= 1) {
4229 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4230 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4231 b72f483a 2019-02-05 stsp char *id_str;
4233 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4235 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4236 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4237 b72f483a 2019-02-05 stsp if (error)
4238 b72f483a 2019-02-05 stsp goto done;
4239 b72f483a 2019-02-05 stsp arg.repo = repo;
4240 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4241 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4242 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4243 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4244 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4245 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4246 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
4248 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
4249 72ea6654 2019-07-27 stsp if (error)
4250 72ea6654 2019-07-27 stsp goto done;
4252 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
4253 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
4254 b72f483a 2019-02-05 stsp free(id_str);
4255 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4256 b72f483a 2019-02-05 stsp goto done;
4259 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4260 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
4261 0adb7196 2019-08-11 stsp if (error)
4262 0adb7196 2019-08-11 stsp goto done;
4264 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4265 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
4266 0adb7196 2019-08-11 stsp if (error)
4267 0adb7196 2019-08-11 stsp goto done;
4269 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
4270 15a94983 2018-12-23 stsp if (error)
4271 15a94983 2018-12-23 stsp goto done;
4273 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
4274 15a94983 2018-12-23 stsp if (error)
4275 15a94983 2018-12-23 stsp goto done;
4277 15a94983 2018-12-23 stsp if (type1 != type2) {
4278 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4279 b00d56cd 2018-04-01 stsp goto done;
4282 15a94983 2018-12-23 stsp switch (type1) {
4283 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4284 fe621944 2020-11-10 stsp error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4285 64453f7e 2020-11-21 stsp NULL, NULL, diff_context, ignore_whitespace,
4286 64453f7e 2020-11-21 stsp force_text_diff, repo, stdout);
4288 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4289 fe621944 2020-11-10 stsp error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4290 64453f7e 2020-11-21 stsp "", "", diff_context, ignore_whitespace, force_text_diff,
4291 64453f7e 2020-11-21 stsp repo, stdout);
4293 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4294 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
4295 fe621944 2020-11-10 stsp error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4296 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, repo,
4300 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4303 5e70831e 2019-05-28 stsp free(label1);
4304 5e70831e 2019-05-28 stsp free(label2);
4305 15a94983 2018-12-23 stsp free(id1);
4306 15a94983 2018-12-23 stsp free(id2);
4307 927df6b7 2019-02-10 stsp free(path);
4308 b72f483a 2019-02-05 stsp if (worktree)
4309 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4310 ad242220 2018-09-08 stsp if (repo) {
4311 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4312 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4313 ad242220 2018-09-08 stsp if (error == NULL)
4314 ad242220 2018-09-08 stsp error = repo_error;
4316 b00d56cd 2018-04-01 stsp return error;
4319 404c43c4 2018-06-21 stsp __dead static void
4320 404c43c4 2018-06-21 stsp usage_blame(void)
4322 9270e621 2019-02-05 stsp fprintf(stderr,
4323 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4324 404c43c4 2018-06-21 stsp getprogname());
4328 28315671 2019-08-14 stsp struct blame_line {
4329 28315671 2019-08-14 stsp int annotated;
4330 28315671 2019-08-14 stsp char *id_str;
4331 82f6abb8 2019-08-14 stsp char *committer;
4332 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4335 28315671 2019-08-14 stsp struct blame_cb_args {
4336 28315671 2019-08-14 stsp struct blame_line *lines;
4337 28315671 2019-08-14 stsp int nlines;
4338 7ef28ff8 2019-08-14 stsp int nlines_prec;
4339 28315671 2019-08-14 stsp int lineno_cur;
4340 28315671 2019-08-14 stsp off_t *line_offsets;
4342 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4345 404c43c4 2018-06-21 stsp static const struct got_error *
4346 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4348 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4349 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4350 28315671 2019-08-14 stsp struct blame_line *bline;
4351 82f6abb8 2019-08-14 stsp char *line = NULL;
4352 28315671 2019-08-14 stsp size_t linesize = 0;
4353 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4354 28315671 2019-08-14 stsp off_t offset;
4355 bcb49d15 2019-08-14 stsp struct tm tm;
4356 bcb49d15 2019-08-14 stsp time_t committer_time;
4358 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4359 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4360 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4362 28315671 2019-08-14 stsp if (sigint_received)
4363 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4365 2839f8b9 2019-08-18 stsp if (lineno == -1)
4366 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4368 28315671 2019-08-14 stsp /* Annotate this line. */
4369 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4370 28315671 2019-08-14 stsp if (bline->annotated)
4371 28315671 2019-08-14 stsp return NULL;
4372 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4374 28315671 2019-08-14 stsp return err;
4376 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4378 82f6abb8 2019-08-14 stsp goto done;
4380 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4381 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4382 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4383 bcb49d15 2019-08-14 stsp goto done;
4386 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4387 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4388 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4389 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4390 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4391 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4392 82f6abb8 2019-08-14 stsp goto done;
4394 28315671 2019-08-14 stsp bline->annotated = 1;
4396 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4397 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4398 28315671 2019-08-14 stsp if (!bline->annotated)
4399 82f6abb8 2019-08-14 stsp goto done;
4401 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4402 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4403 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4404 82f6abb8 2019-08-14 stsp goto done;
4407 28315671 2019-08-14 stsp while (bline->annotated) {
4408 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4409 82f6abb8 2019-08-14 stsp size_t len;
4411 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4412 28315671 2019-08-14 stsp if (ferror(a->f))
4413 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4417 82f6abb8 2019-08-14 stsp committer = bline->committer;
4418 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4419 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4420 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4421 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4423 82f6abb8 2019-08-14 stsp *at = '\0';
4424 82f6abb8 2019-08-14 stsp len = strlen(committer);
4425 82f6abb8 2019-08-14 stsp if (len >= 9)
4426 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4428 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4430 28315671 2019-08-14 stsp *nl = '\0';
4431 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4432 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4434 28315671 2019-08-14 stsp a->lineno_cur++;
4435 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4438 82f6abb8 2019-08-14 stsp if (commit)
4439 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4440 28315671 2019-08-14 stsp free(line);
4441 28315671 2019-08-14 stsp return err;
4444 28315671 2019-08-14 stsp static const struct got_error *
4445 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4447 404c43c4 2018-06-21 stsp const struct got_error *error;
4448 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4449 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4450 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4451 0587e10c 2020-07-23 stsp char *link_target = NULL;
4452 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4453 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4454 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4455 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4456 28315671 2019-08-14 stsp struct blame_cb_args bca;
4457 28315671 2019-08-14 stsp int ch, obj_type, i;
4458 be659d10 2020-11-18 stsp off_t filesize;
4460 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4462 404c43c4 2018-06-21 stsp #ifndef PROFILE
4463 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4464 36e2fb66 2019-01-04 stsp NULL) == -1)
4465 404c43c4 2018-06-21 stsp err(1, "pledge");
4468 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4469 404c43c4 2018-06-21 stsp switch (ch) {
4471 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4474 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4475 66bea077 2018-08-02 stsp if (repo_path == NULL)
4476 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4478 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4481 2deda0b9 2019-03-07 stsp usage_blame();
4482 404c43c4 2018-06-21 stsp /* NOTREACHED */
4486 404c43c4 2018-06-21 stsp argc -= optind;
4487 404c43c4 2018-06-21 stsp argv += optind;
4489 a39318fd 2018-08-02 stsp if (argc == 1)
4490 404c43c4 2018-06-21 stsp path = argv[0];
4492 404c43c4 2018-06-21 stsp usage_blame();
4494 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4495 66bea077 2018-08-02 stsp if (cwd == NULL) {
4496 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4497 66bea077 2018-08-02 stsp goto done;
4499 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4500 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4501 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4502 66bea077 2018-08-02 stsp goto done;
4504 0c06baac 2019-02-05 stsp error = NULL;
4505 0c06baac 2019-02-05 stsp if (worktree) {
4506 0c06baac 2019-02-05 stsp repo_path =
4507 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4508 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4509 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4510 1f03b8da 2020-03-20 stsp if (error)
4511 1f03b8da 2020-03-20 stsp goto done;
4514 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4515 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4516 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4517 0c06baac 2019-02-05 stsp goto done;
4522 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4523 c02c541e 2019-03-29 stsp if (error != NULL)
4524 404c43c4 2018-06-21 stsp goto done;
4526 0c06baac 2019-02-05 stsp if (worktree) {
4527 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4530 01740607 2020-11-04 stsp error = got_worktree_resolve_path(&p, worktree, path);
4531 01740607 2020-11-04 stsp if (error)
4532 01740607 2020-11-04 stsp goto done;
4533 01740607 2020-11-04 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4534 01740607 2020-11-04 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4535 01740607 2020-11-04 stsp p) == -1) {
4536 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4538 0c06baac 2019-02-05 stsp goto done;
4541 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4543 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4544 01740607 2020-11-04 stsp if (error)
4545 01740607 2020-11-04 stsp goto done;
4546 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4548 0c06baac 2019-02-05 stsp if (error)
4549 66bea077 2018-08-02 stsp goto done;
4551 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4552 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4553 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4554 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4555 404c43c4 2018-06-21 stsp if (error != NULL)
4556 66bea077 2018-08-02 stsp goto done;
4557 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4558 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4559 404c43c4 2018-06-21 stsp if (error != NULL)
4560 66bea077 2018-08-02 stsp goto done;
4562 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4563 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4564 30837e32 2019-07-25 stsp if (error)
4565 66bea077 2018-08-02 stsp goto done;
4568 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4569 0587e10c 2020-07-23 stsp commit_id, repo);
4570 0587e10c 2020-07-23 stsp if (error)
4571 0587e10c 2020-07-23 stsp goto done;
4573 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
4574 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
4575 28315671 2019-08-14 stsp if (error)
4576 28315671 2019-08-14 stsp goto done;
4578 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4579 28315671 2019-08-14 stsp if (error)
4580 28315671 2019-08-14 stsp goto done;
4582 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4583 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
4584 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
4585 28315671 2019-08-14 stsp goto done;
4588 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4589 28315671 2019-08-14 stsp if (error)
4590 28315671 2019-08-14 stsp goto done;
4591 28315671 2019-08-14 stsp bca.f = got_opentemp();
4592 28315671 2019-08-14 stsp if (bca.f == NULL) {
4593 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4594 28315671 2019-08-14 stsp goto done;
4596 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4597 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4598 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4599 28315671 2019-08-14 stsp goto done;
4601 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4602 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4603 b02560ec 2019-08-19 stsp bca.nlines--;
4605 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4606 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4607 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4608 28315671 2019-08-14 stsp goto done;
4610 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4611 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4612 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4613 7ef28ff8 2019-08-14 stsp while (i > 0) {
4615 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4617 82f6abb8 2019-08-14 stsp bca.repo = repo;
4619 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4620 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
4622 66bea077 2018-08-02 stsp free(in_repo_path);
4623 0587e10c 2020-07-23 stsp free(link_target);
4624 66bea077 2018-08-02 stsp free(repo_path);
4625 66bea077 2018-08-02 stsp free(cwd);
4626 404c43c4 2018-06-21 stsp free(commit_id);
4627 28315671 2019-08-14 stsp free(obj_id);
4629 28315671 2019-08-14 stsp got_object_blob_close(blob);
4630 0c06baac 2019-02-05 stsp if (worktree)
4631 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4632 ad242220 2018-09-08 stsp if (repo) {
4633 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4634 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4635 ad242220 2018-09-08 stsp if (error == NULL)
4636 ad242220 2018-09-08 stsp error = repo_error;
4638 3affba96 2019-09-22 stsp if (bca.lines) {
4639 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4640 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4641 3affba96 2019-09-22 stsp free(bline->id_str);
4642 3affba96 2019-09-22 stsp free(bline->committer);
4644 3affba96 2019-09-22 stsp free(bca.lines);
4646 28315671 2019-08-14 stsp free(bca.line_offsets);
4647 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4648 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4649 404c43c4 2018-06-21 stsp return error;
4652 5de5890b 2018-10-18 stsp __dead static void
4653 5de5890b 2018-10-18 stsp usage_tree(void)
4655 c1669e2e 2019-01-09 stsp fprintf(stderr,
4656 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4657 5de5890b 2018-10-18 stsp getprogname());
4661 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4662 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4663 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4665 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4666 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4667 848d6979 2019-08-12 stsp const char *modestr = "";
4668 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4669 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4671 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4672 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4675 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4676 63c5ca5d 2019-08-24 stsp modestr = "$";
4677 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4680 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4682 0d6c6ee3 2020-05-20 stsp return err;
4683 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4684 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4685 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4688 848d6979 2019-08-12 stsp modestr = "@";
4690 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4691 848d6979 2019-08-12 stsp modestr = "/";
4692 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4693 848d6979 2019-08-12 stsp modestr = "*";
4695 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4696 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4697 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4699 0d6c6ee3 2020-05-20 stsp free(link_target);
4700 0d6c6ee3 2020-05-20 stsp return NULL;
4703 5de5890b 2018-10-18 stsp static const struct got_error *
4704 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4705 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4706 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4708 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4709 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4710 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4711 56e0773d 2019-11-28 stsp int nentries, i;
4713 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4715 5de5890b 2018-10-18 stsp goto done;
4717 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4719 5de5890b 2018-10-18 stsp goto done;
4720 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4721 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4722 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4723 5de5890b 2018-10-18 stsp char *id = NULL;
4725 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4728 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4729 5de5890b 2018-10-18 stsp if (show_ids) {
4730 5de5890b 2018-10-18 stsp char *id_str;
4731 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4732 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4734 5de5890b 2018-10-18 stsp goto done;
4735 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4736 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4737 5de5890b 2018-10-18 stsp free(id_str);
4738 5de5890b 2018-10-18 stsp goto done;
4740 5de5890b 2018-10-18 stsp free(id_str);
4742 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4745 0d6c6ee3 2020-05-20 stsp goto done;
4747 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4748 c1669e2e 2019-01-09 stsp char *child_path;
4749 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4750 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4751 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4752 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4753 c1669e2e 2019-01-09 stsp goto done;
4755 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4756 c1669e2e 2019-01-09 stsp root_path, repo);
4757 c1669e2e 2019-01-09 stsp free(child_path);
4759 c1669e2e 2019-01-09 stsp goto done;
4764 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4765 5de5890b 2018-10-18 stsp free(tree_id);
4766 5de5890b 2018-10-18 stsp return err;
4769 5de5890b 2018-10-18 stsp static const struct got_error *
4770 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4772 5de5890b 2018-10-18 stsp const struct got_error *error;
4773 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4774 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4775 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4776 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4777 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4778 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4779 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4782 5de5890b 2018-10-18 stsp #ifndef PROFILE
4783 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4784 0f8d269b 2019-01-04 stsp NULL) == -1)
4785 5de5890b 2018-10-18 stsp err(1, "pledge");
4788 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4789 5de5890b 2018-10-18 stsp switch (ch) {
4791 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4794 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4795 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4796 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4798 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4801 5de5890b 2018-10-18 stsp show_ids = 1;
4804 c1669e2e 2019-01-09 stsp recurse = 1;
4807 2deda0b9 2019-03-07 stsp usage_tree();
4808 5de5890b 2018-10-18 stsp /* NOTREACHED */
4812 5de5890b 2018-10-18 stsp argc -= optind;
4813 5de5890b 2018-10-18 stsp argv += optind;
4815 5de5890b 2018-10-18 stsp if (argc == 1)
4816 5de5890b 2018-10-18 stsp path = argv[0];
4817 5de5890b 2018-10-18 stsp else if (argc > 1)
4818 5de5890b 2018-10-18 stsp usage_tree();
4820 7a2c19d6 2019-02-05 stsp path = NULL;
4822 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4823 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4824 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4825 9bf7a39b 2019-02-05 stsp goto done;
4827 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4828 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4829 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4830 7a2c19d6 2019-02-05 stsp goto done;
4832 7a2c19d6 2019-02-05 stsp error = NULL;
4833 7a2c19d6 2019-02-05 stsp if (worktree) {
4834 7a2c19d6 2019-02-05 stsp repo_path =
4835 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4836 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4837 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4838 7a2c19d6 2019-02-05 stsp if (error)
4839 7a2c19d6 2019-02-05 stsp goto done;
4841 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4842 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4843 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4844 7a2c19d6 2019-02-05 stsp goto done;
4849 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4850 5de5890b 2018-10-18 stsp if (error != NULL)
4851 c02c541e 2019-03-29 stsp goto done;
4853 4fedbf4c 2020-11-07 stsp if (worktree) {
4854 4fedbf4c 2020-11-07 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4857 4fedbf4c 2020-11-07 stsp if (path == NULL)
4858 4fedbf4c 2020-11-07 stsp path = "";
4859 4fedbf4c 2020-11-07 stsp error = got_worktree_resolve_path(&p, worktree, path);
4860 4fedbf4c 2020-11-07 stsp if (error)
4861 4fedbf4c 2020-11-07 stsp goto done;
4862 4fedbf4c 2020-11-07 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4863 4fedbf4c 2020-11-07 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4864 4fedbf4c 2020-11-07 stsp p) == -1) {
4865 4fedbf4c 2020-11-07 stsp error = got_error_from_errno("asprintf");
4867 4fedbf4c 2020-11-07 stsp goto done;
4870 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4871 4fedbf4c 2020-11-07 stsp if (error)
4872 4fedbf4c 2020-11-07 stsp goto done;
4874 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4875 4fedbf4c 2020-11-07 stsp if (error)
4876 4fedbf4c 2020-11-07 stsp goto done;
4877 4fedbf4c 2020-11-07 stsp if (path == NULL)
4878 9bf7a39b 2019-02-05 stsp path = "/";
4879 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4880 9bf7a39b 2019-02-05 stsp if (error != NULL)
4881 9bf7a39b 2019-02-05 stsp goto done;
4884 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4885 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4886 4e0a20a4 2020-03-23 tracey if (worktree)
4887 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4889 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4890 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4891 5de5890b 2018-10-18 stsp if (error != NULL)
4892 5de5890b 2018-10-18 stsp goto done;
4893 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4894 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4895 5de5890b 2018-10-18 stsp if (error != NULL)
4896 5de5890b 2018-10-18 stsp goto done;
4898 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4899 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4900 30837e32 2019-07-25 stsp if (error)
4901 5de5890b 2018-10-18 stsp goto done;
4904 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4905 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4907 5de5890b 2018-10-18 stsp free(in_repo_path);
4908 5de5890b 2018-10-18 stsp free(repo_path);
4909 5de5890b 2018-10-18 stsp free(cwd);
4910 5de5890b 2018-10-18 stsp free(commit_id);
4911 7a2c19d6 2019-02-05 stsp if (worktree)
4912 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4913 5de5890b 2018-10-18 stsp if (repo) {
4914 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4915 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4916 5de5890b 2018-10-18 stsp if (error == NULL)
4917 5de5890b 2018-10-18 stsp error = repo_error;
4919 5de5890b 2018-10-18 stsp return error;
4922 6bad629b 2019-02-04 stsp __dead static void
4923 6bad629b 2019-02-04 stsp usage_status(void)
4925 081470ac 2020-08-13 stsp fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4926 081470ac 2020-08-13 stsp getprogname());
4930 b72f483a 2019-02-05 stsp static const struct got_error *
4931 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4932 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4933 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4934 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4936 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4937 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4938 081470ac 2020-08-13 stsp if (arg) {
4939 081470ac 2020-08-13 stsp char *status_codes = arg;
4940 081470ac 2020-08-13 stsp size_t ncodes = strlen(status_codes);
4942 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4943 081470ac 2020-08-13 stsp if (status == status_codes[i] ||
4944 081470ac 2020-08-13 stsp staged_status == status_codes[i])
4947 081470ac 2020-08-13 stsp if (i == ncodes)
4948 081470ac 2020-08-13 stsp return NULL;
4950 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4951 b72f483a 2019-02-05 stsp return NULL;
4954 6bad629b 2019-02-04 stsp static const struct got_error *
4955 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4957 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4958 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4959 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4960 081470ac 2020-08-13 stsp char *cwd = NULL, *status_codes = NULL;;
4961 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4962 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4963 081470ac 2020-08-13 stsp int ch, i;
4965 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4967 081470ac 2020-08-13 stsp while ((ch = getopt(argc, argv, "s:")) != -1) {
4968 6bad629b 2019-02-04 stsp switch (ch) {
4970 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
4971 081470ac 2020-08-13 stsp switch (optarg[i]) {
4972 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
4973 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
4974 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
4975 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
4976 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
4977 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
4978 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
4979 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
4980 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
4983 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
4984 081470ac 2020-08-13 stsp optarg[i]);
4987 081470ac 2020-08-13 stsp status_codes = optarg;
4990 2deda0b9 2019-03-07 stsp usage_status();
4991 6bad629b 2019-02-04 stsp /* NOTREACHED */
4995 6bad629b 2019-02-04 stsp argc -= optind;
4996 6bad629b 2019-02-04 stsp argv += optind;
4998 6bad629b 2019-02-04 stsp #ifndef PROFILE
4999 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5000 6bad629b 2019-02-04 stsp NULL) == -1)
5001 6bad629b 2019-02-04 stsp err(1, "pledge");
5003 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
5004 927df6b7 2019-02-10 stsp if (cwd == NULL) {
5005 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5006 927df6b7 2019-02-10 stsp goto done;
5009 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5010 fa51e947 2020-03-27 stsp if (error) {
5011 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5012 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5013 a5edda0a 2019-07-27 stsp goto done;
5016 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5018 6bad629b 2019-02-04 stsp if (error != NULL)
5019 6bad629b 2019-02-04 stsp goto done;
5021 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5022 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5023 087fb88c 2019-08-04 stsp if (error)
5024 087fb88c 2019-08-04 stsp goto done;
5026 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5027 6bad629b 2019-02-04 stsp if (error)
5028 6bad629b 2019-02-04 stsp goto done;
5030 081470ac 2020-08-13 stsp error = got_worktree_status(worktree, &paths, repo, print_status,
5031 081470ac 2020-08-13 stsp status_codes, check_cancelled, NULL);
5033 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5034 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5035 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5036 927df6b7 2019-02-10 stsp free(cwd);
5037 d0eebce4 2019-03-11 stsp return error;
5040 d0eebce4 2019-03-11 stsp __dead static void
5041 d0eebce4 2019-03-11 stsp usage_ref(void)
5043 d0eebce4 2019-03-11 stsp fprintf(stderr,
5044 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5045 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5046 d0eebce4 2019-03-11 stsp getprogname());
5050 d0eebce4 2019-03-11 stsp static const struct got_error *
5051 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5053 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5054 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5055 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5057 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
5058 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5060 d0eebce4 2019-03-11 stsp return err;
5062 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5063 d0eebce4 2019-03-11 stsp char *refstr;
5064 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5065 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5066 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5067 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5068 d0eebce4 2019-03-11 stsp free(refstr);
5071 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5072 d0eebce4 2019-03-11 stsp return NULL;
5075 d0eebce4 2019-03-11 stsp static const struct got_error *
5076 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
5078 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5079 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5081 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5083 d0eebce4 2019-03-11 stsp return err;
5085 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
5086 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5087 d0eebce4 2019-03-11 stsp return err;
5090 d0eebce4 2019-03-11 stsp static const struct got_error *
5091 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5093 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5094 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5095 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5098 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5099 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5100 d1644381 2019-07-14 stsp * an unintended typo.
5102 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5103 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5105 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5107 d83d9d5c 2019-05-13 stsp if (err) {
5108 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5110 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5111 d83d9d5c 2019-05-13 stsp return err;
5112 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5114 d83d9d5c 2019-05-13 stsp return err;
5115 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5116 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5118 d83d9d5c 2019-05-13 stsp return err;
5121 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5123 d0eebce4 2019-03-11 stsp goto done;
5125 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5128 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5130 d1c1ae5f 2019-08-12 stsp return err;
5133 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5134 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5136 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5137 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5138 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5141 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5142 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5143 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5145 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5146 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5148 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5150 d1c1ae5f 2019-08-12 stsp return err;
5152 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5154 d1c1ae5f 2019-08-12 stsp goto done;
5156 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5158 d1c1ae5f 2019-08-12 stsp if (target_ref)
5159 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5161 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5162 d0eebce4 2019-03-11 stsp return err;
5165 d0eebce4 2019-03-11 stsp static const struct got_error *
5166 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5168 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5169 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5170 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5171 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5172 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5173 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5174 b2070a3f 2020-03-22 stsp char *refname = NULL;
5176 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5177 d0eebce4 2019-03-11 stsp switch (ch) {
5179 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5182 e31abbf2 2020-03-22 stsp do_delete = 1;
5185 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5186 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5187 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5189 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5192 d0eebce4 2019-03-11 stsp do_list = 1;
5195 e31abbf2 2020-03-22 stsp symref_target = optarg;
5198 d0eebce4 2019-03-11 stsp usage_ref();
5199 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5203 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5204 ff69268e 2020-12-13 stsp option_conflict('c', 'l');
5205 ff69268e 2020-12-13 stsp if (obj_arg && do_delete)
5206 ff69268e 2020-12-13 stsp option_conflict('c', 'd');
5207 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5208 ff69268e 2020-12-13 stsp option_conflict('c', 's');
5209 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5210 ff69268e 2020-12-13 stsp option_conflict('s', 'd');
5211 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5212 ff69268e 2020-12-13 stsp option_conflict('s', 'l');
5213 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5214 ff69268e 2020-12-13 stsp option_conflict('d', 'l');
5216 d0eebce4 2019-03-11 stsp argc -= optind;
5217 d0eebce4 2019-03-11 stsp argv += optind;
5219 e31abbf2 2020-03-22 stsp if (do_list) {
5220 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5221 d0eebce4 2019-03-11 stsp usage_ref();
5222 b2070a3f 2020-03-22 stsp if (argc == 1) {
5223 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5224 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5225 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5226 b2070a3f 2020-03-22 stsp goto done;
5230 e31abbf2 2020-03-22 stsp if (argc != 1)
5231 e31abbf2 2020-03-22 stsp usage_ref();
5232 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5233 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5234 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5235 b2070a3f 2020-03-22 stsp goto done;
5239 b2070a3f 2020-03-22 stsp if (refname)
5240 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5242 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5243 e0b57350 2019-03-12 stsp if (do_list) {
5244 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5245 e0b57350 2019-03-12 stsp NULL) == -1)
5246 e0b57350 2019-03-12 stsp err(1, "pledge");
5248 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5249 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5250 e0b57350 2019-03-12 stsp err(1, "pledge");
5253 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5254 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5255 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5256 d0eebce4 2019-03-11 stsp goto done;
5259 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5260 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5261 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5262 d0eebce4 2019-03-11 stsp goto done;
5264 d0eebce4 2019-03-11 stsp error = NULL;
5265 d0eebce4 2019-03-11 stsp if (worktree) {
5266 d0eebce4 2019-03-11 stsp repo_path =
5267 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5268 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5269 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5270 d0eebce4 2019-03-11 stsp if (error)
5271 d0eebce4 2019-03-11 stsp goto done;
5273 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
5274 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5275 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5276 d0eebce4 2019-03-11 stsp goto done;
5281 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5282 d0eebce4 2019-03-11 stsp if (error != NULL)
5283 d0eebce4 2019-03-11 stsp goto done;
5285 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5286 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5287 c02c541e 2019-03-29 stsp if (error)
5288 c02c541e 2019-03-29 stsp goto done;
5290 d0eebce4 2019-03-11 stsp if (do_list)
5291 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5292 e31abbf2 2020-03-22 stsp else if (do_delete)
5293 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
5294 e31abbf2 2020-03-22 stsp else if (symref_target)
5295 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5297 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5298 e31abbf2 2020-03-22 stsp usage_ref();
5299 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5302 b2070a3f 2020-03-22 stsp free(refname);
5304 4e759de4 2019-06-26 stsp got_repo_close(repo);
5305 4e759de4 2019-06-26 stsp if (worktree)
5306 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5307 4e759de4 2019-06-26 stsp free(cwd);
5308 4e759de4 2019-06-26 stsp free(repo_path);
5309 4e759de4 2019-06-26 stsp return error;
5312 4e759de4 2019-06-26 stsp __dead static void
5313 4e759de4 2019-06-26 stsp usage_branch(void)
5315 4e759de4 2019-06-26 stsp fprintf(stderr,
5316 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5317 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5321 4e759de4 2019-06-26 stsp static const struct got_error *
5322 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5323 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5325 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5326 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5327 4e99b47e 2019-10-04 stsp char *refstr;
5329 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5330 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5331 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5332 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5334 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5336 4e99b47e 2019-10-04 stsp return err;
5337 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5338 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5339 4e99b47e 2019-10-04 stsp marker = "* ";
5341 4e99b47e 2019-10-04 stsp marker = "~ ";
5345 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5346 4e99b47e 2019-10-04 stsp refname += 11;
5347 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5348 4e99b47e 2019-10-04 stsp refname += 18;
5350 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5351 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5352 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5354 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5355 4e99b47e 2019-10-04 stsp free(refstr);
5356 4e99b47e 2019-10-04 stsp return NULL;
5359 4e99b47e 2019-10-04 stsp static const struct got_error *
5360 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5362 ad89fa31 2019-10-04 stsp const char *refname;
5364 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5365 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5367 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5369 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5370 ad89fa31 2019-10-04 stsp refname += 11;
5371 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5372 ad89fa31 2019-10-04 stsp refname += 18;
5374 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5376 ad89fa31 2019-10-04 stsp return NULL;
5379 ad89fa31 2019-10-04 stsp static const struct got_error *
5380 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5382 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5383 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5384 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5385 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5386 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5388 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
5390 4e99b47e 2019-10-04 stsp if (worktree) {
5391 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5392 4e99b47e 2019-10-04 stsp worktree);
5394 4e99b47e 2019-10-04 stsp return err;
5396 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5397 4e99b47e 2019-10-04 stsp worktree);
5399 4e99b47e 2019-10-04 stsp return err;
5401 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5402 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5403 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5405 4e99b47e 2019-10-04 stsp return err;
5406 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5407 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5411 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5412 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5414 4e759de4 2019-06-26 stsp return err;
5416 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
5417 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5419 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5420 4e759de4 2019-06-26 stsp return NULL;
5423 4e759de4 2019-06-26 stsp static const struct got_error *
5424 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5425 45cd4e47 2019-08-25 stsp const char *branch_name)
5427 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5428 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5429 4e759de4 2019-06-26 stsp char *refname;
5431 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5432 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5434 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5436 4e759de4 2019-06-26 stsp goto done;
5438 45cd4e47 2019-08-25 stsp if (worktree &&
5439 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5440 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5441 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5442 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5443 45cd4e47 2019-08-25 stsp goto done;
5446 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5449 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5450 4e759de4 2019-06-26 stsp free(refname);
5451 4e759de4 2019-06-26 stsp return err;
5454 4e759de4 2019-06-26 stsp static const struct got_error *
5455 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5456 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5458 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5459 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5460 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5463 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5464 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5465 d3f84d51 2019-07-11 stsp * an unintended typo.
5467 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5468 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5470 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5471 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5472 62d463ca 2020-10-20 naddy goto done;
5475 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5476 4e759de4 2019-06-26 stsp if (err == NULL) {
5477 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5478 4e759de4 2019-06-26 stsp goto done;
5479 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5480 4e759de4 2019-06-26 stsp goto done;
5482 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5484 4e759de4 2019-06-26 stsp goto done;
5486 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5489 4e759de4 2019-06-26 stsp got_ref_close(ref);
5490 4e759de4 2019-06-26 stsp free(base_refname);
5491 4e759de4 2019-06-26 stsp free(refname);
5492 4e759de4 2019-06-26 stsp return err;
5495 4e759de4 2019-06-26 stsp static const struct got_error *
5496 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5498 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5499 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5500 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5501 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5502 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5503 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5504 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5505 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5506 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5507 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5508 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5510 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5512 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5513 4e759de4 2019-06-26 stsp switch (ch) {
5515 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5518 4e759de4 2019-06-26 stsp delref = optarg;
5521 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5522 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5523 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5525 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5528 4e759de4 2019-06-26 stsp do_list = 1;
5531 da76fce2 2020-02-24 stsp do_update = 0;
5534 4e759de4 2019-06-26 stsp usage_branch();
5535 4e759de4 2019-06-26 stsp /* NOTREACHED */
5539 4e759de4 2019-06-26 stsp if (do_list && delref)
5540 ff69268e 2020-12-13 stsp option_conflict('l', 'd');
5542 4e759de4 2019-06-26 stsp argc -= optind;
5543 4e759de4 2019-06-26 stsp argv += optind;
5545 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5546 ad89fa31 2019-10-04 stsp do_show = 1;
5548 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5549 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5551 4e759de4 2019-06-26 stsp if (do_list || delref) {
5552 4e759de4 2019-06-26 stsp if (argc > 0)
5553 4e759de4 2019-06-26 stsp usage_branch();
5554 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5555 4e759de4 2019-06-26 stsp usage_branch();
5557 4e759de4 2019-06-26 stsp #ifndef PROFILE
5558 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5559 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5560 4e759de4 2019-06-26 stsp NULL) == -1)
5561 4e759de4 2019-06-26 stsp err(1, "pledge");
5563 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5564 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5565 4e759de4 2019-06-26 stsp err(1, "pledge");
5568 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5569 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5570 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5571 4e759de4 2019-06-26 stsp goto done;
5574 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5575 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5576 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5577 4e759de4 2019-06-26 stsp goto done;
5579 4e759de4 2019-06-26 stsp error = NULL;
5580 4e759de4 2019-06-26 stsp if (worktree) {
5581 4e759de4 2019-06-26 stsp repo_path =
5582 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5583 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5584 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5585 4e759de4 2019-06-26 stsp if (error)
5586 4e759de4 2019-06-26 stsp goto done;
5588 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5589 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5590 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5591 4e759de4 2019-06-26 stsp goto done;
5596 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5597 4e759de4 2019-06-26 stsp if (error != NULL)
5598 4e759de4 2019-06-26 stsp goto done;
5600 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5601 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5602 4e759de4 2019-06-26 stsp if (error)
5603 4e759de4 2019-06-26 stsp goto done;
5605 ad89fa31 2019-10-04 stsp if (do_show)
5606 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5607 ad89fa31 2019-10-04 stsp else if (do_list)
5608 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5609 4e759de4 2019-06-26 stsp else if (delref)
5610 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5612 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5613 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5614 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5615 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5616 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5617 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5618 a74f7e83 2019-11-10 stsp if (error)
5619 a74f7e83 2019-11-10 stsp goto done;
5620 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5621 da76fce2 2020-02-24 stsp if (error)
5622 da76fce2 2020-02-24 stsp goto done;
5623 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5624 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5625 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5627 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5628 da76fce2 2020-02-24 stsp if (error)
5629 da76fce2 2020-02-24 stsp goto done;
5630 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5631 da76fce2 2020-02-24 stsp worktree);
5632 da76fce2 2020-02-24 stsp if (error)
5633 da76fce2 2020-02-24 stsp goto done;
5634 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5636 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5637 da76fce2 2020-02-24 stsp goto done;
5639 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5640 da76fce2 2020-02-24 stsp free(branch_refname);
5641 da76fce2 2020-02-24 stsp if (error)
5642 da76fce2 2020-02-24 stsp goto done;
5643 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5645 da76fce2 2020-02-24 stsp if (error)
5646 da76fce2 2020-02-24 stsp goto done;
5647 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5648 da76fce2 2020-02-24 stsp commit_id);
5649 da76fce2 2020-02-24 stsp if (error)
5650 da76fce2 2020-02-24 stsp goto done;
5651 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5652 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5653 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5655 da76fce2 2020-02-24 stsp if (error)
5656 da76fce2 2020-02-24 stsp goto done;
5657 9627c110 2020-04-18 stsp if (upa.did_something)
5658 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5659 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5664 da76fce2 2020-02-24 stsp got_ref_close(ref);
5666 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5667 d0eebce4 2019-03-11 stsp if (worktree)
5668 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5669 d0eebce4 2019-03-11 stsp free(cwd);
5670 d0eebce4 2019-03-11 stsp free(repo_path);
5671 da76fce2 2020-02-24 stsp free(commit_id);
5672 da76fce2 2020-02-24 stsp free(commit_id_str);
5673 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5674 da76fce2 2020-02-24 stsp free((char *)pe->path);
5675 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5676 d00136be 2019-03-26 stsp return error;
5680 d00136be 2019-03-26 stsp __dead static void
5681 8e7bd50a 2019-08-22 stsp usage_tag(void)
5683 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5684 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5685 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5690 b8bad2ba 2019-08-23 stsp static const struct got_error *
5691 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5693 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5694 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5695 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5696 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5697 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5699 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5700 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5701 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5702 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5704 b8bad2ba 2019-08-23 stsp return err;
5705 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5708 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5711 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5712 b8bad2ba 2019-08-23 stsp free(re_id);
5715 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5716 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5719 b8bad2ba 2019-08-23 stsp while (se) {
5720 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5723 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5724 b8bad2ba 2019-08-23 stsp free(se_id);
5727 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5728 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5730 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5731 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5733 b8bad2ba 2019-08-23 stsp return err;
5734 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5737 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5742 b8bad2ba 2019-08-23 stsp return err;
5746 b8bad2ba 2019-08-23 stsp static const struct got_error *
5747 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5749 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5750 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5751 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5753 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5755 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5757 8e7bd50a 2019-08-22 stsp return err;
5759 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5760 8e7bd50a 2019-08-22 stsp const char *refname;
5761 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5762 8e7bd50a 2019-08-22 stsp char datebuf[26];
5763 d4efa91b 2020-01-14 stsp const char *tagger;
5764 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5765 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5766 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5767 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5769 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5770 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5772 8e7bd50a 2019-08-22 stsp refname += 10;
5773 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5774 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5775 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5778 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5779 8e7bd50a 2019-08-22 stsp free(refstr);
5781 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5784 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5785 d4efa91b 2020-01-14 stsp if (err) {
5786 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5790 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5791 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5792 d4efa91b 2020-01-14 stsp if (err) {
5796 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5797 d4efa91b 2020-01-14 stsp tagger_time =
5798 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5799 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5805 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5806 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5807 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5808 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5812 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5813 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5814 2417344c 2019-08-23 stsp if (datestr)
5815 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5816 d4efa91b 2020-01-14 stsp if (commit)
5817 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5819 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5820 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5821 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5824 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5825 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5828 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5829 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5832 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5833 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5840 8e7bd50a 2019-08-22 stsp free(id_str);
5841 d4efa91b 2020-01-14 stsp if (commit) {
5842 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5845 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5847 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5848 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5849 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5850 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5855 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5857 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5859 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5860 8e7bd50a 2019-08-22 stsp } while (line);
5861 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5864 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5865 8e7bd50a 2019-08-22 stsp return NULL;
5868 8e7bd50a 2019-08-22 stsp static const struct got_error *
5869 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5870 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5872 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5873 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5874 f372d5cd 2019-10-21 stsp char *editor = NULL;
5875 1601cb9f 2020-09-11 naddy int initial_content_len;
5876 8e7bd50a 2019-08-22 stsp int fd = -1;
5878 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5879 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5880 8e7bd50a 2019-08-22 stsp goto done;
5883 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
5884 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
5885 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
5886 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
5887 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5888 8e7bd50a 2019-08-22 stsp goto done;
5891 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5893 8e7bd50a 2019-08-22 stsp goto done;
5895 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
5896 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
5897 97972933 2020-09-11 stsp goto done;
5900 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5902 8e7bd50a 2019-08-22 stsp goto done;
5903 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
5904 0d5bb276 2020-12-15 stsp initial_content_len, 1);
5906 8e7bd50a 2019-08-22 stsp free(initial_content);
5907 8e7bd50a 2019-08-22 stsp free(template);
5908 8e7bd50a 2019-08-22 stsp free(editor);
5910 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5911 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
5913 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5914 59f86c76 2020-09-11 stsp if (err == NULL)
5915 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5916 59f86c76 2020-09-11 stsp if (err) {
5917 59f86c76 2020-09-11 stsp free(*tagmsg);
5918 59f86c76 2020-09-11 stsp *tagmsg = NULL;
5920 8e7bd50a 2019-08-22 stsp return err;
5923 8e7bd50a 2019-08-22 stsp static const struct got_error *
5924 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
5925 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5927 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5928 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5929 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5930 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5931 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5932 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5933 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5936 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5937 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5938 8e7bd50a 2019-08-22 stsp * an unintended typo.
5940 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5941 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5943 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
5945 8e7bd50a 2019-08-22 stsp return err;
5947 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5948 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5950 8e7bd50a 2019-08-22 stsp goto done;
5952 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5954 8e7bd50a 2019-08-22 stsp goto done;
5956 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5957 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5958 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5959 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
5960 62d463ca 2020-10-20 naddy goto done;
5962 8e7bd50a 2019-08-22 stsp tag_name += 10;
5963 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5964 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5965 62d463ca 2020-10-20 naddy goto done;
5968 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5969 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5970 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5971 8e7bd50a 2019-08-22 stsp goto done;
5972 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5973 8e7bd50a 2019-08-22 stsp goto done;
5975 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5976 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5977 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5978 f372d5cd 2019-10-21 stsp if (err) {
5979 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5980 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5981 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5982 8e7bd50a 2019-08-22 stsp goto done;
5986 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5987 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5988 f372d5cd 2019-10-21 stsp if (err) {
5989 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5990 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5991 8e7bd50a 2019-08-22 stsp goto done;
5994 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5995 f372d5cd 2019-10-21 stsp if (err) {
5996 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5997 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5998 8e7bd50a 2019-08-22 stsp goto done;
6001 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
6002 f372d5cd 2019-10-21 stsp if (err) {
6003 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6004 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6005 f372d5cd 2019-10-21 stsp goto done;
6008 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
6009 f372d5cd 2019-10-21 stsp if (err) {
6010 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6011 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6012 f372d5cd 2019-10-21 stsp goto done;
6014 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6016 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6017 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6018 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6019 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6020 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6021 f372d5cd 2019-10-21 stsp free(tag_id_str);
6023 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6024 8e7bd50a 2019-08-22 stsp free(commit_id);
6025 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6026 8e7bd50a 2019-08-22 stsp free(refname);
6027 8e7bd50a 2019-08-22 stsp free(tagmsg);
6028 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6029 aba9c984 2019-09-08 stsp free(tagger);
6030 8e7bd50a 2019-08-22 stsp return err;
6033 8e7bd50a 2019-08-22 stsp static const struct got_error *
6034 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6036 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6037 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6038 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6039 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6040 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6041 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6042 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6044 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6045 8e7bd50a 2019-08-22 stsp switch (ch) {
6047 80106605 2020-02-24 stsp commit_id_arg = optarg;
6050 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6053 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6054 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6055 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6057 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6060 8e7bd50a 2019-08-22 stsp do_list = 1;
6063 8e7bd50a 2019-08-22 stsp usage_tag();
6064 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6068 8e7bd50a 2019-08-22 stsp argc -= optind;
6069 8e7bd50a 2019-08-22 stsp argv += optind;
6071 8e7bd50a 2019-08-22 stsp if (do_list) {
6072 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6074 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6075 8e7bd50a 2019-08-22 stsp if (tagmsg)
6076 ff69268e 2020-12-13 stsp option_conflict('l', 'm');
6077 8e7bd50a 2019-08-22 stsp if (argc > 0)
6078 8e7bd50a 2019-08-22 stsp usage_tag();
6079 80106605 2020-02-24 stsp } else if (argc != 1)
6080 8e7bd50a 2019-08-22 stsp usage_tag();
6082 a2887370 2019-08-23 stsp tag_name = argv[0];
6084 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6085 8e7bd50a 2019-08-22 stsp if (do_list) {
6086 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6087 8e7bd50a 2019-08-22 stsp NULL) == -1)
6088 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6090 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6091 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6092 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6095 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6096 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6097 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6098 8e7bd50a 2019-08-22 stsp goto done;
6101 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6102 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6103 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6104 8e7bd50a 2019-08-22 stsp goto done;
6106 8e7bd50a 2019-08-22 stsp error = NULL;
6107 8e7bd50a 2019-08-22 stsp if (worktree) {
6108 8e7bd50a 2019-08-22 stsp repo_path =
6109 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6110 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6111 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6112 8e7bd50a 2019-08-22 stsp if (error)
6113 8e7bd50a 2019-08-22 stsp goto done;
6115 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
6116 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6117 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6118 8e7bd50a 2019-08-22 stsp goto done;
6123 8e7bd50a 2019-08-22 stsp if (do_list) {
6124 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6125 c9956ddf 2019-09-08 stsp if (error != NULL)
6126 c9956ddf 2019-09-08 stsp goto done;
6127 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6128 8e7bd50a 2019-08-22 stsp if (error)
6129 8e7bd50a 2019-08-22 stsp goto done;
6130 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6132 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6133 c9956ddf 2019-09-08 stsp if (error)
6134 c9956ddf 2019-09-08 stsp goto done;
6135 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6136 c9956ddf 2019-09-08 stsp if (error != NULL)
6137 c9956ddf 2019-09-08 stsp goto done;
6139 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6140 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6141 8e7bd50a 2019-08-22 stsp if (error)
6142 8e7bd50a 2019-08-22 stsp goto done;
6145 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6146 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6147 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6148 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6149 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6150 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6151 8e7bd50a 2019-08-22 stsp if (error)
6152 8e7bd50a 2019-08-22 stsp goto done;
6153 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6154 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6155 8e7bd50a 2019-08-22 stsp if (error)
6156 8e7bd50a 2019-08-22 stsp goto done;
6157 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6158 8e7bd50a 2019-08-22 stsp free(commit_id);
6159 8e7bd50a 2019-08-22 stsp if (error)
6160 8e7bd50a 2019-08-22 stsp goto done;
6163 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6164 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6168 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
6169 8e7bd50a 2019-08-22 stsp if (worktree)
6170 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6171 8e7bd50a 2019-08-22 stsp free(cwd);
6172 8e7bd50a 2019-08-22 stsp free(repo_path);
6173 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6174 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6175 8e7bd50a 2019-08-22 stsp return error;
6178 8e7bd50a 2019-08-22 stsp __dead static void
6179 d00136be 2019-03-26 stsp usage_add(void)
6181 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6182 022fae89 2019-12-06 tracey getprogname());
6186 d00136be 2019-03-26 stsp static const struct got_error *
6187 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6189 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6191 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6192 4e68cba3 2019-11-23 stsp return NULL;
6195 4e68cba3 2019-11-23 stsp static const struct got_error *
6196 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6198 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6199 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6200 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6201 1dd54920 2019-05-11 stsp char *cwd = NULL;
6202 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6203 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6204 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6206 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6208 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6209 d00136be 2019-03-26 stsp switch (ch) {
6210 022fae89 2019-12-06 tracey case 'I':
6211 022fae89 2019-12-06 tracey no_ignores = 1;
6214 4e68cba3 2019-11-23 stsp can_recurse = 1;
6217 d00136be 2019-03-26 stsp usage_add();
6218 d00136be 2019-03-26 stsp /* NOTREACHED */
6222 d00136be 2019-03-26 stsp argc -= optind;
6223 d00136be 2019-03-26 stsp argv += optind;
6225 43012d58 2019-07-14 stsp #ifndef PROFILE
6226 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6227 43012d58 2019-07-14 stsp NULL) == -1)
6228 43012d58 2019-07-14 stsp err(1, "pledge");
6230 723c305c 2019-05-11 jcs if (argc < 1)
6231 d00136be 2019-03-26 stsp usage_add();
6233 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6234 d00136be 2019-03-26 stsp if (cwd == NULL) {
6235 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6236 d00136be 2019-03-26 stsp goto done;
6239 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6240 fa51e947 2020-03-27 stsp if (error) {
6241 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6242 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6243 d00136be 2019-03-26 stsp goto done;
6246 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6248 031a5338 2019-03-26 stsp if (error != NULL)
6249 031a5338 2019-03-26 stsp goto done;
6251 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6252 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6253 d00136be 2019-03-26 stsp if (error)
6254 d00136be 2019-03-26 stsp goto done;
6256 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6257 6d022e97 2019-08-04 stsp if (error)
6258 022fae89 2019-12-06 tracey goto done;
6260 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
6261 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6262 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
6263 6d022e97 2019-08-04 stsp goto done;
6267 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6268 4e68cba3 2019-11-23 stsp char *ondisk_path;
6269 4e68cba3 2019-11-23 stsp struct stat sb;
6270 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6271 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6272 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6273 62d463ca 2020-10-20 naddy pe->path) == -1) {
6274 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6275 4e68cba3 2019-11-23 stsp goto done;
6277 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6278 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6279 4e68cba3 2019-11-23 stsp free(ondisk_path);
6282 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6283 4e68cba3 2019-11-23 stsp ondisk_path);
6284 4e68cba3 2019-11-23 stsp free(ondisk_path);
6285 4e68cba3 2019-11-23 stsp goto done;
6287 4e68cba3 2019-11-23 stsp free(ondisk_path);
6288 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6289 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6290 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6291 4e68cba3 2019-11-23 stsp goto done;
6296 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6297 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6300 031a5338 2019-03-26 stsp got_repo_close(repo);
6301 d00136be 2019-03-26 stsp if (worktree)
6302 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6303 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6304 1dd54920 2019-05-11 stsp free((char *)pe->path);
6305 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6306 2ec1f75b 2019-03-26 stsp free(cwd);
6307 2ec1f75b 2019-03-26 stsp return error;
6310 2ec1f75b 2019-03-26 stsp __dead static void
6311 648e4ef7 2019-07-09 stsp usage_remove(void)
6313 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6314 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6318 2a06fe5f 2019-08-24 stsp static const struct got_error *
6319 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6320 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6322 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6324 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6325 2a06fe5f 2019-08-24 stsp return NULL;
6326 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6327 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6328 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6329 2a06fe5f 2019-08-24 stsp return NULL;
6332 2ec1f75b 2019-03-26 stsp static const struct got_error *
6333 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6335 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6336 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6337 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6338 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6339 17ed4618 2019-06-02 stsp char *cwd = NULL;
6340 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6341 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6342 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6344 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6346 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6347 2ec1f75b 2019-03-26 stsp switch (ch) {
6349 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6351 70e3e7f5 2019-12-13 tracey case 'k':
6352 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6354 f2a9dc41 2019-12-13 tracey case 'R':
6355 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6358 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6359 766841c2 2020-08-13 stsp switch (optarg[i]) {
6360 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6361 766841c2 2020-08-13 stsp delete_local_mods = 1;
6363 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6366 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6367 766841c2 2020-08-13 stsp optarg[i]);
6370 766841c2 2020-08-13 stsp status_codes = optarg;
6373 f2a9dc41 2019-12-13 tracey usage_remove();
6374 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6378 2ec1f75b 2019-03-26 stsp argc -= optind;
6379 2ec1f75b 2019-03-26 stsp argv += optind;
6381 43012d58 2019-07-14 stsp #ifndef PROFILE
6382 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6383 43012d58 2019-07-14 stsp NULL) == -1)
6384 43012d58 2019-07-14 stsp err(1, "pledge");
6386 17ed4618 2019-06-02 stsp if (argc < 1)
6387 648e4ef7 2019-07-09 stsp usage_remove();
6389 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
6390 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
6391 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6392 2ec1f75b 2019-03-26 stsp goto done;
6394 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6395 fa51e947 2020-03-27 stsp if (error) {
6396 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6397 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
6398 2ec1f75b 2019-03-26 stsp goto done;
6401 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6404 2ec1f75b 2019-03-26 stsp goto done;
6406 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6407 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6408 2ec1f75b 2019-03-26 stsp if (error)
6409 2ec1f75b 2019-03-26 stsp goto done;
6411 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6412 6d022e97 2019-08-04 stsp if (error)
6413 6d022e97 2019-08-04 stsp goto done;
6415 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
6416 f2a9dc41 2019-12-13 tracey char *ondisk_path;
6417 f2a9dc41 2019-12-13 tracey struct stat sb;
6418 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
6419 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6420 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6421 62d463ca 2020-10-20 naddy pe->path) == -1) {
6422 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6423 f2a9dc41 2019-12-13 tracey goto done;
6425 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6426 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6427 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6428 f2a9dc41 2019-12-13 tracey continue;
6430 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6431 f2a9dc41 2019-12-13 tracey ondisk_path);
6432 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6433 f2a9dc41 2019-12-13 tracey goto done;
6435 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6436 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6437 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6438 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6439 f2a9dc41 2019-12-13 tracey goto done;
6444 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6445 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
6446 766841c2 2020-08-13 stsp repo, keep_on_disk);
6449 a129376b 2019-03-28 stsp got_repo_close(repo);
6450 a129376b 2019-03-28 stsp if (worktree)
6451 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6452 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6453 17ed4618 2019-06-02 stsp free((char *)pe->path);
6454 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6455 a129376b 2019-03-28 stsp free(cwd);
6456 a129376b 2019-03-28 stsp return error;
6459 a129376b 2019-03-28 stsp __dead static void
6460 a129376b 2019-03-28 stsp usage_revert(void)
6462 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6463 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6467 1ee397ad 2019-07-12 stsp static const struct got_error *
6468 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6470 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6471 fb9704af 2020-01-27 stsp return NULL;
6473 a129376b 2019-03-28 stsp while (path[0] == '/')
6475 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6476 33aa809d 2019-08-08 stsp return NULL;
6479 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6480 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6481 33aa809d 2019-08-08 stsp const char *action;
6484 33aa809d 2019-08-08 stsp static const struct got_error *
6485 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6486 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6488 33aa809d 2019-08-08 stsp char *line = NULL;
6489 33aa809d 2019-08-08 stsp size_t linesize = 0;
6490 33aa809d 2019-08-08 stsp ssize_t linelen;
6492 33aa809d 2019-08-08 stsp switch (status) {
6493 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6494 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6496 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6497 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6499 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6500 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6501 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6502 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6503 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6504 33aa809d 2019-08-08 stsp printf("%s", line);
6505 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6506 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6507 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6508 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6509 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6512 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6515 33aa809d 2019-08-08 stsp return NULL;
6518 33aa809d 2019-08-08 stsp static const struct got_error *
6519 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6520 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6522 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6523 33aa809d 2019-08-08 stsp char *line = NULL;
6524 33aa809d 2019-08-08 stsp size_t linesize = 0;
6525 33aa809d 2019-08-08 stsp ssize_t linelen;
6526 33aa809d 2019-08-08 stsp int resp = ' ';
6527 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6529 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6531 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6533 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6534 33aa809d 2019-08-08 stsp a->action);
6536 33aa809d 2019-08-08 stsp return err;
6537 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6538 33aa809d 2019-08-08 stsp if (linelen == -1) {
6539 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6540 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6541 33aa809d 2019-08-08 stsp return NULL;
6543 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6545 33aa809d 2019-08-08 stsp *nl = '\0';
6546 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6547 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6548 33aa809d 2019-08-08 stsp printf("y\n");
6549 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6550 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6551 33aa809d 2019-08-08 stsp printf("n\n");
6552 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6553 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6554 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6555 33aa809d 2019-08-08 stsp printf("q\n");
6557 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6558 33aa809d 2019-08-08 stsp free(line);
6559 33aa809d 2019-08-08 stsp return NULL;
6562 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6563 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6564 33aa809d 2019-08-08 stsp a->action);
6566 33aa809d 2019-08-08 stsp return err;
6567 33aa809d 2019-08-08 stsp resp = getchar();
6568 33aa809d 2019-08-08 stsp if (resp == '\n')
6569 33aa809d 2019-08-08 stsp resp = getchar();
6570 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6571 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6572 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6573 33aa809d 2019-08-08 stsp resp = ' ';
6575 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6576 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6577 33aa809d 2019-08-08 stsp resp = ' ';
6581 33aa809d 2019-08-08 stsp if (resp == 'y')
6582 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6583 33aa809d 2019-08-08 stsp else if (resp == 'n')
6584 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6585 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6586 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6588 1ee397ad 2019-07-12 stsp return NULL;
6592 a129376b 2019-03-28 stsp static const struct got_error *
6593 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6595 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6596 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6597 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6598 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6599 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6600 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6601 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6602 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6603 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6604 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6606 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6608 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6609 a129376b 2019-03-28 stsp switch (ch) {
6611 33aa809d 2019-08-08 stsp pflag = 1;
6614 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6617 0f6d7415 2019-08-08 stsp can_recurse = 1;
6620 a129376b 2019-03-28 stsp usage_revert();
6621 a129376b 2019-03-28 stsp /* NOTREACHED */
6625 a129376b 2019-03-28 stsp argc -= optind;
6626 a129376b 2019-03-28 stsp argv += optind;
6628 43012d58 2019-07-14 stsp #ifndef PROFILE
6629 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6630 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6631 43012d58 2019-07-14 stsp err(1, "pledge");
6633 e20a8b6f 2019-06-04 stsp if (argc < 1)
6634 a129376b 2019-03-28 stsp usage_revert();
6635 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6636 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6638 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6639 a129376b 2019-03-28 stsp if (cwd == NULL) {
6640 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6641 a129376b 2019-03-28 stsp goto done;
6643 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6644 fa51e947 2020-03-27 stsp if (error) {
6645 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6646 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6647 2ec1f75b 2019-03-26 stsp goto done;
6650 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6652 a129376b 2019-03-28 stsp if (error != NULL)
6653 a129376b 2019-03-28 stsp goto done;
6655 33aa809d 2019-08-08 stsp if (patch_script_path) {
6656 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6657 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6658 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6659 33aa809d 2019-08-08 stsp patch_script_path);
6660 33aa809d 2019-08-08 stsp goto done;
6663 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6664 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6665 a129376b 2019-03-28 stsp if (error)
6666 a129376b 2019-03-28 stsp goto done;
6668 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6669 6d022e97 2019-08-04 stsp if (error)
6670 6d022e97 2019-08-04 stsp goto done;
6672 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6673 0f6d7415 2019-08-08 stsp char *ondisk_path;
6674 0f6d7415 2019-08-08 stsp struct stat sb;
6675 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6676 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6677 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6678 62d463ca 2020-10-20 naddy pe->path) == -1) {
6679 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6680 0f6d7415 2019-08-08 stsp goto done;
6682 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6683 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6684 0f6d7415 2019-08-08 stsp free(ondisk_path);
6687 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6688 0f6d7415 2019-08-08 stsp ondisk_path);
6689 0f6d7415 2019-08-08 stsp free(ondisk_path);
6690 0f6d7415 2019-08-08 stsp goto done;
6692 0f6d7415 2019-08-08 stsp free(ondisk_path);
6693 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6694 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6695 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6696 0f6d7415 2019-08-08 stsp goto done;
6701 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6702 33aa809d 2019-08-08 stsp cpa.action = "revert";
6703 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6704 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6706 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6707 33aa809d 2019-08-08 stsp error == NULL)
6708 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6710 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6711 2ec1f75b 2019-03-26 stsp if (worktree)
6712 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6713 2ec1f75b 2019-03-26 stsp free(path);
6714 d00136be 2019-03-26 stsp free(cwd);
6715 6bad629b 2019-02-04 stsp return error;
6718 c4296144 2019-05-09 stsp __dead static void
6719 c4296144 2019-05-09 stsp usage_commit(void)
6721 35213c7c 2020-07-23 stsp fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6722 5c1e53bc 2019-07-28 stsp getprogname());
6726 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6727 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6728 e2ba3d07 2019-05-13 stsp const char *editor;
6729 e0870e44 2019-05-13 stsp const char *worktree_path;
6730 76d98825 2019-06-03 stsp const char *branch_name;
6731 314a6357 2019-05-13 stsp const char *repo_path;
6732 e0870e44 2019-05-13 stsp char *logmsg_path;
6736 33ad4cbe 2019-05-12 jcs static const struct got_error *
6737 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6740 76d98825 2019-06-03 stsp char *initial_content = NULL;
6741 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6742 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6743 e0870e44 2019-05-13 stsp char *template = NULL;
6744 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6745 1601cb9f 2020-09-11 naddy int initial_content_len;
6746 97972933 2020-09-11 stsp int fd = -1;
6747 33ad4cbe 2019-05-12 jcs size_t len;
6749 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6750 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6751 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6752 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6753 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6754 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6755 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6756 33ad4cbe 2019-05-12 jcs return NULL;
6759 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6760 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6762 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6763 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6764 1601cb9f 2020-09-11 naddy a->branch_name);
6765 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
6766 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6768 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6770 e0870e44 2019-05-13 stsp goto done;
6772 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6773 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
6774 97972933 2020-09-11 stsp goto done;
6777 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6778 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6779 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6780 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6781 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6784 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6785 0d5bb276 2020-12-15 stsp initial_content_len, 1);
6787 76d98825 2019-06-03 stsp free(initial_content);
6788 e0870e44 2019-05-13 stsp free(template);
6790 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6791 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
6793 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6794 59f86c76 2020-09-11 stsp if (err == NULL)
6795 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6796 59f86c76 2020-09-11 stsp if (err) {
6797 59f86c76 2020-09-11 stsp free(*logmsg);
6798 59f86c76 2020-09-11 stsp *logmsg = NULL;
6800 33ad4cbe 2019-05-12 jcs return err;
6803 c4296144 2019-05-09 stsp static const struct got_error *
6804 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6806 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6807 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6808 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6809 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6810 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6811 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6812 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6813 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6814 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6815 35213c7c 2020-07-23 stsp int allow_bad_symlinks = 0;
6816 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6818 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6819 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6821 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "m:S")) != -1) {
6822 c4296144 2019-05-09 stsp switch (ch) {
6824 c4296144 2019-05-09 stsp logmsg = optarg;
6827 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
6830 c4296144 2019-05-09 stsp usage_commit();
6831 c4296144 2019-05-09 stsp /* NOTREACHED */
6835 c4296144 2019-05-09 stsp argc -= optind;
6836 c4296144 2019-05-09 stsp argv += optind;
6838 43012d58 2019-07-14 stsp #ifndef PROFILE
6839 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6840 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6841 43012d58 2019-07-14 stsp err(1, "pledge");
6843 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6844 c4296144 2019-05-09 stsp if (cwd == NULL) {
6845 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6846 c4296144 2019-05-09 stsp goto done;
6848 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6849 fa51e947 2020-03-27 stsp if (error) {
6850 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6851 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6852 7d5807f4 2019-07-11 stsp goto done;
6855 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6856 c4296144 2019-05-09 stsp if (error)
6857 a698f62e 2019-07-25 stsp goto done;
6858 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6859 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6860 c4296144 2019-05-09 stsp goto done;
6863 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6864 916f288c 2019-07-30 stsp worktree);
6865 5c1e53bc 2019-07-28 stsp if (error)
6866 5c1e53bc 2019-07-28 stsp goto done;
6868 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6869 c9956ddf 2019-09-08 stsp if (error)
6870 c9956ddf 2019-09-08 stsp goto done;
6871 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6872 c9956ddf 2019-09-08 stsp gitconfig_path);
6873 c4296144 2019-05-09 stsp if (error != NULL)
6874 c4296144 2019-05-09 stsp goto done;
6876 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
6877 aba9c984 2019-09-08 stsp if (error)
6878 aba9c984 2019-09-08 stsp return error;
6881 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6882 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6884 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6885 314a6357 2019-05-13 stsp error = get_editor(&editor);
6887 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6888 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6889 c4296144 2019-05-09 stsp if (error)
6890 c4296144 2019-05-09 stsp goto done;
6892 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6893 087fb88c 2019-08-04 stsp if (error)
6894 087fb88c 2019-08-04 stsp goto done;
6896 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6897 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6898 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6899 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6900 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6901 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6902 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6903 916f288c 2019-07-30 stsp goto done;
6905 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6907 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6908 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6909 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6910 35213c7c 2020-07-23 stsp print_status, NULL, repo);
6911 e0870e44 2019-05-13 stsp if (error) {
6912 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6913 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6914 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6915 c4296144 2019-05-09 stsp goto done;
6918 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6919 c4296144 2019-05-09 stsp if (error)
6920 c4296144 2019-05-09 stsp goto done;
6921 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6923 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6924 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6925 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6926 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6927 7266f21f 2019-10-21 stsp error == NULL)
6928 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6929 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6931 c4296144 2019-05-09 stsp got_repo_close(repo);
6932 c4296144 2019-05-09 stsp if (worktree)
6933 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6934 c4296144 2019-05-09 stsp free(cwd);
6935 c4296144 2019-05-09 stsp free(id_str);
6936 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6937 e2ba3d07 2019-05-13 stsp free(editor);
6938 aba9c984 2019-09-08 stsp free(author);
6939 234035bc 2019-06-01 stsp return error;
6942 234035bc 2019-06-01 stsp __dead static void
6943 234035bc 2019-06-01 stsp usage_cherrypick(void)
6945 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6949 234035bc 2019-06-01 stsp static const struct got_error *
6950 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6952 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6953 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6954 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6955 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6956 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6957 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6958 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6959 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6961 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6963 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6964 234035bc 2019-06-01 stsp switch (ch) {
6966 234035bc 2019-06-01 stsp usage_cherrypick();
6967 234035bc 2019-06-01 stsp /* NOTREACHED */
6971 234035bc 2019-06-01 stsp argc -= optind;
6972 234035bc 2019-06-01 stsp argv += optind;
6974 43012d58 2019-07-14 stsp #ifndef PROFILE
6975 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6976 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6977 43012d58 2019-07-14 stsp err(1, "pledge");
6979 234035bc 2019-06-01 stsp if (argc != 1)
6980 234035bc 2019-06-01 stsp usage_cherrypick();
6982 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6983 234035bc 2019-06-01 stsp if (cwd == NULL) {
6984 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6985 234035bc 2019-06-01 stsp goto done;
6987 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6988 fa51e947 2020-03-27 stsp if (error) {
6989 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6990 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6992 234035bc 2019-06-01 stsp goto done;
6995 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6997 234035bc 2019-06-01 stsp if (error != NULL)
6998 234035bc 2019-06-01 stsp goto done;
7000 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7001 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7002 234035bc 2019-06-01 stsp if (error)
7003 234035bc 2019-06-01 stsp goto done;
7005 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7006 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7007 234035bc 2019-06-01 stsp if (error != NULL) {
7008 234035bc 2019-06-01 stsp struct got_reference *ref;
7009 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7010 234035bc 2019-06-01 stsp goto done;
7011 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7012 234035bc 2019-06-01 stsp if (error != NULL)
7013 234035bc 2019-06-01 stsp goto done;
7014 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
7015 234035bc 2019-06-01 stsp got_ref_close(ref);
7016 234035bc 2019-06-01 stsp if (error != NULL)
7017 234035bc 2019-06-01 stsp goto done;
7019 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
7020 234035bc 2019-06-01 stsp if (error)
7021 234035bc 2019-06-01 stsp goto done;
7023 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
7024 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
7025 234035bc 2019-06-01 stsp if (error != NULL)
7026 234035bc 2019-06-01 stsp goto done;
7028 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7029 234035bc 2019-06-01 stsp if (error) {
7030 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
7031 234035bc 2019-06-01 stsp goto done;
7032 234035bc 2019-06-01 stsp error = NULL;
7034 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
7035 234035bc 2019-06-01 stsp goto done;
7038 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7039 234035bc 2019-06-01 stsp if (error)
7040 234035bc 2019-06-01 stsp goto done;
7041 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7042 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7043 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7044 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
7046 234035bc 2019-06-01 stsp if (error != NULL)
7047 234035bc 2019-06-01 stsp goto done;
7049 9627c110 2020-04-18 stsp if (upa.did_something)
7050 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
7051 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7053 234035bc 2019-06-01 stsp if (commit)
7054 234035bc 2019-06-01 stsp got_object_commit_close(commit);
7055 234035bc 2019-06-01 stsp free(commit_id_str);
7056 234035bc 2019-06-01 stsp if (head_ref)
7057 234035bc 2019-06-01 stsp got_ref_close(head_ref);
7058 234035bc 2019-06-01 stsp if (worktree)
7059 234035bc 2019-06-01 stsp got_worktree_close(worktree);
7061 234035bc 2019-06-01 stsp got_repo_close(repo);
7062 c4296144 2019-05-09 stsp return error;
7065 5ef14e63 2019-06-02 stsp __dead static void
7066 5ef14e63 2019-06-02 stsp usage_backout(void)
7068 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7072 5ef14e63 2019-06-02 stsp static const struct got_error *
7073 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
7075 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
7076 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
7077 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
7078 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
7079 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
7080 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
7081 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
7082 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
7084 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7086 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7087 5ef14e63 2019-06-02 stsp switch (ch) {
7089 5ef14e63 2019-06-02 stsp usage_backout();
7090 5ef14e63 2019-06-02 stsp /* NOTREACHED */
7094 5ef14e63 2019-06-02 stsp argc -= optind;
7095 5ef14e63 2019-06-02 stsp argv += optind;
7097 43012d58 2019-07-14 stsp #ifndef PROFILE
7098 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7099 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7100 43012d58 2019-07-14 stsp err(1, "pledge");
7102 5ef14e63 2019-06-02 stsp if (argc != 1)
7103 5ef14e63 2019-06-02 stsp usage_backout();
7105 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
7106 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
7107 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
7108 5ef14e63 2019-06-02 stsp goto done;
7110 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
7111 fa51e947 2020-03-27 stsp if (error) {
7112 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7113 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
7114 5ef14e63 2019-06-02 stsp goto done;
7117 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7119 5ef14e63 2019-06-02 stsp if (error != NULL)
7120 5ef14e63 2019-06-02 stsp goto done;
7122 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7123 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7124 5ef14e63 2019-06-02 stsp if (error)
7125 5ef14e63 2019-06-02 stsp goto done;
7127 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7128 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7129 5ef14e63 2019-06-02 stsp if (error != NULL) {
7130 5ef14e63 2019-06-02 stsp struct got_reference *ref;
7131 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7132 5ef14e63 2019-06-02 stsp goto done;
7133 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7134 5ef14e63 2019-06-02 stsp if (error != NULL)
7135 5ef14e63 2019-06-02 stsp goto done;
7136 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
7137 5ef14e63 2019-06-02 stsp got_ref_close(ref);
7138 5ef14e63 2019-06-02 stsp if (error != NULL)
7139 5ef14e63 2019-06-02 stsp goto done;
7141 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
7142 5ef14e63 2019-06-02 stsp if (error)
7143 5ef14e63 2019-06-02 stsp goto done;
7145 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
7146 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
7147 5ef14e63 2019-06-02 stsp if (error != NULL)
7148 5ef14e63 2019-06-02 stsp goto done;
7150 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7151 5ef14e63 2019-06-02 stsp if (error)
7152 5ef14e63 2019-06-02 stsp goto done;
7154 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7155 5ef14e63 2019-06-02 stsp if (error)
7156 5ef14e63 2019-06-02 stsp goto done;
7157 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7158 5ef14e63 2019-06-02 stsp if (pid == NULL) {
7159 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
7160 5ef14e63 2019-06-02 stsp goto done;
7163 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7164 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7165 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7166 5ef14e63 2019-06-02 stsp if (error != NULL)
7167 5ef14e63 2019-06-02 stsp goto done;
7169 9627c110 2020-04-18 stsp if (upa.did_something)
7170 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
7171 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7173 5ef14e63 2019-06-02 stsp if (commit)
7174 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
7175 5ef14e63 2019-06-02 stsp free(commit_id_str);
7176 5ef14e63 2019-06-02 stsp if (head_ref)
7177 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
7178 818c7501 2019-07-11 stsp if (worktree)
7179 818c7501 2019-07-11 stsp got_worktree_close(worktree);
7181 818c7501 2019-07-11 stsp got_repo_close(repo);
7182 818c7501 2019-07-11 stsp return error;
7185 818c7501 2019-07-11 stsp __dead static void
7186 818c7501 2019-07-11 stsp usage_rebase(void)
7188 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7189 af54c8f8 2019-07-11 stsp getprogname());
7194 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
7197 0ebf8283 2019-07-24 stsp size_t len;
7199 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
7200 0ebf8283 2019-07-24 stsp if (len > limit)
7201 0ebf8283 2019-07-24 stsp len = limit;
7202 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
7203 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
7205 0ebf8283 2019-07-24 stsp *nl = '\0';
7208 0ebf8283 2019-07-24 stsp static const struct got_error *
7209 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7211 5943eee2 2019-08-13 stsp const struct got_error *err;
7212 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
7213 5943eee2 2019-08-13 stsp const char *s;
7215 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
7217 5943eee2 2019-08-13 stsp return err;
7219 5943eee2 2019-08-13 stsp s = logmsg0;
7220 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
7223 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
7224 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
7225 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
7226 5943eee2 2019-08-13 stsp goto done;
7229 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
7231 5943eee2 2019-08-13 stsp free(logmsg0);
7232 a0ea4fc0 2020-02-28 stsp return err;
7235 a0ea4fc0 2020-02-28 stsp static const struct got_error *
7236 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7238 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
7239 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
7240 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
7242 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
7244 a0ea4fc0 2020-02-28 stsp return err;
7246 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
7248 a0ea4fc0 2020-02-28 stsp goto done;
7250 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
7252 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
7254 a0ea4fc0 2020-02-28 stsp goto done;
7256 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
7258 a0ea4fc0 2020-02-28 stsp free(id_str);
7259 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
7260 a0ea4fc0 2020-02-28 stsp free(logmsg);
7261 5943eee2 2019-08-13 stsp return err;
7264 818c7501 2019-07-11 stsp static const struct got_error *
7265 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
7266 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
7268 818c7501 2019-07-11 stsp const struct got_error *err;
7269 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7271 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
7273 818c7501 2019-07-11 stsp goto done;
7275 ff0d2220 2019-07-11 stsp if (new_id) {
7276 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
7278 ff0d2220 2019-07-11 stsp goto done;
7281 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
7282 ff0d2220 2019-07-11 stsp if (new_id_str)
7283 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
7285 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7287 0ebf8283 2019-07-24 stsp goto done;
7289 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
7290 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7292 818c7501 2019-07-11 stsp free(old_id_str);
7293 818c7501 2019-07-11 stsp free(new_id_str);
7294 272a1371 2020-02-28 stsp free(logmsg);
7295 818c7501 2019-07-11 stsp return err;
7298 1ee397ad 2019-07-12 stsp static const struct got_error *
7299 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7300 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
7301 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
7303 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
7304 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
7305 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
7308 818c7501 2019-07-11 stsp static const struct got_error *
7309 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
7310 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7311 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
7312 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7314 ff0d2220 2019-07-11 stsp const struct got_error *error;
7315 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
7316 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
7318 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7319 ff0d2220 2019-07-11 stsp if (error)
7320 ff0d2220 2019-07-11 stsp return error;
7322 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7323 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
7324 ff0d2220 2019-07-11 stsp if (error) {
7325 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7326 ff0d2220 2019-07-11 stsp goto done;
7327 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
7329 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
7330 ff0d2220 2019-07-11 stsp free(new_commit_id);
7333 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
7334 ff0d2220 2019-07-11 stsp return error;
7337 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
7338 64c6d990 2019-07-11 stsp const char *path_prefix;
7339 64c6d990 2019-07-11 stsp size_t len;
7340 8ca9bd68 2019-07-25 stsp int errcode;
7343 64c6d990 2019-07-11 stsp static const struct got_error *
7344 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7345 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
7346 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
7347 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
7349 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
7351 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7352 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7353 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
7355 64c6d990 2019-07-11 stsp return NULL;
7358 64c6d990 2019-07-11 stsp static const struct got_error *
7359 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
7360 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
7361 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
7363 64c6d990 2019-07-11 stsp const struct got_error *err;
7364 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7365 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
7366 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
7368 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
7369 64c6d990 2019-07-11 stsp return NULL;
7371 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7373 64c6d990 2019-07-11 stsp goto done;
7375 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7377 64c6d990 2019-07-11 stsp goto done;
7379 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
7380 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
7382 64c6d990 2019-07-11 stsp goto done;
7384 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
7385 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
7387 64c6d990 2019-07-11 stsp goto done;
7389 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
7390 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
7391 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
7392 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
7393 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
7394 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
7395 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
7397 64c6d990 2019-07-11 stsp if (tree1)
7398 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
7399 64c6d990 2019-07-11 stsp if (tree2)
7400 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
7401 64c6d990 2019-07-11 stsp if (commit)
7402 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
7403 64c6d990 2019-07-11 stsp if (parent_commit)
7404 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
7405 64c6d990 2019-07-11 stsp return err;
7408 ff0d2220 2019-07-11 stsp static const struct got_error *
7409 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
7410 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
7411 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7412 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
7413 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
7415 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
7416 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
7417 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
7418 af61c510 2019-07-19 stsp struct got_object_qid *qid;
7419 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
7421 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
7423 af61c510 2019-07-19 stsp return err;
7425 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7426 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7428 af61c510 2019-07-19 stsp goto done;
7429 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7430 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
7431 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
7432 af61c510 2019-07-19 stsp if (err) {
7433 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7434 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7435 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7436 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7437 af61c510 2019-07-19 stsp "been reached?!?");
7439 ee780d5c 2020-01-04 stsp goto done;
7441 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7442 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7444 af61c510 2019-07-19 stsp goto done;
7446 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7448 af61c510 2019-07-19 stsp goto done;
7449 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7450 af61c510 2019-07-19 stsp commit_id = parent_id;
7454 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7455 af61c510 2019-07-19 stsp return err;
7458 af61c510 2019-07-19 stsp static const struct got_error *
7459 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7461 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7462 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7463 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7464 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7465 818c7501 2019-07-11 stsp char *cwd = NULL;
7466 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7467 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7468 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7469 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7470 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7471 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7472 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7473 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7474 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7475 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7476 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7477 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7478 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7480 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7481 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7483 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7484 818c7501 2019-07-11 stsp switch (ch) {
7486 818c7501 2019-07-11 stsp abort_rebase = 1;
7489 818c7501 2019-07-11 stsp continue_rebase = 1;
7492 818c7501 2019-07-11 stsp usage_rebase();
7493 818c7501 2019-07-11 stsp /* NOTREACHED */
7497 818c7501 2019-07-11 stsp argc -= optind;
7498 818c7501 2019-07-11 stsp argv += optind;
7500 43012d58 2019-07-14 stsp #ifndef PROFILE
7501 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7502 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7503 43012d58 2019-07-14 stsp err(1, "pledge");
7505 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7506 818c7501 2019-07-11 stsp usage_rebase();
7507 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7508 818c7501 2019-07-11 stsp if (argc != 0)
7509 818c7501 2019-07-11 stsp usage_rebase();
7510 818c7501 2019-07-11 stsp } else if (argc != 1)
7511 818c7501 2019-07-11 stsp usage_rebase();
7513 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7514 818c7501 2019-07-11 stsp if (cwd == NULL) {
7515 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7516 818c7501 2019-07-11 stsp goto done;
7518 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7519 fa51e947 2020-03-27 stsp if (error) {
7520 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7521 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7522 818c7501 2019-07-11 stsp goto done;
7525 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7527 818c7501 2019-07-11 stsp if (error != NULL)
7528 818c7501 2019-07-11 stsp goto done;
7530 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7531 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7532 7ef62c4e 2020-02-24 stsp if (error)
7533 7ef62c4e 2020-02-24 stsp goto done;
7535 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7536 7ef62c4e 2020-02-24 stsp worktree);
7537 818c7501 2019-07-11 stsp if (error)
7538 7ef62c4e 2020-02-24 stsp goto done;
7539 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7540 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7541 818c7501 2019-07-11 stsp goto done;
7544 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7545 818c7501 2019-07-11 stsp if (error)
7546 818c7501 2019-07-11 stsp goto done;
7548 f6794adc 2019-07-23 stsp if (abort_rebase) {
7549 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7550 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7551 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7552 f6794adc 2019-07-23 stsp goto done;
7554 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7555 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7556 3e3a69f1 2019-07-25 stsp worktree, repo);
7557 818c7501 2019-07-11 stsp if (error)
7558 818c7501 2019-07-11 stsp goto done;
7559 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7560 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7561 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7562 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7563 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7564 818c7501 2019-07-11 stsp if (error)
7565 818c7501 2019-07-11 stsp goto done;
7566 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7567 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7568 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7571 818c7501 2019-07-11 stsp if (continue_rebase) {
7572 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7573 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7574 f6794adc 2019-07-23 stsp goto done;
7576 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7577 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7578 3e3a69f1 2019-07-25 stsp worktree, repo);
7579 818c7501 2019-07-11 stsp if (error)
7580 818c7501 2019-07-11 stsp goto done;
7582 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7583 01757395 2019-07-12 stsp resume_commit_id, repo);
7584 818c7501 2019-07-11 stsp if (error)
7585 818c7501 2019-07-11 stsp goto done;
7587 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7588 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7589 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7590 818c7501 2019-07-11 stsp goto done;
7593 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7594 818c7501 2019-07-11 stsp if (error != NULL)
7595 818c7501 2019-07-11 stsp goto done;
7598 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7599 ff0d2220 2019-07-11 stsp if (error)
7600 ff0d2220 2019-07-11 stsp goto done;
7602 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7603 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7605 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7606 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7607 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7608 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7609 818c7501 2019-07-11 stsp if (error)
7610 818c7501 2019-07-11 stsp goto done;
7611 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7612 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7613 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7614 818c7501 2019-07-11 stsp "with work tree's branch");
7615 818c7501 2019-07-11 stsp goto done;
7618 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7619 a51a74b3 2019-07-27 stsp if (error) {
7620 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7621 a51a74b3 2019-07-27 stsp goto done;
7622 a51a74b3 2019-07-27 stsp error = NULL;
7624 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7625 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7626 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7627 a51a74b3 2019-07-27 stsp goto done;
7629 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7630 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7631 818c7501 2019-07-11 stsp if (error)
7632 818c7501 2019-07-11 stsp goto done;
7635 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7636 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7637 818c7501 2019-07-11 stsp if (error)
7638 818c7501 2019-07-11 stsp goto done;
7640 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7641 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7642 fc66b545 2019-08-12 stsp if (pid == NULL) {
7643 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7644 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7645 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7646 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7647 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7648 fc66b545 2019-08-12 stsp if (error)
7649 fc66b545 2019-08-12 stsp goto done;
7650 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7651 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7652 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7655 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7656 fc66b545 2019-08-12 stsp goto done;
7658 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7659 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7660 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7661 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7662 818c7501 2019-07-11 stsp commit = NULL;
7663 818c7501 2019-07-11 stsp if (error)
7664 818c7501 2019-07-11 stsp goto done;
7666 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7667 38b0338b 2019-11-29 stsp if (continue_rebase) {
7668 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7669 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7670 38b0338b 2019-11-29 stsp goto done;
7672 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7673 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7674 38b0338b 2019-11-29 stsp char *id_str;
7675 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7676 38b0338b 2019-11-29 stsp new_base_branch);
7677 38b0338b 2019-11-29 stsp if (error)
7678 38b0338b 2019-11-29 stsp goto done;
7679 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7680 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7681 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7682 38b0338b 2019-11-29 stsp free(id_str);
7683 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7684 38b0338b 2019-11-29 stsp new_head_commit_id);
7685 38b0338b 2019-11-29 stsp if (error)
7686 38b0338b 2019-11-29 stsp goto done;
7690 818c7501 2019-07-11 stsp pid = NULL;
7691 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7692 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7694 818c7501 2019-07-11 stsp commit_id = qid->id;
7695 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7696 818c7501 2019-07-11 stsp pid = qid;
7698 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7699 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7700 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7701 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7702 818c7501 2019-07-11 stsp if (error)
7703 818c7501 2019-07-11 stsp goto done;
7705 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7706 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7707 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7709 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7710 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7711 a0ea4fc0 2020-02-28 stsp if (error)
7712 a0ea4fc0 2020-02-28 stsp goto done;
7713 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7717 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7718 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7719 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7720 818c7501 2019-07-11 stsp if (error)
7721 818c7501 2019-07-11 stsp goto done;
7724 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7725 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7726 818c7501 2019-07-11 stsp if (error)
7727 818c7501 2019-07-11 stsp goto done;
7728 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7729 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7731 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7732 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7734 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7735 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7736 818c7501 2019-07-11 stsp free(resume_commit_id);
7737 818c7501 2019-07-11 stsp free(yca_id);
7738 818c7501 2019-07-11 stsp if (commit)
7739 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7740 818c7501 2019-07-11 stsp if (branch)
7741 818c7501 2019-07-11 stsp got_ref_close(branch);
7742 818c7501 2019-07-11 stsp if (new_base_branch)
7743 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7744 818c7501 2019-07-11 stsp if (tmp_branch)
7745 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7746 5ef14e63 2019-06-02 stsp if (worktree)
7747 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7749 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7750 5ef14e63 2019-06-02 stsp return error;
7753 0ebf8283 2019-07-24 stsp __dead static void
7754 0ebf8283 2019-07-24 stsp usage_histedit(void)
7756 466785b9 2020-12-10 jrick fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] [-F histedit-script] [-m]\n",
7757 0ebf8283 2019-07-24 stsp getprogname());
7761 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7762 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7763 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7764 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7765 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7767 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7768 0ebf8283 2019-07-24 stsp unsigned char code;
7769 0ebf8283 2019-07-24 stsp const char *name;
7770 0ebf8283 2019-07-24 stsp const char *desc;
7771 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7772 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7773 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7774 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7775 82997472 2020-01-29 stsp "be used" },
7776 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7777 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7778 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7781 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7782 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7783 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7784 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7785 0ebf8283 2019-07-24 stsp char *logmsg;
7787 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7789 0ebf8283 2019-07-24 stsp static const struct got_error *
7790 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7791 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7793 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7794 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7795 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7798 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7800 0ebf8283 2019-07-24 stsp goto done;
7802 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7804 0ebf8283 2019-07-24 stsp goto done;
7806 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7808 0ebf8283 2019-07-24 stsp goto done;
7810 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7811 0ebf8283 2019-07-24 stsp if (n < 0)
7812 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7814 0ebf8283 2019-07-24 stsp if (commit)
7815 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7816 0ebf8283 2019-07-24 stsp free(id_str);
7817 0ebf8283 2019-07-24 stsp free(logmsg);
7818 0ebf8283 2019-07-24 stsp return err;
7821 0ebf8283 2019-07-24 stsp static const struct got_error *
7822 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7823 466785b9 2020-12-10 jrick FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
7825 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7826 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7827 466785b9 2020-12-10 jrick const char *histedit_cmd = NULL;
7829 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7830 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7832 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7833 466785b9 2020-12-10 jrick histedit_cmd = got_histedit_cmds[0].name;
7834 466785b9 2020-12-10 jrick if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
7835 466785b9 2020-12-10 jrick histedit_cmd = "fold";
7836 466785b9 2020-12-10 jrick err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
7839 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7840 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7841 083957f4 2020-02-24 stsp if (n < 0) {
7842 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7848 0ebf8283 2019-07-24 stsp return err;
7851 0ebf8283 2019-07-24 stsp static const struct got_error *
7852 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7853 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7855 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7857 514f2ffe 2020-01-29 stsp char *id_str;
7858 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7860 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7861 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7863 514f2ffe 2020-01-29 stsp return err;
7865 514f2ffe 2020-01-29 stsp n = fprintf(f,
7866 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7867 514f2ffe 2020-01-29 stsp "# commit %s\n"
7868 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7869 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7870 514f2ffe 2020-01-29 stsp if (n < 0) {
7871 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7872 514f2ffe 2020-01-29 stsp goto done;
7875 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7876 514f2ffe 2020-01-29 stsp if (n < 0) {
7877 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7878 514f2ffe 2020-01-29 stsp goto done;
7881 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7882 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7883 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7884 0ebf8283 2019-07-24 stsp cmd->desc);
7885 0ebf8283 2019-07-24 stsp if (n < 0) {
7886 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7891 514f2ffe 2020-01-29 stsp free(id_str);
7892 0ebf8283 2019-07-24 stsp return err;
7895 0ebf8283 2019-07-24 stsp static const struct got_error *
7896 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7898 0ebf8283 2019-07-24 stsp static char msg[42];
7901 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7903 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7904 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7906 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7909 0ebf8283 2019-07-24 stsp static const struct got_error *
7910 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7911 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7913 0ebf8283 2019-07-24 stsp const struct got_error *err;
7914 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7915 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7917 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7919 0ebf8283 2019-07-24 stsp return err;
7921 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7923 0ebf8283 2019-07-24 stsp goto done;
7925 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7927 5943eee2 2019-08-13 stsp goto done;
7928 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7929 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7930 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7931 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7934 0ebf8283 2019-07-24 stsp if (folded_commit)
7935 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7936 0ebf8283 2019-07-24 stsp free(id_str);
7937 5943eee2 2019-08-13 stsp free(folded_logmsg);
7938 0ebf8283 2019-07-24 stsp return err;
7941 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7942 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7944 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7946 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7947 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7948 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7949 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7950 3f9de99f 2019-07-24 stsp folded = prev;
7951 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7954 0ebf8283 2019-07-24 stsp return folded;
7957 0ebf8283 2019-07-24 stsp static const struct got_error *
7958 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7959 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7961 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7962 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7963 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7964 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7965 1601cb9f 2020-09-11 naddy int logmsg_len;
7967 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7969 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7971 0ebf8283 2019-07-24 stsp return err;
7973 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7974 0ebf8283 2019-07-24 stsp if (folded) {
7975 0ebf8283 2019-07-24 stsp while (folded != hle) {
7976 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7977 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7980 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7981 0ebf8283 2019-07-24 stsp logmsg, repo);
7983 0ebf8283 2019-07-24 stsp goto done;
7984 0ebf8283 2019-07-24 stsp free(logmsg);
7985 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7986 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7990 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7992 0ebf8283 2019-07-24 stsp goto done;
7993 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7995 5943eee2 2019-08-13 stsp goto done;
7996 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
7997 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7998 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
7999 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
8000 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8001 0ebf8283 2019-07-24 stsp goto done;
8003 0ebf8283 2019-07-24 stsp free(logmsg);
8004 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8006 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8008 0ebf8283 2019-07-24 stsp goto done;
8010 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
8011 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
8013 0ebf8283 2019-07-24 stsp goto done;
8015 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
8016 0ebf8283 2019-07-24 stsp close(fd);
8018 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8020 0ebf8283 2019-07-24 stsp goto done;
8022 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8023 0d5bb276 2020-12-15 stsp logmsg_len, 0);
8024 0ebf8283 2019-07-24 stsp if (err) {
8025 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8026 0ebf8283 2019-07-24 stsp goto done;
8027 71392a05 2020-12-13 stsp err = NULL;
8028 71392a05 2020-12-13 stsp hle->logmsg = strdup(new_msg);
8029 71392a05 2020-12-13 stsp if (hle->logmsg == NULL)
8030 71392a05 2020-12-13 stsp err = got_error_from_errno("strdup");
8033 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8034 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
8035 0ebf8283 2019-07-24 stsp free(logmsg_path);
8036 0ebf8283 2019-07-24 stsp free(logmsg);
8037 5943eee2 2019-08-13 stsp free(orig_logmsg);
8038 0ebf8283 2019-07-24 stsp free(editor);
8039 0ebf8283 2019-07-24 stsp if (commit)
8040 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8041 0ebf8283 2019-07-24 stsp return err;
8044 0ebf8283 2019-07-24 stsp static const struct got_error *
8045 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
8046 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8048 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8049 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
8050 0ebf8283 2019-07-24 stsp size_t size;
8051 0ebf8283 2019-07-24 stsp ssize_t len;
8052 0ebf8283 2019-07-24 stsp int lineno = 0, i;
8053 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8054 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
8055 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
8057 0ebf8283 2019-07-24 stsp for (;;) {
8058 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
8059 0ebf8283 2019-07-24 stsp if (len == -1) {
8060 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
8061 0ebf8283 2019-07-24 stsp if (feof(f))
8063 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
8064 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
8069 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8071 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
8072 0ebf8283 2019-07-24 stsp free(line);
8073 0ebf8283 2019-07-24 stsp line = NULL;
8076 0ebf8283 2019-07-24 stsp cmd = NULL;
8077 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8078 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
8079 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8080 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
8081 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
8084 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8089 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
8090 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8093 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8095 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
8096 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
8097 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
8100 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
8101 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8105 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
8106 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
8107 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8111 0ebf8283 2019-07-24 stsp free(line);
8112 0ebf8283 2019-07-24 stsp line = NULL;
8116 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
8118 0ebf8283 2019-07-24 stsp *end = '\0';
8120 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
8121 0ebf8283 2019-07-24 stsp if (err) {
8122 0ebf8283 2019-07-24 stsp /* override error code */
8123 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8127 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
8128 0ebf8283 2019-07-24 stsp if (hle == NULL) {
8129 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
8132 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
8133 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
8134 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
8135 0ebf8283 2019-07-24 stsp commit_id = NULL;
8136 0ebf8283 2019-07-24 stsp free(line);
8137 0ebf8283 2019-07-24 stsp line = NULL;
8138 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8141 0ebf8283 2019-07-24 stsp free(line);
8142 0ebf8283 2019-07-24 stsp free(commit_id);
8143 0ebf8283 2019-07-24 stsp return err;
8146 0ebf8283 2019-07-24 stsp static const struct got_error *
8147 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
8148 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
8150 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
8151 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
8152 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8153 5b87815e 2020-03-05 stsp static char msg[92];
8154 bfce7f83 2019-07-27 stsp char *id_str;
8156 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
8157 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8158 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
8159 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
8160 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8162 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8163 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
8164 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8165 5b87815e 2020-03-05 stsp if (hle == hle2)
8167 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
8168 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
8170 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
8172 5b87815e 2020-03-05 stsp return err;
8173 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
8174 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
8175 5b87815e 2020-03-05 stsp free(id_str);
8176 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8180 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8181 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8182 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8185 bfce7f83 2019-07-27 stsp if (hle == NULL) {
8186 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
8188 bfce7f83 2019-07-27 stsp return err;
8189 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
8190 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
8191 bfce7f83 2019-07-27 stsp free(id_str);
8192 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8196 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8197 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8198 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8199 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
8201 bfce7f83 2019-07-27 stsp return NULL;
8204 bfce7f83 2019-07-27 stsp static const struct got_error *
8205 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
8206 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
8207 bfce7f83 2019-07-27 stsp struct got_repository *repo)
8209 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8210 0ebf8283 2019-07-24 stsp char *editor;
8211 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8213 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8215 0ebf8283 2019-07-24 stsp return err;
8217 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
8218 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
8219 0ebf8283 2019-07-24 stsp goto done;
8222 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8223 0ebf8283 2019-07-24 stsp if (f == NULL) {
8224 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
8225 0ebf8283 2019-07-24 stsp goto done;
8227 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8229 bfce7f83 2019-07-27 stsp goto done;
8231 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
8233 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8234 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8235 0ebf8283 2019-07-24 stsp free(editor);
8236 0ebf8283 2019-07-24 stsp return err;
8239 0ebf8283 2019-07-24 stsp static const struct got_error *
8240 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8241 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
8242 514f2ffe 2020-01-29 stsp struct got_repository *);
8244 0ebf8283 2019-07-24 stsp static const struct got_error *
8245 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
8246 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
8247 466785b9 2020-12-10 jrick int edit_logmsg_only, int fold_only, struct got_repository *repo)
8249 0ebf8283 2019-07-24 stsp const struct got_error *err;
8250 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8251 0ebf8283 2019-07-24 stsp char *path = NULL;
8253 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
8255 0ebf8283 2019-07-24 stsp return err;
8257 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
8259 0ebf8283 2019-07-24 stsp goto done;
8261 466785b9 2020-12-10 jrick err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8262 466785b9 2020-12-10 jrick fold_only, repo);
8264 0ebf8283 2019-07-24 stsp goto done;
8266 466785b9 2020-12-10 jrick if (edit_logmsg_only || fold_only) {
8267 083957f4 2020-02-24 stsp rewind(f);
8268 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8270 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
8271 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
8272 0ebf8283 2019-07-24 stsp goto done;
8275 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
8276 083957f4 2020-02-24 stsp if (err) {
8277 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8278 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8279 083957f4 2020-02-24 stsp goto done;
8280 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
8281 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
8285 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8286 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8287 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
8288 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
8289 0ebf8283 2019-07-24 stsp free(path);
8290 0ebf8283 2019-07-24 stsp return err;
8293 0ebf8283 2019-07-24 stsp static const struct got_error *
8294 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
8295 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8297 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8298 0ebf8283 2019-07-24 stsp char *path = NULL;
8299 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8300 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8301 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8303 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
8305 0ebf8283 2019-07-24 stsp return err;
8307 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
8308 0ebf8283 2019-07-24 stsp if (f == NULL) {
8309 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8310 0ebf8283 2019-07-24 stsp goto done;
8312 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8313 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8318 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8319 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
8320 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
8321 0ebf8283 2019-07-24 stsp if (n < 0) {
8322 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8328 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8329 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8330 0ebf8283 2019-07-24 stsp free(path);
8331 0ebf8283 2019-07-24 stsp if (commit)
8332 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8333 0ebf8283 2019-07-24 stsp return err;
8337 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
8339 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8341 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
8342 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
8343 bfce7f83 2019-07-27 stsp free(hle);
8347 0ebf8283 2019-07-24 stsp static const struct got_error *
8348 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
8349 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
8351 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8352 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8354 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8355 0ebf8283 2019-07-24 stsp if (f == NULL) {
8356 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8357 0ebf8283 2019-07-24 stsp goto done;
8360 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8362 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8363 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8364 0ebf8283 2019-07-24 stsp return err;
8367 0ebf8283 2019-07-24 stsp static const struct got_error *
8368 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8369 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
8370 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
8372 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
8373 0ebf8283 2019-07-24 stsp int resp = ' ';
8375 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
8376 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8377 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
8378 0ebf8283 2019-07-24 stsp resp = getchar();
8379 a61a4414 2019-08-07 stsp if (resp == '\n')
8380 a61a4414 2019-08-07 stsp resp = getchar();
8381 426ebf2e 2019-07-25 stsp if (resp == 'c') {
8382 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8383 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
8385 426ebf2e 2019-07-25 stsp if (err) {
8386 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8387 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8389 bfce7f83 2019-07-27 stsp prev_err = err;
8390 426ebf2e 2019-07-25 stsp resp = ' ';
8394 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
8395 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8396 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
8397 466785b9 2020-12-10 jrick commits, branch_name, 0, 0, repo);
8398 426ebf2e 2019-07-25 stsp if (err) {
8399 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8400 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8402 bfce7f83 2019-07-27 stsp prev_err = err;
8403 426ebf2e 2019-07-25 stsp resp = ' ';
8407 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
8408 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8411 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
8414 0ebf8283 2019-07-24 stsp return err;
8417 0ebf8283 2019-07-24 stsp static const struct got_error *
8418 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
8419 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8420 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
8422 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8423 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8424 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8425 3e3a69f1 2019-07-25 stsp branch, repo);
8428 0ebf8283 2019-07-24 stsp static const struct got_error *
8429 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
8430 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8432 0ebf8283 2019-07-24 stsp const struct got_error *err;
8433 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8435 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
8437 0ebf8283 2019-07-24 stsp goto done;
8439 0ebf8283 2019-07-24 stsp if (new_id) {
8440 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
8442 0ebf8283 2019-07-24 stsp goto done;
8445 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8446 0ebf8283 2019-07-24 stsp if (new_id_str)
8447 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8449 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8450 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8451 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8452 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8453 0ebf8283 2019-07-24 stsp goto done;
8455 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8457 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8459 0ebf8283 2019-07-24 stsp goto done;
8462 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8463 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8464 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8465 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8466 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8468 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8469 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8470 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8477 0ebf8283 2019-07-24 stsp free(old_id_str);
8478 0ebf8283 2019-07-24 stsp free(new_id_str);
8479 0ebf8283 2019-07-24 stsp return err;
8482 0ebf8283 2019-07-24 stsp static const struct got_error *
8483 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8484 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8485 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8486 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8488 0ebf8283 2019-07-24 stsp const struct got_error *err;
8489 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8490 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8492 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8493 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8494 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8496 0ebf8283 2019-07-24 stsp return err;
8499 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8501 0ebf8283 2019-07-24 stsp return err;
8503 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8504 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8505 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8506 0ebf8283 2019-07-24 stsp if (err) {
8507 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8508 0ebf8283 2019-07-24 stsp goto done;
8509 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8511 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8512 0ebf8283 2019-07-24 stsp free(new_commit_id);
8515 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8516 0ebf8283 2019-07-24 stsp return err;
8519 0ebf8283 2019-07-24 stsp static const struct got_error *
8520 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8521 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8523 0ebf8283 2019-07-24 stsp const struct got_error *error;
8524 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8526 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8528 0ebf8283 2019-07-24 stsp if (error)
8529 0ebf8283 2019-07-24 stsp return error;
8531 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8532 0ebf8283 2019-07-24 stsp if (error)
8533 0ebf8283 2019-07-24 stsp return error;
8535 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8536 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8537 0ebf8283 2019-07-24 stsp return error;
8540 ab20a43a 2020-01-29 stsp static const struct got_error *
8541 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8542 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8543 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8544 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8546 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8548 ab20a43a 2020-01-29 stsp switch (status) {
8549 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8550 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8551 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8552 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8553 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8554 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8559 ab20a43a 2020-01-29 stsp switch (staged_status) {
8560 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8561 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8562 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8563 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8564 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8569 ab20a43a 2020-01-29 stsp return NULL;
8572 0ebf8283 2019-07-24 stsp static const struct got_error *
8573 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8575 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8576 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8577 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8578 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8579 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8580 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8581 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8582 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8583 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8584 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8585 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8586 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8587 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8588 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8589 466785b9 2020-12-10 jrick int edit_logmsg_only = 0, fold_only = 0;
8590 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8591 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8592 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8593 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8594 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8595 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8596 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8597 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8599 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8600 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8601 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8602 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8604 466785b9 2020-12-10 jrick while ((ch = getopt(argc, argv, "acfF:m")) != -1) {
8605 0ebf8283 2019-07-24 stsp switch (ch) {
8607 0ebf8283 2019-07-24 stsp abort_edit = 1;
8610 0ebf8283 2019-07-24 stsp continue_edit = 1;
8612 466785b9 2020-12-10 jrick case 'f':
8613 466785b9 2020-12-10 jrick fold_only = 1;
8616 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8619 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8622 0ebf8283 2019-07-24 stsp usage_histedit();
8623 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8627 0ebf8283 2019-07-24 stsp argc -= optind;
8628 0ebf8283 2019-07-24 stsp argv += optind;
8630 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8631 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8632 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8633 0ebf8283 2019-07-24 stsp err(1, "pledge");
8635 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8636 ff69268e 2020-12-13 stsp option_conflict('a', 'c');
8637 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8638 ff69268e 2020-12-13 stsp option_conflict('F', 'm');
8639 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8640 ff69268e 2020-12-13 stsp option_conflict('a', 'm');
8641 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8642 ff69268e 2020-12-13 stsp option_conflict('c', 'm');
8643 466785b9 2020-12-10 jrick if (abort_edit && fold_only)
8644 ff69268e 2020-12-13 stsp option_conflict('a', 'f');
8645 ff69268e 2020-12-13 stsp if (continue_edit && fold_only)
8646 ff69268e 2020-12-13 stsp option_conflict('c', 'f');
8647 466785b9 2020-12-10 jrick if (fold_only && edit_logmsg_only)
8648 ff69268e 2020-12-13 stsp option_conflict('f', 'm');
8649 b3805337 2020-12-13 stsp if (edit_script_path && fold_only)
8650 b3805337 2020-12-13 stsp option_conflict('F', 'f');
8651 0ebf8283 2019-07-24 stsp if (argc != 0)
8652 0ebf8283 2019-07-24 stsp usage_histedit();
8655 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8656 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8657 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8658 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8659 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8660 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8663 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8664 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8665 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8666 0ebf8283 2019-07-24 stsp goto done;
8668 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8669 fa51e947 2020-03-27 stsp if (error) {
8670 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8671 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8672 0ebf8283 2019-07-24 stsp goto done;
8675 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8677 0ebf8283 2019-07-24 stsp if (error != NULL)
8678 0ebf8283 2019-07-24 stsp goto done;
8680 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8681 0ebf8283 2019-07-24 stsp if (error)
8682 0ebf8283 2019-07-24 stsp goto done;
8683 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8684 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8685 0ebf8283 2019-07-24 stsp goto done;
8688 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8689 0ebf8283 2019-07-24 stsp if (error)
8690 0ebf8283 2019-07-24 stsp goto done;
8692 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8693 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8694 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8695 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8696 083957f4 2020-02-24 stsp "before the -m option can be used");
8697 083957f4 2020-02-24 stsp goto done;
8699 466785b9 2020-12-10 jrick if (edit_in_progress && fold_only) {
8700 466785b9 2020-12-10 jrick error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8701 466785b9 2020-12-10 jrick "histedit operation is in progress in this "
8702 466785b9 2020-12-10 jrick "work tree and must be continued or aborted "
8703 466785b9 2020-12-10 jrick "before the -f option can be used");
8704 466785b9 2020-12-10 jrick goto done;
8707 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8708 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8709 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8710 3e3a69f1 2019-07-25 stsp worktree, repo);
8711 0ebf8283 2019-07-24 stsp if (error)
8712 0ebf8283 2019-07-24 stsp goto done;
8713 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8714 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8715 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8716 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8717 0ebf8283 2019-07-24 stsp if (error)
8718 0ebf8283 2019-07-24 stsp goto done;
8719 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8720 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8721 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8722 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8723 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8724 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8725 0ebf8283 2019-07-24 stsp goto done;
8728 0ebf8283 2019-07-24 stsp if (continue_edit) {
8729 0ebf8283 2019-07-24 stsp char *path;
8731 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8732 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8733 0ebf8283 2019-07-24 stsp goto done;
8736 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8737 0ebf8283 2019-07-24 stsp if (error)
8738 0ebf8283 2019-07-24 stsp goto done;
8740 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8741 0ebf8283 2019-07-24 stsp free(path);
8742 0ebf8283 2019-07-24 stsp if (error)
8743 0ebf8283 2019-07-24 stsp goto done;
8745 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8746 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8747 3e3a69f1 2019-07-25 stsp worktree, repo);
8748 0ebf8283 2019-07-24 stsp if (error)
8749 0ebf8283 2019-07-24 stsp goto done;
8751 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8752 0ebf8283 2019-07-24 stsp if (error)
8753 0ebf8283 2019-07-24 stsp goto done;
8755 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8756 0ebf8283 2019-07-24 stsp head_commit_id);
8757 0ebf8283 2019-07-24 stsp if (error)
8758 0ebf8283 2019-07-24 stsp goto done;
8759 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8760 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8761 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8762 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8763 3aac7cf7 2019-07-25 stsp goto done;
8765 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8766 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8767 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8768 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8769 0ebf8283 2019-07-24 stsp commit = NULL;
8770 0ebf8283 2019-07-24 stsp if (error)
8771 0ebf8283 2019-07-24 stsp goto done;
8773 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8774 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8775 0ebf8283 2019-07-24 stsp goto done;
8778 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8779 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8780 0ebf8283 2019-07-24 stsp if (error != NULL)
8781 0ebf8283 2019-07-24 stsp goto done;
8783 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8784 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8785 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8786 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8787 c7d20a3f 2019-07-30 stsp goto done;
8790 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8791 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8792 bfce7f83 2019-07-27 stsp branch = NULL;
8793 0ebf8283 2019-07-24 stsp if (error)
8794 0ebf8283 2019-07-24 stsp goto done;
8796 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8797 0ebf8283 2019-07-24 stsp head_commit_id);
8798 0ebf8283 2019-07-24 stsp if (error)
8799 0ebf8283 2019-07-24 stsp goto done;
8800 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8801 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8802 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8803 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8804 3aac7cf7 2019-07-25 stsp goto done;
8806 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8807 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8808 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8809 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8810 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8811 0ebf8283 2019-07-24 stsp commit = NULL;
8812 0ebf8283 2019-07-24 stsp if (error)
8813 0ebf8283 2019-07-24 stsp goto done;
8815 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8816 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8817 c5996fff 2020-01-29 stsp goto done;
8820 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8821 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8822 bfce7f83 2019-07-27 stsp if (error)
8823 bfce7f83 2019-07-27 stsp goto done;
8825 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8826 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8827 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8828 6ba2bea2 2019-07-27 stsp if (error) {
8829 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8830 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8831 9627c110 2020-04-18 stsp update_progress, &upa);
8832 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8833 0ebf8283 2019-07-24 stsp goto done;
8836 514f2ffe 2020-01-29 stsp const char *branch_name;
8837 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8838 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8839 514f2ffe 2020-01-29 stsp branch_name += 11;
8840 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8841 466785b9 2020-12-10 jrick branch_name, edit_logmsg_only, fold_only, repo);
8842 6ba2bea2 2019-07-27 stsp if (error) {
8843 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8844 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8845 9627c110 2020-04-18 stsp update_progress, &upa);
8846 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8847 0ebf8283 2019-07-24 stsp goto done;
8852 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8854 6ba2bea2 2019-07-27 stsp if (error) {
8855 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8856 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8857 9627c110 2020-04-18 stsp update_progress, &upa);
8858 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8859 0ebf8283 2019-07-24 stsp goto done;
8864 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8865 4ec14e60 2019-08-28 hiltjo if (error)
8866 0ebf8283 2019-07-24 stsp goto done;
8868 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8869 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8870 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8871 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8874 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8875 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8876 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8877 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8879 ab20a43a 2020-01-29 stsp if (error)
8880 ab20a43a 2020-01-29 stsp goto done;
8882 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8883 ab20a43a 2020-01-29 stsp int have_changes = 0;
8885 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8886 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8887 ab20a43a 2020-01-29 stsp if (error)
8888 ab20a43a 2020-01-29 stsp goto done;
8889 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8890 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8891 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8892 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8893 ab20a43a 2020-01-29 stsp if (error) {
8894 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8895 ab20a43a 2020-01-29 stsp goto done;
8896 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8897 ab20a43a 2020-01-29 stsp goto done;
8899 ab20a43a 2020-01-29 stsp if (have_changes) {
8900 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8901 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8902 ab20a43a 2020-01-29 stsp if (error)
8903 ab20a43a 2020-01-29 stsp goto done;
8905 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8906 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8907 ab20a43a 2020-01-29 stsp if (error)
8908 ab20a43a 2020-01-29 stsp goto done;
8909 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8910 ab20a43a 2020-01-29 stsp hle, NULL);
8911 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8912 ab20a43a 2020-01-29 stsp commit = NULL;
8913 ab20a43a 2020-01-29 stsp if (error)
8914 ab20a43a 2020-01-29 stsp goto done;
8920 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8921 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8922 0ebf8283 2019-07-24 stsp if (error)
8923 0ebf8283 2019-07-24 stsp goto done;
8927 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8928 0ebf8283 2019-07-24 stsp hle->commit_id);
8929 0ebf8283 2019-07-24 stsp if (error)
8930 0ebf8283 2019-07-24 stsp goto done;
8931 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8932 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8934 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8935 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8936 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8937 0ebf8283 2019-07-24 stsp if (error)
8938 0ebf8283 2019-07-24 stsp goto done;
8939 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8940 0ebf8283 2019-07-24 stsp commit = NULL;
8942 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8943 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8944 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8946 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8947 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8949 a0ea4fc0 2020-02-28 stsp if (error)
8950 a0ea4fc0 2020-02-28 stsp goto done;
8951 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8955 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8956 0ebf8283 2019-07-24 stsp char *id_str;
8957 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8958 0ebf8283 2019-07-24 stsp if (error)
8959 0ebf8283 2019-07-24 stsp goto done;
8960 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8962 0ebf8283 2019-07-24 stsp free(id_str);
8963 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8964 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8965 3e3a69f1 2019-07-25 stsp fileindex);
8966 0ebf8283 2019-07-24 stsp goto done;
8969 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8970 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8971 0ebf8283 2019-07-24 stsp if (error)
8972 0ebf8283 2019-07-24 stsp goto done;
8976 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8977 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8978 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8979 0ebf8283 2019-07-24 stsp if (error)
8980 0ebf8283 2019-07-24 stsp goto done;
8983 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8984 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8985 0ebf8283 2019-07-24 stsp if (error)
8986 0ebf8283 2019-07-24 stsp goto done;
8987 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8988 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8990 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8991 3e3a69f1 2019-07-25 stsp branch, repo);
8993 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8994 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8995 0ebf8283 2019-07-24 stsp free(head_commit_id);
8996 0ebf8283 2019-07-24 stsp free(base_commit_id);
8997 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8998 0ebf8283 2019-07-24 stsp if (commit)
8999 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
9000 0ebf8283 2019-07-24 stsp if (branch)
9001 0ebf8283 2019-07-24 stsp got_ref_close(branch);
9002 0ebf8283 2019-07-24 stsp if (tmp_branch)
9003 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
9004 0ebf8283 2019-07-24 stsp if (worktree)
9005 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
9007 2822a352 2019-10-15 stsp got_repo_close(repo);
9008 2822a352 2019-10-15 stsp return error;
9011 2822a352 2019-10-15 stsp __dead static void
9012 2822a352 2019-10-15 stsp usage_integrate(void)
9014 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9018 2822a352 2019-10-15 stsp static const struct got_error *
9019 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
9021 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
9022 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
9023 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
9024 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9025 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
9026 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9027 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
9028 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9030 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9032 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9033 2822a352 2019-10-15 stsp switch (ch) {
9035 2822a352 2019-10-15 stsp usage_integrate();
9036 2822a352 2019-10-15 stsp /* NOTREACHED */
9040 2822a352 2019-10-15 stsp argc -= optind;
9041 2822a352 2019-10-15 stsp argv += optind;
9043 2822a352 2019-10-15 stsp if (argc != 1)
9044 2822a352 2019-10-15 stsp usage_integrate();
9045 2822a352 2019-10-15 stsp branch_arg = argv[0];
9046 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
9047 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9048 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
9049 2822a352 2019-10-15 stsp err(1, "pledge");
9051 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
9052 2822a352 2019-10-15 stsp if (cwd == NULL) {
9053 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
9054 2822a352 2019-10-15 stsp goto done;
9057 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
9058 fa51e947 2020-03-27 stsp if (error) {
9059 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9060 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
9062 2822a352 2019-10-15 stsp goto done;
9065 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
9066 2822a352 2019-10-15 stsp if (error)
9067 2822a352 2019-10-15 stsp goto done;
9069 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9071 2822a352 2019-10-15 stsp if (error != NULL)
9072 2822a352 2019-10-15 stsp goto done;
9074 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9075 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
9076 2822a352 2019-10-15 stsp if (error)
9077 2822a352 2019-10-15 stsp goto done;
9079 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9080 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
9081 2822a352 2019-10-15 stsp goto done;
9084 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9085 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
9086 2822a352 2019-10-15 stsp if (error)
9087 2822a352 2019-10-15 stsp goto done;
9089 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
9090 2822a352 2019-10-15 stsp if (refname == NULL) {
9091 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9092 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9093 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9094 2822a352 2019-10-15 stsp goto done;
9096 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
9097 2822a352 2019-10-15 stsp if (base_refname == NULL) {
9098 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9099 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9100 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9101 2822a352 2019-10-15 stsp goto done;
9104 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
9105 2822a352 2019-10-15 stsp if (error)
9106 2822a352 2019-10-15 stsp goto done;
9108 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9109 2822a352 2019-10-15 stsp if (error)
9110 2822a352 2019-10-15 stsp goto done;
9112 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9113 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
9114 2822a352 2019-10-15 stsp "specified branch has already been integrated");
9115 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9116 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9117 2822a352 2019-10-15 stsp goto done;
9120 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9121 2822a352 2019-10-15 stsp if (error) {
9122 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
9123 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
9124 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9125 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9126 2822a352 2019-10-15 stsp goto done;
9129 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9130 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
9131 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
9132 2822a352 2019-10-15 stsp check_cancelled, NULL);
9133 2822a352 2019-10-15 stsp if (error)
9134 2822a352 2019-10-15 stsp goto done;
9136 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
9137 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9140 715dc77e 2019-08-03 stsp got_repo_close(repo);
9141 2822a352 2019-10-15 stsp if (worktree)
9142 2822a352 2019-10-15 stsp got_worktree_close(worktree);
9143 2822a352 2019-10-15 stsp free(cwd);
9144 2822a352 2019-10-15 stsp free(base_commit_id);
9145 2822a352 2019-10-15 stsp free(commit_id);
9146 2822a352 2019-10-15 stsp free(refname);
9147 2822a352 2019-10-15 stsp free(base_refname);
9148 715dc77e 2019-08-03 stsp return error;
9151 715dc77e 2019-08-03 stsp __dead static void
9152 715dc77e 2019-08-03 stsp usage_stage(void)
9154 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9155 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
9156 715dc77e 2019-08-03 stsp getprogname());
9160 715dc77e 2019-08-03 stsp static const struct got_error *
9161 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
9162 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
9163 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9164 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
9166 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
9167 408b4ebc 2019-08-03 stsp char *id_str = NULL;
9169 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
9170 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
9171 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
9172 408b4ebc 2019-08-03 stsp return NULL;
9174 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
9175 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
9176 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
9178 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
9180 408b4ebc 2019-08-03 stsp return err;
9182 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
9183 408b4ebc 2019-08-03 stsp free(id_str);
9184 dc424a06 2019-08-07 stsp return NULL;
9187 dc424a06 2019-08-07 stsp static const struct got_error *
9188 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
9190 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
9191 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
9192 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
9193 715dc77e 2019-08-03 stsp char *cwd = NULL;
9194 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
9195 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
9196 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9197 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
9198 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9199 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9201 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
9203 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9204 715dc77e 2019-08-03 stsp switch (ch) {
9206 408b4ebc 2019-08-03 stsp list_stage = 1;
9209 dc424a06 2019-08-07 stsp pflag = 1;
9212 dc424a06 2019-08-07 stsp patch_script_path = optarg;
9215 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
9218 715dc77e 2019-08-03 stsp usage_stage();
9219 715dc77e 2019-08-03 stsp /* NOTREACHED */
9223 715dc77e 2019-08-03 stsp argc -= optind;
9224 715dc77e 2019-08-03 stsp argv += optind;
9226 715dc77e 2019-08-03 stsp #ifndef PROFILE
9227 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9228 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
9229 715dc77e 2019-08-03 stsp err(1, "pledge");
9231 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
9232 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
9233 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
9234 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
9236 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
9237 715dc77e 2019-08-03 stsp if (cwd == NULL) {
9238 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
9239 715dc77e 2019-08-03 stsp goto done;
9242 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9243 fa51e947 2020-03-27 stsp if (error) {
9244 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9245 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
9246 715dc77e 2019-08-03 stsp goto done;
9249 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9251 715dc77e 2019-08-03 stsp if (error != NULL)
9252 715dc77e 2019-08-03 stsp goto done;
9254 dc424a06 2019-08-07 stsp if (patch_script_path) {
9255 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
9256 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
9257 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
9258 dc424a06 2019-08-07 stsp patch_script_path);
9259 dc424a06 2019-08-07 stsp goto done;
9262 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9263 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
9264 715dc77e 2019-08-03 stsp if (error)
9265 715dc77e 2019-08-03 stsp goto done;
9267 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9268 6d022e97 2019-08-04 stsp if (error)
9269 6d022e97 2019-08-04 stsp goto done;
9271 6d022e97 2019-08-04 stsp if (list_stage)
9272 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
9273 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
9275 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9276 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
9277 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
9278 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
9279 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
9280 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
9283 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9284 2e1f37b0 2019-08-08 stsp error == NULL)
9285 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9287 ad493afc 2019-08-03 stsp got_repo_close(repo);
9288 ad493afc 2019-08-03 stsp if (worktree)
9289 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
9290 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9291 ad493afc 2019-08-03 stsp free((char *)pe->path);
9292 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
9293 ad493afc 2019-08-03 stsp free(cwd);
9294 ad493afc 2019-08-03 stsp return error;
9297 ad493afc 2019-08-03 stsp __dead static void
9298 ad493afc 2019-08-03 stsp usage_unstage(void)
9300 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9301 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
9302 ad493afc 2019-08-03 stsp getprogname());
9307 ad493afc 2019-08-03 stsp static const struct got_error *
9308 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
9310 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
9311 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
9312 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
9313 ad493afc 2019-08-03 stsp char *cwd = NULL;
9314 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
9315 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9316 9627c110 2020-04-18 stsp int ch, pflag = 0;
9317 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9318 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
9319 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9320 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9322 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
9324 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
9325 ad493afc 2019-08-03 stsp switch (ch) {
9327 2e1f37b0 2019-08-08 stsp pflag = 1;
9330 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
9333 ad493afc 2019-08-03 stsp usage_unstage();
9334 ad493afc 2019-08-03 stsp /* NOTREACHED */
9338 ad493afc 2019-08-03 stsp argc -= optind;
9339 ad493afc 2019-08-03 stsp argv += optind;
9341 ad493afc 2019-08-03 stsp #ifndef PROFILE
9342 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9343 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
9344 ad493afc 2019-08-03 stsp err(1, "pledge");
9346 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
9347 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
9349 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
9350 ad493afc 2019-08-03 stsp if (cwd == NULL) {
9351 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
9352 ad493afc 2019-08-03 stsp goto done;
9355 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9356 fa51e947 2020-03-27 stsp if (error) {
9357 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9358 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
9359 ad493afc 2019-08-03 stsp goto done;
9362 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9364 ad493afc 2019-08-03 stsp if (error != NULL)
9365 ad493afc 2019-08-03 stsp goto done;
9367 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
9368 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
9369 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
9370 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
9371 2e1f37b0 2019-08-08 stsp patch_script_path);
9372 2e1f37b0 2019-08-08 stsp goto done;
9376 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9377 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
9378 ad493afc 2019-08-03 stsp if (error)
9379 ad493afc 2019-08-03 stsp goto done;
9381 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9382 ad493afc 2019-08-03 stsp if (error)
9383 ad493afc 2019-08-03 stsp goto done;
9385 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9386 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
9387 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9388 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
9389 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
9390 9627c110 2020-04-18 stsp if (!error)
9391 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9393 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9394 2e1f37b0 2019-08-08 stsp error == NULL)
9395 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9397 0ebf8283 2019-07-24 stsp got_repo_close(repo);
9398 715dc77e 2019-08-03 stsp if (worktree)
9399 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
9400 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9401 715dc77e 2019-08-03 stsp free((char *)pe->path);
9402 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
9403 715dc77e 2019-08-03 stsp free(cwd);
9404 01073a5d 2019-08-22 stsp return error;
9407 01073a5d 2019-08-22 stsp __dead static void
9408 01073a5d 2019-08-22 stsp usage_cat(void)
9410 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9411 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
9415 01073a5d 2019-08-22 stsp static const struct got_error *
9416 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9418 01073a5d 2019-08-22 stsp const struct got_error *err;
9419 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
9421 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
9423 01073a5d 2019-08-22 stsp return err;
9425 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9426 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
9427 01073a5d 2019-08-22 stsp return err;
9430 01073a5d 2019-08-22 stsp static const struct got_error *
9431 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9433 01073a5d 2019-08-22 stsp const struct got_error *err;
9434 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
9435 56e0773d 2019-11-28 stsp int nentries, i;
9437 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
9439 01073a5d 2019-08-22 stsp return err;
9441 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
9442 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
9443 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
9444 01073a5d 2019-08-22 stsp char *id_str;
9445 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
9447 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
9448 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9451 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
9452 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
9453 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
9454 01073a5d 2019-08-22 stsp free(id_str);
9457 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
9458 01073a5d 2019-08-22 stsp return err;
9461 01073a5d 2019-08-22 stsp static const struct got_error *
9462 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9464 01073a5d 2019-08-22 stsp const struct got_error *err;
9465 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
9466 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9467 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9468 01073a5d 2019-08-22 stsp char *id_str = NULL;
9469 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9471 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9473 01073a5d 2019-08-22 stsp return err;
9475 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9477 01073a5d 2019-08-22 stsp goto done;
9479 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9480 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9481 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9482 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9483 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9484 01073a5d 2019-08-22 stsp char *pid_str;
9485 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9487 01073a5d 2019-08-22 stsp goto done;
9488 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9489 01073a5d 2019-08-22 stsp free(pid_str);
9491 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9492 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9493 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
9495 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9496 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9497 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
9499 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9500 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9501 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9503 01073a5d 2019-08-22 stsp free(id_str);
9504 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9505 01073a5d 2019-08-22 stsp return err;
9508 01073a5d 2019-08-22 stsp static const struct got_error *
9509 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9511 01073a5d 2019-08-22 stsp const struct got_error *err;
9512 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9513 01073a5d 2019-08-22 stsp char *id_str = NULL;
9514 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9516 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9518 01073a5d 2019-08-22 stsp return err;
9520 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9522 01073a5d 2019-08-22 stsp goto done;
9524 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9526 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9527 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9528 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9529 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9531 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9532 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9533 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9535 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9536 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9537 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9539 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9540 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9541 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9547 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9548 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9550 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9551 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9552 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
9554 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9555 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9556 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9558 01073a5d 2019-08-22 stsp free(id_str);
9559 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9560 01073a5d 2019-08-22 stsp return err;
9563 01073a5d 2019-08-22 stsp static const struct got_error *
9564 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9566 01073a5d 2019-08-22 stsp const struct got_error *error;
9567 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9568 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9569 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9570 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9571 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9572 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9574 01073a5d 2019-08-22 stsp #ifndef PROFILE
9575 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9576 01073a5d 2019-08-22 stsp NULL) == -1)
9577 01073a5d 2019-08-22 stsp err(1, "pledge");
9580 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9581 01073a5d 2019-08-22 stsp switch (ch) {
9583 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9586 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9587 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9588 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9590 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9593 896e9b6f 2019-08-26 stsp force_path = 1;
9596 01073a5d 2019-08-22 stsp usage_cat();
9597 01073a5d 2019-08-22 stsp /* NOTREACHED */
9601 01073a5d 2019-08-22 stsp argc -= optind;
9602 01073a5d 2019-08-22 stsp argv += optind;
9604 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9605 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9606 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9607 01073a5d 2019-08-22 stsp goto done;
9609 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9610 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9611 01073a5d 2019-08-22 stsp goto done;
9612 01073a5d 2019-08-22 stsp if (worktree) {
9613 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9614 01073a5d 2019-08-22 stsp repo_path = strdup(
9615 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9616 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9617 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9618 01073a5d 2019-08-22 stsp goto done;
9623 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9624 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9625 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9626 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9629 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9630 01073a5d 2019-08-22 stsp free(repo_path);
9631 01073a5d 2019-08-22 stsp if (error != NULL)
9632 01073a5d 2019-08-22 stsp goto done;
9634 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9635 896e9b6f 2019-08-26 stsp if (error)
9636 896e9b6f 2019-08-26 stsp goto done;
9638 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9639 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9640 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9641 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9642 01073a5d 2019-08-22 stsp if (error)
9643 01073a5d 2019-08-22 stsp goto done;
9645 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9646 896e9b6f 2019-08-26 stsp if (force_path) {
9647 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9649 896e9b6f 2019-08-26 stsp if (error)
9652 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9653 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9654 896e9b6f 2019-08-26 stsp if (error) {
9655 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9656 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9658 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9659 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9660 896e9b6f 2019-08-26 stsp if (error)
9665 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9666 01073a5d 2019-08-22 stsp if (error)
9669 01073a5d 2019-08-22 stsp switch (obj_type) {
9670 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9671 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9673 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9674 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9676 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9677 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9679 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9680 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9683 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9686 01073a5d 2019-08-22 stsp if (error)
9688 01073a5d 2019-08-22 stsp free(label);
9689 01073a5d 2019-08-22 stsp label = NULL;
9691 01073a5d 2019-08-22 stsp id = NULL;
9694 01073a5d 2019-08-22 stsp free(label);
9696 896e9b6f 2019-08-26 stsp free(commit_id);
9697 01073a5d 2019-08-22 stsp if (worktree)
9698 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9699 01073a5d 2019-08-22 stsp if (repo) {
9700 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9701 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9702 01073a5d 2019-08-22 stsp if (error == NULL)
9703 01073a5d 2019-08-22 stsp error = repo_error;
9705 b2118c49 2020-07-28 stsp return error;
9708 b2118c49 2020-07-28 stsp __dead static void
9709 b2118c49 2020-07-28 stsp usage_info(void)
9711 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
9712 b2118c49 2020-07-28 stsp getprogname());
9716 b2118c49 2020-07-28 stsp static const struct got_error *
9717 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9718 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9719 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
9721 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
9722 b2118c49 2020-07-28 stsp char *id_str = NULL;
9723 b2118c49 2020-07-28 stsp char datebuf[128];
9724 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
9725 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
9726 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9729 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
9730 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
9732 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
9733 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
9734 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
9735 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
9736 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
9739 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
9740 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
9741 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
9742 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
9743 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
9744 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9745 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
9746 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
9748 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
9750 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
9751 b2118c49 2020-07-28 stsp if (tm == NULL)
9752 b2118c49 2020-07-28 stsp return NULL;
9753 b2118c49 2020-07-28 stsp if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9754 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
9755 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
9757 b2118c49 2020-07-28 stsp if (blob_id) {
9758 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
9760 b2118c49 2020-07-28 stsp return err;
9761 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
9762 b2118c49 2020-07-28 stsp free(id_str);
9765 b2118c49 2020-07-28 stsp if (staged_blob_id) {
9766 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
9768 b2118c49 2020-07-28 stsp return err;
9769 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
9770 b2118c49 2020-07-28 stsp free(id_str);
9773 b2118c49 2020-07-28 stsp if (commit_id) {
9774 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
9776 b2118c49 2020-07-28 stsp return err;
9777 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
9778 b2118c49 2020-07-28 stsp free(id_str);
9781 b2118c49 2020-07-28 stsp return NULL;
9784 b2118c49 2020-07-28 stsp static const struct got_error *
9785 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
9787 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
9788 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
9789 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
9790 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
9791 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9792 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
9793 b2118c49 2020-07-28 stsp int ch, show_files = 0;
9795 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
9797 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9798 b2118c49 2020-07-28 stsp switch (ch) {
9800 b2118c49 2020-07-28 stsp usage_info();
9801 b2118c49 2020-07-28 stsp /* NOTREACHED */
9805 b2118c49 2020-07-28 stsp argc -= optind;
9806 b2118c49 2020-07-28 stsp argv += optind;
9808 b2118c49 2020-07-28 stsp #ifndef PROFILE
9809 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9810 b2118c49 2020-07-28 stsp NULL) == -1)
9811 b2118c49 2020-07-28 stsp err(1, "pledge");
9813 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
9814 b2118c49 2020-07-28 stsp if (cwd == NULL) {
9815 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
9816 b2118c49 2020-07-28 stsp goto done;
9819 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
9820 b2118c49 2020-07-28 stsp if (error) {
9821 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9822 b2118c49 2020-07-28 stsp error = wrap_not_worktree_error(error, "status", cwd);
9823 b2118c49 2020-07-28 stsp goto done;
9826 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9827 b2118c49 2020-07-28 stsp if (error)
9828 b2118c49 2020-07-28 stsp goto done;
9830 b2118c49 2020-07-28 stsp if (argc >= 1) {
9831 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
9832 b2118c49 2020-07-28 stsp worktree);
9833 b2118c49 2020-07-28 stsp if (error)
9834 b2118c49 2020-07-28 stsp goto done;
9835 b2118c49 2020-07-28 stsp show_files = 1;
9838 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
9839 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
9840 b2118c49 2020-07-28 stsp if (error)
9841 b2118c49 2020-07-28 stsp goto done;
9843 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
9844 b2118c49 2020-07-28 stsp if (error)
9845 b2118c49 2020-07-28 stsp goto done;
9847 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9848 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
9849 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
9850 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
9851 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
9852 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
9853 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
9854 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9856 b2118c49 2020-07-28 stsp if (show_files) {
9857 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9858 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9859 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
9862 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
9863 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
9865 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
9866 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
9868 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
9869 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
9870 b2118c49 2020-07-28 stsp if (error)
9871 b2118c49 2020-07-28 stsp goto done;
9872 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9873 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
9874 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
9880 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
9881 b2118c49 2020-07-28 stsp free((char *)pe->path);
9882 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
9883 b2118c49 2020-07-28 stsp free(cwd);
9884 b2118c49 2020-07-28 stsp free(id_str);
9885 b2118c49 2020-07-28 stsp free(uuidstr);
9886 0ebf8283 2019-07-24 stsp return error;
