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);
187 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
189 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
190 5c860e29 2018-03-12 stsp unsigned int i;
192 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
193 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
194 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
195 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0 }
198 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
200 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
201 5c860e29 2018-03-12 stsp switch (ch) {
209 6879ba42 2020-10-01 naddy usage(hflag, 1);
210 5c860e29 2018-03-12 stsp /* NOTREACHED */
214 5c860e29 2018-03-12 stsp argc -= optind;
215 5c860e29 2018-03-12 stsp argv += optind;
216 9814e6a3 2020-09-27 naddy optind = 1;
217 9814e6a3 2020-09-27 naddy optreset = 1;
219 53ccebc2 2019-07-30 stsp if (Vflag) {
220 53ccebc2 2019-07-30 stsp got_version_print_str();
224 5c860e29 2018-03-12 stsp if (argc <= 0)
225 6879ba42 2020-10-01 naddy usage(hflag, hflag ? 0 : 1);
227 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
228 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
230 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
231 d7d4f210 2018-03-12 stsp const struct got_error *error;
233 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
235 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
236 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
240 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
242 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
243 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
244 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
245 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
246 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
247 70015d7a 2019-11-08 stsp !(sigint_received &&
248 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
249 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
256 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
257 6879ba42 2020-10-01 naddy list_commands(stderr);
261 4ed7e80c 2018-05-20 stsp __dead static void
262 6879ba42 2020-10-01 naddy usage(int hflag, int status)
264 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
266 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
267 53ccebc2 2019-07-30 stsp getprogname());
269 6879ba42 2020-10-01 naddy list_commands(fp);
270 6879ba42 2020-10-01 naddy exit(status);
273 0266afb7 2019-01-04 stsp static const struct got_error *
274 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
276 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
277 e2ba3d07 2019-05-13 stsp const char *editor;
279 8920fa04 2019-08-18 stsp *abspath = NULL;
281 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
282 e2ba3d07 2019-05-13 stsp if (editor == NULL)
283 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
285 0ee7065d 2019-05-13 stsp if (editor) {
286 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
288 0ee7065d 2019-05-13 stsp return err;
291 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
292 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
293 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
294 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
297 e2ba3d07 2019-05-13 stsp return NULL;
300 e2ba3d07 2019-05-13 stsp static const struct got_error *
301 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
302 c530dc23 2019-07-23 stsp const char *worktree_path)
304 163ce85a 2019-05-13 stsp const struct got_error *err;
306 37c06ea4 2019-07-15 stsp #ifdef PROFILE
307 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
308 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
310 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
311 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
313 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
314 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
316 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
317 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
319 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
320 163ce85a 2019-05-13 stsp if (err != NULL)
321 163ce85a 2019-05-13 stsp return err;
323 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
324 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
326 0266afb7 2019-01-04 stsp return NULL;
329 2c7829a4 2019-06-17 stsp __dead static void
330 2c7829a4 2019-06-17 stsp usage_init(void)
332 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
336 2c7829a4 2019-06-17 stsp static const struct got_error *
337 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
339 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
340 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
343 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
344 2c7829a4 2019-06-17 stsp switch (ch) {
346 2c7829a4 2019-06-17 stsp usage_init();
347 2c7829a4 2019-06-17 stsp /* NOTREACHED */
351 2c7829a4 2019-06-17 stsp argc -= optind;
352 2c7829a4 2019-06-17 stsp argv += optind;
354 2c7829a4 2019-06-17 stsp #ifndef PROFILE
355 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
356 2c7829a4 2019-06-17 stsp err(1, "pledge");
358 2c7829a4 2019-06-17 stsp if (argc != 1)
359 bc20e173 2019-06-17 stsp usage_init();
361 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
362 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
363 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
365 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
367 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
368 2c7829a4 2019-06-17 stsp if (error &&
369 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
372 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
376 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
378 3ce1b845 2019-07-15 stsp free(repo_path);
379 3ce1b845 2019-07-15 stsp return error;
382 3ce1b845 2019-07-15 stsp __dead static void
383 3ce1b845 2019-07-15 stsp usage_import(void)
385 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
386 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
391 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
394 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
395 3ce1b845 2019-07-15 stsp int st = -1;
397 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
398 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
399 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
401 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
403 3ce1b845 2019-07-15 stsp goto doneediting;
405 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
406 3ce1b845 2019-07-15 stsp _exit(127);
409 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
410 3ce1b845 2019-07-15 stsp if (errno != EINTR)
413 3ce1b845 2019-07-15 stsp doneediting:
414 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
415 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
416 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
418 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
419 3ce1b845 2019-07-15 stsp errno = EINTR;
423 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
426 3ce1b845 2019-07-15 stsp static const struct got_error *
427 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
428 bfa12d5e 2020-09-26 stsp const char *initial_content, size_t initial_content_len)
430 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
431 bfa12d5e 2020-09-26 stsp char *line = NULL;
432 bfa12d5e 2020-09-26 stsp size_t linesize = 0;
433 bfa12d5e 2020-09-26 stsp ssize_t linelen;
434 3ce1b845 2019-07-15 stsp struct stat st, st2;
435 bfa12d5e 2020-09-26 stsp FILE *fp = NULL;
436 bfa12d5e 2020-09-26 stsp size_t len, logmsg_len;
437 bfa12d5e 2020-09-26 stsp char *initial_content_stripped = NULL, *buf = NULL, *s;
439 3ce1b845 2019-07-15 stsp *logmsg = NULL;
441 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
442 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
444 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
445 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
447 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
448 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
450 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
451 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
452 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
455 bfa12d5e 2020-09-26 stsp * Set up a stripped version of the initial content without comments
456 bfa12d5e 2020-09-26 stsp * and blank lines. We need this in order to check if the message
457 bfa12d5e 2020-09-26 stsp * has in fact been edited.
459 bfa12d5e 2020-09-26 stsp initial_content_stripped = malloc(initial_content_len + 1);
460 bfa12d5e 2020-09-26 stsp if (initial_content_stripped == NULL)
461 bfa12d5e 2020-09-26 stsp return got_error_from_errno("malloc");
462 bfa12d5e 2020-09-26 stsp initial_content_stripped[0] = '\0';
464 bfa12d5e 2020-09-26 stsp buf = strdup(initial_content);
465 bfa12d5e 2020-09-26 stsp if (buf == NULL) {
466 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("strdup");
471 bfa12d5e 2020-09-26 stsp while ((line = strsep(&s, "\n")) != NULL) {
472 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
473 bfa12d5e 2020-09-26 stsp continue; /* remove comments and leading empty lines */
474 bfa12d5e 2020-09-26 stsp len = strlcat(initial_content_stripped, line,
475 bfa12d5e 2020-09-26 stsp initial_content_len + 1);
476 bfa12d5e 2020-09-26 stsp if (len >= initial_content_len + 1) {
477 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
481 bfa12d5e 2020-09-26 stsp while (len > 0 && initial_content_stripped[len - 1] == '\n') {
482 bfa12d5e 2020-09-26 stsp initial_content_stripped[len - 1] = '\0';
486 bfa12d5e 2020-09-26 stsp logmsg_len = st2.st_size;
487 bfa12d5e 2020-09-26 stsp *logmsg = malloc(logmsg_len + 1);
488 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
489 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
490 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
492 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
493 3ce1b845 2019-07-15 stsp if (fp == NULL) {
494 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
499 bfa12d5e 2020-09-26 stsp while ((linelen = getline(&line, &linesize, fp)) != -1) {
500 bfa12d5e 2020-09-26 stsp if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
501 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
502 bfa12d5e 2020-09-26 stsp len = strlcat(*logmsg, line, logmsg_len + 1);
503 bfa12d5e 2020-09-26 stsp if (len >= logmsg_len + 1) {
504 bfa12d5e 2020-09-26 stsp err = got_error(GOT_ERR_NO_SPACE);
508 bfa12d5e 2020-09-26 stsp free(line);
509 bfa12d5e 2020-09-26 stsp if (ferror(fp)) {
510 bfa12d5e 2020-09-26 stsp err = got_ferror(fp, GOT_ERR_IO);
513 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
514 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
518 bfa12d5e 2020-09-26 stsp if (len == 0) {
519 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
520 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
523 bfa12d5e 2020-09-26 stsp if (strcmp(*logmsg, initial_content_stripped) == 0)
524 bfa12d5e 2020-09-26 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
525 bfa12d5e 2020-09-26 stsp "no changes made to commit message, aborting");
527 bfa12d5e 2020-09-26 stsp free(initial_content_stripped);
529 bfa12d5e 2020-09-26 stsp if (fp && fclose(fp) == EOF && err == NULL)
530 bfa12d5e 2020-09-26 stsp err = got_error_from_errno("fclose");
532 3ce1b845 2019-07-15 stsp free(*logmsg);
533 3ce1b845 2019-07-15 stsp *logmsg = NULL;
535 3ce1b845 2019-07-15 stsp return err;
538 3ce1b845 2019-07-15 stsp static const struct got_error *
539 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
540 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
542 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
543 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
544 1601cb9f 2020-09-11 naddy int initial_content_len;
545 97972933 2020-09-11 stsp int fd = -1;
547 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
548 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
549 1601cb9f 2020-09-11 naddy branch_name);
550 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
551 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
553 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
554 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
558 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
559 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *logmsg_path);
563 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
564 62d463ca 2020-10-20 naddy initial_content_len);
566 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
567 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *logmsg_path);
568 3ce1b845 2019-07-15 stsp free(initial_content);
570 59f86c76 2020-09-11 stsp free(*logmsg_path);
571 59f86c76 2020-09-11 stsp *logmsg_path = NULL;
573 3ce1b845 2019-07-15 stsp return err;
576 3ce1b845 2019-07-15 stsp static const struct got_error *
577 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
579 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
580 3ce1b845 2019-07-15 stsp return NULL;
583 3ce1b845 2019-07-15 stsp static const struct got_error *
584 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
585 50b0790e 2020-09-11 stsp struct got_worktree *worktree)
587 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
588 50b0790e 2020-09-11 stsp const char *got_author = NULL, *name, *email;
589 50b0790e 2020-09-11 stsp const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
591 84792843 2019-08-09 stsp *author = NULL;
593 50b0790e 2020-09-11 stsp if (worktree)
594 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
595 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
598 50b0790e 2020-09-11 stsp * Priority of potential author information sources, from most
599 50b0790e 2020-09-11 stsp * significant to least significant:
600 50b0790e 2020-09-11 stsp * 1) work tree's .got/got.conf file
601 50b0790e 2020-09-11 stsp * 2) repository's got.conf file
602 50b0790e 2020-09-11 stsp * 3) repository's git config file
603 50b0790e 2020-09-11 stsp * 4) environment variables
604 50b0790e 2020-09-11 stsp * 5) global git config files (in user's home directory or /etc)
607 50b0790e 2020-09-11 stsp if (worktree_conf)
608 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(worktree_conf);
609 50b0790e 2020-09-11 stsp if (got_author == NULL)
610 50b0790e 2020-09-11 stsp got_author = got_gotconfig_get_author(repo_conf);
611 84792843 2019-08-09 stsp if (got_author == NULL) {
612 257add31 2020-09-09 stsp name = got_repo_get_gitconfig_author_name(repo);
613 257add31 2020-09-09 stsp email = got_repo_get_gitconfig_author_email(repo);
614 c9956ddf 2019-09-08 stsp if (name && email) {
615 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
616 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
617 c9956ddf 2019-09-08 stsp return NULL;
620 257add31 2020-09-09 stsp got_author = getenv("GOT_AUTHOR");
621 257add31 2020-09-09 stsp if (got_author == NULL) {
622 257add31 2020-09-09 stsp name = got_repo_get_global_gitconfig_author_name(repo);
623 257add31 2020-09-09 stsp email = got_repo_get_global_gitconfig_author_email(
625 257add31 2020-09-09 stsp if (name && email) {
626 257add31 2020-09-09 stsp if (asprintf(author, "%s <%s>", name, email)
628 257add31 2020-09-09 stsp return got_error_from_errno("asprintf");
629 257add31 2020-09-09 stsp return NULL;
631 257add31 2020-09-09 stsp /* TODO: Look up user in password database? */
632 257add31 2020-09-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
636 aba9c984 2019-09-08 stsp *author = strdup(got_author);
637 aba9c984 2019-09-08 stsp if (*author == NULL)
638 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
641 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
642 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
644 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
645 84792843 2019-08-09 stsp got_author++;
646 aba9c984 2019-09-08 stsp if (*got_author != '<') {
647 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
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 84792843 2019-08-09 stsp if (*got_author != '>')
659 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
662 aba9c984 2019-09-08 stsp free(*author);
663 aba9c984 2019-09-08 stsp *author = NULL;
665 aba9c984 2019-09-08 stsp return err;
668 c9956ddf 2019-09-08 stsp static const struct got_error *
669 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
671 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
673 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
674 c9956ddf 2019-09-08 stsp if (homedir) {
675 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
676 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
679 c9956ddf 2019-09-08 stsp return NULL;
682 84792843 2019-08-09 stsp static const struct got_error *
683 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
685 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
686 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
687 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
688 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
689 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
690 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
691 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
692 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
694 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
695 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
696 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
698 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
700 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
701 3ce1b845 2019-07-15 stsp switch (ch) {
703 3ce1b845 2019-07-15 stsp branch_name = optarg;
706 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
707 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
708 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
713 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
714 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
715 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
721 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
723 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
729 b2b65d18 2019-08-22 stsp usage_import();
730 3ce1b845 2019-07-15 stsp /* NOTREACHED */
734 3ce1b845 2019-07-15 stsp argc -= optind;
735 3ce1b845 2019-07-15 stsp argv += optind;
737 3ce1b845 2019-07-15 stsp #ifndef PROFILE
738 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
740 3ce1b845 2019-07-15 stsp NULL) == -1)
741 3ce1b845 2019-07-15 stsp err(1, "pledge");
743 3ce1b845 2019-07-15 stsp if (argc != 1)
744 3ce1b845 2019-07-15 stsp usage_import();
746 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
747 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
748 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
749 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
751 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
752 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
755 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
759 50b0790e 2020-09-11 stsp error = get_author(&author, repo, NULL);
761 aba9c984 2019-09-08 stsp return error;
764 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
765 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
766 e560b7e0 2019-11-28 stsp * an unintended typo.
768 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
769 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
771 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
772 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
776 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
777 3ce1b845 2019-07-15 stsp if (error) {
778 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
781 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
782 3ce1b845 2019-07-15 stsp "import target branch already exists");
786 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
787 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
788 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
791 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
794 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
795 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
797 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
798 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
801 8e158b01 2019-09-22 stsp free(logmsg);
802 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
803 ef293bdd 2019-10-21 stsp path_dir, refname);
804 ef293bdd 2019-10-21 stsp if (error) {
805 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
806 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
807 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
812 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
813 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
814 ef293bdd 2019-10-21 stsp if (logmsg_path)
815 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
819 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
820 ef293bdd 2019-10-21 stsp if (error) {
821 ef293bdd 2019-10-21 stsp if (logmsg_path)
822 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
826 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
827 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
828 ef293bdd 2019-10-21 stsp if (error) {
829 ef293bdd 2019-10-21 stsp if (logmsg_path)
830 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
834 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
835 ef293bdd 2019-10-21 stsp if (error) {
836 ef293bdd 2019-10-21 stsp if (logmsg_path)
837 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
841 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
842 ef293bdd 2019-10-21 stsp if (error) {
843 ef293bdd 2019-10-21 stsp if (logmsg_path)
844 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
848 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
849 ef293bdd 2019-10-21 stsp if (error) {
850 ef293bdd 2019-10-21 stsp if (logmsg_path)
851 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
855 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
856 3ce1b845 2019-07-15 stsp if (error) {
857 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
858 ef293bdd 2019-10-21 stsp if (logmsg_path)
859 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
863 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
864 3ce1b845 2019-07-15 stsp branch_ref);
865 ef293bdd 2019-10-21 stsp if (error) {
866 ef293bdd 2019-10-21 stsp if (logmsg_path)
867 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
871 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
872 ef293bdd 2019-10-21 stsp if (error) {
873 ef293bdd 2019-10-21 stsp if (logmsg_path)
874 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
879 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
880 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
882 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
883 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
884 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
885 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
886 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
887 8e158b01 2019-09-22 stsp free(logmsg);
888 ef293bdd 2019-10-21 stsp free(logmsg_path);
889 2c7829a4 2019-06-17 stsp free(repo_path);
890 3ce1b845 2019-07-15 stsp free(editor);
891 3ce1b845 2019-07-15 stsp free(refname);
892 3ce1b845 2019-07-15 stsp free(new_commit_id);
893 3ce1b845 2019-07-15 stsp free(id_str);
894 aba9c984 2019-09-08 stsp free(author);
895 c9956ddf 2019-09-08 stsp free(gitconfig_path);
896 3ce1b845 2019-07-15 stsp if (branch_ref)
897 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
898 3ce1b845 2019-07-15 stsp if (head_ref)
899 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
900 2c7829a4 2019-06-17 stsp return error;
903 93658fb9 2020-03-18 stsp __dead static void
904 93658fb9 2020-03-18 stsp usage_clone(void)
906 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
907 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
911 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
912 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
913 892ac3b6 2020-03-18 stsp int last_p_indexed;
914 892ac3b6 2020-03-18 stsp int last_p_resolved;
915 68999b92 2020-03-18 stsp int verbosity;
917 04d9a9ec 2020-09-24 stsp struct got_repository *repo;
919 04d9a9ec 2020-09-24 stsp int create_configs;
920 04d9a9ec 2020-09-24 stsp int configs_created;
922 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *symrefs;
923 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches;
924 04d9a9ec 2020-09-24 stsp const char *proto;
925 04d9a9ec 2020-09-24 stsp const char *host;
926 04d9a9ec 2020-09-24 stsp const char *port;
927 04d9a9ec 2020-09-24 stsp const char *remote_repo_path;
928 04d9a9ec 2020-09-24 stsp const char *git_url;
929 04d9a9ec 2020-09-24 stsp int fetch_all_branches;
930 04d9a9ec 2020-09-24 stsp int mirror_references;
931 04d9a9ec 2020-09-24 stsp } config_info;
934 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
935 93658fb9 2020-03-18 stsp static const struct got_error *
936 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
937 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
938 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
939 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches, struct got_repository *repo);
941 04d9a9ec 2020-09-24 stsp static const struct got_error *
942 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
943 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
945 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
946 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
947 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
948 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
949 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
952 04d9a9ec 2020-09-24 stsp * In order to allow a failed clone to be resumed with 'got fetch'
953 04d9a9ec 2020-09-24 stsp * we try to create configuration files as soon as possible.
954 04d9a9ec 2020-09-24 stsp * Once the server has sent information about its default branch
955 04d9a9ec 2020-09-24 stsp * we have all required information.
957 04d9a9ec 2020-09-24 stsp if (a->create_configs && !a->configs_created &&
958 04d9a9ec 2020-09-24 stsp !TAILQ_EMPTY(a->config_info.symrefs)) {
959 04d9a9ec 2020-09-24 stsp err = create_config_files(a->config_info.proto,
960 62d463ca 2020-10-20 naddy a->config_info.host, a->config_info.port,
961 62d463ca 2020-10-20 naddy a->config_info.remote_repo_path,
962 62d463ca 2020-10-20 naddy a->config_info.git_url,
963 62d463ca 2020-10-20 naddy a->config_info.fetch_all_branches,
964 62d463ca 2020-10-20 naddy a->config_info.mirror_references,
965 62d463ca 2020-10-20 naddy a->config_info.symrefs,
966 62d463ca 2020-10-20 naddy a->config_info.wanted_branches, a->repo);
968 04d9a9ec 2020-09-24 stsp return err;
969 04d9a9ec 2020-09-24 stsp a->configs_created = 1;
972 68999b92 2020-03-18 stsp if (a->verbosity < 0)
973 68999b92 2020-03-18 stsp return NULL;
975 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
976 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
977 892ac3b6 2020-03-18 stsp fflush(stdout);
978 12d1281e 2020-03-19 stsp return NULL;
981 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
982 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
983 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
984 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
985 892ac3b6 2020-03-18 stsp print_size = 1;
986 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
987 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
988 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
990 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
991 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
992 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
993 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
994 892ac3b6 2020-03-18 stsp print_indexed = 1;
995 892ac3b6 2020-03-18 stsp print_size = 1;
998 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
999 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1000 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1001 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1002 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1003 892ac3b6 2020-03-18 stsp print_resolved = 1;
1004 892ac3b6 2020-03-18 stsp print_indexed = 1;
1005 892ac3b6 2020-03-18 stsp print_size = 1;
1010 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1011 892ac3b6 2020-03-18 stsp printf("\r");
1012 892ac3b6 2020-03-18 stsp if (print_size)
1013 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1014 d715f13e 2020-03-19 stsp if (print_indexed)
1015 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1016 d715f13e 2020-03-19 stsp if (print_resolved)
1017 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1018 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1019 892ac3b6 2020-03-18 stsp fflush(stdout);
1021 531c3985 2020-03-18 stsp return NULL;
1024 531c3985 2020-03-18 stsp static const struct got_error *
1025 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
1026 04d9a9ec 2020-09-24 stsp int verbosity, struct got_repository *repo)
1028 4ba14133 2020-03-20 stsp const struct got_error *err;
1029 04d9a9ec 2020-09-24 stsp struct got_reference *head_symref;
1031 04d9a9ec 2020-09-24 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1033 4ba14133 2020-03-20 stsp return err;
1035 04d9a9ec 2020-09-24 stsp err = got_ref_write(head_symref, repo);
1036 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
1037 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
1038 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
1040 04d9a9ec 2020-09-24 stsp got_ref_close(head_symref);
1041 4ba14133 2020-03-20 stsp return err;
1044 4ba14133 2020-03-20 stsp static const struct got_error *
1045 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
1046 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
1048 41b0de12 2020-03-21 stsp const struct got_error *err;
1049 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
1051 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1052 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1053 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
1055 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
1058 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
1059 41b0de12 2020-03-21 stsp const char *refname = pe->path;
1060 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
1061 41b0de12 2020-03-21 stsp char *id_str;
1063 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1065 41b0de12 2020-03-21 stsp return err;
1066 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
1067 41b0de12 2020-03-21 stsp free(id_str);
1070 41b0de12 2020-03-21 stsp return NULL;
1073 6338a6a1 2020-03-21 stsp static const struct got_error *
1074 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
1075 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
1077 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
1078 6338a6a1 2020-03-21 stsp struct got_reference *ref;
1079 6338a6a1 2020-03-21 stsp char *id_str;
1081 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1083 6338a6a1 2020-03-21 stsp return err;
1085 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
1087 6338a6a1 2020-03-21 stsp goto done;
1089 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1090 6338a6a1 2020-03-21 stsp got_ref_close(ref);
1092 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
1093 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
1095 6338a6a1 2020-03-21 stsp free(id_str);
1096 6338a6a1 2020-03-21 stsp return err;
1099 0e4002ca 2020-03-21 stsp static int
1100 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
1102 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
1104 0e4002ca 2020-03-21 stsp refname += 5;
1107 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
1108 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
1110 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
1112 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
1115 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
1116 0e4002ca 2020-03-21 stsp wanted_ref += 5;
1118 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
1119 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1122 0e4002ca 2020-03-21 stsp /* Allow exact match. */
1123 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
1126 0e4002ca 2020-03-21 stsp static int
1127 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1129 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
1131 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
1132 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1139 41b0de12 2020-03-21 stsp static const struct got_error *
1140 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1141 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1143 0e4002ca 2020-03-21 stsp const struct got_error *err;
1144 0e4002ca 2020-03-21 stsp char *remote_refname;
1146 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1147 0e4002ca 2020-03-21 stsp refname += 5;
1149 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1150 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1151 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1153 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1154 0e4002ca 2020-03-21 stsp free(remote_refname);
1155 7c0b7f42 2020-09-24 stsp return err;
1158 7c0b7f42 2020-09-24 stsp static const struct got_error *
1159 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
1160 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, int fetch_all_branches, int mirror_references,
1161 7c0b7f42 2020-09-24 stsp struct got_repository *repo)
1163 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1164 7c0b7f42 2020-09-24 stsp char *gotconfig_path = NULL;
1165 7c0b7f42 2020-09-24 stsp char *gotconfig = NULL;
1166 7c0b7f42 2020-09-24 stsp FILE *gotconfig_file = NULL;
1167 7c0b7f42 2020-09-24 stsp ssize_t n;
1169 7c0b7f42 2020-09-24 stsp /* Create got.conf(5). */
1170 7c0b7f42 2020-09-24 stsp gotconfig_path = got_repo_get_path_gotconfig(repo);
1171 7c0b7f42 2020-09-24 stsp if (gotconfig_path == NULL) {
1172 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gotconfig");
1173 7c0b7f42 2020-09-24 stsp goto done;
1175 7c0b7f42 2020-09-24 stsp gotconfig_file = fopen(gotconfig_path, "a");
1176 7c0b7f42 2020-09-24 stsp if (gotconfig_file == NULL) {
1177 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gotconfig_path);
1178 7c0b7f42 2020-09-24 stsp goto done;
1180 7c0b7f42 2020-09-24 stsp if (asprintf(&gotconfig,
1181 7c0b7f42 2020-09-24 stsp "remote \"%s\" {\n"
1182 7c0b7f42 2020-09-24 stsp "\tserver %s\n"
1183 7c0b7f42 2020-09-24 stsp "\tprotocol %s\n"
1185 7c0b7f42 2020-09-24 stsp "\trepository \"%s\"\n"
1188 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1189 7c0b7f42 2020-09-24 stsp port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1190 7c0b7f42 2020-09-24 stsp remote_repo_path,
1191 7c0b7f42 2020-09-24 stsp mirror_references ? "\tmirror-references yes\n" : "") == -1) {
1192 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1193 7c0b7f42 2020-09-24 stsp goto done;
1195 7c0b7f42 2020-09-24 stsp n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1196 7c0b7f42 2020-09-24 stsp if (n != strlen(gotconfig)) {
1197 7c0b7f42 2020-09-24 stsp err = got_ferror(gotconfig_file, GOT_ERR_IO);
1198 7c0b7f42 2020-09-24 stsp goto done;
1202 7c0b7f42 2020-09-24 stsp if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1203 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gotconfig_path);
1204 7c0b7f42 2020-09-24 stsp free(gotconfig_path);
1205 7c0b7f42 2020-09-24 stsp return err;
1208 7c0b7f42 2020-09-24 stsp static const struct got_error *
1209 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
1210 7c0b7f42 2020-09-24 stsp int fetch_all_branches, int mirror_references, struct got_repository *repo)
1212 7c0b7f42 2020-09-24 stsp const struct got_error *err = NULL;
1213 7c0b7f42 2020-09-24 stsp char *gitconfig_path = NULL;
1214 7c0b7f42 2020-09-24 stsp char *gitconfig = NULL;
1215 7c0b7f42 2020-09-24 stsp FILE *gitconfig_file = NULL;
1216 7c0b7f42 2020-09-24 stsp ssize_t n;
1218 7c0b7f42 2020-09-24 stsp /* Create a config file Git can understand. */
1219 7c0b7f42 2020-09-24 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1220 7c0b7f42 2020-09-24 stsp if (gitconfig_path == NULL) {
1221 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("got_repo_get_path_gitconfig");
1222 7c0b7f42 2020-09-24 stsp goto done;
1224 7c0b7f42 2020-09-24 stsp gitconfig_file = fopen(gitconfig_path, "a");
1225 7c0b7f42 2020-09-24 stsp if (gitconfig_file == NULL) {
1226 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fopen", gitconfig_path);
1227 7c0b7f42 2020-09-24 stsp goto done;
1229 7c0b7f42 2020-09-24 stsp if (mirror_references) {
1230 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1231 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1232 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1233 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/*:refs/*\n"
1234 7c0b7f42 2020-09-24 stsp "\tmirror = true\n",
1235 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1236 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1237 7c0b7f42 2020-09-24 stsp goto done;
1239 7c0b7f42 2020-09-24 stsp } else if (fetch_all_branches) {
1240 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1241 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1242 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1243 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1244 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1245 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1246 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1247 7c0b7f42 2020-09-24 stsp goto done;
1250 7c0b7f42 2020-09-24 stsp const char *branchname;
1253 7c0b7f42 2020-09-24 stsp * If the server specified a default branch, use just that one.
1254 7c0b7f42 2020-09-24 stsp * Otherwise fall back to fetching all branches on next fetch.
1256 04d9a9ec 2020-09-24 stsp if (default_branch) {
1257 04d9a9ec 2020-09-24 stsp branchname = default_branch;
1258 7c0b7f42 2020-09-24 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1259 7c0b7f42 2020-09-24 stsp branchname += 11;
1261 7c0b7f42 2020-09-24 stsp branchname = "*"; /* fall back to all branches */
1262 7c0b7f42 2020-09-24 stsp if (asprintf(&gitconfig,
1263 7c0b7f42 2020-09-24 stsp "[remote \"%s\"]\n"
1264 7c0b7f42 2020-09-24 stsp "\turl = %s\n"
1265 7c0b7f42 2020-09-24 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1266 7c0b7f42 2020-09-24 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1267 7c0b7f42 2020-09-24 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1268 7c0b7f42 2020-09-24 stsp branchname) == -1) {
1269 7c0b7f42 2020-09-24 stsp err = got_error_from_errno("asprintf");
1270 7c0b7f42 2020-09-24 stsp goto done;
1273 7c0b7f42 2020-09-24 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1274 7c0b7f42 2020-09-24 stsp if (n != strlen(gitconfig)) {
1275 7c0b7f42 2020-09-24 stsp err = got_ferror(gitconfig_file, GOT_ERR_IO);
1276 7c0b7f42 2020-09-24 stsp goto done;
1279 7c0b7f42 2020-09-24 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1280 7c0b7f42 2020-09-24 stsp err = got_error_from_errno2("fclose", gitconfig_path);
1281 7c0b7f42 2020-09-24 stsp free(gitconfig_path);
1282 0e4002ca 2020-03-21 stsp return err;
1285 0e4002ca 2020-03-21 stsp static const struct got_error *
1286 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
1287 04d9a9ec 2020-09-24 stsp const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1288 04d9a9ec 2020-09-24 stsp int mirror_references, struct got_pathlist_head *symrefs,
1289 04d9a9ec 2020-09-24 stsp struct got_pathlist_head *wanted_branches, struct got_repository *repo)
1291 04d9a9ec 2020-09-24 stsp const struct got_error *err = NULL;
1292 04d9a9ec 2020-09-24 stsp const char *default_branch = NULL;
1293 04d9a9ec 2020-09-24 stsp struct got_pathlist_entry *pe;
1296 04d9a9ec 2020-09-24 stsp * If we asked for a set of wanted branches then use the first
1297 04d9a9ec 2020-09-24 stsp * one of those.
1299 62d463ca 2020-10-20 naddy if (!TAILQ_EMPTY(wanted_branches)) {
1300 04d9a9ec 2020-09-24 stsp pe = TAILQ_FIRST(wanted_branches);
1301 04d9a9ec 2020-09-24 stsp default_branch = pe->path;
1303 04d9a9ec 2020-09-24 stsp /* First HEAD ref listed by server is the default branch. */
1304 04d9a9ec 2020-09-24 stsp TAILQ_FOREACH(pe, symrefs, entry) {
1305 04d9a9ec 2020-09-24 stsp const char *refname = pe->path;
1306 04d9a9ec 2020-09-24 stsp const char *target = pe->data;
1308 04d9a9ec 2020-09-24 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1311 04d9a9ec 2020-09-24 stsp default_branch = target;
1316 04d9a9ec 2020-09-24 stsp /* Create got.conf(5). */
1317 04d9a9ec 2020-09-24 stsp err = create_gotconfig(proto, host, port, remote_repo_path,
1318 04d9a9ec 2020-09-24 stsp fetch_all_branches, mirror_references, repo);
1320 04d9a9ec 2020-09-24 stsp return err;
1322 04d9a9ec 2020-09-24 stsp /* Create a config file Git can understand. */
1323 04d9a9ec 2020-09-24 stsp return create_gitconfig(git_url, default_branch, fetch_all_branches,
1324 04d9a9ec 2020-09-24 stsp mirror_references, repo);
1327 04d9a9ec 2020-09-24 stsp static const struct got_error *
1328 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1330 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1331 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1332 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1333 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1334 a9c2d4c2 2020-09-24 stsp const char *repo_path;
1335 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1336 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1337 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1338 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1339 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1340 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1341 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1342 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1343 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1344 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1346 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1347 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1348 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1349 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1351 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1352 93658fb9 2020-03-18 stsp switch (ch) {
1354 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1357 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1358 4ba14133 2020-03-20 stsp optarg, NULL);
1359 4ba14133 2020-03-20 stsp if (error)
1360 4ba14133 2020-03-20 stsp return error;
1363 41b0de12 2020-03-21 stsp list_refs_only = 1;
1366 469dd726 2020-03-20 stsp mirror_references = 1;
1369 68999b92 2020-03-18 stsp if (verbosity < 0)
1370 68999b92 2020-03-18 stsp verbosity = 0;
1371 68999b92 2020-03-18 stsp else if (verbosity < 3)
1372 68999b92 2020-03-18 stsp verbosity++;
1375 68999b92 2020-03-18 stsp verbosity = -1;
1378 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1379 0e4002ca 2020-03-21 stsp optarg, NULL);
1380 0e4002ca 2020-03-21 stsp if (error)
1381 0e4002ca 2020-03-21 stsp return error;
1384 93658fb9 2020-03-18 stsp usage_clone();
1388 93658fb9 2020-03-18 stsp argc -= optind;
1389 93658fb9 2020-03-18 stsp argv += optind;
1391 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1392 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1393 41b0de12 2020-03-21 stsp if (list_refs_only) {
1394 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1395 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1396 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1397 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1398 41b0de12 2020-03-21 stsp if (mirror_references)
1399 41b0de12 2020-03-21 stsp errx(1, "-l and -m options are mutually exclusive");
1400 41b0de12 2020-03-21 stsp if (verbosity == -1)
1401 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1402 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1403 0e4002ca 2020-03-21 stsp errx(1, "-l and -R options are mutually exclusive");
1406 93658fb9 2020-03-18 stsp uri = argv[0];
1408 9df6f38b 2020-03-18 stsp if (argc == 1)
1409 93658fb9 2020-03-18 stsp dirname = NULL;
1410 9df6f38b 2020-03-18 stsp else if (argc == 2)
1411 93658fb9 2020-03-18 stsp dirname = argv[1];
1413 93658fb9 2020-03-18 stsp usage_clone();
1415 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1416 4dbec0a8 2020-08-27 stsp &repo_name, uri);
1417 39c64a6a 2020-03-18 stsp if (error)
1418 09f63084 2020-03-20 stsp goto done;
1420 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1421 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1422 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1423 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1424 09838ffc 2020-03-18 stsp goto done;
1427 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1428 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1429 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1430 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1431 39c64a6a 2020-03-18 stsp err(1, "pledge");
1433 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1434 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1435 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1436 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1437 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1438 39c64a6a 2020-03-18 stsp err(1, "pledge");
1440 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1441 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1442 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1443 39c64a6a 2020-03-18 stsp goto done;
1445 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1446 39c64a6a 2020-03-18 stsp goto done;
1448 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1449 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1450 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1451 bb64b798 2020-03-18 stsp goto done;
1453 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1455 bb64b798 2020-03-18 stsp repo_path = dirname;
1457 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1458 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1459 2751fe64 2020-09-24 stsp if (error &&
1460 2751fe64 2020-09-24 stsp (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1461 2751fe64 2020-09-24 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1462 41b0de12 2020-03-21 stsp goto done;
1463 2751fe64 2020-09-24 stsp if (!got_path_dir_is_empty(repo_path)) {
1464 2751fe64 2020-09-24 stsp error = got_error_path(repo_path,
1465 2751fe64 2020-09-24 stsp GOT_ERR_DIR_NOT_EMPTY);
1466 41b0de12 2020-03-21 stsp goto done;
1470 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1471 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1472 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1473 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1474 ee448f5f 2020-03-18 stsp goto done;
1477 f535bcd4 2020-09-30 stsp error = apply_unveil(repo_path, 0, NULL);
1478 ee448f5f 2020-03-18 stsp if (error)
1479 ee448f5f 2020-03-18 stsp goto done;
1481 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1482 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1483 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1485 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1486 9c52365f 2020-03-21 stsp server_path, verbosity);
1487 39c64a6a 2020-03-18 stsp if (error)
1488 bb64b798 2020-03-18 stsp goto done;
1490 2751fe64 2020-09-24 stsp if (!list_refs_only) {
1491 2751fe64 2020-09-24 stsp error = got_repo_init(repo_path);
1492 2751fe64 2020-09-24 stsp if (error)
1493 2751fe64 2020-09-24 stsp goto done;
1494 2751fe64 2020-09-24 stsp error = got_repo_open(&repo, repo_path, NULL);
1495 2751fe64 2020-09-24 stsp if (error)
1496 2751fe64 2020-09-24 stsp goto done;
1499 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1500 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1501 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1502 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1503 04d9a9ec 2020-09-24 stsp fpa.create_configs = 1;
1504 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
1505 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
1506 04d9a9ec 2020-09-24 stsp fpa.config_info.symrefs = &symrefs;
1507 04d9a9ec 2020-09-24 stsp fpa.config_info.wanted_branches = &wanted_branches;
1508 04d9a9ec 2020-09-24 stsp fpa.config_info.proto = proto;
1509 04d9a9ec 2020-09-24 stsp fpa.config_info.host = host;
1510 04d9a9ec 2020-09-24 stsp fpa.config_info.port = port;
1511 04d9a9ec 2020-09-24 stsp fpa.config_info.remote_repo_path = server_path;
1512 04d9a9ec 2020-09-24 stsp fpa.config_info.git_url = git_url;
1513 04d9a9ec 2020-09-24 stsp fpa.config_info.fetch_all_branches = fetch_all_branches;
1514 04d9a9ec 2020-09-24 stsp fpa.config_info.mirror_references = mirror_references;
1515 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1516 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1517 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1518 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1519 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1520 39c64a6a 2020-03-18 stsp if (error)
1521 d9b4d0c0 2020-03-18 stsp goto done;
1523 41b0de12 2020-03-21 stsp if (list_refs_only) {
1524 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1525 41b0de12 2020-03-21 stsp goto done;
1528 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1529 39c64a6a 2020-03-18 stsp if (error)
1530 d9b4d0c0 2020-03-18 stsp goto done;
1531 68999b92 2020-03-18 stsp if (verbosity >= 0)
1532 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1533 d9b4d0c0 2020-03-18 stsp free(id_str);
1535 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1536 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1537 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1538 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1539 7ebc0570 2020-03-18 stsp char *remote_refname;
1541 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1542 0e4002ca 2020-03-21 stsp !mirror_references) {
1543 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1544 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1545 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1546 0e4002ca 2020-03-21 stsp if (error)
1547 0e4002ca 2020-03-21 stsp goto done;
1551 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1552 39c64a6a 2020-03-18 stsp if (error)
1553 d9b4d0c0 2020-03-18 stsp goto done;
1555 469dd726 2020-03-20 stsp if (mirror_references)
1558 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1561 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1562 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1563 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1564 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1565 7ebc0570 2020-03-18 stsp goto done;
1567 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1568 f298ae0f 2020-03-25 stsp free(remote_refname);
1569 39c64a6a 2020-03-18 stsp if (error)
1570 d9b4d0c0 2020-03-18 stsp goto done;
1573 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1574 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1575 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1576 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1577 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1578 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1580 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1583 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1584 39c64a6a 2020-03-18 stsp if (error) {
1585 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1586 55330abe 2020-03-20 stsp error = NULL;
1589 d9b4d0c0 2020-03-18 stsp goto done;
1592 04d9a9ec 2020-09-24 stsp error = create_symref(refname, target_ref, verbosity, repo);
1593 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1594 f298ae0f 2020-03-25 stsp if (error)
1595 f298ae0f 2020-03-25 stsp goto done;
1597 f298ae0f 2020-03-25 stsp if (mirror_references)
1600 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1603 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1604 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1605 f298ae0f 2020-03-25 stsp refname) == -1) {
1606 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1607 f298ae0f 2020-03-25 stsp goto done;
1609 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1610 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1611 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1612 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1613 f298ae0f 2020-03-25 stsp free(remote_refname);
1614 f298ae0f 2020-03-25 stsp goto done;
1616 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1617 f298ae0f 2020-03-25 stsp if (error) {
1618 f298ae0f 2020-03-25 stsp free(remote_refname);
1619 f298ae0f 2020-03-25 stsp free(remote_target);
1620 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1621 f298ae0f 2020-03-25 stsp error = NULL;
1624 f298ae0f 2020-03-25 stsp goto done;
1626 04d9a9ec 2020-09-24 stsp error = create_symref(remote_refname, target_ref,
1627 04d9a9ec 2020-09-24 stsp verbosity - 1, repo);
1628 f298ae0f 2020-03-25 stsp free(remote_refname);
1629 f298ae0f 2020-03-25 stsp free(remote_target);
1630 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1631 39c64a6a 2020-03-18 stsp if (error)
1632 d9b4d0c0 2020-03-18 stsp goto done;
1634 4ba14133 2020-03-20 stsp if (pe == NULL) {
1636 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1637 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1638 4ba14133 2020-03-20 stsp * which could be fetched instead.
1640 62d463ca 2020-10-20 naddy TAILQ_FOREACH(pe, &wanted_branches, entry) {
1641 4ba14133 2020-03-20 stsp const char *target = pe->path;
1642 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1644 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1645 4ba14133 2020-03-20 stsp if (error) {
1646 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1647 4ba14133 2020-03-20 stsp error = NULL;
1650 4ba14133 2020-03-20 stsp goto done;
1653 04d9a9ec 2020-09-24 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1654 04d9a9ec 2020-09-24 stsp verbosity, repo);
1655 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1656 4ba14133 2020-03-20 stsp if (error)
1657 4ba14133 2020-03-20 stsp goto done;
1662 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1663 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1664 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1666 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1667 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1668 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1669 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1670 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1672 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1673 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1675 bb64b798 2020-03-18 stsp got_repo_close(repo);
1676 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1677 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1678 d9b4d0c0 2020-03-18 stsp free(pe->data);
1680 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1681 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1682 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1683 d9b4d0c0 2020-03-18 stsp free(pe->data);
1685 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1686 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1687 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1688 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1689 09838ffc 2020-03-18 stsp free(proto);
1690 09838ffc 2020-03-18 stsp free(host);
1691 09838ffc 2020-03-18 stsp free(port);
1692 09838ffc 2020-03-18 stsp free(server_path);
1693 09838ffc 2020-03-18 stsp free(repo_name);
1694 bb64b798 2020-03-18 stsp free(default_destdir);
1695 b46f3e71 2020-03-18 stsp free(git_url);
1696 39c64a6a 2020-03-18 stsp return error;
1699 7848a0e1 2020-03-19 stsp static const struct got_error *
1700 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1701 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1703 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1704 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1705 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1707 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1709 7848a0e1 2020-03-19 stsp goto done;
1711 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1712 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1713 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1715 88609724 2020-03-21 stsp goto done;
1716 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1717 88609724 2020-03-21 stsp goto done;
1718 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1719 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1720 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1722 db6d8ad8 2020-03-21 stsp goto done;
1725 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1726 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1727 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1728 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1729 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1731 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1733 7848a0e1 2020-03-19 stsp goto done;
1734 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1736 e8a967e0 2020-03-21 stsp goto done;
1738 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1740 7848a0e1 2020-03-19 stsp goto done;
1741 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1742 6338a6a1 2020-03-21 stsp goto done;
1744 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1746 6338a6a1 2020-03-21 stsp goto done;
1747 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1749 6338a6a1 2020-03-21 stsp goto done;
1752 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1753 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1754 6338a6a1 2020-03-21 stsp new_id_str);
1756 7848a0e1 2020-03-19 stsp free(old_id);
1757 7848a0e1 2020-03-19 stsp free(new_id_str);
1758 7848a0e1 2020-03-19 stsp return err;
1761 f1bcca34 2020-03-25 stsp static const struct got_error *
1762 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1763 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1765 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1766 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1767 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1769 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1770 bcf34b0e 2020-03-26 stsp if (err) {
1771 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1772 bcf34b0e 2020-03-26 stsp return err;
1773 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1775 bcf34b0e 2020-03-26 stsp goto done;
1777 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1779 bcf34b0e 2020-03-26 stsp goto done;
1781 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1782 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1783 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1784 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1786 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1788 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1789 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1790 bcf34b0e 2020-03-26 stsp goto done;
1792 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1793 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1795 bcf34b0e 2020-03-26 stsp goto done;
1797 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1799 bcf34b0e 2020-03-26 stsp goto done;
1801 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1802 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1803 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1807 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1808 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1809 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1810 bcf34b0e 2020-03-26 stsp err = unlock_err;
1812 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1813 f1bcca34 2020-03-25 stsp return err;
1816 2ab43947 2020-03-18 stsp __dead static void
1817 7848a0e1 2020-03-19 stsp usage_fetch(void)
1819 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1820 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1821 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1822 13f12b09 2020-03-21 stsp getprogname());
1826 7848a0e1 2020-03-19 stsp static const struct got_error *
1827 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1828 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1830 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1831 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1832 3789fd73 2020-03-26 stsp char *id_str = NULL;
1834 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1835 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1837 3789fd73 2020-03-26 stsp return err;
1838 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1839 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1840 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1841 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1844 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1846 3789fd73 2020-03-26 stsp return err;
1847 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1849 3789fd73 2020-03-26 stsp goto done;
1851 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1853 3789fd73 2020-03-26 stsp goto done;
1854 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1855 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1856 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1861 3789fd73 2020-03-26 stsp free(id_str);
1862 3789fd73 2020-03-26 stsp return NULL;
1865 3789fd73 2020-03-26 stsp static const struct got_error *
1866 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1867 50b0790e 2020-09-11 stsp struct got_pathlist_head *their_symrefs,
1868 50b0790e 2020-09-11 stsp const struct got_remote_repo *remote,
1869 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1871 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
1872 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1873 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1874 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1875 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
1876 3789fd73 2020-03-26 stsp char *local_refname = NULL;
1878 f21ec2f0 2020-03-21 stsp SIMPLEQ_INIT(&my_refs);
1880 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1882 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
1884 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1886 3789fd73 2020-03-26 stsp goto done;
1888 f21ec2f0 2020-03-21 stsp SIMPLEQ_FOREACH(re, &my_refs, entry) {
1889 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1891 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
1892 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
1893 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
1894 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
1895 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
1897 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
1898 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
1899 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
1900 3789fd73 2020-03-26 stsp goto done;
1902 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
1906 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1907 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1910 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1913 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
1914 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1917 3789fd73 2020-03-26 stsp if (pe != NULL)
1920 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
1924 3789fd73 2020-03-26 stsp if (local_refname) {
1925 3789fd73 2020-03-26 stsp struct got_reference *ref;
1926 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
1927 3789fd73 2020-03-26 stsp if (err) {
1928 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1930 3789fd73 2020-03-26 stsp free(local_refname);
1931 3789fd73 2020-03-26 stsp local_refname = NULL;
1934 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
1937 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
1938 3789fd73 2020-03-26 stsp got_ref_close(ref);
1939 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
1940 3789fd73 2020-03-26 stsp err = unlock_err;
1944 3789fd73 2020-03-26 stsp free(local_refname);
1945 3789fd73 2020-03-26 stsp local_refname = NULL;
1949 3789fd73 2020-03-26 stsp free(remote_namespace);
1950 3789fd73 2020-03-26 stsp free(local_refname);
1951 0e4002ca 2020-03-21 stsp return err;
1954 0e4002ca 2020-03-21 stsp static const struct got_error *
1955 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1956 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1958 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1959 0e4002ca 2020-03-21 stsp char *remote_refname;
1960 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1962 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1963 0e4002ca 2020-03-21 stsp refname += 5;
1965 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1966 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1967 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1969 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1970 0e4002ca 2020-03-21 stsp if (err) {
1971 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1972 0e4002ca 2020-03-21 stsp goto done;
1973 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1975 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1976 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1977 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1978 9f142382 2020-03-21 stsp err = unlock_err;
1979 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1982 0e4002ca 2020-03-21 stsp free(remote_refname);
1983 f21ec2f0 2020-03-21 stsp return err;
1986 f21ec2f0 2020-03-21 stsp static const struct got_error *
1987 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1989 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1990 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1991 7848a0e1 2020-03-19 stsp const char *remote_name;
1992 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1993 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
1994 50b0790e 2020-09-11 stsp const struct got_remote_repo *remotes, *remote = NULL;
1995 7848a0e1 2020-03-19 stsp int nremotes;
1996 7848a0e1 2020-03-19 stsp char *id_str = NULL;
1997 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
1998 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
1999 50b0790e 2020-09-11 stsp const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2000 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2001 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
2002 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
2003 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
2004 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
2005 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
2006 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2007 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
2009 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
2010 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
2011 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
2012 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
2014 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2015 7848a0e1 2020-03-19 stsp switch (ch) {
2017 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
2020 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
2021 4ba14133 2020-03-20 stsp optarg, NULL);
2022 4ba14133 2020-03-20 stsp if (error)
2023 4ba14133 2020-03-20 stsp return error;
2026 f21ec2f0 2020-03-21 stsp delete_refs = 1;
2029 41b0de12 2020-03-21 stsp list_refs_only = 1;
2032 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
2033 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2034 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
2036 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
2039 db6d8ad8 2020-03-21 stsp replace_tags = 1;
2042 7848a0e1 2020-03-19 stsp if (verbosity < 0)
2043 7848a0e1 2020-03-19 stsp verbosity = 0;
2044 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
2045 7848a0e1 2020-03-19 stsp verbosity++;
2048 7848a0e1 2020-03-19 stsp verbosity = -1;
2051 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
2052 0e4002ca 2020-03-21 stsp optarg, NULL);
2053 0e4002ca 2020-03-21 stsp if (error)
2054 0e4002ca 2020-03-21 stsp return error;
2057 7848a0e1 2020-03-19 stsp usage_fetch();
2061 7848a0e1 2020-03-19 stsp argc -= optind;
2062 7848a0e1 2020-03-19 stsp argv += optind;
2064 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2065 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
2066 41b0de12 2020-03-21 stsp if (list_refs_only) {
2067 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
2068 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
2069 41b0de12 2020-03-21 stsp if (fetch_all_branches)
2070 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
2071 f21ec2f0 2020-03-21 stsp if (delete_refs)
2072 f21ec2f0 2020-03-21 stsp errx(1, "-l and -d options are mutually exclusive");
2073 41b0de12 2020-03-21 stsp if (verbosity == -1)
2074 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
2077 7848a0e1 2020-03-19 stsp if (argc == 0)
2078 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2079 7848a0e1 2020-03-19 stsp else if (argc == 1)
2080 7848a0e1 2020-03-19 stsp remote_name = argv[0];
2082 7848a0e1 2020-03-19 stsp usage_fetch();
2084 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
2085 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
2086 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
2087 7848a0e1 2020-03-19 stsp goto done;
2090 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
2091 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
2092 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2093 7848a0e1 2020-03-19 stsp goto done;
2095 7848a0e1 2020-03-19 stsp error = NULL;
2096 7848a0e1 2020-03-19 stsp if (worktree) {
2097 7848a0e1 2020-03-19 stsp repo_path =
2098 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
2099 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
2100 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
2101 7848a0e1 2020-03-19 stsp if (error)
2102 7848a0e1 2020-03-19 stsp goto done;
2104 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
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 goto done;
2112 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
2113 7848a0e1 2020-03-19 stsp if (error)
2114 7848a0e1 2020-03-19 stsp goto done;
2116 50b0790e 2020-09-11 stsp if (worktree) {
2117 50b0790e 2020-09-11 stsp worktree_conf = got_worktree_get_gotconfig(worktree);
2118 50b0790e 2020-09-11 stsp if (worktree_conf) {
2119 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2120 50b0790e 2020-09-11 stsp worktree_conf);
2121 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2122 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2123 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2129 50b0790e 2020-09-11 stsp if (remote == NULL) {
2130 50b0790e 2020-09-11 stsp repo_conf = got_repo_get_gotconfig(repo);
2131 50b0790e 2020-09-11 stsp if (repo_conf) {
2132 50b0790e 2020-09-11 stsp got_gotconfig_get_remotes(&nremotes, &remotes,
2133 50b0790e 2020-09-11 stsp repo_conf);
2134 50b0790e 2020-09-11 stsp for (i = 0; i < nremotes; i++) {
2135 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2136 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2142 50b0790e 2020-09-11 stsp if (remote == NULL) {
2143 257add31 2020-09-09 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2144 257add31 2020-09-09 stsp for (i = 0; i < nremotes; i++) {
2145 54eb00d5 2020-10-20 stsp if (strcmp(remotes[i].name, remote_name) == 0) {
2146 54eb00d5 2020-10-20 stsp remote = &remotes[i];
2151 50b0790e 2020-09-11 stsp if (remote == NULL) {
2152 50b0790e 2020-09-11 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2153 50b0790e 2020-09-11 stsp goto done;
2156 b8adfa55 2020-09-25 stsp if (TAILQ_EMPTY(&wanted_branches) && remote->nbranches > 0) {
2157 b8adfa55 2020-09-25 stsp for (i = 0; i < remote->nbranches; i++) {
2158 b8adfa55 2020-09-25 stsp got_pathlist_append(&wanted_branches,
2159 b8adfa55 2020-09-25 stsp remote->branches[i], NULL);
2164 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2165 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
2166 7848a0e1 2020-03-19 stsp if (error)
2167 7848a0e1 2020-03-19 stsp goto done;
2169 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
2170 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2171 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2172 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
2173 7848a0e1 2020-03-19 stsp err(1, "pledge");
2175 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
2176 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
2177 7848a0e1 2020-03-19 stsp #ifndef PROFILE
2178 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2179 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
2180 7848a0e1 2020-03-19 stsp err(1, "pledge");
2182 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
2183 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
2184 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2185 7848a0e1 2020-03-19 stsp goto done;
2187 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2188 7848a0e1 2020-03-19 stsp goto done;
2191 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2192 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2193 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
2194 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
2195 7848a0e1 2020-03-19 stsp goto done;
2198 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2199 7848a0e1 2020-03-19 stsp if (error)
2200 7848a0e1 2020-03-19 stsp goto done;
2202 f79e6490 2020-04-19 stsp if (verbosity >= 0)
2203 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2204 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
2206 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2207 9c52365f 2020-03-21 stsp server_path, verbosity);
2208 7848a0e1 2020-03-19 stsp if (error)
2209 7848a0e1 2020-03-19 stsp goto done;
2211 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
2212 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
2213 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
2214 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
2215 04d9a9ec 2020-09-24 stsp fpa.repo = repo;
2216 04d9a9ec 2020-09-24 stsp fpa.create_configs = 0;
2217 04d9a9ec 2020-09-24 stsp fpa.configs_created = 0;
2218 04d9a9ec 2020-09-24 stsp memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2219 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2220 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
2221 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2222 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
2223 7848a0e1 2020-03-19 stsp if (error)
2224 7848a0e1 2020-03-19 stsp goto done;
2226 41b0de12 2020-03-21 stsp if (list_refs_only) {
2227 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
2228 41b0de12 2020-03-21 stsp goto done;
2231 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
2232 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
2233 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
2234 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
2235 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
2236 984065c8 2020-03-19 stsp if (error)
2237 984065c8 2020-03-19 stsp goto done;
2238 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
2239 984065c8 2020-03-19 stsp free(id_str);
2240 984065c8 2020-03-19 stsp id_str = NULL;
2243 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
2244 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2245 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
2246 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
2247 7848a0e1 2020-03-19 stsp struct got_reference *ref;
2248 7848a0e1 2020-03-19 stsp char *remote_refname;
2250 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
2251 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
2252 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
2253 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
2254 0e4002ca 2020-03-21 stsp if (error)
2255 0e4002ca 2020-03-21 stsp goto done;
2259 1510c839 2020-03-20 stsp if (remote->mirror_references ||
2260 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
2261 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2262 7848a0e1 2020-03-19 stsp if (error) {
2263 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2264 7848a0e1 2020-03-19 stsp goto done;
2265 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2267 7848a0e1 2020-03-19 stsp if (error)
2268 7848a0e1 2020-03-19 stsp goto done;
2270 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2271 db6d8ad8 2020-03-21 stsp verbosity, repo);
2272 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2273 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2274 9f142382 2020-03-21 stsp error = unlock_err;
2275 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2276 7848a0e1 2020-03-19 stsp if (error)
2277 7848a0e1 2020-03-19 stsp goto done;
2279 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
2280 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2281 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
2282 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
2283 7848a0e1 2020-03-19 stsp goto done;
2286 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
2287 7848a0e1 2020-03-19 stsp if (error) {
2288 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
2289 7848a0e1 2020-03-19 stsp goto done;
2290 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
2291 688f11b3 2020-03-21 stsp verbosity, repo);
2292 7848a0e1 2020-03-19 stsp if (error)
2293 7848a0e1 2020-03-19 stsp goto done;
2295 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
2296 db6d8ad8 2020-03-21 stsp verbosity, repo);
2297 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2298 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2299 9f142382 2020-03-21 stsp error = unlock_err;
2300 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2301 7848a0e1 2020-03-19 stsp if (error)
2302 7848a0e1 2020-03-19 stsp goto done;
2305 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2306 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2307 2ec30c80 2020-03-20 stsp if (error) {
2308 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2309 2ec30c80 2020-03-20 stsp goto done;
2310 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2312 2ec30c80 2020-03-20 stsp if (error)
2313 2ec30c80 2020-03-20 stsp goto done;
2315 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2316 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2317 9f142382 2020-03-21 stsp error = unlock_err;
2318 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2322 f1bcca34 2020-03-25 stsp if (delete_refs) {
2323 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2324 3789fd73 2020-03-26 stsp verbosity, repo);
2325 f1bcca34 2020-03-25 stsp if (error)
2326 f1bcca34 2020-03-25 stsp goto done;
2329 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2330 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2331 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2332 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2333 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2334 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2335 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2337 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2340 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2343 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2344 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2345 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2346 f1bcca34 2020-03-25 stsp goto done;
2348 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2349 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2350 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2351 f1bcca34 2020-03-25 stsp free(remote_refname);
2352 f1bcca34 2020-03-25 stsp goto done;
2355 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2357 f1bcca34 2020-03-25 stsp if (error) {
2358 f1bcca34 2020-03-25 stsp free(remote_refname);
2359 f1bcca34 2020-03-25 stsp free(remote_target);
2360 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2361 f1bcca34 2020-03-25 stsp error = NULL;
2364 f1bcca34 2020-03-25 stsp goto done;
2366 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2367 f1bcca34 2020-03-25 stsp verbosity, repo);
2368 f1bcca34 2020-03-25 stsp free(remote_refname);
2369 f1bcca34 2020-03-25 stsp free(remote_target);
2370 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2371 f1bcca34 2020-03-25 stsp if (error)
2372 f1bcca34 2020-03-25 stsp goto done;
2376 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2377 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2378 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2379 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2380 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2382 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2383 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2385 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2386 7848a0e1 2020-03-19 stsp if (worktree)
2387 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2388 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2389 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2390 7848a0e1 2020-03-19 stsp free(pe->data);
2392 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2393 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2394 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2395 7848a0e1 2020-03-19 stsp free(pe->data);
2397 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2398 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2399 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2400 7848a0e1 2020-03-19 stsp free(id_str);
2401 7848a0e1 2020-03-19 stsp free(cwd);
2402 7848a0e1 2020-03-19 stsp free(repo_path);
2403 7848a0e1 2020-03-19 stsp free(pack_hash);
2404 7848a0e1 2020-03-19 stsp free(proto);
2405 7848a0e1 2020-03-19 stsp free(host);
2406 7848a0e1 2020-03-19 stsp free(port);
2407 7848a0e1 2020-03-19 stsp free(server_path);
2408 7848a0e1 2020-03-19 stsp free(repo_name);
2409 7848a0e1 2020-03-19 stsp return error;
2413 7848a0e1 2020-03-19 stsp __dead static void
2414 2ab43947 2020-03-18 stsp usage_checkout(void)
2416 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2417 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2421 2ab43947 2020-03-18 stsp static void
2422 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2424 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2425 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2426 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2427 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2428 2ab43947 2020-03-18 stsp getprogname());
2431 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2432 2ab43947 2020-03-18 stsp const char *worktree_path;
2433 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2436 2ab43947 2020-03-18 stsp static const struct got_error *
2437 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2439 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2441 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2442 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2443 2ab43947 2020-03-18 stsp return NULL;
2445 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2446 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2447 2ab43947 2020-03-18 stsp return NULL;
2450 2ab43947 2020-03-18 stsp while (path[0] == '/')
2453 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2454 2ab43947 2020-03-18 stsp return NULL;
2457 2ab43947 2020-03-18 stsp static const struct got_error *
2458 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2460 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2461 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2462 2ab43947 2020-03-18 stsp return NULL;
2465 2ab43947 2020-03-18 stsp static const struct got_error *
2466 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2467 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2468 2ab43947 2020-03-18 stsp struct got_repository *repo)
2470 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2471 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2473 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2474 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2476 2ab43947 2020-03-18 stsp return err;
2478 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2479 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2482 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2483 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2485 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2487 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2495 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2496 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2497 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2499 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2500 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2501 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2502 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2503 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2504 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2506 2ab43947 2020-03-18 stsp free(yca_id);
2507 2ab43947 2020-03-18 stsp return NULL;
2510 2ab43947 2020-03-18 stsp static const struct got_error *
2511 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2512 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2513 2ab43947 2020-03-18 stsp struct got_repository *repo)
2515 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2516 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2517 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2518 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2520 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2522 2ab43947 2020-03-18 stsp goto done;
2524 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2525 2ab43947 2020-03-18 stsp is_same_branch = 1;
2526 2ab43947 2020-03-18 stsp goto done;
2528 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2529 2ab43947 2020-03-18 stsp is_same_branch = 1;
2530 2ab43947 2020-03-18 stsp goto done;
2533 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2535 2ab43947 2020-03-18 stsp goto done;
2537 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2538 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2540 2ab43947 2020-03-18 stsp goto done;
2542 2ab43947 2020-03-18 stsp for (;;) {
2543 2ab43947 2020-03-18 stsp struct got_object_id *id;
2544 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2545 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2546 2ab43947 2020-03-18 stsp if (err) {
2547 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2548 2ab43947 2020-03-18 stsp err = NULL;
2553 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2555 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2556 2ab43947 2020-03-18 stsp is_same_branch = 1;
2562 2ab43947 2020-03-18 stsp if (graph)
2563 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2564 2ab43947 2020-03-18 stsp free(head_commit_id);
2565 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2566 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2567 2ab43947 2020-03-18 stsp return err;
2570 4ed7e80c 2018-05-20 stsp static const struct got_error *
2571 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2573 4b6c9460 2020-03-05 stsp static char msg[512];
2574 4b6c9460 2020-03-05 stsp const char *branch_name;
2576 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2577 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2579 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2581 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2582 4b6c9460 2020-03-05 stsp branch_name += 11;
2584 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2585 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2586 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2587 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2588 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2589 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2591 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2594 4b6c9460 2020-03-05 stsp static const struct got_error *
2595 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2597 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2598 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2599 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2600 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2601 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2602 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2603 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2604 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2605 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2606 f0207f6a 2020-10-19 stsp char *cwd = NULL;
2607 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2608 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2609 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2611 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2613 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2614 0bb8a95e 2018-03-12 stsp switch (ch) {
2616 08573d5b 2019-05-14 stsp branch_name = optarg;
2619 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2620 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2621 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2624 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2627 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2630 2deda0b9 2019-03-07 stsp usage_checkout();
2631 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2635 0bb8a95e 2018-03-12 stsp argc -= optind;
2636 0bb8a95e 2018-03-12 stsp argv += optind;
2638 6715a751 2018-03-16 stsp #ifndef PROFILE
2639 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2640 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2641 c09a553d 2018-03-12 stsp err(1, "pledge");
2643 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2644 c47340da 2020-09-20 stsp char *base, *dotgit;
2645 f0207f6a 2020-10-19 stsp const char *path;
2646 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2647 76089277 2018-04-01 stsp if (repo_path == NULL)
2648 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2649 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2650 76089277 2018-04-01 stsp if (cwd == NULL) {
2651 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2652 76089277 2018-04-01 stsp goto done;
2654 c47340da 2020-09-20 stsp if (path_prefix[0])
2655 f0207f6a 2020-10-19 stsp path = path_prefix;
2657 f0207f6a 2020-10-19 stsp path = repo_path;
2658 f0207f6a 2020-10-19 stsp error = got_path_basename(&base, path);
2659 f0207f6a 2020-10-19 stsp if (error)
2660 c47340da 2020-09-20 stsp goto done;
2661 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2662 c09a553d 2018-03-12 stsp if (dotgit)
2663 c09a553d 2018-03-12 stsp *dotgit = '\0';
2664 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2665 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2666 f0207f6a 2020-10-19 stsp free(base);
2667 76089277 2018-04-01 stsp goto done;
2669 f0207f6a 2020-10-19 stsp free(base);
2670 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2671 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2672 76089277 2018-04-01 stsp if (repo_path == NULL) {
2673 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2674 76089277 2018-04-01 stsp goto done;
2676 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2677 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2678 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2679 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2681 b4b3a7dd 2019-07-22 stsp goto done;
2683 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2684 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2685 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2686 b4b3a7dd 2019-07-22 stsp goto done;
2690 c09a553d 2018-03-12 stsp usage_checkout();
2692 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2693 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2695 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2696 c09a553d 2018-03-12 stsp if (error != NULL)
2697 c02c541e 2019-03-29 stsp goto done;
2699 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2700 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2701 c530dc23 2019-07-23 stsp if (error) {
2702 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2703 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2704 c530dc23 2019-07-23 stsp goto done;
2705 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2706 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2707 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2708 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2709 c530dc23 2019-07-23 stsp goto done;
2713 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2714 c02c541e 2019-03-29 stsp if (error)
2715 c09a553d 2018-03-12 stsp goto done;
2717 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2718 c09a553d 2018-03-12 stsp if (error != NULL)
2719 c09a553d 2018-03-12 stsp goto done;
2721 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2722 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2723 c09a553d 2018-03-12 stsp goto done;
2725 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2726 c09a553d 2018-03-12 stsp if (error != NULL)
2727 c09a553d 2018-03-12 stsp goto done;
2729 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2730 e5dc7198 2018-12-29 stsp path_prefix);
2731 e5dc7198 2018-12-29 stsp if (error != NULL)
2732 e5dc7198 2018-12-29 stsp goto done;
2733 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2734 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2735 49520a32 2018-12-29 stsp goto done;
2738 8069f636 2019-01-12 stsp if (commit_id_str) {
2739 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2740 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2741 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2742 30837e32 2019-07-25 stsp if (error)
2743 8069f636 2019-01-12 stsp goto done;
2744 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2745 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2746 8069f636 2019-01-12 stsp if (error != NULL) {
2747 8069f636 2019-01-12 stsp free(commit_id);
2748 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2749 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2750 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2752 8069f636 2019-01-12 stsp goto done;
2754 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2755 4b6c9460 2020-03-05 stsp if (error) {
2756 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2757 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2758 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2760 45d344f6 2019-05-14 stsp goto done;
2762 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2763 8069f636 2019-01-12 stsp commit_id);
2764 8069f636 2019-01-12 stsp free(commit_id);
2765 8069f636 2019-01-12 stsp if (error)
2766 8069f636 2019-01-12 stsp goto done;
2769 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2770 f2ea84fa 2019-07-27 stsp if (error)
2771 f2ea84fa 2019-07-27 stsp goto done;
2772 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2773 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2774 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2775 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2776 c09a553d 2018-03-12 stsp if (error != NULL)
2777 c09a553d 2018-03-12 stsp goto done;
2779 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2780 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2781 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2783 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2784 8069f636 2019-01-12 stsp free(commit_id_str);
2785 76089277 2018-04-01 stsp free(repo_path);
2786 507dc3bb 2018-12-29 stsp free(worktree_path);
2787 c47340da 2020-09-20 stsp free(cwd);
2788 507dc3bb 2018-12-29 stsp return error;
2791 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2792 9627c110 2020-04-18 stsp int did_something;
2793 9627c110 2020-04-18 stsp int conflicts;
2794 9627c110 2020-04-18 stsp int obstructed;
2795 9627c110 2020-04-18 stsp int not_updated;
2799 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2801 9627c110 2020-04-18 stsp if (!upa->did_something)
2804 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2805 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2806 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2807 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2808 9627c110 2020-04-18 stsp upa->obstructed);
2809 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2810 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2811 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2814 507dc3bb 2018-12-29 stsp __dead static void
2815 507dc3bb 2018-12-29 stsp usage_update(void)
2817 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2818 507dc3bb 2018-12-29 stsp getprogname());
2822 1ee397ad 2019-07-12 stsp static const struct got_error *
2823 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2825 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2827 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2828 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2829 1ee397ad 2019-07-12 stsp return NULL;
2831 9627c110 2020-04-18 stsp upa->did_something = 1;
2833 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2834 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2835 1ee397ad 2019-07-12 stsp return NULL;
2837 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2838 9627c110 2020-04-18 stsp upa->conflicts++;
2839 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2840 9627c110 2020-04-18 stsp upa->obstructed++;
2841 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2842 9627c110 2020-04-18 stsp upa->not_updated++;
2844 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2846 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2847 1ee397ad 2019-07-12 stsp return NULL;
2850 be7061eb 2018-12-30 stsp static const struct got_error *
2851 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2852 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2853 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2855 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2856 a1fb16d8 2019-05-24 stsp char *base_id_str;
2857 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2859 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2860 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2861 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2862 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2863 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2864 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2865 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2868 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2869 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2870 a1fb16d8 2019-05-24 stsp if (err) {
2871 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2872 a1fb16d8 2019-05-24 stsp return err;
2873 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2875 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2876 a1fb16d8 2019-05-24 stsp return NULL;
2878 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2879 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2880 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2882 a1fb16d8 2019-05-24 stsp return err;
2883 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2884 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2885 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2886 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2887 0ebf8283 2019-07-24 stsp return NULL;
2890 0ebf8283 2019-07-24 stsp static const struct got_error *
2891 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2893 0ebf8283 2019-07-24 stsp const struct got_error *err;
2894 0ebf8283 2019-07-24 stsp int in_progress;
2896 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2898 0ebf8283 2019-07-24 stsp return err;
2899 0ebf8283 2019-07-24 stsp if (in_progress)
2900 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2902 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_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_HISTEDIT_BUSY);
2908 a1fb16d8 2019-05-24 stsp return NULL;
2911 a5edda0a 2019-07-27 stsp static const struct got_error *
2912 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2913 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2915 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2916 a5edda0a 2019-07-27 stsp char *path;
2919 a5edda0a 2019-07-27 stsp if (argc == 0) {
2920 a5edda0a 2019-07-27 stsp path = strdup("");
2921 a5edda0a 2019-07-27 stsp if (path == NULL)
2922 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2923 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2926 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2927 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2930 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2931 a5edda0a 2019-07-27 stsp if (err) {
2932 a5edda0a 2019-07-27 stsp free(path);
2937 a5edda0a 2019-07-27 stsp return err;
2940 a1fb16d8 2019-05-24 stsp static const struct got_error *
2941 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2942 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2944 fa51e947 2020-03-27 stsp const struct got_error *err;
2945 fa51e947 2020-03-27 stsp struct got_repository *repo;
2946 fa51e947 2020-03-27 stsp static char msg[512];
2948 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2950 fa51e947 2020-03-27 stsp return orig_err;
2952 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2953 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2954 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2955 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2956 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2957 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2958 fa51e947 2020-03-27 stsp got_repo_close(repo);
2959 fa51e947 2020-03-27 stsp return err;
2962 fa51e947 2020-03-27 stsp static const struct got_error *
2963 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2965 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2966 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2967 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2968 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2969 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2970 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2971 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2972 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2973 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2974 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2976 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
2978 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2980 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2981 507dc3bb 2018-12-29 stsp switch (ch) {
2983 024e9686 2019-05-14 stsp branch_name = optarg;
2986 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2987 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2988 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2991 2deda0b9 2019-03-07 stsp usage_update();
2992 507dc3bb 2018-12-29 stsp /* NOTREACHED */
2996 507dc3bb 2018-12-29 stsp argc -= optind;
2997 507dc3bb 2018-12-29 stsp argv += optind;
2999 507dc3bb 2018-12-29 stsp #ifndef PROFILE
3000 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3001 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
3002 507dc3bb 2018-12-29 stsp err(1, "pledge");
3004 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
3005 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
3006 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3007 c4cdcb68 2019-04-03 stsp goto done;
3009 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
3010 fa51e947 2020-03-27 stsp if (error) {
3011 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3012 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
3013 fa51e947 2020-03-27 stsp worktree_path);
3014 7d5807f4 2019-07-11 stsp goto done;
3017 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
3018 f2ea84fa 2019-07-27 stsp if (error)
3019 f2ea84fa 2019-07-27 stsp goto done;
3021 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3023 507dc3bb 2018-12-29 stsp if (error != NULL)
3024 507dc3bb 2018-12-29 stsp goto done;
3026 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3027 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3028 087fb88c 2019-08-04 stsp if (error)
3029 087fb88c 2019-08-04 stsp goto done;
3031 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3032 0266afb7 2019-01-04 stsp if (error)
3033 0266afb7 2019-01-04 stsp goto done;
3035 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3036 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
3037 024e9686 2019-05-14 stsp if (error != NULL)
3038 024e9686 2019-05-14 stsp goto done;
3039 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
3040 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3041 9c4b8182 2019-01-02 stsp if (error != NULL)
3042 9c4b8182 2019-01-02 stsp goto done;
3043 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3044 507dc3bb 2018-12-29 stsp if (error != NULL)
3045 507dc3bb 2018-12-29 stsp goto done;
3047 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3048 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3049 04f57cb3 2019-07-25 stsp free(commit_id_str);
3050 bb787f09 2019-07-25 stsp commit_id_str = NULL;
3051 30837e32 2019-07-25 stsp if (error)
3052 a297e751 2019-07-11 stsp goto done;
3053 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
3054 a297e751 2019-07-11 stsp if (error)
3055 507dc3bb 2018-12-29 stsp goto done;
3058 a1fb16d8 2019-05-24 stsp if (branch_name) {
3059 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
3060 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
3061 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
3063 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3064 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
3065 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
3066 024e9686 2019-05-14 stsp goto done;
3068 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
3069 024e9686 2019-05-14 stsp if (error)
3070 024e9686 2019-05-14 stsp goto done;
3071 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
3073 a367ff0f 2019-05-14 stsp free(head_commit_id);
3074 024e9686 2019-05-14 stsp if (error != NULL)
3075 024e9686 2019-05-14 stsp goto done;
3076 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3077 a367ff0f 2019-05-14 stsp if (error)
3078 a367ff0f 2019-05-14 stsp goto done;
3079 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
3080 024e9686 2019-05-14 stsp if (error)
3081 024e9686 2019-05-14 stsp goto done;
3083 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
3084 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
3085 a367ff0f 2019-05-14 stsp if (error != NULL) {
3086 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
3087 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
3088 024e9686 2019-05-14 stsp goto done;
3090 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3091 a367ff0f 2019-05-14 stsp if (error)
3092 a367ff0f 2019-05-14 stsp goto done;
3095 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3096 507dc3bb 2018-12-29 stsp commit_id) != 0) {
3097 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3098 507dc3bb 2018-12-29 stsp commit_id);
3099 507dc3bb 2018-12-29 stsp if (error)
3100 507dc3bb 2018-12-29 stsp goto done;
3103 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
3104 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
3105 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
3106 507dc3bb 2018-12-29 stsp if (error != NULL)
3107 507dc3bb 2018-12-29 stsp goto done;
3109 9627c110 2020-04-18 stsp if (upa.did_something)
3110 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
3112 784955db 2019-01-12 stsp printf("Already up-to-date\n");
3113 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
3115 c09a553d 2018-03-12 stsp free(worktree_path);
3116 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3117 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
3118 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
3119 507dc3bb 2018-12-29 stsp free(commit_id);
3120 9c4b8182 2019-01-02 stsp free(commit_id_str);
3121 c09a553d 2018-03-12 stsp return error;
3124 f42b1b34 2018-03-12 stsp static const struct got_error *
3125 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3126 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3127 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3129 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
3130 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3132 44392932 2019-08-25 stsp if (blob_id1) {
3133 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3135 44392932 2019-08-25 stsp goto done;
3138 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3140 44392932 2019-08-25 stsp goto done;
3142 44392932 2019-08-25 stsp while (path[0] == '/')
3144 fe621944 2020-11-10 stsp err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3145 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, stdout);
3147 44392932 2019-08-25 stsp if (blob1)
3148 44392932 2019-08-25 stsp got_object_blob_close(blob1);
3149 44392932 2019-08-25 stsp got_object_blob_close(blob2);
3150 44392932 2019-08-25 stsp return err;
3153 44392932 2019-08-25 stsp static const struct got_error *
3154 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3155 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
3156 64453f7e 2020-11-21 stsp int force_text_diff, struct got_repository *repo)
3158 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3159 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3160 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
3162 44392932 2019-08-25 stsp if (tree_id1) {
3163 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3165 44392932 2019-08-25 stsp goto done;
3168 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3170 0f2b3dca 2018-12-22 stsp goto done;
3172 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
3173 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3174 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
3175 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3176 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
3177 fe621944 2020-11-10 stsp arg.nlines = 0;
3178 44392932 2019-08-25 stsp while (path[0] == '/')
3180 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3181 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3183 79109fed 2018-03-27 stsp if (tree1)
3184 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3185 366e0a5f 2019-10-10 stsp if (tree2)
3186 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3187 44392932 2019-08-25 stsp return err;
3190 44392932 2019-08-25 stsp static const struct got_error *
3191 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3192 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3194 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3195 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3196 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3197 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3199 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3200 0208f208 2020-05-05 stsp if (qid != NULL) {
3201 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3202 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3205 0208f208 2020-05-05 stsp return err;
3207 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3208 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3212 0208f208 2020-05-05 stsp if (tree_id1) {
3213 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3215 0208f208 2020-05-05 stsp goto done;
3218 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3219 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3221 0208f208 2020-05-05 stsp goto done;
3223 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3224 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3226 0208f208 2020-05-05 stsp if (tree1)
3227 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3228 0208f208 2020-05-05 stsp if (tree2)
3229 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3230 0208f208 2020-05-05 stsp return err;
3233 0208f208 2020-05-05 stsp static const struct got_error *
3234 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3235 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3237 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3238 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3239 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3240 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3241 44392932 2019-08-25 stsp struct got_object_qid *qid;
3243 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3244 44392932 2019-08-25 stsp if (qid != NULL) {
3245 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3248 44392932 2019-08-25 stsp return err;
3251 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3252 44392932 2019-08-25 stsp int obj_type;
3253 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3255 44392932 2019-08-25 stsp goto done;
3256 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3257 44392932 2019-08-25 stsp if (err) {
3258 44392932 2019-08-25 stsp free(obj_id2);
3259 44392932 2019-08-25 stsp goto done;
3261 44392932 2019-08-25 stsp if (pcommit) {
3262 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3263 44392932 2019-08-25 stsp qid->id, path);
3264 44392932 2019-08-25 stsp if (err) {
3265 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3266 2e8c69d1 2020-05-04 stsp free(obj_id2);
3267 2e8c69d1 2020-05-04 stsp goto done;
3270 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3271 2e8c69d1 2020-05-04 stsp if (err) {
3272 2e8c69d1 2020-05-04 stsp free(obj_id2);
3273 2e8c69d1 2020-05-04 stsp goto done;
3277 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3278 44392932 2019-08-25 stsp if (err) {
3279 44392932 2019-08-25 stsp free(obj_id2);
3280 44392932 2019-08-25 stsp goto done;
3282 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3283 44392932 2019-08-25 stsp switch (obj_type) {
3284 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3285 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3286 64453f7e 2020-11-21 stsp 0, 0, repo);
3288 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3289 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3290 64453f7e 2020-11-21 stsp 0, 0, repo);
3293 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3296 44392932 2019-08-25 stsp free(obj_id1);
3297 44392932 2019-08-25 stsp free(obj_id2);
3299 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3300 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3302 44392932 2019-08-25 stsp goto done;
3303 579bd556 2020-10-24 stsp if (pcommit) {
3304 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3305 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3307 579bd556 2020-10-24 stsp goto done;
3309 64453f7e 2020-11-21 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3311 64453f7e 2020-11-21 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3315 0f2b3dca 2018-12-22 stsp free(id_str1);
3316 0f2b3dca 2018-12-22 stsp free(id_str2);
3317 44392932 2019-08-25 stsp if (pcommit)
3318 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3319 79109fed 2018-03-27 stsp return err;
3322 4bb494d5 2018-06-16 stsp static char *
3323 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3325 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3326 09867e48 2019-08-13 stsp char *p, *s;
3328 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3329 09867e48 2019-08-13 stsp if (tm == NULL)
3330 09867e48 2019-08-13 stsp return NULL;
3331 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3332 09867e48 2019-08-13 stsp if (s == NULL)
3333 09867e48 2019-08-13 stsp return NULL;
3334 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3336 6c281f94 2018-06-11 stsp *p = '\0';
3340 6841bf13 2019-11-29 kn static const struct got_error *
3341 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3342 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3344 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3345 6841bf13 2019-11-29 kn regmatch_t regmatch;
3346 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3348 6841bf13 2019-11-29 kn *have_match = 0;
3350 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3354 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3358 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3359 6841bf13 2019-11-29 kn *have_match = 1;
3361 6841bf13 2019-11-29 kn free(id_str);
3362 6841bf13 2019-11-29 kn free(logmsg);
3366 0208f208 2020-05-05 stsp static void
3367 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3368 0208f208 2020-05-05 stsp regex_t *regex)
3370 0208f208 2020-05-05 stsp regmatch_t regmatch;
3371 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3373 0208f208 2020-05-05 stsp *have_match = 0;
3375 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3376 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3377 0208f208 2020-05-05 stsp *have_match = 1;
3383 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3385 79109fed 2018-03-27 stsp static const struct got_error *
3386 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3387 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path,
3388 0208f208 2020-05-05 stsp struct got_pathlist_head *changed_paths, int show_patch,
3389 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3391 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3392 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3393 6c281f94 2018-06-11 stsp char datebuf[26];
3394 45d799e2 2018-12-23 stsp time_t committer_time;
3395 45d799e2 2018-12-23 stsp const char *author, *committer;
3396 199a4027 2019-02-02 stsp char *refs_str = NULL;
3397 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3399 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3401 199a4027 2019-02-02 stsp const char *name;
3402 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3403 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3406 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3407 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3409 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3410 199a4027 2019-02-02 stsp name += 5;
3411 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3413 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3414 e34f9ed6 2019-02-02 stsp name += 6;
3415 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3416 141c2bff 2019-02-04 stsp name += 8;
3417 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3418 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3421 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3423 48cae60d 2020-09-22 stsp return err;
3424 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3425 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3426 5d844a1e 2019-08-13 stsp if (err) {
3427 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3428 48cae60d 2020-09-22 stsp free(ref_id);
3429 5d844a1e 2019-08-13 stsp return err;
3431 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3432 5d844a1e 2019-08-13 stsp err = NULL;
3433 5d844a1e 2019-08-13 stsp tag = NULL;
3436 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3437 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3438 48cae60d 2020-09-22 stsp free(ref_id);
3440 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3441 a436ad14 2019-08-13 stsp if (cmp != 0)
3443 199a4027 2019-02-02 stsp s = refs_str;
3444 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3445 199a4027 2019-02-02 stsp name) == -1) {
3446 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3448 34ca4898 2019-08-13 stsp return err;
3452 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3454 8bf5b3c9 2018-03-17 stsp return err;
3456 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3457 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3458 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3459 832c249c 2018-06-10 stsp free(id_str);
3460 d3d493d7 2019-02-21 stsp id_str = NULL;
3461 d3d493d7 2019-02-21 stsp free(refs_str);
3462 d3d493d7 2019-02-21 stsp refs_str = NULL;
3463 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3464 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3465 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3466 09867e48 2019-08-13 stsp if (datestr)
3467 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3468 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3469 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3470 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3471 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3472 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3473 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3474 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3475 3fe1abad 2018-06-10 stsp int n = 1;
3476 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3477 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3478 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3480 a0603db2 2018-06-10 stsp return err;
3481 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3482 a0603db2 2018-06-10 stsp free(id_str);
3486 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3488 5943eee2 2019-08-13 stsp return err;
3490 621015ac 2018-07-23 stsp logmsg = logmsg0;
3492 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3494 832c249c 2018-06-10 stsp printf(" %s\n", line);
3495 832c249c 2018-06-10 stsp } while (line);
3496 621015ac 2018-07-23 stsp free(logmsg0);
3498 0208f208 2020-05-05 stsp if (changed_paths) {
3499 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3500 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3501 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3502 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3504 0208f208 2020-05-05 stsp printf("\n");
3506 971751ac 2018-03-27 stsp if (show_patch) {
3507 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3508 971751ac 2018-03-27 stsp if (err == 0)
3509 971751ac 2018-03-27 stsp printf("\n");
3512 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3513 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3514 07862c20 2018-09-15 stsp return err;
3517 f42b1b34 2018-03-12 stsp static const struct got_error *
3518 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3519 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3520 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3521 0208f208 2020-05-05 stsp int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3523 f42b1b34 2018-03-12 stsp const struct got_error *err;
3524 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3525 6841bf13 2019-11-29 kn regex_t regex;
3526 6841bf13 2019-11-29 kn int have_match;
3527 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3528 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3529 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3530 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3531 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3533 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3534 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3536 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3537 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3538 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3540 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3542 f42b1b34 2018-03-12 stsp return err;
3543 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3544 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3546 fcc85cad 2018-07-22 stsp goto done;
3548 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3550 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3553 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3554 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3555 372ccdbb 2018-06-10 stsp if (err) {
3556 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3557 9ba79e04 2018-06-11 stsp err = NULL;
3560 b43fbaa0 2018-06-11 stsp if (id == NULL)
3563 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3567 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3568 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3573 6841bf13 2019-11-29 kn if (search_pattern) {
3574 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3576 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3579 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3580 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3581 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3582 6841bf13 2019-11-29 kn if (have_match == 0) {
3583 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3584 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3585 0208f208 2020-05-05 stsp free((char *)pe->path);
3586 0208f208 2020-05-05 stsp free(pe->data);
3588 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3593 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3594 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3597 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3598 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3600 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3601 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3602 0208f208 2020-05-05 stsp show_patch, diff_context, refs);
3603 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3607 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3608 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3611 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3612 0208f208 2020-05-05 stsp free((char *)pe->path);
3613 0208f208 2020-05-05 stsp free(pe->data);
3615 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3617 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3618 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3619 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3622 502b9684 2020-07-31 stsp if (show_changed_paths) {
3623 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
3624 502b9684 2020-07-31 stsp commit, repo);
3628 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3629 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3630 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3631 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3634 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3635 502b9684 2020-07-31 stsp free((char *)pe->path);
3636 502b9684 2020-07-31 stsp free(pe->data);
3638 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
3642 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3643 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3644 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3645 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3647 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3648 0208f208 2020-05-05 stsp free((char *)pe->path);
3649 0208f208 2020-05-05 stsp free(pe->data);
3651 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3652 6841bf13 2019-11-29 kn if (search_pattern)
3653 6841bf13 2019-11-29 kn regfree(®ex);
3654 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3655 f42b1b34 2018-03-12 stsp return err;
3658 4ed7e80c 2018-05-20 stsp __dead static void
3659 6f3d1eb0 2018-03-12 stsp usage_log(void)
3661 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3662 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3663 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3667 b1ebc001 2019-08-13 stsp static int
3668 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3670 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3671 b1ebc001 2019-08-13 stsp long long n;
3672 b1ebc001 2019-08-13 stsp const char *errstr;
3674 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3675 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3677 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3678 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3683 4ed7e80c 2018-05-20 stsp static const struct got_error *
3684 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3686 f42b1b34 2018-03-12 stsp const struct got_error *error;
3687 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3688 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3689 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3690 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3691 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3692 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3693 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3694 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3695 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3696 64a96a6d 2018-04-01 stsp const char *errstr;
3697 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3699 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3701 6715a751 2018-03-16 stsp #ifndef PROFILE
3702 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3705 f42b1b34 2018-03-12 stsp err(1, "pledge");
3708 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3710 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3711 79109fed 2018-03-27 stsp switch (ch) {
3713 79109fed 2018-03-27 stsp show_patch = 1;
3716 0208f208 2020-05-05 stsp show_changed_paths = 1;
3719 d142fc45 2018-04-01 stsp start_commit = optarg;
3722 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3724 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3725 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3728 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3729 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3730 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3733 48c8c60d 2020-01-27 stsp log_branches = 1;
3736 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3737 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3738 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3740 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3743 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3746 6841bf13 2019-11-29 kn search_pattern = optarg;
3749 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3752 2deda0b9 2019-03-07 stsp usage_log();
3753 79109fed 2018-03-27 stsp /* NOTREACHED */
3757 79109fed 2018-03-27 stsp argc -= optind;
3758 79109fed 2018-03-27 stsp argv += optind;
3760 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3761 dc1edbfa 2019-11-29 kn diff_context = 3;
3762 dc1edbfa 2019-11-29 kn else if (!show_patch)
3763 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
3765 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3766 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3767 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3768 04ca23f4 2018-07-16 stsp goto done;
3771 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3772 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3773 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3774 50f2fada 2020-04-24 stsp goto done;
3775 50f2fada 2020-04-24 stsp error = NULL;
3778 603cdeb0 2020-10-22 stsp if (argc == 1) {
3779 e7301579 2019-03-18 stsp if (worktree) {
3780 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3782 e7301579 2019-03-18 stsp if (error)
3783 e7301579 2019-03-18 stsp goto done;
3785 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3786 e7301579 2019-03-18 stsp if (path == NULL) {
3787 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3788 e7301579 2019-03-18 stsp goto done;
3791 603cdeb0 2020-10-22 stsp } else if (argc != 0)
3792 cbd1af7a 2019-03-18 stsp usage_log();
3794 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3795 5486daa2 2019-05-11 stsp repo_path = worktree ?
3796 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3798 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3799 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3800 cffc0aa4 2019-02-05 stsp goto done;
3803 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3804 d7d4f210 2018-03-12 stsp if (error != NULL)
3805 04ca23f4 2018-07-16 stsp goto done;
3807 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3808 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3809 c02c541e 2019-03-29 stsp if (error)
3810 c02c541e 2019-03-29 stsp goto done;
3812 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3813 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3814 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3815 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3816 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3817 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3818 3235492e 2018-04-01 stsp if (error != NULL)
3819 d1fe46f9 2020-04-18 stsp goto done;
3820 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3821 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3822 3235492e 2018-04-01 stsp if (error != NULL)
3823 d1fe46f9 2020-04-18 stsp goto done;
3824 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3825 d1fe46f9 2020-04-18 stsp start_id);
3826 d1fe46f9 2020-04-18 stsp if (error != NULL)
3827 d1fe46f9 2020-04-18 stsp goto done;
3828 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3830 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&start_id, NULL,
3831 7f9bfb31 2020-11-01 stsp start_commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
3832 d1fe46f9 2020-04-18 stsp if (error != NULL)
3833 d1fe46f9 2020-04-18 stsp goto done;
3835 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3836 7f9bfb31 2020-11-01 stsp error = got_repo_match_object_id(&end_id, NULL,
3837 7f9bfb31 2020-11-01 stsp end_commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
3838 d1fe46f9 2020-04-18 stsp if (error != NULL)
3839 d1fe46f9 2020-04-18 stsp goto done;
3842 deeabeae 2019-08-27 stsp if (worktree) {
3844 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
3845 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
3846 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
3848 603cdeb0 2020-10-22 stsp if (path) {
3849 603cdeb0 2020-10-22 stsp const char *prefix;
3850 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
3851 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
3852 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
3853 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
3854 603cdeb0 2020-10-22 stsp goto done;
3858 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
3859 8fa913ec 2020-11-14 stsp path ? path : "");
3860 04ca23f4 2018-07-16 stsp if (error != NULL)
3861 04ca23f4 2018-07-16 stsp goto done;
3862 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3863 04ca23f4 2018-07-16 stsp free(path);
3864 04ca23f4 2018-07-16 stsp path = in_repo_path;
3867 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3868 199a4027 2019-02-02 stsp if (error)
3869 199a4027 2019-02-02 stsp goto done;
3871 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
3872 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
3873 603cdeb0 2020-10-22 stsp limit, log_branches, reverse_display_order, &refs);
3875 04ca23f4 2018-07-16 stsp free(path);
3876 04ca23f4 2018-07-16 stsp free(repo_path);
3877 04ca23f4 2018-07-16 stsp free(cwd);
3878 cffc0aa4 2019-02-05 stsp if (worktree)
3879 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3880 ad242220 2018-09-08 stsp if (repo) {
3881 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3882 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3883 ad242220 2018-09-08 stsp if (error == NULL)
3884 ad242220 2018-09-08 stsp error = repo_error;
3886 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3887 8bf5b3c9 2018-03-17 stsp return error;
3890 4ed7e80c 2018-05-20 stsp __dead static void
3891 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3893 64453f7e 2020-11-21 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
3894 64453f7e 2020-11-21 stsp "[-s] [-w] [object1 object2 | path]\n", getprogname());
3898 b72f483a 2019-02-05 stsp struct print_diff_arg {
3899 b72f483a 2019-02-05 stsp struct got_repository *repo;
3900 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3901 b72f483a 2019-02-05 stsp int diff_context;
3902 3fc0c068 2019-02-10 stsp const char *id_str;
3903 3fc0c068 2019-02-10 stsp int header_shown;
3904 98eaaa12 2019-08-03 stsp int diff_staged;
3905 63035f9f 2019-10-06 stsp int ignore_whitespace;
3906 64453f7e 2020-11-21 stsp int force_text_diff;
3910 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
3911 39449a05 2020-07-23 stsp * it as content to the diff engine.
3913 39449a05 2020-07-23 stsp static const struct got_error *
3914 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3915 39449a05 2020-07-23 stsp const char *abspath)
3917 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
3918 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
3919 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
3923 39449a05 2020-07-23 stsp if (dirfd != -1) {
3924 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3925 39449a05 2020-07-23 stsp if (target_len == -1)
3926 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
3928 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
3929 39449a05 2020-07-23 stsp if (target_len == -1)
3930 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
3933 39449a05 2020-07-23 stsp *fd = got_opentempfd();
3934 39449a05 2020-07-23 stsp if (*fd == -1)
3935 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
3937 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
3938 39449a05 2020-07-23 stsp if (outlen == -1) {
3939 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
3940 39449a05 2020-07-23 stsp goto done;
3943 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
3944 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
3945 39449a05 2020-07-23 stsp goto done;
3948 39449a05 2020-07-23 stsp if (err) {
3949 39449a05 2020-07-23 stsp close(*fd);
3952 39449a05 2020-07-23 stsp return err;
3955 4ed7e80c 2018-05-20 stsp static const struct got_error *
3956 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3957 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3958 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3959 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3961 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3962 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3963 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3964 12463d8b 2019-12-13 stsp int fd = -1;
3965 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3966 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3967 b72f483a 2019-02-05 stsp struct stat sb;
3969 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3970 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3971 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3972 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3973 98eaaa12 2019-08-03 stsp return NULL;
3975 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3976 98eaaa12 2019-08-03 stsp return NULL;
3977 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3978 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3979 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3980 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3981 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3982 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3983 98eaaa12 2019-08-03 stsp return NULL;
3986 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3987 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3988 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3989 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3990 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3993 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3994 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
3995 98eaaa12 2019-08-03 stsp switch (staged_status) {
3996 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
3997 98eaaa12 2019-08-03 stsp label1 = path;
3998 98eaaa12 2019-08-03 stsp label2 = path;
4000 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4001 98eaaa12 2019-08-03 stsp label2 = path;
4003 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4004 98eaaa12 2019-08-03 stsp label1 = path;
4007 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4009 fe621944 2020-11-10 stsp return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4010 fe621944 2020-11-10 stsp staged_blob_id, label1, label2, a->diff_context,
4011 64453f7e 2020-11-21 stsp a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4014 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4015 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4016 4ce46740 2019-08-08 stsp char *id_str;
4017 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4020 4ce46740 2019-08-08 stsp goto done;
4021 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4023 4ce46740 2019-08-08 stsp goto done;
4024 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4025 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4026 4ce46740 2019-08-08 stsp free(id_str);
4027 4ce46740 2019-08-08 stsp goto done;
4029 4ce46740 2019-08-08 stsp free(id_str);
4030 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4031 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4033 4ce46740 2019-08-08 stsp goto done;
4036 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4037 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4038 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4039 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4040 2ec1f75b 2019-03-26 stsp goto done;
4043 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4044 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4045 12463d8b 2019-12-13 stsp if (fd == -1) {
4046 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4047 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4049 39449a05 2020-07-23 stsp goto done;
4051 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4052 39449a05 2020-07-23 stsp de_name, abspath);
4054 39449a05 2020-07-23 stsp goto done;
4057 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4058 12463d8b 2019-12-13 stsp if (fd == -1) {
4059 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4060 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4062 39449a05 2020-07-23 stsp goto done;
4064 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4065 39449a05 2020-07-23 stsp de_name, abspath);
4067 39449a05 2020-07-23 stsp goto done;
4070 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4071 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4072 2ec1f75b 2019-03-26 stsp goto done;
4074 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4075 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4076 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4077 2ec1f75b 2019-03-26 stsp goto done;
4081 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4083 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4084 64453f7e 2020-11-21 stsp a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4086 b72f483a 2019-02-05 stsp if (blob1)
4087 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4088 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4089 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4090 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4091 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4092 b72f483a 2019-02-05 stsp free(abspath);
4093 927df6b7 2019-02-10 stsp return err;
4096 927df6b7 2019-02-10 stsp static const struct got_error *
4097 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4099 b00d56cd 2018-04-01 stsp const struct got_error *error;
4100 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4101 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4102 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4103 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4104 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
4105 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
4106 15a94983 2018-12-23 stsp int type1, type2;
4107 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4108 64453f7e 2020-11-21 stsp int force_text_diff = 0;
4109 c0cc5c62 2018-10-18 stsp const char *errstr;
4110 927df6b7 2019-02-10 stsp char *path = NULL;
4112 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4113 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4114 25eccc22 2019-01-04 stsp NULL) == -1)
4115 b00d56cd 2018-04-01 stsp err(1, "pledge");
4118 64453f7e 2020-11-21 stsp while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4119 b00d56cd 2018-04-01 stsp switch (ch) {
4121 64453f7e 2020-11-21 stsp force_text_diff = 1;
4124 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4126 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4127 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4130 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4131 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4132 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4134 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4137 98eaaa12 2019-08-03 stsp diff_staged = 1;
4140 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4143 2deda0b9 2019-03-07 stsp usage_diff();
4144 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4148 b00d56cd 2018-04-01 stsp argc -= optind;
4149 b00d56cd 2018-04-01 stsp argv += optind;
4151 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4152 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4153 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4154 b72f483a 2019-02-05 stsp goto done;
4156 927df6b7 2019-02-10 stsp if (argc <= 1) {
4157 b72f483a 2019-02-05 stsp if (repo_path)
4159 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
4160 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4161 fa51e947 2020-03-27 stsp if (error) {
4162 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4163 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
4165 1f03b8da 2020-03-20 stsp goto done;
4167 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
4168 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
4169 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4170 927df6b7 2019-02-10 stsp goto done;
4172 927df6b7 2019-02-10 stsp if (argc == 1) {
4173 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4175 927df6b7 2019-02-10 stsp if (error)
4176 927df6b7 2019-02-10 stsp goto done;
4178 927df6b7 2019-02-10 stsp path = strdup("");
4179 927df6b7 2019-02-10 stsp if (path == NULL) {
4180 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4181 927df6b7 2019-02-10 stsp goto done;
4184 b72f483a 2019-02-05 stsp } else if (argc == 2) {
4185 98eaaa12 2019-08-03 stsp if (diff_staged)
4186 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
4187 98eaaa12 2019-08-03 stsp "objects in repository");
4188 15a94983 2018-12-23 stsp id_str1 = argv[0];
4189 15a94983 2018-12-23 stsp id_str2 = argv[1];
4190 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4191 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4192 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4193 30db809c 2019-06-05 stsp goto done;
4194 1f03b8da 2020-03-20 stsp if (worktree) {
4195 1f03b8da 2020-03-20 stsp repo_path = strdup(
4196 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
4197 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4198 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4199 1f03b8da 2020-03-20 stsp goto done;
4202 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
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;
4210 b00d56cd 2018-04-01 stsp usage_diff();
4212 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4213 76089277 2018-04-01 stsp free(repo_path);
4214 b00d56cd 2018-04-01 stsp if (error != NULL)
4215 b00d56cd 2018-04-01 stsp goto done;
4217 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4218 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4219 c02c541e 2019-03-29 stsp if (error)
4220 c02c541e 2019-03-29 stsp goto done;
4222 30db809c 2019-06-05 stsp if (argc <= 1) {
4223 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4224 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4225 b72f483a 2019-02-05 stsp char *id_str;
4227 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4229 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4230 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4231 b72f483a 2019-02-05 stsp if (error)
4232 b72f483a 2019-02-05 stsp goto done;
4233 b72f483a 2019-02-05 stsp arg.repo = repo;
4234 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4235 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4236 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4237 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4238 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4239 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4240 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
4242 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
4243 72ea6654 2019-07-27 stsp if (error)
4244 72ea6654 2019-07-27 stsp goto done;
4246 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
4247 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
4248 b72f483a 2019-02-05 stsp free(id_str);
4249 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4250 b72f483a 2019-02-05 stsp goto done;
4253 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4254 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
4255 0adb7196 2019-08-11 stsp if (error)
4256 0adb7196 2019-08-11 stsp goto done;
4258 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4259 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
4260 0adb7196 2019-08-11 stsp if (error)
4261 0adb7196 2019-08-11 stsp goto done;
4263 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
4264 15a94983 2018-12-23 stsp if (error)
4265 15a94983 2018-12-23 stsp goto done;
4267 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
4268 15a94983 2018-12-23 stsp if (error)
4269 15a94983 2018-12-23 stsp goto done;
4271 15a94983 2018-12-23 stsp if (type1 != type2) {
4272 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4273 b00d56cd 2018-04-01 stsp goto done;
4276 15a94983 2018-12-23 stsp switch (type1) {
4277 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4278 fe621944 2020-11-10 stsp error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4279 64453f7e 2020-11-21 stsp NULL, NULL, diff_context, ignore_whitespace,
4280 64453f7e 2020-11-21 stsp force_text_diff, repo, stdout);
4282 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4283 fe621944 2020-11-10 stsp error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4284 64453f7e 2020-11-21 stsp "", "", diff_context, ignore_whitespace, force_text_diff,
4285 64453f7e 2020-11-21 stsp repo, stdout);
4287 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4288 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
4289 fe621944 2020-11-10 stsp error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4290 64453f7e 2020-11-21 stsp diff_context, ignore_whitespace, force_text_diff, repo,
4294 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4297 5e70831e 2019-05-28 stsp free(label1);
4298 5e70831e 2019-05-28 stsp free(label2);
4299 15a94983 2018-12-23 stsp free(id1);
4300 15a94983 2018-12-23 stsp free(id2);
4301 927df6b7 2019-02-10 stsp free(path);
4302 b72f483a 2019-02-05 stsp if (worktree)
4303 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4304 ad242220 2018-09-08 stsp if (repo) {
4305 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4306 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4307 ad242220 2018-09-08 stsp if (error == NULL)
4308 ad242220 2018-09-08 stsp error = repo_error;
4310 b00d56cd 2018-04-01 stsp return error;
4313 404c43c4 2018-06-21 stsp __dead static void
4314 404c43c4 2018-06-21 stsp usage_blame(void)
4316 9270e621 2019-02-05 stsp fprintf(stderr,
4317 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4318 404c43c4 2018-06-21 stsp getprogname());
4322 28315671 2019-08-14 stsp struct blame_line {
4323 28315671 2019-08-14 stsp int annotated;
4324 28315671 2019-08-14 stsp char *id_str;
4325 82f6abb8 2019-08-14 stsp char *committer;
4326 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4329 28315671 2019-08-14 stsp struct blame_cb_args {
4330 28315671 2019-08-14 stsp struct blame_line *lines;
4331 28315671 2019-08-14 stsp int nlines;
4332 7ef28ff8 2019-08-14 stsp int nlines_prec;
4333 28315671 2019-08-14 stsp int lineno_cur;
4334 28315671 2019-08-14 stsp off_t *line_offsets;
4336 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4339 404c43c4 2018-06-21 stsp static const struct got_error *
4340 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4342 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4343 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4344 28315671 2019-08-14 stsp struct blame_line *bline;
4345 82f6abb8 2019-08-14 stsp char *line = NULL;
4346 28315671 2019-08-14 stsp size_t linesize = 0;
4347 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4348 28315671 2019-08-14 stsp off_t offset;
4349 bcb49d15 2019-08-14 stsp struct tm tm;
4350 bcb49d15 2019-08-14 stsp time_t committer_time;
4352 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4353 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4354 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4356 28315671 2019-08-14 stsp if (sigint_received)
4357 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4359 2839f8b9 2019-08-18 stsp if (lineno == -1)
4360 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4362 28315671 2019-08-14 stsp /* Annotate this line. */
4363 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4364 28315671 2019-08-14 stsp if (bline->annotated)
4365 28315671 2019-08-14 stsp return NULL;
4366 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4368 28315671 2019-08-14 stsp return err;
4370 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4372 82f6abb8 2019-08-14 stsp goto done;
4374 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4375 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4376 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4377 bcb49d15 2019-08-14 stsp goto done;
4380 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4381 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4382 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4383 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4384 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4385 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4386 82f6abb8 2019-08-14 stsp goto done;
4388 28315671 2019-08-14 stsp bline->annotated = 1;
4390 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4391 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4392 28315671 2019-08-14 stsp if (!bline->annotated)
4393 82f6abb8 2019-08-14 stsp goto done;
4395 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4396 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4397 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4398 82f6abb8 2019-08-14 stsp goto done;
4401 28315671 2019-08-14 stsp while (bline->annotated) {
4402 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4403 82f6abb8 2019-08-14 stsp size_t len;
4405 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4406 28315671 2019-08-14 stsp if (ferror(a->f))
4407 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4411 82f6abb8 2019-08-14 stsp committer = bline->committer;
4412 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4413 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4414 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4415 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4417 82f6abb8 2019-08-14 stsp *at = '\0';
4418 82f6abb8 2019-08-14 stsp len = strlen(committer);
4419 82f6abb8 2019-08-14 stsp if (len >= 9)
4420 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4422 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4424 28315671 2019-08-14 stsp *nl = '\0';
4425 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4426 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4428 28315671 2019-08-14 stsp a->lineno_cur++;
4429 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4432 82f6abb8 2019-08-14 stsp if (commit)
4433 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4434 28315671 2019-08-14 stsp free(line);
4435 28315671 2019-08-14 stsp return err;
4438 28315671 2019-08-14 stsp static const struct got_error *
4439 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4441 404c43c4 2018-06-21 stsp const struct got_error *error;
4442 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4443 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4444 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4445 0587e10c 2020-07-23 stsp char *link_target = NULL;
4446 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4447 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4448 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4449 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4450 28315671 2019-08-14 stsp struct blame_cb_args bca;
4451 28315671 2019-08-14 stsp int ch, obj_type, i;
4452 be659d10 2020-11-18 stsp off_t filesize;
4454 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4456 404c43c4 2018-06-21 stsp #ifndef PROFILE
4457 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4458 36e2fb66 2019-01-04 stsp NULL) == -1)
4459 404c43c4 2018-06-21 stsp err(1, "pledge");
4462 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4463 404c43c4 2018-06-21 stsp switch (ch) {
4465 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4468 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4469 66bea077 2018-08-02 stsp if (repo_path == NULL)
4470 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4472 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4475 2deda0b9 2019-03-07 stsp usage_blame();
4476 404c43c4 2018-06-21 stsp /* NOTREACHED */
4480 404c43c4 2018-06-21 stsp argc -= optind;
4481 404c43c4 2018-06-21 stsp argv += optind;
4483 a39318fd 2018-08-02 stsp if (argc == 1)
4484 404c43c4 2018-06-21 stsp path = argv[0];
4486 404c43c4 2018-06-21 stsp usage_blame();
4488 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4489 66bea077 2018-08-02 stsp if (cwd == NULL) {
4490 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4491 66bea077 2018-08-02 stsp goto done;
4493 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4494 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4495 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4496 66bea077 2018-08-02 stsp goto done;
4498 0c06baac 2019-02-05 stsp error = NULL;
4499 0c06baac 2019-02-05 stsp if (worktree) {
4500 0c06baac 2019-02-05 stsp repo_path =
4501 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4502 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4503 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4504 1f03b8da 2020-03-20 stsp if (error)
4505 1f03b8da 2020-03-20 stsp goto done;
4508 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4509 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4510 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4511 0c06baac 2019-02-05 stsp goto done;
4516 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4517 c02c541e 2019-03-29 stsp if (error != NULL)
4518 404c43c4 2018-06-21 stsp goto done;
4520 0c06baac 2019-02-05 stsp if (worktree) {
4521 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4524 01740607 2020-11-04 stsp error = got_worktree_resolve_path(&p, worktree, path);
4525 01740607 2020-11-04 stsp if (error)
4526 01740607 2020-11-04 stsp goto done;
4527 01740607 2020-11-04 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4528 01740607 2020-11-04 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4529 01740607 2020-11-04 stsp p) == -1) {
4530 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4532 0c06baac 2019-02-05 stsp goto done;
4535 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4537 01740607 2020-11-04 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4538 01740607 2020-11-04 stsp if (error)
4539 01740607 2020-11-04 stsp goto done;
4540 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4542 0c06baac 2019-02-05 stsp if (error)
4543 66bea077 2018-08-02 stsp goto done;
4545 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4546 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4547 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4548 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4549 404c43c4 2018-06-21 stsp if (error != NULL)
4550 66bea077 2018-08-02 stsp goto done;
4551 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4552 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4553 404c43c4 2018-06-21 stsp if (error != NULL)
4554 66bea077 2018-08-02 stsp goto done;
4556 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4557 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4558 30837e32 2019-07-25 stsp if (error)
4559 66bea077 2018-08-02 stsp goto done;
4562 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4563 0587e10c 2020-07-23 stsp commit_id, repo);
4564 0587e10c 2020-07-23 stsp if (error)
4565 0587e10c 2020-07-23 stsp goto done;
4567 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
4568 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
4569 28315671 2019-08-14 stsp if (error)
4570 28315671 2019-08-14 stsp goto done;
4572 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4573 28315671 2019-08-14 stsp if (error)
4574 28315671 2019-08-14 stsp goto done;
4576 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4577 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
4578 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
4579 28315671 2019-08-14 stsp goto done;
4582 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4583 28315671 2019-08-14 stsp if (error)
4584 28315671 2019-08-14 stsp goto done;
4585 28315671 2019-08-14 stsp bca.f = got_opentemp();
4586 28315671 2019-08-14 stsp if (bca.f == NULL) {
4587 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4588 28315671 2019-08-14 stsp goto done;
4590 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4591 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4592 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4593 28315671 2019-08-14 stsp goto done;
4595 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4596 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4597 b02560ec 2019-08-19 stsp bca.nlines--;
4599 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4600 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4601 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4602 28315671 2019-08-14 stsp goto done;
4604 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4605 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4606 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4607 7ef28ff8 2019-08-14 stsp while (i > 0) {
4609 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4611 82f6abb8 2019-08-14 stsp bca.repo = repo;
4613 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4614 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
4616 66bea077 2018-08-02 stsp free(in_repo_path);
4617 0587e10c 2020-07-23 stsp free(link_target);
4618 66bea077 2018-08-02 stsp free(repo_path);
4619 66bea077 2018-08-02 stsp free(cwd);
4620 404c43c4 2018-06-21 stsp free(commit_id);
4621 28315671 2019-08-14 stsp free(obj_id);
4623 28315671 2019-08-14 stsp got_object_blob_close(blob);
4624 0c06baac 2019-02-05 stsp if (worktree)
4625 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4626 ad242220 2018-09-08 stsp if (repo) {
4627 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4628 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4629 ad242220 2018-09-08 stsp if (error == NULL)
4630 ad242220 2018-09-08 stsp error = repo_error;
4632 3affba96 2019-09-22 stsp if (bca.lines) {
4633 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4634 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4635 3affba96 2019-09-22 stsp free(bline->id_str);
4636 3affba96 2019-09-22 stsp free(bline->committer);
4638 3affba96 2019-09-22 stsp free(bca.lines);
4640 28315671 2019-08-14 stsp free(bca.line_offsets);
4641 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4642 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4643 404c43c4 2018-06-21 stsp return error;
4646 5de5890b 2018-10-18 stsp __dead static void
4647 5de5890b 2018-10-18 stsp usage_tree(void)
4649 c1669e2e 2019-01-09 stsp fprintf(stderr,
4650 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4651 5de5890b 2018-10-18 stsp getprogname());
4655 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4656 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4657 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4659 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4660 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4661 848d6979 2019-08-12 stsp const char *modestr = "";
4662 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4663 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4665 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4666 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4669 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4670 63c5ca5d 2019-08-24 stsp modestr = "$";
4671 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4674 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4676 0d6c6ee3 2020-05-20 stsp return err;
4677 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4678 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4679 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4682 848d6979 2019-08-12 stsp modestr = "@";
4684 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4685 848d6979 2019-08-12 stsp modestr = "/";
4686 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4687 848d6979 2019-08-12 stsp modestr = "*";
4689 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4690 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4691 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4693 0d6c6ee3 2020-05-20 stsp free(link_target);
4694 0d6c6ee3 2020-05-20 stsp return NULL;
4697 5de5890b 2018-10-18 stsp static const struct got_error *
4698 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4699 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4700 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4702 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4703 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4704 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4705 56e0773d 2019-11-28 stsp int nentries, i;
4707 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4709 5de5890b 2018-10-18 stsp goto done;
4711 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4713 5de5890b 2018-10-18 stsp goto done;
4714 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4715 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4716 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4717 5de5890b 2018-10-18 stsp char *id = NULL;
4719 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4722 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4723 5de5890b 2018-10-18 stsp if (show_ids) {
4724 5de5890b 2018-10-18 stsp char *id_str;
4725 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4726 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4728 5de5890b 2018-10-18 stsp goto done;
4729 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4730 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4731 5de5890b 2018-10-18 stsp free(id_str);
4732 5de5890b 2018-10-18 stsp goto done;
4734 5de5890b 2018-10-18 stsp free(id_str);
4736 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4739 0d6c6ee3 2020-05-20 stsp goto done;
4741 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4742 c1669e2e 2019-01-09 stsp char *child_path;
4743 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4744 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4745 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4746 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4747 c1669e2e 2019-01-09 stsp goto done;
4749 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4750 c1669e2e 2019-01-09 stsp root_path, repo);
4751 c1669e2e 2019-01-09 stsp free(child_path);
4753 c1669e2e 2019-01-09 stsp goto done;
4758 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4759 5de5890b 2018-10-18 stsp free(tree_id);
4760 5de5890b 2018-10-18 stsp return err;
4763 5de5890b 2018-10-18 stsp static const struct got_error *
4764 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4766 5de5890b 2018-10-18 stsp const struct got_error *error;
4767 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4768 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4769 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4770 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4771 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4772 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4773 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4776 5de5890b 2018-10-18 stsp #ifndef PROFILE
4777 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4778 0f8d269b 2019-01-04 stsp NULL) == -1)
4779 5de5890b 2018-10-18 stsp err(1, "pledge");
4782 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4783 5de5890b 2018-10-18 stsp switch (ch) {
4785 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4788 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4789 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4790 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4792 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4795 5de5890b 2018-10-18 stsp show_ids = 1;
4798 c1669e2e 2019-01-09 stsp recurse = 1;
4801 2deda0b9 2019-03-07 stsp usage_tree();
4802 5de5890b 2018-10-18 stsp /* NOTREACHED */
4806 5de5890b 2018-10-18 stsp argc -= optind;
4807 5de5890b 2018-10-18 stsp argv += optind;
4809 5de5890b 2018-10-18 stsp if (argc == 1)
4810 5de5890b 2018-10-18 stsp path = argv[0];
4811 5de5890b 2018-10-18 stsp else if (argc > 1)
4812 5de5890b 2018-10-18 stsp usage_tree();
4814 7a2c19d6 2019-02-05 stsp path = NULL;
4816 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4817 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4818 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4819 9bf7a39b 2019-02-05 stsp goto done;
4821 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4822 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4823 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4824 7a2c19d6 2019-02-05 stsp goto done;
4826 7a2c19d6 2019-02-05 stsp error = NULL;
4827 7a2c19d6 2019-02-05 stsp if (worktree) {
4828 7a2c19d6 2019-02-05 stsp repo_path =
4829 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4830 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4831 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4832 7a2c19d6 2019-02-05 stsp if (error)
4833 7a2c19d6 2019-02-05 stsp goto done;
4835 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
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 goto done;
4843 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4844 5de5890b 2018-10-18 stsp if (error != NULL)
4845 c02c541e 2019-03-29 stsp goto done;
4847 4fedbf4c 2020-11-07 stsp if (worktree) {
4848 4fedbf4c 2020-11-07 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4851 4fedbf4c 2020-11-07 stsp if (path == NULL)
4852 4fedbf4c 2020-11-07 stsp path = "";
4853 4fedbf4c 2020-11-07 stsp error = got_worktree_resolve_path(&p, worktree, path);
4854 4fedbf4c 2020-11-07 stsp if (error)
4855 4fedbf4c 2020-11-07 stsp goto done;
4856 4fedbf4c 2020-11-07 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
4857 4fedbf4c 2020-11-07 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4858 4fedbf4c 2020-11-07 stsp p) == -1) {
4859 4fedbf4c 2020-11-07 stsp error = got_error_from_errno("asprintf");
4861 4fedbf4c 2020-11-07 stsp goto done;
4864 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4865 4fedbf4c 2020-11-07 stsp if (error)
4866 4fedbf4c 2020-11-07 stsp goto done;
4868 4fedbf4c 2020-11-07 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4869 4fedbf4c 2020-11-07 stsp if (error)
4870 4fedbf4c 2020-11-07 stsp goto done;
4871 4fedbf4c 2020-11-07 stsp if (path == NULL)
4872 9bf7a39b 2019-02-05 stsp path = "/";
4873 8fa913ec 2020-11-14 stsp error = got_repo_map_path(&in_repo_path, repo, path);
4874 9bf7a39b 2019-02-05 stsp if (error != NULL)
4875 9bf7a39b 2019-02-05 stsp goto done;
4878 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4879 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4880 4e0a20a4 2020-03-23 tracey if (worktree)
4881 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4883 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4884 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4885 5de5890b 2018-10-18 stsp if (error != NULL)
4886 5de5890b 2018-10-18 stsp goto done;
4887 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4888 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4889 5de5890b 2018-10-18 stsp if (error != NULL)
4890 5de5890b 2018-10-18 stsp goto done;
4892 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4893 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4894 30837e32 2019-07-25 stsp if (error)
4895 5de5890b 2018-10-18 stsp goto done;
4898 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4899 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4901 5de5890b 2018-10-18 stsp free(in_repo_path);
4902 5de5890b 2018-10-18 stsp free(repo_path);
4903 5de5890b 2018-10-18 stsp free(cwd);
4904 5de5890b 2018-10-18 stsp free(commit_id);
4905 7a2c19d6 2019-02-05 stsp if (worktree)
4906 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4907 5de5890b 2018-10-18 stsp if (repo) {
4908 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4909 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4910 5de5890b 2018-10-18 stsp if (error == NULL)
4911 5de5890b 2018-10-18 stsp error = repo_error;
4913 5de5890b 2018-10-18 stsp return error;
4916 6bad629b 2019-02-04 stsp __dead static void
4917 6bad629b 2019-02-04 stsp usage_status(void)
4919 081470ac 2020-08-13 stsp fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4920 081470ac 2020-08-13 stsp getprogname());
4924 b72f483a 2019-02-05 stsp static const struct got_error *
4925 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4926 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4927 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4928 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4930 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4931 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4932 081470ac 2020-08-13 stsp if (arg) {
4933 081470ac 2020-08-13 stsp char *status_codes = arg;
4934 081470ac 2020-08-13 stsp size_t ncodes = strlen(status_codes);
4936 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4937 081470ac 2020-08-13 stsp if (status == status_codes[i] ||
4938 081470ac 2020-08-13 stsp staged_status == status_codes[i])
4941 081470ac 2020-08-13 stsp if (i == ncodes)
4942 081470ac 2020-08-13 stsp return NULL;
4944 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4945 b72f483a 2019-02-05 stsp return NULL;
4948 6bad629b 2019-02-04 stsp static const struct got_error *
4949 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4951 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4952 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4953 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4954 081470ac 2020-08-13 stsp char *cwd = NULL, *status_codes = NULL;;
4955 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4956 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4957 081470ac 2020-08-13 stsp int ch, i;
4959 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4961 081470ac 2020-08-13 stsp while ((ch = getopt(argc, argv, "s:")) != -1) {
4962 6bad629b 2019-02-04 stsp switch (ch) {
4964 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
4965 081470ac 2020-08-13 stsp switch (optarg[i]) {
4966 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
4967 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
4968 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
4969 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
4970 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
4971 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
4972 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
4973 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
4974 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
4977 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
4978 081470ac 2020-08-13 stsp optarg[i]);
4981 081470ac 2020-08-13 stsp status_codes = optarg;
4984 2deda0b9 2019-03-07 stsp usage_status();
4985 6bad629b 2019-02-04 stsp /* NOTREACHED */
4989 6bad629b 2019-02-04 stsp argc -= optind;
4990 6bad629b 2019-02-04 stsp argv += optind;
4992 6bad629b 2019-02-04 stsp #ifndef PROFILE
4993 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4994 6bad629b 2019-02-04 stsp NULL) == -1)
4995 6bad629b 2019-02-04 stsp err(1, "pledge");
4997 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4998 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4999 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5000 927df6b7 2019-02-10 stsp goto done;
5003 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5004 fa51e947 2020-03-27 stsp if (error) {
5005 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5006 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5007 a5edda0a 2019-07-27 stsp goto done;
5010 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5012 6bad629b 2019-02-04 stsp if (error != NULL)
5013 6bad629b 2019-02-04 stsp goto done;
5015 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5016 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5017 087fb88c 2019-08-04 stsp if (error)
5018 087fb88c 2019-08-04 stsp goto done;
5020 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5021 6bad629b 2019-02-04 stsp if (error)
5022 6bad629b 2019-02-04 stsp goto done;
5024 081470ac 2020-08-13 stsp error = got_worktree_status(worktree, &paths, repo, print_status,
5025 081470ac 2020-08-13 stsp status_codes, check_cancelled, NULL);
5027 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5028 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5029 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5030 927df6b7 2019-02-10 stsp free(cwd);
5031 d0eebce4 2019-03-11 stsp return error;
5034 d0eebce4 2019-03-11 stsp __dead static void
5035 d0eebce4 2019-03-11 stsp usage_ref(void)
5037 d0eebce4 2019-03-11 stsp fprintf(stderr,
5038 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5039 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5040 d0eebce4 2019-03-11 stsp getprogname());
5044 d0eebce4 2019-03-11 stsp static const struct got_error *
5045 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5047 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5048 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5049 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5051 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
5052 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5054 d0eebce4 2019-03-11 stsp return err;
5056 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5057 d0eebce4 2019-03-11 stsp char *refstr;
5058 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5059 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5060 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5061 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5062 d0eebce4 2019-03-11 stsp free(refstr);
5065 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5066 d0eebce4 2019-03-11 stsp return NULL;
5069 d0eebce4 2019-03-11 stsp static const struct got_error *
5070 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
5072 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5073 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5075 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5077 d0eebce4 2019-03-11 stsp return err;
5079 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
5080 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5081 d0eebce4 2019-03-11 stsp return err;
5084 d0eebce4 2019-03-11 stsp static const struct got_error *
5085 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5087 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5088 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5089 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5092 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5093 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5094 d1644381 2019-07-14 stsp * an unintended typo.
5096 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5097 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5099 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5101 d83d9d5c 2019-05-13 stsp if (err) {
5102 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5104 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5105 d83d9d5c 2019-05-13 stsp return err;
5106 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5108 d83d9d5c 2019-05-13 stsp return err;
5109 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5110 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5112 d83d9d5c 2019-05-13 stsp return err;
5115 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5117 d0eebce4 2019-03-11 stsp goto done;
5119 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5122 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5124 d1c1ae5f 2019-08-12 stsp return err;
5127 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5128 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5130 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5131 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5132 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5135 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5136 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5137 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5139 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5140 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5142 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5144 d1c1ae5f 2019-08-12 stsp return err;
5146 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5148 d1c1ae5f 2019-08-12 stsp goto done;
5150 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5152 d1c1ae5f 2019-08-12 stsp if (target_ref)
5153 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5155 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5156 d0eebce4 2019-03-11 stsp return err;
5159 d0eebce4 2019-03-11 stsp static const struct got_error *
5160 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5162 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5163 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5164 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5165 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5166 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5167 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5168 b2070a3f 2020-03-22 stsp char *refname = NULL;
5170 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5171 d0eebce4 2019-03-11 stsp switch (ch) {
5173 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5176 e31abbf2 2020-03-22 stsp do_delete = 1;
5179 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5180 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5181 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5183 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5186 d0eebce4 2019-03-11 stsp do_list = 1;
5189 e31abbf2 2020-03-22 stsp symref_target = optarg;
5192 d0eebce4 2019-03-11 stsp usage_ref();
5193 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5197 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5198 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
5199 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
5200 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
5201 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5202 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
5203 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5204 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
5205 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5206 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
5207 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5208 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
5210 d0eebce4 2019-03-11 stsp argc -= optind;
5211 d0eebce4 2019-03-11 stsp argv += optind;
5213 e31abbf2 2020-03-22 stsp if (do_list) {
5214 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5215 d0eebce4 2019-03-11 stsp usage_ref();
5216 b2070a3f 2020-03-22 stsp if (argc == 1) {
5217 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5218 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5219 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5220 b2070a3f 2020-03-22 stsp goto done;
5224 e31abbf2 2020-03-22 stsp if (argc != 1)
5225 e31abbf2 2020-03-22 stsp usage_ref();
5226 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5227 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5228 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5229 b2070a3f 2020-03-22 stsp goto done;
5233 b2070a3f 2020-03-22 stsp if (refname)
5234 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5236 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5237 e0b57350 2019-03-12 stsp if (do_list) {
5238 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5239 e0b57350 2019-03-12 stsp NULL) == -1)
5240 e0b57350 2019-03-12 stsp err(1, "pledge");
5242 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5243 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5244 e0b57350 2019-03-12 stsp err(1, "pledge");
5247 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5248 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5249 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5250 d0eebce4 2019-03-11 stsp goto done;
5253 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5254 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5255 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5256 d0eebce4 2019-03-11 stsp goto done;
5258 d0eebce4 2019-03-11 stsp error = NULL;
5259 d0eebce4 2019-03-11 stsp if (worktree) {
5260 d0eebce4 2019-03-11 stsp repo_path =
5261 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5262 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5263 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5264 d0eebce4 2019-03-11 stsp if (error)
5265 d0eebce4 2019-03-11 stsp goto done;
5267 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
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 goto done;
5275 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5276 d0eebce4 2019-03-11 stsp if (error != NULL)
5277 d0eebce4 2019-03-11 stsp goto done;
5279 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5280 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5281 c02c541e 2019-03-29 stsp if (error)
5282 c02c541e 2019-03-29 stsp goto done;
5284 d0eebce4 2019-03-11 stsp if (do_list)
5285 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5286 e31abbf2 2020-03-22 stsp else if (do_delete)
5287 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
5288 e31abbf2 2020-03-22 stsp else if (symref_target)
5289 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5291 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5292 e31abbf2 2020-03-22 stsp usage_ref();
5293 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5296 b2070a3f 2020-03-22 stsp free(refname);
5298 4e759de4 2019-06-26 stsp got_repo_close(repo);
5299 4e759de4 2019-06-26 stsp if (worktree)
5300 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5301 4e759de4 2019-06-26 stsp free(cwd);
5302 4e759de4 2019-06-26 stsp free(repo_path);
5303 4e759de4 2019-06-26 stsp return error;
5306 4e759de4 2019-06-26 stsp __dead static void
5307 4e759de4 2019-06-26 stsp usage_branch(void)
5309 4e759de4 2019-06-26 stsp fprintf(stderr,
5310 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5311 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5315 4e759de4 2019-06-26 stsp static const struct got_error *
5316 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5317 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5319 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5320 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5321 4e99b47e 2019-10-04 stsp char *refstr;
5323 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5324 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5325 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5326 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5328 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5330 4e99b47e 2019-10-04 stsp return err;
5331 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5332 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5333 4e99b47e 2019-10-04 stsp marker = "* ";
5335 4e99b47e 2019-10-04 stsp marker = "~ ";
5339 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5340 4e99b47e 2019-10-04 stsp refname += 11;
5341 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5342 4e99b47e 2019-10-04 stsp refname += 18;
5344 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5345 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5346 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5348 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5349 4e99b47e 2019-10-04 stsp free(refstr);
5350 4e99b47e 2019-10-04 stsp return NULL;
5353 4e99b47e 2019-10-04 stsp static const struct got_error *
5354 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5356 ad89fa31 2019-10-04 stsp const char *refname;
5358 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5359 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5361 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5363 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5364 ad89fa31 2019-10-04 stsp refname += 11;
5365 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5366 ad89fa31 2019-10-04 stsp refname += 18;
5368 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5370 ad89fa31 2019-10-04 stsp return NULL;
5373 ad89fa31 2019-10-04 stsp static const struct got_error *
5374 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5376 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5377 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5378 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5379 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5380 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5382 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
5384 4e99b47e 2019-10-04 stsp if (worktree) {
5385 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5386 4e99b47e 2019-10-04 stsp worktree);
5388 4e99b47e 2019-10-04 stsp return err;
5390 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5391 4e99b47e 2019-10-04 stsp worktree);
5393 4e99b47e 2019-10-04 stsp return err;
5395 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5396 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5397 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5399 4e99b47e 2019-10-04 stsp return err;
5400 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5401 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5405 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5406 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5408 4e759de4 2019-06-26 stsp return err;
5410 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
5411 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5413 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5414 4e759de4 2019-06-26 stsp return NULL;
5417 4e759de4 2019-06-26 stsp static const struct got_error *
5418 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5419 45cd4e47 2019-08-25 stsp const char *branch_name)
5421 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5422 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5423 4e759de4 2019-06-26 stsp char *refname;
5425 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5426 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5428 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5430 4e759de4 2019-06-26 stsp goto done;
5432 45cd4e47 2019-08-25 stsp if (worktree &&
5433 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5434 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5435 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5436 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5437 45cd4e47 2019-08-25 stsp goto done;
5440 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5443 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5444 4e759de4 2019-06-26 stsp free(refname);
5445 4e759de4 2019-06-26 stsp return err;
5448 4e759de4 2019-06-26 stsp static const struct got_error *
5449 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5450 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5452 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5453 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5454 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5457 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5458 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5459 d3f84d51 2019-07-11 stsp * an unintended typo.
5461 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5462 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5464 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5465 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5466 62d463ca 2020-10-20 naddy goto done;
5469 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5470 4e759de4 2019-06-26 stsp if (err == NULL) {
5471 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5472 4e759de4 2019-06-26 stsp goto done;
5473 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5474 4e759de4 2019-06-26 stsp goto done;
5476 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5478 4e759de4 2019-06-26 stsp goto done;
5480 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5483 4e759de4 2019-06-26 stsp got_ref_close(ref);
5484 4e759de4 2019-06-26 stsp free(base_refname);
5485 4e759de4 2019-06-26 stsp free(refname);
5486 4e759de4 2019-06-26 stsp return err;
5489 4e759de4 2019-06-26 stsp static const struct got_error *
5490 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5492 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5493 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5494 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5495 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5496 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5497 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5498 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5499 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5500 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5501 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5502 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5504 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5506 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5507 4e759de4 2019-06-26 stsp switch (ch) {
5509 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5512 4e759de4 2019-06-26 stsp delref = optarg;
5515 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5516 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5517 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5519 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5522 4e759de4 2019-06-26 stsp do_list = 1;
5525 da76fce2 2020-02-24 stsp do_update = 0;
5528 4e759de4 2019-06-26 stsp usage_branch();
5529 4e759de4 2019-06-26 stsp /* NOTREACHED */
5533 4e759de4 2019-06-26 stsp if (do_list && delref)
5534 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
5536 4e759de4 2019-06-26 stsp argc -= optind;
5537 4e759de4 2019-06-26 stsp argv += optind;
5539 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5540 ad89fa31 2019-10-04 stsp do_show = 1;
5542 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5543 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5545 4e759de4 2019-06-26 stsp if (do_list || delref) {
5546 4e759de4 2019-06-26 stsp if (argc > 0)
5547 4e759de4 2019-06-26 stsp usage_branch();
5548 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5549 4e759de4 2019-06-26 stsp usage_branch();
5551 4e759de4 2019-06-26 stsp #ifndef PROFILE
5552 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5553 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5554 4e759de4 2019-06-26 stsp NULL) == -1)
5555 4e759de4 2019-06-26 stsp err(1, "pledge");
5557 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5558 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5559 4e759de4 2019-06-26 stsp err(1, "pledge");
5562 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5563 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5564 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5565 4e759de4 2019-06-26 stsp goto done;
5568 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5569 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5570 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5571 4e759de4 2019-06-26 stsp goto done;
5573 4e759de4 2019-06-26 stsp error = NULL;
5574 4e759de4 2019-06-26 stsp if (worktree) {
5575 4e759de4 2019-06-26 stsp repo_path =
5576 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5577 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5578 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5579 4e759de4 2019-06-26 stsp if (error)
5580 4e759de4 2019-06-26 stsp goto done;
5582 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
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 goto done;
5590 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5591 4e759de4 2019-06-26 stsp if (error != NULL)
5592 4e759de4 2019-06-26 stsp goto done;
5594 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5595 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5596 4e759de4 2019-06-26 stsp if (error)
5597 4e759de4 2019-06-26 stsp goto done;
5599 ad89fa31 2019-10-04 stsp if (do_show)
5600 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5601 ad89fa31 2019-10-04 stsp else if (do_list)
5602 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5603 4e759de4 2019-06-26 stsp else if (delref)
5604 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5606 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5607 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5608 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5609 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5610 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5611 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5612 a74f7e83 2019-11-10 stsp if (error)
5613 a74f7e83 2019-11-10 stsp goto done;
5614 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5615 da76fce2 2020-02-24 stsp if (error)
5616 da76fce2 2020-02-24 stsp goto done;
5617 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5618 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5619 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5621 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5622 da76fce2 2020-02-24 stsp if (error)
5623 da76fce2 2020-02-24 stsp goto done;
5624 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5625 da76fce2 2020-02-24 stsp worktree);
5626 da76fce2 2020-02-24 stsp if (error)
5627 da76fce2 2020-02-24 stsp goto done;
5628 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5630 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5631 da76fce2 2020-02-24 stsp goto done;
5633 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5634 da76fce2 2020-02-24 stsp free(branch_refname);
5635 da76fce2 2020-02-24 stsp if (error)
5636 da76fce2 2020-02-24 stsp goto done;
5637 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5639 da76fce2 2020-02-24 stsp if (error)
5640 da76fce2 2020-02-24 stsp goto done;
5641 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5642 da76fce2 2020-02-24 stsp commit_id);
5643 da76fce2 2020-02-24 stsp if (error)
5644 da76fce2 2020-02-24 stsp goto done;
5645 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5646 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5647 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5649 da76fce2 2020-02-24 stsp if (error)
5650 da76fce2 2020-02-24 stsp goto done;
5651 9627c110 2020-04-18 stsp if (upa.did_something)
5652 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5653 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5658 da76fce2 2020-02-24 stsp got_ref_close(ref);
5660 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5661 d0eebce4 2019-03-11 stsp if (worktree)
5662 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5663 d0eebce4 2019-03-11 stsp free(cwd);
5664 d0eebce4 2019-03-11 stsp free(repo_path);
5665 da76fce2 2020-02-24 stsp free(commit_id);
5666 da76fce2 2020-02-24 stsp free(commit_id_str);
5667 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5668 da76fce2 2020-02-24 stsp free((char *)pe->path);
5669 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5670 d00136be 2019-03-26 stsp return error;
5674 d00136be 2019-03-26 stsp __dead static void
5675 8e7bd50a 2019-08-22 stsp usage_tag(void)
5677 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5678 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5679 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5684 b8bad2ba 2019-08-23 stsp static const struct got_error *
5685 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5687 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5688 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5689 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5690 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5691 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5693 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5694 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5695 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5696 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5698 b8bad2ba 2019-08-23 stsp return err;
5699 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5702 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5705 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5706 b8bad2ba 2019-08-23 stsp free(re_id);
5709 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5710 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5713 b8bad2ba 2019-08-23 stsp while (se) {
5714 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5717 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5718 b8bad2ba 2019-08-23 stsp free(se_id);
5721 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5722 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5724 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5725 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5727 b8bad2ba 2019-08-23 stsp return err;
5728 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5731 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5736 b8bad2ba 2019-08-23 stsp return err;
5740 b8bad2ba 2019-08-23 stsp static const struct got_error *
5741 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5743 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5744 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5745 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5747 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5749 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5751 8e7bd50a 2019-08-22 stsp return err;
5753 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5754 8e7bd50a 2019-08-22 stsp const char *refname;
5755 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5756 8e7bd50a 2019-08-22 stsp char datebuf[26];
5757 d4efa91b 2020-01-14 stsp const char *tagger;
5758 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5759 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5760 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5761 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5763 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5764 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5766 8e7bd50a 2019-08-22 stsp refname += 10;
5767 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5768 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5769 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5772 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5773 8e7bd50a 2019-08-22 stsp free(refstr);
5775 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5778 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5779 d4efa91b 2020-01-14 stsp if (err) {
5780 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5784 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5785 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5786 d4efa91b 2020-01-14 stsp if (err) {
5790 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5791 d4efa91b 2020-01-14 stsp tagger_time =
5792 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5793 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5799 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5800 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5801 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5802 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5806 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5807 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5808 2417344c 2019-08-23 stsp if (datestr)
5809 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5810 d4efa91b 2020-01-14 stsp if (commit)
5811 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5813 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5814 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5815 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5818 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5819 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5822 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5823 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5826 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5827 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5834 8e7bd50a 2019-08-22 stsp free(id_str);
5835 d4efa91b 2020-01-14 stsp if (commit) {
5836 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5839 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5841 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5842 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5843 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5844 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5849 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5851 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5853 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5854 8e7bd50a 2019-08-22 stsp } while (line);
5855 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5858 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5859 8e7bd50a 2019-08-22 stsp return NULL;
5862 8e7bd50a 2019-08-22 stsp static const struct got_error *
5863 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5864 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5866 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5867 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5868 f372d5cd 2019-10-21 stsp char *editor = NULL;
5869 1601cb9f 2020-09-11 naddy int initial_content_len;
5870 8e7bd50a 2019-08-22 stsp int fd = -1;
5872 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5873 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5874 8e7bd50a 2019-08-22 stsp goto done;
5877 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
5878 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
5879 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
5880 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
5881 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5882 8e7bd50a 2019-08-22 stsp goto done;
5885 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5887 8e7bd50a 2019-08-22 stsp goto done;
5889 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
5890 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
5891 97972933 2020-09-11 stsp goto done;
5894 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5896 8e7bd50a 2019-08-22 stsp goto done;
5897 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
5898 bfa12d5e 2020-09-26 stsp initial_content_len);
5900 8e7bd50a 2019-08-22 stsp free(initial_content);
5901 8e7bd50a 2019-08-22 stsp free(template);
5902 8e7bd50a 2019-08-22 stsp free(editor);
5904 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5905 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
5907 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5908 59f86c76 2020-09-11 stsp if (err == NULL)
5909 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5910 59f86c76 2020-09-11 stsp if (err) {
5911 59f86c76 2020-09-11 stsp free(*tagmsg);
5912 59f86c76 2020-09-11 stsp *tagmsg = NULL;
5914 8e7bd50a 2019-08-22 stsp return err;
5917 8e7bd50a 2019-08-22 stsp static const struct got_error *
5918 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
5919 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5921 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5922 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5923 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5924 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5925 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5926 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5927 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5930 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5931 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5932 8e7bd50a 2019-08-22 stsp * an unintended typo.
5934 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5935 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5937 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
5939 8e7bd50a 2019-08-22 stsp return err;
5941 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5942 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5944 8e7bd50a 2019-08-22 stsp goto done;
5946 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5948 8e7bd50a 2019-08-22 stsp goto done;
5950 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5951 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5952 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5953 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
5954 62d463ca 2020-10-20 naddy goto done;
5956 8e7bd50a 2019-08-22 stsp tag_name += 10;
5957 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5958 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5959 62d463ca 2020-10-20 naddy goto done;
5962 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5963 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5964 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5965 8e7bd50a 2019-08-22 stsp goto done;
5966 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5967 8e7bd50a 2019-08-22 stsp goto done;
5969 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5970 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5971 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5972 f372d5cd 2019-10-21 stsp if (err) {
5973 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5974 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5975 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5976 8e7bd50a 2019-08-22 stsp goto done;
5980 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5981 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5982 f372d5cd 2019-10-21 stsp if (err) {
5983 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5984 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5985 8e7bd50a 2019-08-22 stsp goto done;
5988 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5989 f372d5cd 2019-10-21 stsp if (err) {
5990 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5991 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5992 8e7bd50a 2019-08-22 stsp goto done;
5995 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5996 f372d5cd 2019-10-21 stsp if (err) {
5997 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5998 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5999 f372d5cd 2019-10-21 stsp goto done;
6002 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
6003 f372d5cd 2019-10-21 stsp if (err) {
6004 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6005 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6006 f372d5cd 2019-10-21 stsp goto done;
6008 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6010 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6011 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6012 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6013 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6014 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6015 f372d5cd 2019-10-21 stsp free(tag_id_str);
6017 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6018 8e7bd50a 2019-08-22 stsp free(commit_id);
6019 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6020 8e7bd50a 2019-08-22 stsp free(refname);
6021 8e7bd50a 2019-08-22 stsp free(tagmsg);
6022 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6023 aba9c984 2019-09-08 stsp free(tagger);
6024 8e7bd50a 2019-08-22 stsp return err;
6027 8e7bd50a 2019-08-22 stsp static const struct got_error *
6028 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6030 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6031 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6032 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6033 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6034 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6035 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6036 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6038 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6039 8e7bd50a 2019-08-22 stsp switch (ch) {
6041 80106605 2020-02-24 stsp commit_id_arg = optarg;
6044 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6047 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6048 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6049 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6051 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6054 8e7bd50a 2019-08-22 stsp do_list = 1;
6057 8e7bd50a 2019-08-22 stsp usage_tag();
6058 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6062 8e7bd50a 2019-08-22 stsp argc -= optind;
6063 8e7bd50a 2019-08-22 stsp argv += optind;
6065 8e7bd50a 2019-08-22 stsp if (do_list) {
6066 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6068 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6069 8e7bd50a 2019-08-22 stsp if (tagmsg)
6070 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
6071 8e7bd50a 2019-08-22 stsp if (argc > 0)
6072 8e7bd50a 2019-08-22 stsp usage_tag();
6073 80106605 2020-02-24 stsp } else if (argc != 1)
6074 8e7bd50a 2019-08-22 stsp usage_tag();
6076 a2887370 2019-08-23 stsp tag_name = argv[0];
6078 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6079 8e7bd50a 2019-08-22 stsp if (do_list) {
6080 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6081 8e7bd50a 2019-08-22 stsp NULL) == -1)
6082 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6084 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6085 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6086 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6089 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6090 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6091 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6092 8e7bd50a 2019-08-22 stsp goto done;
6095 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6096 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6097 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6098 8e7bd50a 2019-08-22 stsp goto done;
6100 8e7bd50a 2019-08-22 stsp error = NULL;
6101 8e7bd50a 2019-08-22 stsp if (worktree) {
6102 8e7bd50a 2019-08-22 stsp repo_path =
6103 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6104 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6105 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6106 8e7bd50a 2019-08-22 stsp if (error)
6107 8e7bd50a 2019-08-22 stsp goto done;
6109 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
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 goto done;
6117 8e7bd50a 2019-08-22 stsp if (do_list) {
6118 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6119 c9956ddf 2019-09-08 stsp if (error != NULL)
6120 c9956ddf 2019-09-08 stsp goto done;
6121 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6122 8e7bd50a 2019-08-22 stsp if (error)
6123 8e7bd50a 2019-08-22 stsp goto done;
6124 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6126 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6127 c9956ddf 2019-09-08 stsp if (error)
6128 c9956ddf 2019-09-08 stsp goto done;
6129 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6130 c9956ddf 2019-09-08 stsp if (error != NULL)
6131 c9956ddf 2019-09-08 stsp goto done;
6133 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6134 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6135 8e7bd50a 2019-08-22 stsp if (error)
6136 8e7bd50a 2019-08-22 stsp goto done;
6139 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6140 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6141 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6142 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6143 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6144 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6145 8e7bd50a 2019-08-22 stsp if (error)
6146 8e7bd50a 2019-08-22 stsp goto done;
6147 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6148 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6149 8e7bd50a 2019-08-22 stsp if (error)
6150 8e7bd50a 2019-08-22 stsp goto done;
6151 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6152 8e7bd50a 2019-08-22 stsp free(commit_id);
6153 8e7bd50a 2019-08-22 stsp if (error)
6154 8e7bd50a 2019-08-22 stsp goto done;
6157 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6158 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6162 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
6163 8e7bd50a 2019-08-22 stsp if (worktree)
6164 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6165 8e7bd50a 2019-08-22 stsp free(cwd);
6166 8e7bd50a 2019-08-22 stsp free(repo_path);
6167 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6168 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6169 8e7bd50a 2019-08-22 stsp return error;
6172 8e7bd50a 2019-08-22 stsp __dead static void
6173 d00136be 2019-03-26 stsp usage_add(void)
6175 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6176 022fae89 2019-12-06 tracey getprogname());
6180 d00136be 2019-03-26 stsp static const struct got_error *
6181 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6183 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6185 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6186 4e68cba3 2019-11-23 stsp return NULL;
6189 4e68cba3 2019-11-23 stsp static const struct got_error *
6190 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6192 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6193 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6194 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6195 1dd54920 2019-05-11 stsp char *cwd = NULL;
6196 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6197 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6198 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6200 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6202 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6203 d00136be 2019-03-26 stsp switch (ch) {
6204 022fae89 2019-12-06 tracey case 'I':
6205 022fae89 2019-12-06 tracey no_ignores = 1;
6208 4e68cba3 2019-11-23 stsp can_recurse = 1;
6211 d00136be 2019-03-26 stsp usage_add();
6212 d00136be 2019-03-26 stsp /* NOTREACHED */
6216 d00136be 2019-03-26 stsp argc -= optind;
6217 d00136be 2019-03-26 stsp argv += optind;
6219 43012d58 2019-07-14 stsp #ifndef PROFILE
6220 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6221 43012d58 2019-07-14 stsp NULL) == -1)
6222 43012d58 2019-07-14 stsp err(1, "pledge");
6224 723c305c 2019-05-11 jcs if (argc < 1)
6225 d00136be 2019-03-26 stsp usage_add();
6227 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6228 d00136be 2019-03-26 stsp if (cwd == NULL) {
6229 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6230 d00136be 2019-03-26 stsp goto done;
6233 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6234 fa51e947 2020-03-27 stsp if (error) {
6235 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6236 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6237 d00136be 2019-03-26 stsp goto done;
6240 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6242 031a5338 2019-03-26 stsp if (error != NULL)
6243 031a5338 2019-03-26 stsp goto done;
6245 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6246 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6247 d00136be 2019-03-26 stsp if (error)
6248 d00136be 2019-03-26 stsp goto done;
6250 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6251 6d022e97 2019-08-04 stsp if (error)
6252 022fae89 2019-12-06 tracey goto done;
6254 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
6255 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6256 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
6257 6d022e97 2019-08-04 stsp goto done;
6261 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6262 4e68cba3 2019-11-23 stsp char *ondisk_path;
6263 4e68cba3 2019-11-23 stsp struct stat sb;
6264 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6265 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6266 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6267 62d463ca 2020-10-20 naddy pe->path) == -1) {
6268 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6269 4e68cba3 2019-11-23 stsp goto done;
6271 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6272 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6273 4e68cba3 2019-11-23 stsp free(ondisk_path);
6276 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6277 4e68cba3 2019-11-23 stsp ondisk_path);
6278 4e68cba3 2019-11-23 stsp free(ondisk_path);
6279 4e68cba3 2019-11-23 stsp goto done;
6281 4e68cba3 2019-11-23 stsp free(ondisk_path);
6282 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6283 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6284 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6285 4e68cba3 2019-11-23 stsp goto done;
6290 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6291 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6294 031a5338 2019-03-26 stsp got_repo_close(repo);
6295 d00136be 2019-03-26 stsp if (worktree)
6296 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6297 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6298 1dd54920 2019-05-11 stsp free((char *)pe->path);
6299 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6300 2ec1f75b 2019-03-26 stsp free(cwd);
6301 2ec1f75b 2019-03-26 stsp return error;
6304 2ec1f75b 2019-03-26 stsp __dead static void
6305 648e4ef7 2019-07-09 stsp usage_remove(void)
6307 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6308 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6312 2a06fe5f 2019-08-24 stsp static const struct got_error *
6313 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6314 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6316 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6318 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6319 2a06fe5f 2019-08-24 stsp return NULL;
6320 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6321 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6322 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6323 2a06fe5f 2019-08-24 stsp return NULL;
6326 2ec1f75b 2019-03-26 stsp static const struct got_error *
6327 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6329 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6330 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6331 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6332 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6333 17ed4618 2019-06-02 stsp char *cwd = NULL;
6334 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6335 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6336 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6338 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6340 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6341 2ec1f75b 2019-03-26 stsp switch (ch) {
6343 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6345 70e3e7f5 2019-12-13 tracey case 'k':
6346 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6348 f2a9dc41 2019-12-13 tracey case 'R':
6349 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6352 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6353 766841c2 2020-08-13 stsp switch (optarg[i]) {
6354 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6355 766841c2 2020-08-13 stsp delete_local_mods = 1;
6357 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6360 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6361 766841c2 2020-08-13 stsp optarg[i]);
6364 766841c2 2020-08-13 stsp status_codes = optarg;
6367 f2a9dc41 2019-12-13 tracey usage_remove();
6368 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6372 2ec1f75b 2019-03-26 stsp argc -= optind;
6373 2ec1f75b 2019-03-26 stsp argv += optind;
6375 43012d58 2019-07-14 stsp #ifndef PROFILE
6376 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6377 43012d58 2019-07-14 stsp NULL) == -1)
6378 43012d58 2019-07-14 stsp err(1, "pledge");
6380 17ed4618 2019-06-02 stsp if (argc < 1)
6381 648e4ef7 2019-07-09 stsp usage_remove();
6383 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
6384 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
6385 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6386 2ec1f75b 2019-03-26 stsp goto done;
6388 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6389 fa51e947 2020-03-27 stsp if (error) {
6390 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6391 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
6392 2ec1f75b 2019-03-26 stsp goto done;
6395 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6398 2ec1f75b 2019-03-26 stsp goto done;
6400 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6401 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6402 2ec1f75b 2019-03-26 stsp if (error)
6403 2ec1f75b 2019-03-26 stsp goto done;
6405 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6406 6d022e97 2019-08-04 stsp if (error)
6407 6d022e97 2019-08-04 stsp goto done;
6409 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
6410 f2a9dc41 2019-12-13 tracey char *ondisk_path;
6411 f2a9dc41 2019-12-13 tracey struct stat sb;
6412 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
6413 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6414 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6415 62d463ca 2020-10-20 naddy pe->path) == -1) {
6416 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6417 f2a9dc41 2019-12-13 tracey goto done;
6419 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6420 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6421 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6422 f2a9dc41 2019-12-13 tracey continue;
6424 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6425 f2a9dc41 2019-12-13 tracey ondisk_path);
6426 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6427 f2a9dc41 2019-12-13 tracey goto done;
6429 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6430 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6431 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6432 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6433 f2a9dc41 2019-12-13 tracey goto done;
6438 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6439 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
6440 766841c2 2020-08-13 stsp repo, keep_on_disk);
6443 a129376b 2019-03-28 stsp got_repo_close(repo);
6444 a129376b 2019-03-28 stsp if (worktree)
6445 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6446 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6447 17ed4618 2019-06-02 stsp free((char *)pe->path);
6448 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6449 a129376b 2019-03-28 stsp free(cwd);
6450 a129376b 2019-03-28 stsp return error;
6453 a129376b 2019-03-28 stsp __dead static void
6454 a129376b 2019-03-28 stsp usage_revert(void)
6456 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6457 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6461 1ee397ad 2019-07-12 stsp static const struct got_error *
6462 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6464 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6465 fb9704af 2020-01-27 stsp return NULL;
6467 a129376b 2019-03-28 stsp while (path[0] == '/')
6469 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6470 33aa809d 2019-08-08 stsp return NULL;
6473 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6474 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6475 33aa809d 2019-08-08 stsp const char *action;
6478 33aa809d 2019-08-08 stsp static const struct got_error *
6479 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6480 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6482 33aa809d 2019-08-08 stsp char *line = NULL;
6483 33aa809d 2019-08-08 stsp size_t linesize = 0;
6484 33aa809d 2019-08-08 stsp ssize_t linelen;
6486 33aa809d 2019-08-08 stsp switch (status) {
6487 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6488 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6490 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6491 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6493 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6494 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6495 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6496 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6497 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6498 33aa809d 2019-08-08 stsp printf("%s", line);
6499 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6500 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6501 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6502 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6503 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6506 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6509 33aa809d 2019-08-08 stsp return NULL;
6512 33aa809d 2019-08-08 stsp static const struct got_error *
6513 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6514 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6516 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6517 33aa809d 2019-08-08 stsp char *line = NULL;
6518 33aa809d 2019-08-08 stsp size_t linesize = 0;
6519 33aa809d 2019-08-08 stsp ssize_t linelen;
6520 33aa809d 2019-08-08 stsp int resp = ' ';
6521 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6523 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6525 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6527 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6528 33aa809d 2019-08-08 stsp a->action);
6530 33aa809d 2019-08-08 stsp return err;
6531 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6532 33aa809d 2019-08-08 stsp if (linelen == -1) {
6533 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6534 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6535 33aa809d 2019-08-08 stsp return NULL;
6537 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6539 33aa809d 2019-08-08 stsp *nl = '\0';
6540 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6541 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6542 33aa809d 2019-08-08 stsp printf("y\n");
6543 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6544 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6545 33aa809d 2019-08-08 stsp printf("n\n");
6546 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6547 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6548 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6549 33aa809d 2019-08-08 stsp printf("q\n");
6551 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6552 33aa809d 2019-08-08 stsp free(line);
6553 33aa809d 2019-08-08 stsp return NULL;
6556 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6557 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6558 33aa809d 2019-08-08 stsp a->action);
6560 33aa809d 2019-08-08 stsp return err;
6561 33aa809d 2019-08-08 stsp resp = getchar();
6562 33aa809d 2019-08-08 stsp if (resp == '\n')
6563 33aa809d 2019-08-08 stsp resp = getchar();
6564 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6565 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6566 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6567 33aa809d 2019-08-08 stsp resp = ' ';
6569 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6570 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6571 33aa809d 2019-08-08 stsp resp = ' ';
6575 33aa809d 2019-08-08 stsp if (resp == 'y')
6576 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6577 33aa809d 2019-08-08 stsp else if (resp == 'n')
6578 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6579 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6580 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6582 1ee397ad 2019-07-12 stsp return NULL;
6586 a129376b 2019-03-28 stsp static const struct got_error *
6587 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6589 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6590 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6591 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6592 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6593 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6594 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6595 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6596 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6597 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6598 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6600 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6602 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6603 a129376b 2019-03-28 stsp switch (ch) {
6605 33aa809d 2019-08-08 stsp pflag = 1;
6608 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6611 0f6d7415 2019-08-08 stsp can_recurse = 1;
6614 a129376b 2019-03-28 stsp usage_revert();
6615 a129376b 2019-03-28 stsp /* NOTREACHED */
6619 a129376b 2019-03-28 stsp argc -= optind;
6620 a129376b 2019-03-28 stsp argv += optind;
6622 43012d58 2019-07-14 stsp #ifndef PROFILE
6623 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6624 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6625 43012d58 2019-07-14 stsp err(1, "pledge");
6627 e20a8b6f 2019-06-04 stsp if (argc < 1)
6628 a129376b 2019-03-28 stsp usage_revert();
6629 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6630 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6632 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6633 a129376b 2019-03-28 stsp if (cwd == NULL) {
6634 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6635 a129376b 2019-03-28 stsp goto done;
6637 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6638 fa51e947 2020-03-27 stsp if (error) {
6639 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6640 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6641 2ec1f75b 2019-03-26 stsp goto done;
6644 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6646 a129376b 2019-03-28 stsp if (error != NULL)
6647 a129376b 2019-03-28 stsp goto done;
6649 33aa809d 2019-08-08 stsp if (patch_script_path) {
6650 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6651 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6652 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6653 33aa809d 2019-08-08 stsp patch_script_path);
6654 33aa809d 2019-08-08 stsp goto done;
6657 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6658 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6659 a129376b 2019-03-28 stsp if (error)
6660 a129376b 2019-03-28 stsp goto done;
6662 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6663 6d022e97 2019-08-04 stsp if (error)
6664 6d022e97 2019-08-04 stsp goto done;
6666 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6667 0f6d7415 2019-08-08 stsp char *ondisk_path;
6668 0f6d7415 2019-08-08 stsp struct stat sb;
6669 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6670 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6671 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6672 62d463ca 2020-10-20 naddy pe->path) == -1) {
6673 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6674 0f6d7415 2019-08-08 stsp goto done;
6676 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6677 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6678 0f6d7415 2019-08-08 stsp free(ondisk_path);
6681 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6682 0f6d7415 2019-08-08 stsp ondisk_path);
6683 0f6d7415 2019-08-08 stsp free(ondisk_path);
6684 0f6d7415 2019-08-08 stsp goto done;
6686 0f6d7415 2019-08-08 stsp free(ondisk_path);
6687 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6688 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6689 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6690 0f6d7415 2019-08-08 stsp goto done;
6695 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6696 33aa809d 2019-08-08 stsp cpa.action = "revert";
6697 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6698 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6700 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6701 33aa809d 2019-08-08 stsp error == NULL)
6702 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6704 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6705 2ec1f75b 2019-03-26 stsp if (worktree)
6706 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6707 2ec1f75b 2019-03-26 stsp free(path);
6708 d00136be 2019-03-26 stsp free(cwd);
6709 6bad629b 2019-02-04 stsp return error;
6712 c4296144 2019-05-09 stsp __dead static void
6713 c4296144 2019-05-09 stsp usage_commit(void)
6715 35213c7c 2020-07-23 stsp fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6716 5c1e53bc 2019-07-28 stsp getprogname());
6720 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6721 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6722 e2ba3d07 2019-05-13 stsp const char *editor;
6723 e0870e44 2019-05-13 stsp const char *worktree_path;
6724 76d98825 2019-06-03 stsp const char *branch_name;
6725 314a6357 2019-05-13 stsp const char *repo_path;
6726 e0870e44 2019-05-13 stsp char *logmsg_path;
6730 33ad4cbe 2019-05-12 jcs static const struct got_error *
6731 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6734 76d98825 2019-06-03 stsp char *initial_content = NULL;
6735 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6736 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6737 e0870e44 2019-05-13 stsp char *template = NULL;
6738 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6739 1601cb9f 2020-09-11 naddy int initial_content_len;
6740 97972933 2020-09-11 stsp int fd = -1;
6741 33ad4cbe 2019-05-12 jcs size_t len;
6743 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6744 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6745 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6746 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6747 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6748 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6749 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6750 33ad4cbe 2019-05-12 jcs return NULL;
6753 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6754 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6756 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6757 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6758 1601cb9f 2020-09-11 naddy a->branch_name);
6759 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
6760 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6762 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6764 e0870e44 2019-05-13 stsp goto done;
6766 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6767 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
6768 97972933 2020-09-11 stsp goto done;
6771 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6772 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6773 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6774 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6775 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6778 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6779 bfa12d5e 2020-09-26 stsp initial_content_len);
6781 76d98825 2019-06-03 stsp free(initial_content);
6782 e0870e44 2019-05-13 stsp free(template);
6784 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6785 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
6787 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6788 59f86c76 2020-09-11 stsp if (err == NULL)
6789 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6790 59f86c76 2020-09-11 stsp if (err) {
6791 59f86c76 2020-09-11 stsp free(*logmsg);
6792 59f86c76 2020-09-11 stsp *logmsg = NULL;
6794 33ad4cbe 2019-05-12 jcs return err;
6797 c4296144 2019-05-09 stsp static const struct got_error *
6798 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6800 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6801 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6802 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6803 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6804 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6805 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6806 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6807 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6808 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6809 35213c7c 2020-07-23 stsp int allow_bad_symlinks = 0;
6810 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6812 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6813 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6815 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "m:S")) != -1) {
6816 c4296144 2019-05-09 stsp switch (ch) {
6818 c4296144 2019-05-09 stsp logmsg = optarg;
6821 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
6824 c4296144 2019-05-09 stsp usage_commit();
6825 c4296144 2019-05-09 stsp /* NOTREACHED */
6829 c4296144 2019-05-09 stsp argc -= optind;
6830 c4296144 2019-05-09 stsp argv += optind;
6832 43012d58 2019-07-14 stsp #ifndef PROFILE
6833 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6834 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6835 43012d58 2019-07-14 stsp err(1, "pledge");
6837 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6838 c4296144 2019-05-09 stsp if (cwd == NULL) {
6839 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6840 c4296144 2019-05-09 stsp goto done;
6842 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6843 fa51e947 2020-03-27 stsp if (error) {
6844 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6845 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6846 7d5807f4 2019-07-11 stsp goto done;
6849 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6850 c4296144 2019-05-09 stsp if (error)
6851 a698f62e 2019-07-25 stsp goto done;
6852 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6853 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6854 c4296144 2019-05-09 stsp goto done;
6857 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6858 916f288c 2019-07-30 stsp worktree);
6859 5c1e53bc 2019-07-28 stsp if (error)
6860 5c1e53bc 2019-07-28 stsp goto done;
6862 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6863 c9956ddf 2019-09-08 stsp if (error)
6864 c9956ddf 2019-09-08 stsp goto done;
6865 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6866 c9956ddf 2019-09-08 stsp gitconfig_path);
6867 c4296144 2019-05-09 stsp if (error != NULL)
6868 c4296144 2019-05-09 stsp goto done;
6870 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
6871 aba9c984 2019-09-08 stsp if (error)
6872 aba9c984 2019-09-08 stsp return error;
6875 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6876 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6878 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6879 314a6357 2019-05-13 stsp error = get_editor(&editor);
6881 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6882 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6883 c4296144 2019-05-09 stsp if (error)
6884 c4296144 2019-05-09 stsp goto done;
6886 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6887 087fb88c 2019-08-04 stsp if (error)
6888 087fb88c 2019-08-04 stsp goto done;
6890 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6891 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6892 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6893 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6894 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6895 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6896 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6897 916f288c 2019-07-30 stsp goto done;
6899 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6901 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6902 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6903 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6904 35213c7c 2020-07-23 stsp print_status, NULL, repo);
6905 e0870e44 2019-05-13 stsp if (error) {
6906 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6907 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6908 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6909 c4296144 2019-05-09 stsp goto done;
6912 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6913 c4296144 2019-05-09 stsp if (error)
6914 c4296144 2019-05-09 stsp goto done;
6915 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6917 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6918 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6919 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6920 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6921 7266f21f 2019-10-21 stsp error == NULL)
6922 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6923 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6925 c4296144 2019-05-09 stsp got_repo_close(repo);
6926 c4296144 2019-05-09 stsp if (worktree)
6927 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6928 c4296144 2019-05-09 stsp free(cwd);
6929 c4296144 2019-05-09 stsp free(id_str);
6930 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6931 e2ba3d07 2019-05-13 stsp free(editor);
6932 aba9c984 2019-09-08 stsp free(author);
6933 234035bc 2019-06-01 stsp return error;
6936 234035bc 2019-06-01 stsp __dead static void
6937 234035bc 2019-06-01 stsp usage_cherrypick(void)
6939 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6943 234035bc 2019-06-01 stsp static const struct got_error *
6944 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6946 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6947 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6948 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6949 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6950 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6951 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6952 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6953 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6955 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6957 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6958 234035bc 2019-06-01 stsp switch (ch) {
6960 234035bc 2019-06-01 stsp usage_cherrypick();
6961 234035bc 2019-06-01 stsp /* NOTREACHED */
6965 234035bc 2019-06-01 stsp argc -= optind;
6966 234035bc 2019-06-01 stsp argv += optind;
6968 43012d58 2019-07-14 stsp #ifndef PROFILE
6969 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6970 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6971 43012d58 2019-07-14 stsp err(1, "pledge");
6973 234035bc 2019-06-01 stsp if (argc != 1)
6974 234035bc 2019-06-01 stsp usage_cherrypick();
6976 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6977 234035bc 2019-06-01 stsp if (cwd == NULL) {
6978 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6979 234035bc 2019-06-01 stsp goto done;
6981 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6982 fa51e947 2020-03-27 stsp if (error) {
6983 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6984 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6986 234035bc 2019-06-01 stsp goto done;
6989 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6991 234035bc 2019-06-01 stsp if (error != NULL)
6992 234035bc 2019-06-01 stsp goto done;
6994 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6995 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6996 234035bc 2019-06-01 stsp if (error)
6997 234035bc 2019-06-01 stsp goto done;
6999 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7000 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7001 234035bc 2019-06-01 stsp if (error != NULL) {
7002 234035bc 2019-06-01 stsp struct got_reference *ref;
7003 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7004 234035bc 2019-06-01 stsp goto done;
7005 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7006 234035bc 2019-06-01 stsp if (error != NULL)
7007 234035bc 2019-06-01 stsp goto done;
7008 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
7009 234035bc 2019-06-01 stsp got_ref_close(ref);
7010 234035bc 2019-06-01 stsp if (error != NULL)
7011 234035bc 2019-06-01 stsp goto done;
7013 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
7014 234035bc 2019-06-01 stsp if (error)
7015 234035bc 2019-06-01 stsp goto done;
7017 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
7018 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
7019 234035bc 2019-06-01 stsp if (error != NULL)
7020 234035bc 2019-06-01 stsp goto done;
7022 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7023 234035bc 2019-06-01 stsp if (error) {
7024 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
7025 234035bc 2019-06-01 stsp goto done;
7026 234035bc 2019-06-01 stsp error = NULL;
7028 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
7029 234035bc 2019-06-01 stsp goto done;
7032 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7033 234035bc 2019-06-01 stsp if (error)
7034 234035bc 2019-06-01 stsp goto done;
7035 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7036 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7037 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7038 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
7040 234035bc 2019-06-01 stsp if (error != NULL)
7041 234035bc 2019-06-01 stsp goto done;
7043 9627c110 2020-04-18 stsp if (upa.did_something)
7044 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
7045 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7047 234035bc 2019-06-01 stsp if (commit)
7048 234035bc 2019-06-01 stsp got_object_commit_close(commit);
7049 234035bc 2019-06-01 stsp free(commit_id_str);
7050 234035bc 2019-06-01 stsp if (head_ref)
7051 234035bc 2019-06-01 stsp got_ref_close(head_ref);
7052 234035bc 2019-06-01 stsp if (worktree)
7053 234035bc 2019-06-01 stsp got_worktree_close(worktree);
7055 234035bc 2019-06-01 stsp got_repo_close(repo);
7056 c4296144 2019-05-09 stsp return error;
7059 5ef14e63 2019-06-02 stsp __dead static void
7060 5ef14e63 2019-06-02 stsp usage_backout(void)
7062 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7066 5ef14e63 2019-06-02 stsp static const struct got_error *
7067 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
7069 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
7070 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
7071 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
7072 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
7073 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
7074 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
7075 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
7076 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
7078 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7080 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7081 5ef14e63 2019-06-02 stsp switch (ch) {
7083 5ef14e63 2019-06-02 stsp usage_backout();
7084 5ef14e63 2019-06-02 stsp /* NOTREACHED */
7088 5ef14e63 2019-06-02 stsp argc -= optind;
7089 5ef14e63 2019-06-02 stsp argv += optind;
7091 43012d58 2019-07-14 stsp #ifndef PROFILE
7092 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7093 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7094 43012d58 2019-07-14 stsp err(1, "pledge");
7096 5ef14e63 2019-06-02 stsp if (argc != 1)
7097 5ef14e63 2019-06-02 stsp usage_backout();
7099 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
7100 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
7101 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
7102 5ef14e63 2019-06-02 stsp goto done;
7104 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
7105 fa51e947 2020-03-27 stsp if (error) {
7106 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7107 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
7108 5ef14e63 2019-06-02 stsp goto done;
7111 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7113 5ef14e63 2019-06-02 stsp if (error != NULL)
7114 5ef14e63 2019-06-02 stsp goto done;
7116 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7117 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7118 5ef14e63 2019-06-02 stsp if (error)
7119 5ef14e63 2019-06-02 stsp goto done;
7121 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7122 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7123 5ef14e63 2019-06-02 stsp if (error != NULL) {
7124 5ef14e63 2019-06-02 stsp struct got_reference *ref;
7125 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7126 5ef14e63 2019-06-02 stsp goto done;
7127 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7128 5ef14e63 2019-06-02 stsp if (error != NULL)
7129 5ef14e63 2019-06-02 stsp goto done;
7130 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
7131 5ef14e63 2019-06-02 stsp got_ref_close(ref);
7132 5ef14e63 2019-06-02 stsp if (error != NULL)
7133 5ef14e63 2019-06-02 stsp goto done;
7135 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
7136 5ef14e63 2019-06-02 stsp if (error)
7137 5ef14e63 2019-06-02 stsp goto done;
7139 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
7140 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
7141 5ef14e63 2019-06-02 stsp if (error != NULL)
7142 5ef14e63 2019-06-02 stsp goto done;
7144 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7145 5ef14e63 2019-06-02 stsp if (error)
7146 5ef14e63 2019-06-02 stsp goto done;
7148 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7149 5ef14e63 2019-06-02 stsp if (error)
7150 5ef14e63 2019-06-02 stsp goto done;
7151 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7152 5ef14e63 2019-06-02 stsp if (pid == NULL) {
7153 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
7154 5ef14e63 2019-06-02 stsp goto done;
7157 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7158 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7159 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7160 5ef14e63 2019-06-02 stsp if (error != NULL)
7161 5ef14e63 2019-06-02 stsp goto done;
7163 9627c110 2020-04-18 stsp if (upa.did_something)
7164 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
7165 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7167 5ef14e63 2019-06-02 stsp if (commit)
7168 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
7169 5ef14e63 2019-06-02 stsp free(commit_id_str);
7170 5ef14e63 2019-06-02 stsp if (head_ref)
7171 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
7172 818c7501 2019-07-11 stsp if (worktree)
7173 818c7501 2019-07-11 stsp got_worktree_close(worktree);
7175 818c7501 2019-07-11 stsp got_repo_close(repo);
7176 818c7501 2019-07-11 stsp return error;
7179 818c7501 2019-07-11 stsp __dead static void
7180 818c7501 2019-07-11 stsp usage_rebase(void)
7182 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7183 af54c8f8 2019-07-11 stsp getprogname());
7188 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
7191 0ebf8283 2019-07-24 stsp size_t len;
7193 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
7194 0ebf8283 2019-07-24 stsp if (len > limit)
7195 0ebf8283 2019-07-24 stsp len = limit;
7196 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
7197 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
7199 0ebf8283 2019-07-24 stsp *nl = '\0';
7202 0ebf8283 2019-07-24 stsp static const struct got_error *
7203 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7205 5943eee2 2019-08-13 stsp const struct got_error *err;
7206 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
7207 5943eee2 2019-08-13 stsp const char *s;
7209 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
7211 5943eee2 2019-08-13 stsp return err;
7213 5943eee2 2019-08-13 stsp s = logmsg0;
7214 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
7217 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
7218 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
7219 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
7220 5943eee2 2019-08-13 stsp goto done;
7223 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
7225 5943eee2 2019-08-13 stsp free(logmsg0);
7226 a0ea4fc0 2020-02-28 stsp return err;
7229 a0ea4fc0 2020-02-28 stsp static const struct got_error *
7230 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7232 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
7233 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
7234 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
7236 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
7238 a0ea4fc0 2020-02-28 stsp return err;
7240 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
7242 a0ea4fc0 2020-02-28 stsp goto done;
7244 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
7246 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
7248 a0ea4fc0 2020-02-28 stsp goto done;
7250 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
7252 a0ea4fc0 2020-02-28 stsp free(id_str);
7253 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
7254 a0ea4fc0 2020-02-28 stsp free(logmsg);
7255 5943eee2 2019-08-13 stsp return err;
7258 818c7501 2019-07-11 stsp static const struct got_error *
7259 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
7260 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
7262 818c7501 2019-07-11 stsp const struct got_error *err;
7263 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7265 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
7267 818c7501 2019-07-11 stsp goto done;
7269 ff0d2220 2019-07-11 stsp if (new_id) {
7270 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
7272 ff0d2220 2019-07-11 stsp goto done;
7275 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
7276 ff0d2220 2019-07-11 stsp if (new_id_str)
7277 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
7279 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7281 0ebf8283 2019-07-24 stsp goto done;
7283 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
7284 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7286 818c7501 2019-07-11 stsp free(old_id_str);
7287 818c7501 2019-07-11 stsp free(new_id_str);
7288 272a1371 2020-02-28 stsp free(logmsg);
7289 818c7501 2019-07-11 stsp return err;
7292 1ee397ad 2019-07-12 stsp static const struct got_error *
7293 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7294 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
7295 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
7297 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
7298 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
7299 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
7302 818c7501 2019-07-11 stsp static const struct got_error *
7303 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
7304 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7305 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
7306 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7308 ff0d2220 2019-07-11 stsp const struct got_error *error;
7309 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
7310 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
7312 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7313 ff0d2220 2019-07-11 stsp if (error)
7314 ff0d2220 2019-07-11 stsp return error;
7316 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7317 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
7318 ff0d2220 2019-07-11 stsp if (error) {
7319 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7320 ff0d2220 2019-07-11 stsp goto done;
7321 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
7323 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
7324 ff0d2220 2019-07-11 stsp free(new_commit_id);
7327 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
7328 ff0d2220 2019-07-11 stsp return error;
7331 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
7332 64c6d990 2019-07-11 stsp const char *path_prefix;
7333 64c6d990 2019-07-11 stsp size_t len;
7334 8ca9bd68 2019-07-25 stsp int errcode;
7337 64c6d990 2019-07-11 stsp static const struct got_error *
7338 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7339 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
7340 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
7341 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
7343 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
7345 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7346 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7347 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
7349 64c6d990 2019-07-11 stsp return NULL;
7352 64c6d990 2019-07-11 stsp static const struct got_error *
7353 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
7354 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
7355 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
7357 64c6d990 2019-07-11 stsp const struct got_error *err;
7358 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7359 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
7360 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
7362 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
7363 64c6d990 2019-07-11 stsp return NULL;
7365 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7367 64c6d990 2019-07-11 stsp goto done;
7369 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7371 64c6d990 2019-07-11 stsp goto done;
7373 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
7374 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
7376 64c6d990 2019-07-11 stsp goto done;
7378 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
7379 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
7381 64c6d990 2019-07-11 stsp goto done;
7383 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
7384 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
7385 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
7386 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
7387 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
7388 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
7389 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
7391 64c6d990 2019-07-11 stsp if (tree1)
7392 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
7393 64c6d990 2019-07-11 stsp if (tree2)
7394 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
7395 64c6d990 2019-07-11 stsp if (commit)
7396 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
7397 64c6d990 2019-07-11 stsp if (parent_commit)
7398 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
7399 64c6d990 2019-07-11 stsp return err;
7402 ff0d2220 2019-07-11 stsp static const struct got_error *
7403 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
7404 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
7405 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7406 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
7407 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
7409 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
7410 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
7411 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
7412 af61c510 2019-07-19 stsp struct got_object_qid *qid;
7413 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
7415 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
7417 af61c510 2019-07-19 stsp return err;
7419 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7420 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7422 af61c510 2019-07-19 stsp goto done;
7423 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7424 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
7425 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
7426 af61c510 2019-07-19 stsp if (err) {
7427 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7428 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7429 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7430 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7431 af61c510 2019-07-19 stsp "been reached?!?");
7433 ee780d5c 2020-01-04 stsp goto done;
7435 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7436 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7438 af61c510 2019-07-19 stsp goto done;
7440 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7442 af61c510 2019-07-19 stsp goto done;
7443 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7444 af61c510 2019-07-19 stsp commit_id = parent_id;
7448 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7449 af61c510 2019-07-19 stsp return err;
7452 af61c510 2019-07-19 stsp static const struct got_error *
7453 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7455 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7456 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7457 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7458 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7459 818c7501 2019-07-11 stsp char *cwd = NULL;
7460 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7461 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7462 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7463 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7464 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7465 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7466 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7467 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7468 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7469 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7470 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7471 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7472 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7474 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7475 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7477 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7478 818c7501 2019-07-11 stsp switch (ch) {
7480 818c7501 2019-07-11 stsp abort_rebase = 1;
7483 818c7501 2019-07-11 stsp continue_rebase = 1;
7486 818c7501 2019-07-11 stsp usage_rebase();
7487 818c7501 2019-07-11 stsp /* NOTREACHED */
7491 818c7501 2019-07-11 stsp argc -= optind;
7492 818c7501 2019-07-11 stsp argv += optind;
7494 43012d58 2019-07-14 stsp #ifndef PROFILE
7495 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7496 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7497 43012d58 2019-07-14 stsp err(1, "pledge");
7499 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7500 818c7501 2019-07-11 stsp usage_rebase();
7501 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7502 818c7501 2019-07-11 stsp if (argc != 0)
7503 818c7501 2019-07-11 stsp usage_rebase();
7504 818c7501 2019-07-11 stsp } else if (argc != 1)
7505 818c7501 2019-07-11 stsp usage_rebase();
7507 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7508 818c7501 2019-07-11 stsp if (cwd == NULL) {
7509 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7510 818c7501 2019-07-11 stsp goto done;
7512 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7513 fa51e947 2020-03-27 stsp if (error) {
7514 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7515 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7516 818c7501 2019-07-11 stsp goto done;
7519 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7521 818c7501 2019-07-11 stsp if (error != NULL)
7522 818c7501 2019-07-11 stsp goto done;
7524 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7525 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7526 7ef62c4e 2020-02-24 stsp if (error)
7527 7ef62c4e 2020-02-24 stsp goto done;
7529 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7530 7ef62c4e 2020-02-24 stsp worktree);
7531 818c7501 2019-07-11 stsp if (error)
7532 7ef62c4e 2020-02-24 stsp goto done;
7533 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7534 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7535 818c7501 2019-07-11 stsp goto done;
7538 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7539 818c7501 2019-07-11 stsp if (error)
7540 818c7501 2019-07-11 stsp goto done;
7542 f6794adc 2019-07-23 stsp if (abort_rebase) {
7543 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7544 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7545 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7546 f6794adc 2019-07-23 stsp goto done;
7548 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7549 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7550 3e3a69f1 2019-07-25 stsp worktree, repo);
7551 818c7501 2019-07-11 stsp if (error)
7552 818c7501 2019-07-11 stsp goto done;
7553 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7554 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7555 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7556 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7557 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7558 818c7501 2019-07-11 stsp if (error)
7559 818c7501 2019-07-11 stsp goto done;
7560 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7561 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7562 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7565 818c7501 2019-07-11 stsp if (continue_rebase) {
7566 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7567 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7568 f6794adc 2019-07-23 stsp goto done;
7570 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7571 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7572 3e3a69f1 2019-07-25 stsp worktree, repo);
7573 818c7501 2019-07-11 stsp if (error)
7574 818c7501 2019-07-11 stsp goto done;
7576 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7577 01757395 2019-07-12 stsp resume_commit_id, repo);
7578 818c7501 2019-07-11 stsp if (error)
7579 818c7501 2019-07-11 stsp goto done;
7581 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7582 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7583 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7584 818c7501 2019-07-11 stsp goto done;
7587 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7588 818c7501 2019-07-11 stsp if (error != NULL)
7589 818c7501 2019-07-11 stsp goto done;
7592 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7593 ff0d2220 2019-07-11 stsp if (error)
7594 ff0d2220 2019-07-11 stsp goto done;
7596 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7597 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7599 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7600 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7601 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7602 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7603 818c7501 2019-07-11 stsp if (error)
7604 818c7501 2019-07-11 stsp goto done;
7605 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7606 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7607 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7608 818c7501 2019-07-11 stsp "with work tree's branch");
7609 818c7501 2019-07-11 stsp goto done;
7612 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7613 a51a74b3 2019-07-27 stsp if (error) {
7614 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7615 a51a74b3 2019-07-27 stsp goto done;
7616 a51a74b3 2019-07-27 stsp error = NULL;
7618 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7619 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7620 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7621 a51a74b3 2019-07-27 stsp goto done;
7623 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7624 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7625 818c7501 2019-07-11 stsp if (error)
7626 818c7501 2019-07-11 stsp goto done;
7629 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7630 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7631 818c7501 2019-07-11 stsp if (error)
7632 818c7501 2019-07-11 stsp goto done;
7634 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7635 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7636 fc66b545 2019-08-12 stsp if (pid == NULL) {
7637 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7638 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7639 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7640 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7641 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7642 fc66b545 2019-08-12 stsp if (error)
7643 fc66b545 2019-08-12 stsp goto done;
7644 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7645 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7646 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7649 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7650 fc66b545 2019-08-12 stsp goto done;
7652 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7653 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7654 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7655 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7656 818c7501 2019-07-11 stsp commit = NULL;
7657 818c7501 2019-07-11 stsp if (error)
7658 818c7501 2019-07-11 stsp goto done;
7660 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7661 38b0338b 2019-11-29 stsp if (continue_rebase) {
7662 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7663 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7664 38b0338b 2019-11-29 stsp goto done;
7666 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7667 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7668 38b0338b 2019-11-29 stsp char *id_str;
7669 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7670 38b0338b 2019-11-29 stsp new_base_branch);
7671 38b0338b 2019-11-29 stsp if (error)
7672 38b0338b 2019-11-29 stsp goto done;
7673 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7674 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7675 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7676 38b0338b 2019-11-29 stsp free(id_str);
7677 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7678 38b0338b 2019-11-29 stsp new_head_commit_id);
7679 38b0338b 2019-11-29 stsp if (error)
7680 38b0338b 2019-11-29 stsp goto done;
7684 818c7501 2019-07-11 stsp pid = NULL;
7685 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7686 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7688 818c7501 2019-07-11 stsp commit_id = qid->id;
7689 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7690 818c7501 2019-07-11 stsp pid = qid;
7692 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7693 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7694 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7695 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7696 818c7501 2019-07-11 stsp if (error)
7697 818c7501 2019-07-11 stsp goto done;
7699 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7700 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7701 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7703 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7704 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7705 a0ea4fc0 2020-02-28 stsp if (error)
7706 a0ea4fc0 2020-02-28 stsp goto done;
7707 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7711 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7712 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7713 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7714 818c7501 2019-07-11 stsp if (error)
7715 818c7501 2019-07-11 stsp goto done;
7718 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7719 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7720 818c7501 2019-07-11 stsp if (error)
7721 818c7501 2019-07-11 stsp goto done;
7722 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7723 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7725 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7726 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7728 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7729 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7730 818c7501 2019-07-11 stsp free(resume_commit_id);
7731 818c7501 2019-07-11 stsp free(yca_id);
7732 818c7501 2019-07-11 stsp if (commit)
7733 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7734 818c7501 2019-07-11 stsp if (branch)
7735 818c7501 2019-07-11 stsp got_ref_close(branch);
7736 818c7501 2019-07-11 stsp if (new_base_branch)
7737 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7738 818c7501 2019-07-11 stsp if (tmp_branch)
7739 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7740 5ef14e63 2019-06-02 stsp if (worktree)
7741 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7743 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7744 5ef14e63 2019-06-02 stsp return error;
7747 0ebf8283 2019-07-24 stsp __dead static void
7748 0ebf8283 2019-07-24 stsp usage_histedit(void)
7750 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7751 0ebf8283 2019-07-24 stsp getprogname());
7755 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7756 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7757 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7758 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7759 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7761 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7762 0ebf8283 2019-07-24 stsp unsigned char code;
7763 0ebf8283 2019-07-24 stsp const char *name;
7764 0ebf8283 2019-07-24 stsp const char *desc;
7765 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7766 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7767 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7768 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7769 82997472 2020-01-29 stsp "be used" },
7770 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7771 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7772 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7775 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7776 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7777 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7778 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7779 0ebf8283 2019-07-24 stsp char *logmsg;
7781 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7783 0ebf8283 2019-07-24 stsp static const struct got_error *
7784 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7785 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7787 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7788 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7789 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7792 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7794 0ebf8283 2019-07-24 stsp goto done;
7796 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7798 0ebf8283 2019-07-24 stsp goto done;
7800 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7802 0ebf8283 2019-07-24 stsp goto done;
7804 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7805 0ebf8283 2019-07-24 stsp if (n < 0)
7806 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7808 0ebf8283 2019-07-24 stsp if (commit)
7809 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7810 0ebf8283 2019-07-24 stsp free(id_str);
7811 0ebf8283 2019-07-24 stsp free(logmsg);
7812 0ebf8283 2019-07-24 stsp return err;
7815 0ebf8283 2019-07-24 stsp static const struct got_error *
7816 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7817 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7819 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7820 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7822 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7823 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7825 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7826 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7830 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7831 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7832 083957f4 2020-02-24 stsp if (n < 0) {
7833 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7839 0ebf8283 2019-07-24 stsp return err;
7842 0ebf8283 2019-07-24 stsp static const struct got_error *
7843 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7844 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7846 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7848 514f2ffe 2020-01-29 stsp char *id_str;
7849 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7851 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7852 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7854 514f2ffe 2020-01-29 stsp return err;
7856 514f2ffe 2020-01-29 stsp n = fprintf(f,
7857 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7858 514f2ffe 2020-01-29 stsp "# commit %s\n"
7859 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7860 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7861 514f2ffe 2020-01-29 stsp if (n < 0) {
7862 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7863 514f2ffe 2020-01-29 stsp goto done;
7866 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7867 514f2ffe 2020-01-29 stsp if (n < 0) {
7868 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7869 514f2ffe 2020-01-29 stsp goto done;
7872 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7873 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7874 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7875 0ebf8283 2019-07-24 stsp cmd->desc);
7876 0ebf8283 2019-07-24 stsp if (n < 0) {
7877 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7882 514f2ffe 2020-01-29 stsp free(id_str);
7883 0ebf8283 2019-07-24 stsp return err;
7886 0ebf8283 2019-07-24 stsp static const struct got_error *
7887 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7889 0ebf8283 2019-07-24 stsp static char msg[42];
7892 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7894 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7895 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7897 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7900 0ebf8283 2019-07-24 stsp static const struct got_error *
7901 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7902 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7904 0ebf8283 2019-07-24 stsp const struct got_error *err;
7905 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7906 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7908 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7910 0ebf8283 2019-07-24 stsp return err;
7912 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7914 0ebf8283 2019-07-24 stsp goto done;
7916 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7918 5943eee2 2019-08-13 stsp goto done;
7919 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7920 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7921 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7922 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7925 0ebf8283 2019-07-24 stsp if (folded_commit)
7926 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7927 0ebf8283 2019-07-24 stsp free(id_str);
7928 5943eee2 2019-08-13 stsp free(folded_logmsg);
7929 0ebf8283 2019-07-24 stsp return err;
7932 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7933 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7935 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7937 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7938 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7939 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7940 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7941 3f9de99f 2019-07-24 stsp folded = prev;
7942 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7945 0ebf8283 2019-07-24 stsp return folded;
7948 0ebf8283 2019-07-24 stsp static const struct got_error *
7949 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7950 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7952 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7953 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7954 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7955 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7956 1601cb9f 2020-09-11 naddy int logmsg_len;
7958 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7960 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7962 0ebf8283 2019-07-24 stsp return err;
7964 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7965 0ebf8283 2019-07-24 stsp if (folded) {
7966 0ebf8283 2019-07-24 stsp while (folded != hle) {
7967 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7968 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7971 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7972 0ebf8283 2019-07-24 stsp logmsg, repo);
7974 0ebf8283 2019-07-24 stsp goto done;
7975 0ebf8283 2019-07-24 stsp free(logmsg);
7976 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7977 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7981 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7983 0ebf8283 2019-07-24 stsp goto done;
7984 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7986 5943eee2 2019-08-13 stsp goto done;
7987 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
7988 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7989 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
7990 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
7991 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7992 0ebf8283 2019-07-24 stsp goto done;
7994 0ebf8283 2019-07-24 stsp free(logmsg);
7995 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7997 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7999 0ebf8283 2019-07-24 stsp goto done;
8001 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
8002 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
8004 0ebf8283 2019-07-24 stsp goto done;
8006 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
8007 0ebf8283 2019-07-24 stsp close(fd);
8009 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8011 0ebf8283 2019-07-24 stsp goto done;
8013 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8014 bfa12d5e 2020-09-26 stsp logmsg_len);
8015 0ebf8283 2019-07-24 stsp if (err) {
8016 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8017 0ebf8283 2019-07-24 stsp goto done;
8018 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
8021 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8022 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
8023 0ebf8283 2019-07-24 stsp free(logmsg_path);
8024 0ebf8283 2019-07-24 stsp free(logmsg);
8025 5943eee2 2019-08-13 stsp free(orig_logmsg);
8026 0ebf8283 2019-07-24 stsp free(editor);
8027 0ebf8283 2019-07-24 stsp if (commit)
8028 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8029 0ebf8283 2019-07-24 stsp return err;
8032 0ebf8283 2019-07-24 stsp static const struct got_error *
8033 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
8034 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8036 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8037 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
8038 0ebf8283 2019-07-24 stsp size_t size;
8039 0ebf8283 2019-07-24 stsp ssize_t len;
8040 0ebf8283 2019-07-24 stsp int lineno = 0, i;
8041 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8042 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
8043 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
8045 0ebf8283 2019-07-24 stsp for (;;) {
8046 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
8047 0ebf8283 2019-07-24 stsp if (len == -1) {
8048 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
8049 0ebf8283 2019-07-24 stsp if (feof(f))
8051 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
8052 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
8057 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8059 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
8060 0ebf8283 2019-07-24 stsp free(line);
8061 0ebf8283 2019-07-24 stsp line = NULL;
8064 0ebf8283 2019-07-24 stsp cmd = NULL;
8065 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8066 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
8067 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8068 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
8069 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
8072 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8077 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
8078 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8081 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8083 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
8084 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
8085 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
8088 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
8089 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8093 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
8094 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
8095 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8099 0ebf8283 2019-07-24 stsp free(line);
8100 0ebf8283 2019-07-24 stsp line = NULL;
8104 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
8106 0ebf8283 2019-07-24 stsp *end = '\0';
8108 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
8109 0ebf8283 2019-07-24 stsp if (err) {
8110 0ebf8283 2019-07-24 stsp /* override error code */
8111 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8115 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
8116 0ebf8283 2019-07-24 stsp if (hle == NULL) {
8117 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
8120 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
8121 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
8122 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
8123 0ebf8283 2019-07-24 stsp commit_id = NULL;
8124 0ebf8283 2019-07-24 stsp free(line);
8125 0ebf8283 2019-07-24 stsp line = NULL;
8126 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8129 0ebf8283 2019-07-24 stsp free(line);
8130 0ebf8283 2019-07-24 stsp free(commit_id);
8131 0ebf8283 2019-07-24 stsp return err;
8134 0ebf8283 2019-07-24 stsp static const struct got_error *
8135 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
8136 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
8138 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
8139 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
8140 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8141 5b87815e 2020-03-05 stsp static char msg[92];
8142 bfce7f83 2019-07-27 stsp char *id_str;
8144 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
8145 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8146 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
8147 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
8148 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8150 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8151 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
8152 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8153 5b87815e 2020-03-05 stsp if (hle == hle2)
8155 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
8156 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
8158 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
8160 5b87815e 2020-03-05 stsp return err;
8161 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
8162 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
8163 5b87815e 2020-03-05 stsp free(id_str);
8164 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8168 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8169 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8170 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8173 bfce7f83 2019-07-27 stsp if (hle == NULL) {
8174 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
8176 bfce7f83 2019-07-27 stsp return err;
8177 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
8178 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
8179 bfce7f83 2019-07-27 stsp free(id_str);
8180 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8184 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8185 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8186 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8187 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
8189 bfce7f83 2019-07-27 stsp return NULL;
8192 bfce7f83 2019-07-27 stsp static const struct got_error *
8193 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
8194 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
8195 bfce7f83 2019-07-27 stsp struct got_repository *repo)
8197 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8198 0ebf8283 2019-07-24 stsp char *editor;
8199 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8201 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8203 0ebf8283 2019-07-24 stsp return err;
8205 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
8206 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
8207 0ebf8283 2019-07-24 stsp goto done;
8210 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8211 0ebf8283 2019-07-24 stsp if (f == NULL) {
8212 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
8213 0ebf8283 2019-07-24 stsp goto done;
8215 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8217 bfce7f83 2019-07-27 stsp goto done;
8219 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
8221 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8222 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8223 0ebf8283 2019-07-24 stsp free(editor);
8224 0ebf8283 2019-07-24 stsp return err;
8227 0ebf8283 2019-07-24 stsp static const struct got_error *
8228 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8229 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
8230 514f2ffe 2020-01-29 stsp struct got_repository *);
8232 0ebf8283 2019-07-24 stsp static const struct got_error *
8233 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
8234 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
8235 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
8237 0ebf8283 2019-07-24 stsp const struct got_error *err;
8238 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8239 0ebf8283 2019-07-24 stsp char *path = NULL;
8241 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
8243 0ebf8283 2019-07-24 stsp return err;
8245 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
8247 0ebf8283 2019-07-24 stsp goto done;
8249 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
8251 0ebf8283 2019-07-24 stsp goto done;
8253 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
8254 083957f4 2020-02-24 stsp rewind(f);
8255 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8257 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
8258 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
8259 0ebf8283 2019-07-24 stsp goto done;
8262 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
8263 083957f4 2020-02-24 stsp if (err) {
8264 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8265 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8266 083957f4 2020-02-24 stsp goto done;
8267 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
8268 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
8272 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8273 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8274 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
8275 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
8276 0ebf8283 2019-07-24 stsp free(path);
8277 0ebf8283 2019-07-24 stsp return err;
8280 0ebf8283 2019-07-24 stsp static const struct got_error *
8281 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
8282 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8284 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8285 0ebf8283 2019-07-24 stsp char *path = NULL;
8286 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8287 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8288 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8290 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
8292 0ebf8283 2019-07-24 stsp return err;
8294 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
8295 0ebf8283 2019-07-24 stsp if (f == NULL) {
8296 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8297 0ebf8283 2019-07-24 stsp goto done;
8299 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8300 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8305 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8306 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
8307 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
8308 0ebf8283 2019-07-24 stsp if (n < 0) {
8309 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8315 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8316 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8317 0ebf8283 2019-07-24 stsp free(path);
8318 0ebf8283 2019-07-24 stsp if (commit)
8319 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8320 0ebf8283 2019-07-24 stsp return err;
8324 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
8326 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8328 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
8329 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
8330 bfce7f83 2019-07-27 stsp free(hle);
8334 0ebf8283 2019-07-24 stsp static const struct got_error *
8335 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
8336 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
8338 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8339 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8341 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8342 0ebf8283 2019-07-24 stsp if (f == NULL) {
8343 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8344 0ebf8283 2019-07-24 stsp goto done;
8347 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8349 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8350 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8351 0ebf8283 2019-07-24 stsp return err;
8354 0ebf8283 2019-07-24 stsp static const struct got_error *
8355 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8356 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
8357 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
8359 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
8360 0ebf8283 2019-07-24 stsp int resp = ' ';
8362 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
8363 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8364 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
8365 0ebf8283 2019-07-24 stsp resp = getchar();
8366 a61a4414 2019-08-07 stsp if (resp == '\n')
8367 a61a4414 2019-08-07 stsp resp = getchar();
8368 426ebf2e 2019-07-25 stsp if (resp == 'c') {
8369 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8370 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
8372 426ebf2e 2019-07-25 stsp if (err) {
8373 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8374 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8376 bfce7f83 2019-07-27 stsp prev_err = err;
8377 426ebf2e 2019-07-25 stsp resp = ' ';
8381 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
8382 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8383 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
8384 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
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 == 'a') {
8395 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8398 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
8401 0ebf8283 2019-07-24 stsp return err;
8404 0ebf8283 2019-07-24 stsp static const struct got_error *
8405 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
8406 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8407 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
8409 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8410 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8411 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8412 3e3a69f1 2019-07-25 stsp branch, repo);
8415 0ebf8283 2019-07-24 stsp static const struct got_error *
8416 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
8417 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8419 0ebf8283 2019-07-24 stsp const struct got_error *err;
8420 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8422 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
8424 0ebf8283 2019-07-24 stsp goto done;
8426 0ebf8283 2019-07-24 stsp if (new_id) {
8427 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
8429 0ebf8283 2019-07-24 stsp goto done;
8432 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8433 0ebf8283 2019-07-24 stsp if (new_id_str)
8434 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8436 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8437 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8438 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8439 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8440 0ebf8283 2019-07-24 stsp goto done;
8442 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8444 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8446 0ebf8283 2019-07-24 stsp goto done;
8449 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8450 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8451 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8452 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8453 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8455 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8456 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8457 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8464 0ebf8283 2019-07-24 stsp free(old_id_str);
8465 0ebf8283 2019-07-24 stsp free(new_id_str);
8466 0ebf8283 2019-07-24 stsp return err;
8469 0ebf8283 2019-07-24 stsp static const struct got_error *
8470 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8471 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8472 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8473 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8475 0ebf8283 2019-07-24 stsp const struct got_error *err;
8476 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8477 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8479 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8480 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8481 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8483 0ebf8283 2019-07-24 stsp return err;
8486 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8488 0ebf8283 2019-07-24 stsp return err;
8490 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8491 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8492 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8493 0ebf8283 2019-07-24 stsp if (err) {
8494 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8495 0ebf8283 2019-07-24 stsp goto done;
8496 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8498 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8499 0ebf8283 2019-07-24 stsp free(new_commit_id);
8502 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8503 0ebf8283 2019-07-24 stsp return err;
8506 0ebf8283 2019-07-24 stsp static const struct got_error *
8507 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8508 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8510 0ebf8283 2019-07-24 stsp const struct got_error *error;
8511 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8513 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8515 0ebf8283 2019-07-24 stsp if (error)
8516 0ebf8283 2019-07-24 stsp return error;
8518 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8519 0ebf8283 2019-07-24 stsp if (error)
8520 0ebf8283 2019-07-24 stsp return error;
8522 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8523 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8524 0ebf8283 2019-07-24 stsp return error;
8527 ab20a43a 2020-01-29 stsp static const struct got_error *
8528 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8529 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8530 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8531 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8533 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8535 ab20a43a 2020-01-29 stsp switch (status) {
8536 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8537 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8538 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8539 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8540 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8541 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8546 ab20a43a 2020-01-29 stsp switch (staged_status) {
8547 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8548 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8549 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8550 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8551 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8556 ab20a43a 2020-01-29 stsp return NULL;
8559 0ebf8283 2019-07-24 stsp static const struct got_error *
8560 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8562 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8563 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8564 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8565 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8566 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8567 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8568 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8569 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8570 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8571 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8572 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8573 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8574 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8575 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8576 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
8577 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8578 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8579 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8580 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8581 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8582 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8583 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8584 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8586 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8587 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8588 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8589 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8591 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8592 0ebf8283 2019-07-24 stsp switch (ch) {
8594 0ebf8283 2019-07-24 stsp abort_edit = 1;
8597 0ebf8283 2019-07-24 stsp continue_edit = 1;
8600 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8603 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8606 0ebf8283 2019-07-24 stsp usage_histedit();
8607 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8611 0ebf8283 2019-07-24 stsp argc -= optind;
8612 0ebf8283 2019-07-24 stsp argv += optind;
8614 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8615 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8616 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8617 0ebf8283 2019-07-24 stsp err(1, "pledge");
8619 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8620 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
8621 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8622 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
8623 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8624 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
8625 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8626 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
8627 0ebf8283 2019-07-24 stsp if (argc != 0)
8628 0ebf8283 2019-07-24 stsp usage_histedit();
8631 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8632 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8633 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8634 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8635 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8636 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8639 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8640 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8641 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8642 0ebf8283 2019-07-24 stsp goto done;
8644 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8645 fa51e947 2020-03-27 stsp if (error) {
8646 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8647 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8648 0ebf8283 2019-07-24 stsp goto done;
8651 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8653 0ebf8283 2019-07-24 stsp if (error != NULL)
8654 0ebf8283 2019-07-24 stsp goto done;
8656 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8657 0ebf8283 2019-07-24 stsp if (error)
8658 0ebf8283 2019-07-24 stsp goto done;
8659 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8660 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8661 0ebf8283 2019-07-24 stsp goto done;
8664 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8665 0ebf8283 2019-07-24 stsp if (error)
8666 0ebf8283 2019-07-24 stsp goto done;
8668 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8669 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8670 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8671 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8672 083957f4 2020-02-24 stsp "before the -m option can be used");
8673 083957f4 2020-02-24 stsp goto done;
8676 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8677 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8678 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8679 3e3a69f1 2019-07-25 stsp worktree, repo);
8680 0ebf8283 2019-07-24 stsp if (error)
8681 0ebf8283 2019-07-24 stsp goto done;
8682 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8683 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8684 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8685 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8686 0ebf8283 2019-07-24 stsp if (error)
8687 0ebf8283 2019-07-24 stsp goto done;
8688 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8689 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8690 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8691 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8692 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8693 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8694 0ebf8283 2019-07-24 stsp goto done;
8697 0ebf8283 2019-07-24 stsp if (continue_edit) {
8698 0ebf8283 2019-07-24 stsp char *path;
8700 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8701 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8702 0ebf8283 2019-07-24 stsp goto done;
8705 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8706 0ebf8283 2019-07-24 stsp if (error)
8707 0ebf8283 2019-07-24 stsp goto done;
8709 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8710 0ebf8283 2019-07-24 stsp free(path);
8711 0ebf8283 2019-07-24 stsp if (error)
8712 0ebf8283 2019-07-24 stsp goto done;
8714 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8715 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8716 3e3a69f1 2019-07-25 stsp worktree, repo);
8717 0ebf8283 2019-07-24 stsp if (error)
8718 0ebf8283 2019-07-24 stsp goto done;
8720 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8721 0ebf8283 2019-07-24 stsp if (error)
8722 0ebf8283 2019-07-24 stsp goto done;
8724 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8725 0ebf8283 2019-07-24 stsp head_commit_id);
8726 0ebf8283 2019-07-24 stsp if (error)
8727 0ebf8283 2019-07-24 stsp goto done;
8728 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8729 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8730 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8731 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8732 3aac7cf7 2019-07-25 stsp goto done;
8734 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8735 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8736 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8737 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8738 0ebf8283 2019-07-24 stsp commit = NULL;
8739 0ebf8283 2019-07-24 stsp if (error)
8740 0ebf8283 2019-07-24 stsp goto done;
8742 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8743 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8744 0ebf8283 2019-07-24 stsp goto done;
8747 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8748 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8749 0ebf8283 2019-07-24 stsp if (error != NULL)
8750 0ebf8283 2019-07-24 stsp goto done;
8752 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8753 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8754 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8755 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8756 c7d20a3f 2019-07-30 stsp goto done;
8759 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8760 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8761 bfce7f83 2019-07-27 stsp branch = NULL;
8762 0ebf8283 2019-07-24 stsp if (error)
8763 0ebf8283 2019-07-24 stsp goto done;
8765 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8766 0ebf8283 2019-07-24 stsp head_commit_id);
8767 0ebf8283 2019-07-24 stsp if (error)
8768 0ebf8283 2019-07-24 stsp goto done;
8769 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8770 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8771 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8772 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8773 3aac7cf7 2019-07-25 stsp goto done;
8775 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8776 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8777 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8778 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8779 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8780 0ebf8283 2019-07-24 stsp commit = NULL;
8781 0ebf8283 2019-07-24 stsp if (error)
8782 0ebf8283 2019-07-24 stsp goto done;
8784 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8785 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8786 c5996fff 2020-01-29 stsp goto done;
8789 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8790 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8791 bfce7f83 2019-07-27 stsp if (error)
8792 bfce7f83 2019-07-27 stsp goto done;
8794 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8795 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8796 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8797 6ba2bea2 2019-07-27 stsp if (error) {
8798 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8799 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8800 9627c110 2020-04-18 stsp update_progress, &upa);
8801 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8802 0ebf8283 2019-07-24 stsp goto done;
8805 514f2ffe 2020-01-29 stsp const char *branch_name;
8806 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8807 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8808 514f2ffe 2020-01-29 stsp branch_name += 11;
8809 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8810 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8811 6ba2bea2 2019-07-27 stsp if (error) {
8812 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8813 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8814 9627c110 2020-04-18 stsp update_progress, &upa);
8815 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8816 0ebf8283 2019-07-24 stsp goto done;
8821 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8823 6ba2bea2 2019-07-27 stsp if (error) {
8824 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8825 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8826 9627c110 2020-04-18 stsp update_progress, &upa);
8827 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8828 0ebf8283 2019-07-24 stsp goto done;
8833 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8834 4ec14e60 2019-08-28 hiltjo if (error)
8835 0ebf8283 2019-07-24 stsp goto done;
8837 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8838 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8839 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8840 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8843 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8844 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8845 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8846 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8848 ab20a43a 2020-01-29 stsp if (error)
8849 ab20a43a 2020-01-29 stsp goto done;
8851 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8852 ab20a43a 2020-01-29 stsp int have_changes = 0;
8854 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8855 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8856 ab20a43a 2020-01-29 stsp if (error)
8857 ab20a43a 2020-01-29 stsp goto done;
8858 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8859 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8860 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8861 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8862 ab20a43a 2020-01-29 stsp if (error) {
8863 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8864 ab20a43a 2020-01-29 stsp goto done;
8865 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8866 ab20a43a 2020-01-29 stsp goto done;
8868 ab20a43a 2020-01-29 stsp if (have_changes) {
8869 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8870 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8871 ab20a43a 2020-01-29 stsp if (error)
8872 ab20a43a 2020-01-29 stsp goto done;
8874 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8875 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8876 ab20a43a 2020-01-29 stsp if (error)
8877 ab20a43a 2020-01-29 stsp goto done;
8878 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8879 ab20a43a 2020-01-29 stsp hle, NULL);
8880 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8881 ab20a43a 2020-01-29 stsp commit = NULL;
8882 ab20a43a 2020-01-29 stsp if (error)
8883 ab20a43a 2020-01-29 stsp goto done;
8889 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8890 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8891 0ebf8283 2019-07-24 stsp if (error)
8892 0ebf8283 2019-07-24 stsp goto done;
8896 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8897 0ebf8283 2019-07-24 stsp hle->commit_id);
8898 0ebf8283 2019-07-24 stsp if (error)
8899 0ebf8283 2019-07-24 stsp goto done;
8900 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8901 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8903 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8904 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8905 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8906 0ebf8283 2019-07-24 stsp if (error)
8907 0ebf8283 2019-07-24 stsp goto done;
8908 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8909 0ebf8283 2019-07-24 stsp commit = NULL;
8911 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8912 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8913 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8915 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8916 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8918 a0ea4fc0 2020-02-28 stsp if (error)
8919 a0ea4fc0 2020-02-28 stsp goto done;
8920 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8924 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8925 0ebf8283 2019-07-24 stsp char *id_str;
8926 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8927 0ebf8283 2019-07-24 stsp if (error)
8928 0ebf8283 2019-07-24 stsp goto done;
8929 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8931 0ebf8283 2019-07-24 stsp free(id_str);
8932 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8933 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8934 3e3a69f1 2019-07-25 stsp fileindex);
8935 0ebf8283 2019-07-24 stsp goto done;
8938 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8939 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8940 0ebf8283 2019-07-24 stsp if (error)
8941 0ebf8283 2019-07-24 stsp goto done;
8945 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8946 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8947 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8948 0ebf8283 2019-07-24 stsp if (error)
8949 0ebf8283 2019-07-24 stsp goto done;
8952 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8953 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8954 0ebf8283 2019-07-24 stsp if (error)
8955 0ebf8283 2019-07-24 stsp goto done;
8956 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8957 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8959 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8960 3e3a69f1 2019-07-25 stsp branch, repo);
8962 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8963 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8964 0ebf8283 2019-07-24 stsp free(head_commit_id);
8965 0ebf8283 2019-07-24 stsp free(base_commit_id);
8966 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8967 0ebf8283 2019-07-24 stsp if (commit)
8968 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8969 0ebf8283 2019-07-24 stsp if (branch)
8970 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8971 0ebf8283 2019-07-24 stsp if (tmp_branch)
8972 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8973 0ebf8283 2019-07-24 stsp if (worktree)
8974 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8976 2822a352 2019-10-15 stsp got_repo_close(repo);
8977 2822a352 2019-10-15 stsp return error;
8980 2822a352 2019-10-15 stsp __dead static void
8981 2822a352 2019-10-15 stsp usage_integrate(void)
8983 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8987 2822a352 2019-10-15 stsp static const struct got_error *
8988 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8990 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8991 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8992 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8993 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8994 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8995 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8996 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8997 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8999 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9001 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9002 2822a352 2019-10-15 stsp switch (ch) {
9004 2822a352 2019-10-15 stsp usage_integrate();
9005 2822a352 2019-10-15 stsp /* NOTREACHED */
9009 2822a352 2019-10-15 stsp argc -= optind;
9010 2822a352 2019-10-15 stsp argv += optind;
9012 2822a352 2019-10-15 stsp if (argc != 1)
9013 2822a352 2019-10-15 stsp usage_integrate();
9014 2822a352 2019-10-15 stsp branch_arg = argv[0];
9015 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
9016 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9017 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
9018 2822a352 2019-10-15 stsp err(1, "pledge");
9020 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
9021 2822a352 2019-10-15 stsp if (cwd == NULL) {
9022 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
9023 2822a352 2019-10-15 stsp goto done;
9026 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
9027 fa51e947 2020-03-27 stsp if (error) {
9028 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9029 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
9031 2822a352 2019-10-15 stsp goto done;
9034 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
9035 2822a352 2019-10-15 stsp if (error)
9036 2822a352 2019-10-15 stsp goto done;
9038 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9040 2822a352 2019-10-15 stsp if (error != NULL)
9041 2822a352 2019-10-15 stsp goto done;
9043 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9044 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
9045 2822a352 2019-10-15 stsp if (error)
9046 2822a352 2019-10-15 stsp goto done;
9048 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9049 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
9050 2822a352 2019-10-15 stsp goto done;
9053 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9054 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
9055 2822a352 2019-10-15 stsp if (error)
9056 2822a352 2019-10-15 stsp goto done;
9058 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
9059 2822a352 2019-10-15 stsp if (refname == NULL) {
9060 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9061 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9062 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9063 2822a352 2019-10-15 stsp goto done;
9065 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
9066 2822a352 2019-10-15 stsp if (base_refname == NULL) {
9067 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9068 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9069 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9070 2822a352 2019-10-15 stsp goto done;
9073 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
9074 2822a352 2019-10-15 stsp if (error)
9075 2822a352 2019-10-15 stsp goto done;
9077 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9078 2822a352 2019-10-15 stsp if (error)
9079 2822a352 2019-10-15 stsp goto done;
9081 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9082 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
9083 2822a352 2019-10-15 stsp "specified branch has already been integrated");
9084 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9085 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9086 2822a352 2019-10-15 stsp goto done;
9089 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9090 2822a352 2019-10-15 stsp if (error) {
9091 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
9092 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
9093 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9094 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9095 2822a352 2019-10-15 stsp goto done;
9098 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9099 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
9100 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
9101 2822a352 2019-10-15 stsp check_cancelled, NULL);
9102 2822a352 2019-10-15 stsp if (error)
9103 2822a352 2019-10-15 stsp goto done;
9105 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
9106 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9109 715dc77e 2019-08-03 stsp got_repo_close(repo);
9110 2822a352 2019-10-15 stsp if (worktree)
9111 2822a352 2019-10-15 stsp got_worktree_close(worktree);
9112 2822a352 2019-10-15 stsp free(cwd);
9113 2822a352 2019-10-15 stsp free(base_commit_id);
9114 2822a352 2019-10-15 stsp free(commit_id);
9115 2822a352 2019-10-15 stsp free(refname);
9116 2822a352 2019-10-15 stsp free(base_refname);
9117 715dc77e 2019-08-03 stsp return error;
9120 715dc77e 2019-08-03 stsp __dead static void
9121 715dc77e 2019-08-03 stsp usage_stage(void)
9123 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9124 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
9125 715dc77e 2019-08-03 stsp getprogname());
9129 715dc77e 2019-08-03 stsp static const struct got_error *
9130 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
9131 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
9132 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9133 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
9135 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
9136 408b4ebc 2019-08-03 stsp char *id_str = NULL;
9138 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
9139 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
9140 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
9141 408b4ebc 2019-08-03 stsp return NULL;
9143 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
9144 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
9145 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
9147 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
9149 408b4ebc 2019-08-03 stsp return err;
9151 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
9152 408b4ebc 2019-08-03 stsp free(id_str);
9153 dc424a06 2019-08-07 stsp return NULL;
9156 dc424a06 2019-08-07 stsp static const struct got_error *
9157 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
9159 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
9160 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
9161 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
9162 715dc77e 2019-08-03 stsp char *cwd = NULL;
9163 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
9164 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
9165 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9166 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
9167 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9168 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9170 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
9172 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9173 715dc77e 2019-08-03 stsp switch (ch) {
9175 408b4ebc 2019-08-03 stsp list_stage = 1;
9178 dc424a06 2019-08-07 stsp pflag = 1;
9181 dc424a06 2019-08-07 stsp patch_script_path = optarg;
9184 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
9187 715dc77e 2019-08-03 stsp usage_stage();
9188 715dc77e 2019-08-03 stsp /* NOTREACHED */
9192 715dc77e 2019-08-03 stsp argc -= optind;
9193 715dc77e 2019-08-03 stsp argv += optind;
9195 715dc77e 2019-08-03 stsp #ifndef PROFILE
9196 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9197 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
9198 715dc77e 2019-08-03 stsp err(1, "pledge");
9200 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
9201 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
9202 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
9203 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
9205 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
9206 715dc77e 2019-08-03 stsp if (cwd == NULL) {
9207 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
9208 715dc77e 2019-08-03 stsp goto done;
9211 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9212 fa51e947 2020-03-27 stsp if (error) {
9213 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9214 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
9215 715dc77e 2019-08-03 stsp goto done;
9218 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9220 715dc77e 2019-08-03 stsp if (error != NULL)
9221 715dc77e 2019-08-03 stsp goto done;
9223 dc424a06 2019-08-07 stsp if (patch_script_path) {
9224 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
9225 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
9226 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
9227 dc424a06 2019-08-07 stsp patch_script_path);
9228 dc424a06 2019-08-07 stsp goto done;
9231 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9232 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
9233 715dc77e 2019-08-03 stsp if (error)
9234 715dc77e 2019-08-03 stsp goto done;
9236 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9237 6d022e97 2019-08-04 stsp if (error)
9238 6d022e97 2019-08-04 stsp goto done;
9240 6d022e97 2019-08-04 stsp if (list_stage)
9241 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
9242 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
9244 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9245 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
9246 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
9247 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
9248 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
9249 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
9252 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9253 2e1f37b0 2019-08-08 stsp error == NULL)
9254 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9256 ad493afc 2019-08-03 stsp got_repo_close(repo);
9257 ad493afc 2019-08-03 stsp if (worktree)
9258 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
9259 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9260 ad493afc 2019-08-03 stsp free((char *)pe->path);
9261 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
9262 ad493afc 2019-08-03 stsp free(cwd);
9263 ad493afc 2019-08-03 stsp return error;
9266 ad493afc 2019-08-03 stsp __dead static void
9267 ad493afc 2019-08-03 stsp usage_unstage(void)
9269 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9270 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
9271 ad493afc 2019-08-03 stsp getprogname());
9276 ad493afc 2019-08-03 stsp static const struct got_error *
9277 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
9279 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
9280 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
9281 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
9282 ad493afc 2019-08-03 stsp char *cwd = NULL;
9283 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
9284 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9285 9627c110 2020-04-18 stsp int ch, pflag = 0;
9286 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9287 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
9288 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9289 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9291 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
9293 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
9294 ad493afc 2019-08-03 stsp switch (ch) {
9296 2e1f37b0 2019-08-08 stsp pflag = 1;
9299 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
9302 ad493afc 2019-08-03 stsp usage_unstage();
9303 ad493afc 2019-08-03 stsp /* NOTREACHED */
9307 ad493afc 2019-08-03 stsp argc -= optind;
9308 ad493afc 2019-08-03 stsp argv += optind;
9310 ad493afc 2019-08-03 stsp #ifndef PROFILE
9311 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9312 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
9313 ad493afc 2019-08-03 stsp err(1, "pledge");
9315 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
9316 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
9318 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
9319 ad493afc 2019-08-03 stsp if (cwd == NULL) {
9320 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
9321 ad493afc 2019-08-03 stsp goto done;
9324 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9325 fa51e947 2020-03-27 stsp if (error) {
9326 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9327 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
9328 ad493afc 2019-08-03 stsp goto done;
9331 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9333 ad493afc 2019-08-03 stsp if (error != NULL)
9334 ad493afc 2019-08-03 stsp goto done;
9336 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
9337 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
9338 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
9339 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
9340 2e1f37b0 2019-08-08 stsp patch_script_path);
9341 2e1f37b0 2019-08-08 stsp goto done;
9345 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9346 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
9347 ad493afc 2019-08-03 stsp if (error)
9348 ad493afc 2019-08-03 stsp goto done;
9350 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9351 ad493afc 2019-08-03 stsp if (error)
9352 ad493afc 2019-08-03 stsp goto done;
9354 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9355 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
9356 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9357 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
9358 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
9359 9627c110 2020-04-18 stsp if (!error)
9360 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9362 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9363 2e1f37b0 2019-08-08 stsp error == NULL)
9364 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9366 0ebf8283 2019-07-24 stsp got_repo_close(repo);
9367 715dc77e 2019-08-03 stsp if (worktree)
9368 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
9369 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9370 715dc77e 2019-08-03 stsp free((char *)pe->path);
9371 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
9372 715dc77e 2019-08-03 stsp free(cwd);
9373 01073a5d 2019-08-22 stsp return error;
9376 01073a5d 2019-08-22 stsp __dead static void
9377 01073a5d 2019-08-22 stsp usage_cat(void)
9379 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9380 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
9384 01073a5d 2019-08-22 stsp static const struct got_error *
9385 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9387 01073a5d 2019-08-22 stsp const struct got_error *err;
9388 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
9390 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
9392 01073a5d 2019-08-22 stsp return err;
9394 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9395 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
9396 01073a5d 2019-08-22 stsp return err;
9399 01073a5d 2019-08-22 stsp static const struct got_error *
9400 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9402 01073a5d 2019-08-22 stsp const struct got_error *err;
9403 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
9404 56e0773d 2019-11-28 stsp int nentries, i;
9406 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
9408 01073a5d 2019-08-22 stsp return err;
9410 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
9411 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
9412 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
9413 01073a5d 2019-08-22 stsp char *id_str;
9414 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
9416 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
9417 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9420 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
9421 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
9422 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
9423 01073a5d 2019-08-22 stsp free(id_str);
9426 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
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_commit(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_commit_object *commit;
9435 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9436 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9437 01073a5d 2019-08-22 stsp char *id_str = NULL;
9438 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9440 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9442 01073a5d 2019-08-22 stsp return err;
9444 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9446 01073a5d 2019-08-22 stsp goto done;
9448 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9449 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9450 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9451 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9452 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9453 01073a5d 2019-08-22 stsp char *pid_str;
9454 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9456 01073a5d 2019-08-22 stsp goto done;
9457 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9458 01073a5d 2019-08-22 stsp free(pid_str);
9460 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9461 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9462 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
9464 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9465 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9466 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
9468 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9469 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9470 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9472 01073a5d 2019-08-22 stsp free(id_str);
9473 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9474 01073a5d 2019-08-22 stsp return err;
9477 01073a5d 2019-08-22 stsp static const struct got_error *
9478 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9480 01073a5d 2019-08-22 stsp const struct got_error *err;
9481 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9482 01073a5d 2019-08-22 stsp char *id_str = NULL;
9483 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9485 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9487 01073a5d 2019-08-22 stsp return err;
9489 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9491 01073a5d 2019-08-22 stsp goto done;
9493 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9495 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9496 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9497 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9498 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9500 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9501 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9502 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9504 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9505 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9506 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9508 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9509 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9510 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9516 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9517 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9519 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9520 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9521 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
9523 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9524 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9525 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9527 01073a5d 2019-08-22 stsp free(id_str);
9528 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9529 01073a5d 2019-08-22 stsp return err;
9532 01073a5d 2019-08-22 stsp static const struct got_error *
9533 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9535 01073a5d 2019-08-22 stsp const struct got_error *error;
9536 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9537 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9538 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9539 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9540 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9541 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9543 01073a5d 2019-08-22 stsp #ifndef PROFILE
9544 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9545 01073a5d 2019-08-22 stsp NULL) == -1)
9546 01073a5d 2019-08-22 stsp err(1, "pledge");
9549 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9550 01073a5d 2019-08-22 stsp switch (ch) {
9552 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9555 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9556 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9557 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9559 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9562 896e9b6f 2019-08-26 stsp force_path = 1;
9565 01073a5d 2019-08-22 stsp usage_cat();
9566 01073a5d 2019-08-22 stsp /* NOTREACHED */
9570 01073a5d 2019-08-22 stsp argc -= optind;
9571 01073a5d 2019-08-22 stsp argv += optind;
9573 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9574 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9575 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9576 01073a5d 2019-08-22 stsp goto done;
9578 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9579 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9580 01073a5d 2019-08-22 stsp goto done;
9581 01073a5d 2019-08-22 stsp if (worktree) {
9582 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9583 01073a5d 2019-08-22 stsp repo_path = strdup(
9584 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9585 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9586 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9587 01073a5d 2019-08-22 stsp goto done;
9592 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9593 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9594 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9595 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9598 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9599 01073a5d 2019-08-22 stsp free(repo_path);
9600 01073a5d 2019-08-22 stsp if (error != NULL)
9601 01073a5d 2019-08-22 stsp goto done;
9603 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9604 896e9b6f 2019-08-26 stsp if (error)
9605 896e9b6f 2019-08-26 stsp goto done;
9607 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9608 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9609 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9610 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9611 01073a5d 2019-08-22 stsp if (error)
9612 01073a5d 2019-08-22 stsp goto done;
9614 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9615 896e9b6f 2019-08-26 stsp if (force_path) {
9616 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9618 896e9b6f 2019-08-26 stsp if (error)
9621 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9622 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9623 896e9b6f 2019-08-26 stsp if (error) {
9624 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9625 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9627 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9628 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9629 896e9b6f 2019-08-26 stsp if (error)
9634 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9635 01073a5d 2019-08-22 stsp if (error)
9638 01073a5d 2019-08-22 stsp switch (obj_type) {
9639 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9640 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9642 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9643 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9645 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9646 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9648 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9649 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9652 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9655 01073a5d 2019-08-22 stsp if (error)
9657 01073a5d 2019-08-22 stsp free(label);
9658 01073a5d 2019-08-22 stsp label = NULL;
9660 01073a5d 2019-08-22 stsp id = NULL;
9663 01073a5d 2019-08-22 stsp free(label);
9665 896e9b6f 2019-08-26 stsp free(commit_id);
9666 01073a5d 2019-08-22 stsp if (worktree)
9667 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9668 01073a5d 2019-08-22 stsp if (repo) {
9669 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9670 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9671 01073a5d 2019-08-22 stsp if (error == NULL)
9672 01073a5d 2019-08-22 stsp error = repo_error;
9674 b2118c49 2020-07-28 stsp return error;
9677 b2118c49 2020-07-28 stsp __dead static void
9678 b2118c49 2020-07-28 stsp usage_info(void)
9680 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
9681 b2118c49 2020-07-28 stsp getprogname());
9685 b2118c49 2020-07-28 stsp static const struct got_error *
9686 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9687 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9688 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
9690 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
9691 b2118c49 2020-07-28 stsp char *id_str = NULL;
9692 b2118c49 2020-07-28 stsp char datebuf[128];
9693 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
9694 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
9695 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9698 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
9699 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
9701 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
9702 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
9703 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
9704 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
9705 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
9708 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
9709 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
9710 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
9711 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
9712 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
9713 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9714 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
9715 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
9717 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
9719 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
9720 b2118c49 2020-07-28 stsp if (tm == NULL)
9721 b2118c49 2020-07-28 stsp return NULL;
9722 b2118c49 2020-07-28 stsp if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9723 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
9724 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
9726 b2118c49 2020-07-28 stsp if (blob_id) {
9727 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
9729 b2118c49 2020-07-28 stsp return err;
9730 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
9731 b2118c49 2020-07-28 stsp free(id_str);
9734 b2118c49 2020-07-28 stsp if (staged_blob_id) {
9735 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
9737 b2118c49 2020-07-28 stsp return err;
9738 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
9739 b2118c49 2020-07-28 stsp free(id_str);
9742 b2118c49 2020-07-28 stsp if (commit_id) {
9743 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
9745 b2118c49 2020-07-28 stsp return err;
9746 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
9747 b2118c49 2020-07-28 stsp free(id_str);
9750 b2118c49 2020-07-28 stsp return NULL;
9753 b2118c49 2020-07-28 stsp static const struct got_error *
9754 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
9756 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
9757 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
9758 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
9759 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
9760 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9761 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
9762 b2118c49 2020-07-28 stsp int ch, show_files = 0;
9764 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
9766 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9767 b2118c49 2020-07-28 stsp switch (ch) {
9769 b2118c49 2020-07-28 stsp usage_info();
9770 b2118c49 2020-07-28 stsp /* NOTREACHED */
9774 b2118c49 2020-07-28 stsp argc -= optind;
9775 b2118c49 2020-07-28 stsp argv += optind;
9777 b2118c49 2020-07-28 stsp #ifndef PROFILE
9778 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9779 b2118c49 2020-07-28 stsp NULL) == -1)
9780 b2118c49 2020-07-28 stsp err(1, "pledge");
9782 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
9783 b2118c49 2020-07-28 stsp if (cwd == NULL) {
9784 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
9785 b2118c49 2020-07-28 stsp goto done;
9788 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
9789 b2118c49 2020-07-28 stsp if (error) {
9790 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9791 b2118c49 2020-07-28 stsp error = wrap_not_worktree_error(error, "status", cwd);
9792 b2118c49 2020-07-28 stsp goto done;
9795 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9796 b2118c49 2020-07-28 stsp if (error)
9797 b2118c49 2020-07-28 stsp goto done;
9799 b2118c49 2020-07-28 stsp if (argc >= 1) {
9800 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
9801 b2118c49 2020-07-28 stsp worktree);
9802 b2118c49 2020-07-28 stsp if (error)
9803 b2118c49 2020-07-28 stsp goto done;
9804 b2118c49 2020-07-28 stsp show_files = 1;
9807 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
9808 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
9809 b2118c49 2020-07-28 stsp if (error)
9810 b2118c49 2020-07-28 stsp goto done;
9812 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
9813 b2118c49 2020-07-28 stsp if (error)
9814 b2118c49 2020-07-28 stsp goto done;
9816 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9817 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
9818 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
9819 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
9820 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
9821 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
9822 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
9823 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9825 b2118c49 2020-07-28 stsp if (show_files) {
9826 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9827 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9828 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
9831 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
9832 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
9834 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
9835 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
9837 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
9838 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
9839 b2118c49 2020-07-28 stsp if (error)
9840 b2118c49 2020-07-28 stsp goto done;
9841 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9842 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
9843 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
9849 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
9850 b2118c49 2020-07-28 stsp free((char *)pe->path);
9851 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
9852 b2118c49 2020-07-28 stsp free(cwd);
9853 b2118c49 2020-07-28 stsp free(id_str);
9854 b2118c49 2020-07-28 stsp free(uuidstr);
9855 0ebf8283 2019-07-24 stsp return error;
