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 63035f9f 2019-10-06 stsp 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 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
3145 63035f9f 2019-10-06 stsp ignore_whitespace, 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 63035f9f 2019-10-06 stsp 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 aaa13589 2019-06-01 stsp arg.outfile = stdout;
3175 44392932 2019-08-25 stsp while (path[0] == '/')
3177 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
3178 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
3180 79109fed 2018-03-27 stsp if (tree1)
3181 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
3182 366e0a5f 2019-10-10 stsp if (tree2)
3183 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
3184 44392932 2019-08-25 stsp return err;
3187 44392932 2019-08-25 stsp static const struct got_error *
3188 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3189 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3191 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3192 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3193 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3194 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3196 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3197 0208f208 2020-05-05 stsp if (qid != NULL) {
3198 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3199 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3202 0208f208 2020-05-05 stsp return err;
3204 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3205 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3209 0208f208 2020-05-05 stsp if (tree_id1) {
3210 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3212 0208f208 2020-05-05 stsp goto done;
3215 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3216 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3218 0208f208 2020-05-05 stsp goto done;
3220 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3221 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3223 0208f208 2020-05-05 stsp if (tree1)
3224 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3225 0208f208 2020-05-05 stsp if (tree2)
3226 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3227 0208f208 2020-05-05 stsp return err;
3230 0208f208 2020-05-05 stsp static const struct got_error *
3231 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
3232 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
3234 44392932 2019-08-25 stsp const struct got_error *err = NULL;
3235 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
3236 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
3237 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3238 44392932 2019-08-25 stsp struct got_object_qid *qid;
3240 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3241 44392932 2019-08-25 stsp if (qid != NULL) {
3242 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
3245 44392932 2019-08-25 stsp return err;
3248 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
3249 44392932 2019-08-25 stsp int obj_type;
3250 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
3252 44392932 2019-08-25 stsp goto done;
3253 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3254 44392932 2019-08-25 stsp if (err) {
3255 44392932 2019-08-25 stsp free(obj_id2);
3256 44392932 2019-08-25 stsp goto done;
3258 44392932 2019-08-25 stsp if (pcommit) {
3259 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
3260 44392932 2019-08-25 stsp qid->id, path);
3261 44392932 2019-08-25 stsp if (err) {
3262 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3263 2e8c69d1 2020-05-04 stsp free(obj_id2);
3264 2e8c69d1 2020-05-04 stsp goto done;
3267 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
3268 2e8c69d1 2020-05-04 stsp if (err) {
3269 2e8c69d1 2020-05-04 stsp free(obj_id2);
3270 2e8c69d1 2020-05-04 stsp goto done;
3274 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
3275 44392932 2019-08-25 stsp if (err) {
3276 44392932 2019-08-25 stsp free(obj_id2);
3277 44392932 2019-08-25 stsp goto done;
3279 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3280 44392932 2019-08-25 stsp switch (obj_type) {
3281 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
3282 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3285 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
3286 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
3290 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3293 44392932 2019-08-25 stsp free(obj_id1);
3294 44392932 2019-08-25 stsp free(obj_id2);
3296 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3297 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3299 44392932 2019-08-25 stsp goto done;
3300 579bd556 2020-10-24 stsp if (pcommit) {
3301 579bd556 2020-10-24 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3302 579bd556 2020-10-24 stsp err = got_object_id_str(&id_str1, obj_id1);
3304 579bd556 2020-10-24 stsp goto done;
3306 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3307 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
3310 0f2b3dca 2018-12-22 stsp free(id_str1);
3311 0f2b3dca 2018-12-22 stsp free(id_str2);
3312 44392932 2019-08-25 stsp if (pcommit)
3313 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3314 79109fed 2018-03-27 stsp return err;
3317 4bb494d5 2018-06-16 stsp static char *
3318 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3320 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3321 09867e48 2019-08-13 stsp char *p, *s;
3323 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3324 09867e48 2019-08-13 stsp if (tm == NULL)
3325 09867e48 2019-08-13 stsp return NULL;
3326 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3327 09867e48 2019-08-13 stsp if (s == NULL)
3328 09867e48 2019-08-13 stsp return NULL;
3329 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3331 6c281f94 2018-06-11 stsp *p = '\0';
3335 6841bf13 2019-11-29 kn static const struct got_error *
3336 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3337 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3339 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3340 6841bf13 2019-11-29 kn regmatch_t regmatch;
3341 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3343 6841bf13 2019-11-29 kn *have_match = 0;
3345 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3349 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3353 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3354 6841bf13 2019-11-29 kn *have_match = 1;
3356 6841bf13 2019-11-29 kn free(id_str);
3357 6841bf13 2019-11-29 kn free(logmsg);
3361 0208f208 2020-05-05 stsp static void
3362 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3363 0208f208 2020-05-05 stsp regex_t *regex)
3365 0208f208 2020-05-05 stsp regmatch_t regmatch;
3366 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3368 0208f208 2020-05-05 stsp *have_match = 0;
3370 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3371 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3372 0208f208 2020-05-05 stsp *have_match = 1;
3378 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3380 79109fed 2018-03-27 stsp static const struct got_error *
3381 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3382 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path,
3383 0208f208 2020-05-05 stsp struct got_pathlist_head *changed_paths, int show_patch,
3384 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3386 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3387 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3388 6c281f94 2018-06-11 stsp char datebuf[26];
3389 45d799e2 2018-12-23 stsp time_t committer_time;
3390 45d799e2 2018-12-23 stsp const char *author, *committer;
3391 199a4027 2019-02-02 stsp char *refs_str = NULL;
3392 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3394 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3396 199a4027 2019-02-02 stsp const char *name;
3397 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3398 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
3401 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3402 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3404 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3405 199a4027 2019-02-02 stsp name += 5;
3406 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3408 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3409 e34f9ed6 2019-02-02 stsp name += 6;
3410 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3411 141c2bff 2019-02-04 stsp name += 8;
3412 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3413 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3416 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
3418 48cae60d 2020-09-22 stsp return err;
3419 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3420 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
3421 5d844a1e 2019-08-13 stsp if (err) {
3422 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3423 48cae60d 2020-09-22 stsp free(ref_id);
3424 5d844a1e 2019-08-13 stsp return err;
3426 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3427 5d844a1e 2019-08-13 stsp err = NULL;
3428 5d844a1e 2019-08-13 stsp tag = NULL;
3431 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3432 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
3433 48cae60d 2020-09-22 stsp free(ref_id);
3435 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3436 a436ad14 2019-08-13 stsp if (cmp != 0)
3438 199a4027 2019-02-02 stsp s = refs_str;
3439 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3440 199a4027 2019-02-02 stsp name) == -1) {
3441 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3443 34ca4898 2019-08-13 stsp return err;
3447 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3449 8bf5b3c9 2018-03-17 stsp return err;
3451 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3452 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3453 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3454 832c249c 2018-06-10 stsp free(id_str);
3455 d3d493d7 2019-02-21 stsp id_str = NULL;
3456 d3d493d7 2019-02-21 stsp free(refs_str);
3457 d3d493d7 2019-02-21 stsp refs_str = NULL;
3458 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3459 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3460 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3461 09867e48 2019-08-13 stsp if (datestr)
3462 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3463 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3464 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3465 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3466 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3467 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3468 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3469 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3470 3fe1abad 2018-06-10 stsp int n = 1;
3471 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3472 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3473 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3475 a0603db2 2018-06-10 stsp return err;
3476 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3477 a0603db2 2018-06-10 stsp free(id_str);
3481 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3483 5943eee2 2019-08-13 stsp return err;
3485 621015ac 2018-07-23 stsp logmsg = logmsg0;
3487 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3489 832c249c 2018-06-10 stsp printf(" %s\n", line);
3490 832c249c 2018-06-10 stsp } while (line);
3491 621015ac 2018-07-23 stsp free(logmsg0);
3493 0208f208 2020-05-05 stsp if (changed_paths) {
3494 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3495 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3496 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3497 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3499 0208f208 2020-05-05 stsp printf("\n");
3501 971751ac 2018-03-27 stsp if (show_patch) {
3502 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3503 971751ac 2018-03-27 stsp if (err == 0)
3504 971751ac 2018-03-27 stsp printf("\n");
3507 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3508 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3509 07862c20 2018-09-15 stsp return err;
3512 f42b1b34 2018-03-12 stsp static const struct got_error *
3513 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3514 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3515 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3516 0208f208 2020-05-05 stsp int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3518 f42b1b34 2018-03-12 stsp const struct got_error *err;
3519 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3520 6841bf13 2019-11-29 kn regex_t regex;
3521 6841bf13 2019-11-29 kn int have_match;
3522 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3523 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3524 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3525 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3526 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3528 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3529 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3531 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3532 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3533 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3535 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3537 f42b1b34 2018-03-12 stsp return err;
3538 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3539 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3541 fcc85cad 2018-07-22 stsp goto done;
3543 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3545 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3548 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3549 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3550 372ccdbb 2018-06-10 stsp if (err) {
3551 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3552 9ba79e04 2018-06-11 stsp err = NULL;
3555 b43fbaa0 2018-06-11 stsp if (id == NULL)
3558 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3562 502b9684 2020-07-31 stsp if (show_changed_paths && !reverse_display_order) {
3563 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3568 6841bf13 2019-11-29 kn if (search_pattern) {
3569 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3571 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3574 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3575 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3576 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3577 6841bf13 2019-11-29 kn if (have_match == 0) {
3578 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3579 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3580 0208f208 2020-05-05 stsp free((char *)pe->path);
3581 0208f208 2020-05-05 stsp free(pe->data);
3583 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3588 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3589 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3592 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3593 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3595 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3596 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3597 0208f208 2020-05-05 stsp show_patch, diff_context, refs);
3598 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3602 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3603 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3606 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3607 0208f208 2020-05-05 stsp free((char *)pe->path);
3608 0208f208 2020-05-05 stsp free(pe->data);
3610 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3612 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3613 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3614 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3617 502b9684 2020-07-31 stsp if (show_changed_paths) {
3618 502b9684 2020-07-31 stsp err = get_changed_paths(&changed_paths,
3619 502b9684 2020-07-31 stsp commit, repo);
3623 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3624 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3625 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3626 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3629 502b9684 2020-07-31 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3630 502b9684 2020-07-31 stsp free((char *)pe->path);
3631 502b9684 2020-07-31 stsp free(pe->data);
3633 502b9684 2020-07-31 stsp got_pathlist_free(&changed_paths);
3637 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3638 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3639 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3640 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3642 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3643 0208f208 2020-05-05 stsp free((char *)pe->path);
3644 0208f208 2020-05-05 stsp free(pe->data);
3646 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3647 6841bf13 2019-11-29 kn if (search_pattern)
3648 6841bf13 2019-11-29 kn regfree(®ex);
3649 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3650 f42b1b34 2018-03-12 stsp return err;
3653 4ed7e80c 2018-05-20 stsp __dead static void
3654 6f3d1eb0 2018-03-12 stsp usage_log(void)
3656 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3657 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3658 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3662 b1ebc001 2019-08-13 stsp static int
3663 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3665 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3666 b1ebc001 2019-08-13 stsp long long n;
3667 b1ebc001 2019-08-13 stsp const char *errstr;
3669 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3670 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3672 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3673 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3678 d1fe46f9 2020-04-18 stsp static const struct got_error *
3679 d1fe46f9 2020-04-18 stsp resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3680 d1fe46f9 2020-04-18 stsp struct got_repository *repo)
3682 d1fe46f9 2020-04-18 stsp const struct got_error *err = NULL;
3683 d1fe46f9 2020-04-18 stsp struct got_reference *ref;
3685 d1fe46f9 2020-04-18 stsp *id = NULL;
3687 d1fe46f9 2020-04-18 stsp err = got_ref_open(&ref, repo, commit_arg, 0);
3688 d1fe46f9 2020-04-18 stsp if (err == NULL) {
3689 d1fe46f9 2020-04-18 stsp int obj_type;
3690 d1fe46f9 2020-04-18 stsp err = got_ref_resolve(id, repo, ref);
3691 d1fe46f9 2020-04-18 stsp got_ref_close(ref);
3693 d1fe46f9 2020-04-18 stsp return err;
3694 d1fe46f9 2020-04-18 stsp err = got_object_get_type(&obj_type, repo, *id);
3696 d1fe46f9 2020-04-18 stsp return err;
3697 d1fe46f9 2020-04-18 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
3698 d1fe46f9 2020-04-18 stsp struct got_tag_object *tag;
3699 d1fe46f9 2020-04-18 stsp err = got_object_open_as_tag(&tag, repo, *id);
3701 d1fe46f9 2020-04-18 stsp return err;
3702 d1fe46f9 2020-04-18 stsp if (got_object_tag_get_object_type(tag) !=
3703 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT) {
3704 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3705 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3707 d1fe46f9 2020-04-18 stsp free(*id);
3708 d1fe46f9 2020-04-18 stsp *id = got_object_id_dup(
3709 d1fe46f9 2020-04-18 stsp got_object_tag_get_object_id(tag));
3710 d1fe46f9 2020-04-18 stsp if (*id == NULL)
3711 d1fe46f9 2020-04-18 stsp err = got_error_from_errno(
3712 d1fe46f9 2020-04-18 stsp "got_object_id_dup");
3713 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3715 d1fe46f9 2020-04-18 stsp return err;
3716 d1fe46f9 2020-04-18 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3717 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3719 d1fe46f9 2020-04-18 stsp err = got_repo_match_object_id_prefix(id, commit_arg,
3720 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT, repo);
3723 d1fe46f9 2020-04-18 stsp return err;
3726 4ed7e80c 2018-05-20 stsp static const struct got_error *
3727 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3729 f42b1b34 2018-03-12 stsp const struct got_error *error;
3730 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3731 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3732 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3733 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3734 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3735 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3736 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3737 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3738 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3739 64a96a6d 2018-04-01 stsp const char *errstr;
3740 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3742 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3744 6715a751 2018-03-16 stsp #ifndef PROFILE
3745 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3748 f42b1b34 2018-03-12 stsp err(1, "pledge");
3751 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3753 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3754 79109fed 2018-03-27 stsp switch (ch) {
3756 79109fed 2018-03-27 stsp show_patch = 1;
3759 0208f208 2020-05-05 stsp show_changed_paths = 1;
3762 d142fc45 2018-04-01 stsp start_commit = optarg;
3765 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3767 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3768 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3771 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3772 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3773 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3776 48c8c60d 2020-01-27 stsp log_branches = 1;
3779 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3780 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3781 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3783 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3786 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3789 6841bf13 2019-11-29 kn search_pattern = optarg;
3792 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3795 2deda0b9 2019-03-07 stsp usage_log();
3796 79109fed 2018-03-27 stsp /* NOTREACHED */
3800 79109fed 2018-03-27 stsp argc -= optind;
3801 79109fed 2018-03-27 stsp argv += optind;
3803 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3804 dc1edbfa 2019-11-29 kn diff_context = 3;
3805 dc1edbfa 2019-11-29 kn else if (!show_patch)
3806 0429cd76 2020-09-15 naddy errx(1, "-C requires -p");
3808 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3809 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3810 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3811 04ca23f4 2018-07-16 stsp goto done;
3814 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3815 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3816 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3817 50f2fada 2020-04-24 stsp goto done;
3818 50f2fada 2020-04-24 stsp error = NULL;
3821 603cdeb0 2020-10-22 stsp if (argc == 1) {
3822 e7301579 2019-03-18 stsp if (worktree) {
3823 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3825 e7301579 2019-03-18 stsp if (error)
3826 e7301579 2019-03-18 stsp goto done;
3828 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3829 e7301579 2019-03-18 stsp if (path == NULL) {
3830 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3831 e7301579 2019-03-18 stsp goto done;
3834 603cdeb0 2020-10-22 stsp } else if (argc != 0)
3835 cbd1af7a 2019-03-18 stsp usage_log();
3837 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3838 5486daa2 2019-05-11 stsp repo_path = worktree ?
3839 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3841 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3842 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3843 cffc0aa4 2019-02-05 stsp goto done;
3846 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3847 d7d4f210 2018-03-12 stsp if (error != NULL)
3848 04ca23f4 2018-07-16 stsp goto done;
3850 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3851 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3852 c02c541e 2019-03-29 stsp if (error)
3853 c02c541e 2019-03-29 stsp goto done;
3855 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3856 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3857 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3858 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3859 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3860 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3861 3235492e 2018-04-01 stsp if (error != NULL)
3862 d1fe46f9 2020-04-18 stsp goto done;
3863 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3864 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3865 3235492e 2018-04-01 stsp if (error != NULL)
3866 d1fe46f9 2020-04-18 stsp goto done;
3867 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3868 d1fe46f9 2020-04-18 stsp start_id);
3869 d1fe46f9 2020-04-18 stsp if (error != NULL)
3870 d1fe46f9 2020-04-18 stsp goto done;
3871 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3873 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&start_id, start_commit, repo);
3874 d1fe46f9 2020-04-18 stsp if (error != NULL)
3875 d1fe46f9 2020-04-18 stsp goto done;
3877 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3878 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&end_id, end_commit, repo);
3879 d1fe46f9 2020-04-18 stsp if (error != NULL)
3880 d1fe46f9 2020-04-18 stsp goto done;
3883 deeabeae 2019-08-27 stsp if (worktree) {
3885 603cdeb0 2020-10-22 stsp * If a path was specified on the command line it was resolved
3886 603cdeb0 2020-10-22 stsp * to a path in the work tree above. Prepend the work tree's
3887 603cdeb0 2020-10-22 stsp * path prefix to obtain the corresponding in-repository path.
3889 603cdeb0 2020-10-22 stsp if (path) {
3890 603cdeb0 2020-10-22 stsp const char *prefix;
3891 603cdeb0 2020-10-22 stsp prefix = got_worktree_get_path_prefix(worktree);
3892 603cdeb0 2020-10-22 stsp if (asprintf(&in_repo_path, "%s%s%s", prefix,
3893 603cdeb0 2020-10-22 stsp (path[0] != '\0') ? "/" : "", path) == -1) {
3894 603cdeb0 2020-10-22 stsp error = got_error_from_errno("asprintf");
3895 603cdeb0 2020-10-22 stsp goto done;
3899 603cdeb0 2020-10-22 stsp error = got_repo_map_path(&in_repo_path, repo,
3900 603cdeb0 2020-10-22 stsp path ? path : "", 1);
3901 04ca23f4 2018-07-16 stsp if (error != NULL)
3902 04ca23f4 2018-07-16 stsp goto done;
3903 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3904 04ca23f4 2018-07-16 stsp free(path);
3905 04ca23f4 2018-07-16 stsp path = in_repo_path;
3908 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3909 199a4027 2019-02-02 stsp if (error)
3910 199a4027 2019-02-02 stsp goto done;
3912 603cdeb0 2020-10-22 stsp error = print_commits(start_id, end_id, repo, path ? path : "",
3913 603cdeb0 2020-10-22 stsp show_changed_paths, show_patch, search_pattern, diff_context,
3914 603cdeb0 2020-10-22 stsp limit, log_branches, reverse_display_order, &refs);
3916 04ca23f4 2018-07-16 stsp free(path);
3917 04ca23f4 2018-07-16 stsp free(repo_path);
3918 04ca23f4 2018-07-16 stsp free(cwd);
3919 cffc0aa4 2019-02-05 stsp if (worktree)
3920 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3921 ad242220 2018-09-08 stsp if (repo) {
3922 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3923 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3924 ad242220 2018-09-08 stsp if (error == NULL)
3925 ad242220 2018-09-08 stsp error = repo_error;
3927 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3928 8bf5b3c9 2018-03-17 stsp return error;
3931 4ed7e80c 2018-05-20 stsp __dead static void
3932 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3934 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3935 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
3939 b72f483a 2019-02-05 stsp struct print_diff_arg {
3940 b72f483a 2019-02-05 stsp struct got_repository *repo;
3941 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3942 b72f483a 2019-02-05 stsp int diff_context;
3943 3fc0c068 2019-02-10 stsp const char *id_str;
3944 3fc0c068 2019-02-10 stsp int header_shown;
3945 98eaaa12 2019-08-03 stsp int diff_staged;
3946 63035f9f 2019-10-06 stsp int ignore_whitespace;
3950 39449a05 2020-07-23 stsp * Create a file which contains the target path of a symlink so we can feed
3951 39449a05 2020-07-23 stsp * it as content to the diff engine.
3953 39449a05 2020-07-23 stsp static const struct got_error *
3954 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3955 39449a05 2020-07-23 stsp const char *abspath)
3957 39449a05 2020-07-23 stsp const struct got_error *err = NULL;
3958 39449a05 2020-07-23 stsp char target_path[PATH_MAX];
3959 39449a05 2020-07-23 stsp ssize_t target_len, outlen;
3963 39449a05 2020-07-23 stsp if (dirfd != -1) {
3964 39449a05 2020-07-23 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3965 39449a05 2020-07-23 stsp if (target_len == -1)
3966 39449a05 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
3968 39449a05 2020-07-23 stsp target_len = readlink(abspath, target_path, PATH_MAX);
3969 39449a05 2020-07-23 stsp if (target_len == -1)
3970 39449a05 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
3973 39449a05 2020-07-23 stsp *fd = got_opentempfd();
3974 39449a05 2020-07-23 stsp if (*fd == -1)
3975 39449a05 2020-07-23 stsp return got_error_from_errno("got_opentempfd");
3977 39449a05 2020-07-23 stsp outlen = write(*fd, target_path, target_len);
3978 39449a05 2020-07-23 stsp if (outlen == -1) {
3979 39449a05 2020-07-23 stsp err = got_error_from_errno("got_opentempfd");
3980 39449a05 2020-07-23 stsp goto done;
3983 39449a05 2020-07-23 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
3984 39449a05 2020-07-23 stsp err = got_error_from_errno2("lseek", abspath);
3985 39449a05 2020-07-23 stsp goto done;
3988 39449a05 2020-07-23 stsp if (err) {
3989 39449a05 2020-07-23 stsp close(*fd);
3992 39449a05 2020-07-23 stsp return err;
3995 4ed7e80c 2018-05-20 stsp static const struct got_error *
3996 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3997 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3998 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3999 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4001 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
4002 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
4003 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
4004 12463d8b 2019-12-13 stsp int fd = -1;
4005 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
4006 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
4007 b72f483a 2019-02-05 stsp struct stat sb;
4009 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4010 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4011 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4012 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4013 98eaaa12 2019-08-03 stsp return NULL;
4015 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4016 98eaaa12 2019-08-03 stsp return NULL;
4017 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4018 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
4019 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4020 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
4021 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
4022 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
4023 98eaaa12 2019-08-03 stsp return NULL;
4026 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
4027 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
4028 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
4029 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
4030 3fc0c068 2019-02-10 stsp a->header_shown = 1;
4033 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
4034 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
4035 98eaaa12 2019-08-03 stsp switch (staged_status) {
4036 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
4037 98eaaa12 2019-08-03 stsp label1 = path;
4038 98eaaa12 2019-08-03 stsp label2 = path;
4040 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
4041 98eaaa12 2019-08-03 stsp label2 = path;
4043 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
4044 98eaaa12 2019-08-03 stsp label1 = path;
4047 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
4049 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
4050 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
4051 63035f9f 2019-10-06 stsp a->repo, stdout);
4054 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4055 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
4056 4ce46740 2019-08-08 stsp char *id_str;
4057 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4060 4ce46740 2019-08-08 stsp goto done;
4061 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
4063 4ce46740 2019-08-08 stsp goto done;
4064 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4065 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
4066 4ce46740 2019-08-08 stsp free(id_str);
4067 4ce46740 2019-08-08 stsp goto done;
4069 4ce46740 2019-08-08 stsp free(id_str);
4070 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
4071 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4073 4ce46740 2019-08-08 stsp goto done;
4076 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
4077 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
4078 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
4079 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4080 2ec1f75b 2019-03-26 stsp goto done;
4083 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4084 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4085 12463d8b 2019-12-13 stsp if (fd == -1) {
4086 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4087 39449a05 2020-07-23 stsp err = got_error_from_errno2("openat",
4089 39449a05 2020-07-23 stsp goto done;
4091 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4092 39449a05 2020-07-23 stsp de_name, abspath);
4094 39449a05 2020-07-23 stsp goto done;
4097 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4098 12463d8b 2019-12-13 stsp if (fd == -1) {
4099 39449a05 2020-07-23 stsp if (errno != ELOOP) {
4100 39449a05 2020-07-23 stsp err = got_error_from_errno2("open",
4102 39449a05 2020-07-23 stsp goto done;
4104 39449a05 2020-07-23 stsp err = get_symlink_target_file(&fd, dirfd,
4105 39449a05 2020-07-23 stsp de_name, abspath);
4107 39449a05 2020-07-23 stsp goto done;
4110 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
4111 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
4112 2ec1f75b 2019-03-26 stsp goto done;
4114 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
4115 12463d8b 2019-12-13 stsp if (f2 == NULL) {
4116 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
4117 2ec1f75b 2019-03-26 stsp goto done;
4121 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
4123 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4124 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
4126 b72f483a 2019-02-05 stsp if (blob1)
4127 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
4128 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4129 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4130 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
4131 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
4132 b72f483a 2019-02-05 stsp free(abspath);
4133 927df6b7 2019-02-10 stsp return err;
4136 927df6b7 2019-02-10 stsp static const struct got_error *
4137 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
4139 b00d56cd 2018-04-01 stsp const struct got_error *error;
4140 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
4141 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
4142 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
4143 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4144 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
4145 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
4146 15a94983 2018-12-23 stsp int type1, type2;
4147 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4148 c0cc5c62 2018-10-18 stsp const char *errstr;
4149 927df6b7 2019-02-10 stsp char *path = NULL;
4151 b00d56cd 2018-04-01 stsp #ifndef PROFILE
4152 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4153 25eccc22 2019-01-04 stsp NULL) == -1)
4154 b00d56cd 2018-04-01 stsp err(1, "pledge");
4157 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
4158 b00d56cd 2018-04-01 stsp switch (ch) {
4160 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4162 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
4163 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
4166 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
4167 b72f483a 2019-02-05 stsp if (repo_path == NULL)
4168 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4170 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4173 98eaaa12 2019-08-03 stsp diff_staged = 1;
4176 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
4179 2deda0b9 2019-03-07 stsp usage_diff();
4180 b00d56cd 2018-04-01 stsp /* NOTREACHED */
4184 b00d56cd 2018-04-01 stsp argc -= optind;
4185 b00d56cd 2018-04-01 stsp argv += optind;
4187 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
4188 b72f483a 2019-02-05 stsp if (cwd == NULL) {
4189 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4190 b72f483a 2019-02-05 stsp goto done;
4192 927df6b7 2019-02-10 stsp if (argc <= 1) {
4193 b72f483a 2019-02-05 stsp if (repo_path)
4195 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
4196 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4197 fa51e947 2020-03-27 stsp if (error) {
4198 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4199 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
4201 1f03b8da 2020-03-20 stsp goto done;
4203 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
4204 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
4205 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4206 927df6b7 2019-02-10 stsp goto done;
4208 927df6b7 2019-02-10 stsp if (argc == 1) {
4209 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
4211 927df6b7 2019-02-10 stsp if (error)
4212 927df6b7 2019-02-10 stsp goto done;
4214 927df6b7 2019-02-10 stsp path = strdup("");
4215 927df6b7 2019-02-10 stsp if (path == NULL) {
4216 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4217 927df6b7 2019-02-10 stsp goto done;
4220 b72f483a 2019-02-05 stsp } else if (argc == 2) {
4221 98eaaa12 2019-08-03 stsp if (diff_staged)
4222 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
4223 98eaaa12 2019-08-03 stsp "objects in repository");
4224 15a94983 2018-12-23 stsp id_str1 = argv[0];
4225 15a94983 2018-12-23 stsp id_str2 = argv[1];
4226 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4227 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
4228 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4229 30db809c 2019-06-05 stsp goto done;
4230 1f03b8da 2020-03-20 stsp if (worktree) {
4231 1f03b8da 2020-03-20 stsp repo_path = strdup(
4232 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
4233 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4234 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4235 1f03b8da 2020-03-20 stsp goto done;
4238 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
4239 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4240 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
4241 1f03b8da 2020-03-20 stsp goto done;
4246 b00d56cd 2018-04-01 stsp usage_diff();
4248 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4249 76089277 2018-04-01 stsp free(repo_path);
4250 b00d56cd 2018-04-01 stsp if (error != NULL)
4251 b00d56cd 2018-04-01 stsp goto done;
4253 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4254 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4255 c02c541e 2019-03-29 stsp if (error)
4256 c02c541e 2019-03-29 stsp goto done;
4258 30db809c 2019-06-05 stsp if (argc <= 1) {
4259 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
4260 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4261 b72f483a 2019-02-05 stsp char *id_str;
4263 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4265 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
4266 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
4267 b72f483a 2019-02-05 stsp if (error)
4268 b72f483a 2019-02-05 stsp goto done;
4269 b72f483a 2019-02-05 stsp arg.repo = repo;
4270 b72f483a 2019-02-05 stsp arg.worktree = worktree;
4271 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
4272 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
4273 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
4274 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
4275 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
4277 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
4278 72ea6654 2019-07-27 stsp if (error)
4279 72ea6654 2019-07-27 stsp goto done;
4281 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
4282 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
4283 b72f483a 2019-02-05 stsp free(id_str);
4284 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4285 b72f483a 2019-02-05 stsp goto done;
4288 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4289 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
4290 0adb7196 2019-08-11 stsp if (error)
4291 0adb7196 2019-08-11 stsp goto done;
4293 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4294 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
4295 0adb7196 2019-08-11 stsp if (error)
4296 0adb7196 2019-08-11 stsp goto done;
4298 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
4299 15a94983 2018-12-23 stsp if (error)
4300 15a94983 2018-12-23 stsp goto done;
4302 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
4303 15a94983 2018-12-23 stsp if (error)
4304 15a94983 2018-12-23 stsp goto done;
4306 15a94983 2018-12-23 stsp if (type1 != type2) {
4307 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4308 b00d56cd 2018-04-01 stsp goto done;
4311 15a94983 2018-12-23 stsp switch (type1) {
4312 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
4313 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
4314 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
4316 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
4317 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
4318 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
4320 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
4321 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
4322 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
4323 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
4326 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4329 5e70831e 2019-05-28 stsp free(label1);
4330 5e70831e 2019-05-28 stsp free(label2);
4331 15a94983 2018-12-23 stsp free(id1);
4332 15a94983 2018-12-23 stsp free(id2);
4333 927df6b7 2019-02-10 stsp free(path);
4334 b72f483a 2019-02-05 stsp if (worktree)
4335 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
4336 ad242220 2018-09-08 stsp if (repo) {
4337 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4338 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4339 ad242220 2018-09-08 stsp if (error == NULL)
4340 ad242220 2018-09-08 stsp error = repo_error;
4342 b00d56cd 2018-04-01 stsp return error;
4345 404c43c4 2018-06-21 stsp __dead static void
4346 404c43c4 2018-06-21 stsp usage_blame(void)
4348 9270e621 2019-02-05 stsp fprintf(stderr,
4349 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4350 404c43c4 2018-06-21 stsp getprogname());
4354 28315671 2019-08-14 stsp struct blame_line {
4355 28315671 2019-08-14 stsp int annotated;
4356 28315671 2019-08-14 stsp char *id_str;
4357 82f6abb8 2019-08-14 stsp char *committer;
4358 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
4361 28315671 2019-08-14 stsp struct blame_cb_args {
4362 28315671 2019-08-14 stsp struct blame_line *lines;
4363 28315671 2019-08-14 stsp int nlines;
4364 7ef28ff8 2019-08-14 stsp int nlines_prec;
4365 28315671 2019-08-14 stsp int lineno_cur;
4366 28315671 2019-08-14 stsp off_t *line_offsets;
4368 82f6abb8 2019-08-14 stsp struct got_repository *repo;
4371 404c43c4 2018-06-21 stsp static const struct got_error *
4372 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4374 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4375 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4376 28315671 2019-08-14 stsp struct blame_line *bline;
4377 82f6abb8 2019-08-14 stsp char *line = NULL;
4378 28315671 2019-08-14 stsp size_t linesize = 0;
4379 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4380 28315671 2019-08-14 stsp off_t offset;
4381 bcb49d15 2019-08-14 stsp struct tm tm;
4382 bcb49d15 2019-08-14 stsp time_t committer_time;
4384 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4385 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4386 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4388 28315671 2019-08-14 stsp if (sigint_received)
4389 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4391 2839f8b9 2019-08-18 stsp if (lineno == -1)
4392 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4394 28315671 2019-08-14 stsp /* Annotate this line. */
4395 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4396 28315671 2019-08-14 stsp if (bline->annotated)
4397 28315671 2019-08-14 stsp return NULL;
4398 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4400 28315671 2019-08-14 stsp return err;
4402 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4404 82f6abb8 2019-08-14 stsp goto done;
4406 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4407 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4408 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4409 bcb49d15 2019-08-14 stsp goto done;
4412 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4413 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4414 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4415 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4416 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4417 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4418 82f6abb8 2019-08-14 stsp goto done;
4420 28315671 2019-08-14 stsp bline->annotated = 1;
4422 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4423 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4424 28315671 2019-08-14 stsp if (!bline->annotated)
4425 82f6abb8 2019-08-14 stsp goto done;
4427 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4428 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4429 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4430 82f6abb8 2019-08-14 stsp goto done;
4433 28315671 2019-08-14 stsp while (bline->annotated) {
4434 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4435 82f6abb8 2019-08-14 stsp size_t len;
4437 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4438 28315671 2019-08-14 stsp if (ferror(a->f))
4439 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4443 82f6abb8 2019-08-14 stsp committer = bline->committer;
4444 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4445 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4446 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4447 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4449 82f6abb8 2019-08-14 stsp *at = '\0';
4450 82f6abb8 2019-08-14 stsp len = strlen(committer);
4451 82f6abb8 2019-08-14 stsp if (len >= 9)
4452 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4454 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4456 28315671 2019-08-14 stsp *nl = '\0';
4457 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4458 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4460 28315671 2019-08-14 stsp a->lineno_cur++;
4461 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4464 82f6abb8 2019-08-14 stsp if (commit)
4465 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4466 28315671 2019-08-14 stsp free(line);
4467 28315671 2019-08-14 stsp return err;
4470 28315671 2019-08-14 stsp static const struct got_error *
4471 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4473 404c43c4 2018-06-21 stsp const struct got_error *error;
4474 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4475 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4476 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4477 0587e10c 2020-07-23 stsp char *link_target = NULL;
4478 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4479 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4480 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4481 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4482 28315671 2019-08-14 stsp struct blame_cb_args bca;
4483 28315671 2019-08-14 stsp int ch, obj_type, i;
4484 b02560ec 2019-08-19 stsp size_t filesize;
4486 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4488 404c43c4 2018-06-21 stsp #ifndef PROFILE
4489 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4490 36e2fb66 2019-01-04 stsp NULL) == -1)
4491 404c43c4 2018-06-21 stsp err(1, "pledge");
4494 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4495 404c43c4 2018-06-21 stsp switch (ch) {
4497 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4500 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4501 66bea077 2018-08-02 stsp if (repo_path == NULL)
4502 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4504 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4507 2deda0b9 2019-03-07 stsp usage_blame();
4508 404c43c4 2018-06-21 stsp /* NOTREACHED */
4512 404c43c4 2018-06-21 stsp argc -= optind;
4513 404c43c4 2018-06-21 stsp argv += optind;
4515 a39318fd 2018-08-02 stsp if (argc == 1)
4516 404c43c4 2018-06-21 stsp path = argv[0];
4518 404c43c4 2018-06-21 stsp usage_blame();
4520 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4521 66bea077 2018-08-02 stsp if (cwd == NULL) {
4522 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4523 66bea077 2018-08-02 stsp goto done;
4525 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4526 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4527 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4528 66bea077 2018-08-02 stsp goto done;
4530 0c06baac 2019-02-05 stsp error = NULL;
4531 0c06baac 2019-02-05 stsp if (worktree) {
4532 0c06baac 2019-02-05 stsp repo_path =
4533 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4534 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4535 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4536 1f03b8da 2020-03-20 stsp if (error)
4537 1f03b8da 2020-03-20 stsp goto done;
4540 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4541 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4542 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4543 0c06baac 2019-02-05 stsp goto done;
4548 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4549 c02c541e 2019-03-29 stsp if (error != NULL)
4550 36e2fb66 2019-01-04 stsp goto done;
4552 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4553 c02c541e 2019-03-29 stsp if (error)
4554 404c43c4 2018-06-21 stsp goto done;
4556 0c06baac 2019-02-05 stsp if (worktree) {
4557 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4558 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4559 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4560 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
4561 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4562 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
4563 6efaaa2d 2019-02-05 stsp path) == -1) {
4564 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4565 0c06baac 2019-02-05 stsp goto done;
4567 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4570 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4572 0c06baac 2019-02-05 stsp if (error)
4573 66bea077 2018-08-02 stsp goto done;
4575 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4576 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4577 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4578 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4579 404c43c4 2018-06-21 stsp if (error != NULL)
4580 66bea077 2018-08-02 stsp goto done;
4581 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4582 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4583 404c43c4 2018-06-21 stsp if (error != NULL)
4584 66bea077 2018-08-02 stsp goto done;
4586 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4587 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4588 30837e32 2019-07-25 stsp if (error)
4589 66bea077 2018-08-02 stsp goto done;
4592 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4593 0587e10c 2020-07-23 stsp commit_id, repo);
4594 0587e10c 2020-07-23 stsp if (error)
4595 0587e10c 2020-07-23 stsp goto done;
4597 0587e10c 2020-07-23 stsp error = got_object_id_by_path(&obj_id, repo, commit_id,
4598 0587e10c 2020-07-23 stsp link_target ? link_target : in_repo_path);
4599 28315671 2019-08-14 stsp if (error)
4600 28315671 2019-08-14 stsp goto done;
4602 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4603 28315671 2019-08-14 stsp if (error)
4604 28315671 2019-08-14 stsp goto done;
4606 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4607 eb59b6d4 2020-07-23 stsp error = got_error_path(link_target ? link_target : in_repo_path,
4608 eb59b6d4 2020-07-23 stsp GOT_ERR_OBJ_TYPE);
4609 28315671 2019-08-14 stsp goto done;
4612 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4613 28315671 2019-08-14 stsp if (error)
4614 28315671 2019-08-14 stsp goto done;
4615 28315671 2019-08-14 stsp bca.f = got_opentemp();
4616 28315671 2019-08-14 stsp if (bca.f == NULL) {
4617 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4618 28315671 2019-08-14 stsp goto done;
4620 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4621 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4622 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4623 28315671 2019-08-14 stsp goto done;
4625 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4626 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4627 b02560ec 2019-08-19 stsp bca.nlines--;
4629 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4630 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4631 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4632 28315671 2019-08-14 stsp goto done;
4634 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4635 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4636 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4637 7ef28ff8 2019-08-14 stsp while (i > 0) {
4639 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4641 82f6abb8 2019-08-14 stsp bca.repo = repo;
4643 0587e10c 2020-07-23 stsp error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4644 0587e10c 2020-07-23 stsp repo, blame_cb, &bca, check_cancelled, NULL);
4646 66bea077 2018-08-02 stsp free(in_repo_path);
4647 0587e10c 2020-07-23 stsp free(link_target);
4648 66bea077 2018-08-02 stsp free(repo_path);
4649 66bea077 2018-08-02 stsp free(cwd);
4650 404c43c4 2018-06-21 stsp free(commit_id);
4651 28315671 2019-08-14 stsp free(obj_id);
4653 28315671 2019-08-14 stsp got_object_blob_close(blob);
4654 0c06baac 2019-02-05 stsp if (worktree)
4655 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4656 ad242220 2018-09-08 stsp if (repo) {
4657 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4658 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4659 ad242220 2018-09-08 stsp if (error == NULL)
4660 ad242220 2018-09-08 stsp error = repo_error;
4662 3affba96 2019-09-22 stsp if (bca.lines) {
4663 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4664 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4665 3affba96 2019-09-22 stsp free(bline->id_str);
4666 3affba96 2019-09-22 stsp free(bline->committer);
4668 3affba96 2019-09-22 stsp free(bca.lines);
4670 28315671 2019-08-14 stsp free(bca.line_offsets);
4671 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4672 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4673 404c43c4 2018-06-21 stsp return error;
4676 5de5890b 2018-10-18 stsp __dead static void
4677 5de5890b 2018-10-18 stsp usage_tree(void)
4679 c1669e2e 2019-01-09 stsp fprintf(stderr,
4680 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4681 5de5890b 2018-10-18 stsp getprogname());
4685 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4686 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4687 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4689 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4690 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4691 848d6979 2019-08-12 stsp const char *modestr = "";
4692 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4693 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4695 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4696 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4699 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4700 63c5ca5d 2019-08-24 stsp modestr = "$";
4701 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4704 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4706 0d6c6ee3 2020-05-20 stsp return err;
4707 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4708 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4709 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4712 848d6979 2019-08-12 stsp modestr = "@";
4714 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4715 848d6979 2019-08-12 stsp modestr = "/";
4716 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4717 848d6979 2019-08-12 stsp modestr = "*";
4719 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4720 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4721 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4723 0d6c6ee3 2020-05-20 stsp free(link_target);
4724 0d6c6ee3 2020-05-20 stsp return NULL;
4727 5de5890b 2018-10-18 stsp static const struct got_error *
4728 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4729 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4730 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4732 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4733 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4734 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4735 56e0773d 2019-11-28 stsp int nentries, i;
4737 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4739 5de5890b 2018-10-18 stsp goto done;
4741 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4743 5de5890b 2018-10-18 stsp goto done;
4744 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4745 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4746 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4747 5de5890b 2018-10-18 stsp char *id = NULL;
4749 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4752 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4753 5de5890b 2018-10-18 stsp if (show_ids) {
4754 5de5890b 2018-10-18 stsp char *id_str;
4755 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4756 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4758 5de5890b 2018-10-18 stsp goto done;
4759 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4760 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4761 5de5890b 2018-10-18 stsp free(id_str);
4762 5de5890b 2018-10-18 stsp goto done;
4764 5de5890b 2018-10-18 stsp free(id_str);
4766 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4769 0d6c6ee3 2020-05-20 stsp goto done;
4771 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4772 c1669e2e 2019-01-09 stsp char *child_path;
4773 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4774 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4775 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4776 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4777 c1669e2e 2019-01-09 stsp goto done;
4779 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4780 c1669e2e 2019-01-09 stsp root_path, repo);
4781 c1669e2e 2019-01-09 stsp free(child_path);
4783 c1669e2e 2019-01-09 stsp goto done;
4788 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4789 5de5890b 2018-10-18 stsp free(tree_id);
4790 5de5890b 2018-10-18 stsp return err;
4793 5de5890b 2018-10-18 stsp static const struct got_error *
4794 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4796 5de5890b 2018-10-18 stsp const struct got_error *error;
4797 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4798 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4799 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4800 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4801 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4802 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4803 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4806 5de5890b 2018-10-18 stsp #ifndef PROFILE
4807 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4808 0f8d269b 2019-01-04 stsp NULL) == -1)
4809 5de5890b 2018-10-18 stsp err(1, "pledge");
4812 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4813 5de5890b 2018-10-18 stsp switch (ch) {
4815 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4818 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4819 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4820 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4822 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4825 5de5890b 2018-10-18 stsp show_ids = 1;
4828 c1669e2e 2019-01-09 stsp recurse = 1;
4831 2deda0b9 2019-03-07 stsp usage_tree();
4832 5de5890b 2018-10-18 stsp /* NOTREACHED */
4836 5de5890b 2018-10-18 stsp argc -= optind;
4837 5de5890b 2018-10-18 stsp argv += optind;
4839 5de5890b 2018-10-18 stsp if (argc == 1)
4840 5de5890b 2018-10-18 stsp path = argv[0];
4841 5de5890b 2018-10-18 stsp else if (argc > 1)
4842 5de5890b 2018-10-18 stsp usage_tree();
4844 7a2c19d6 2019-02-05 stsp path = NULL;
4846 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4847 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4848 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4849 9bf7a39b 2019-02-05 stsp goto done;
4851 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4852 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4853 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4854 7a2c19d6 2019-02-05 stsp goto done;
4856 7a2c19d6 2019-02-05 stsp error = NULL;
4857 7a2c19d6 2019-02-05 stsp if (worktree) {
4858 7a2c19d6 2019-02-05 stsp repo_path =
4859 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4860 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4861 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4862 7a2c19d6 2019-02-05 stsp if (error)
4863 7a2c19d6 2019-02-05 stsp goto done;
4865 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4866 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4867 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4868 7a2c19d6 2019-02-05 stsp goto done;
4873 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4874 5de5890b 2018-10-18 stsp if (error != NULL)
4875 c02c541e 2019-03-29 stsp goto done;
4877 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4878 c02c541e 2019-03-29 stsp if (error)
4879 5de5890b 2018-10-18 stsp goto done;
4881 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4882 9bf7a39b 2019-02-05 stsp if (worktree) {
4883 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4884 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4885 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4886 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4887 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4888 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4889 9bf7a39b 2019-02-05 stsp goto done;
4891 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4893 9bf7a39b 2019-02-05 stsp if (error)
4894 9bf7a39b 2019-02-05 stsp goto done;
4896 9bf7a39b 2019-02-05 stsp path = "/";
4898 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4899 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4900 9bf7a39b 2019-02-05 stsp if (error != NULL)
4901 9bf7a39b 2019-02-05 stsp goto done;
4904 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4905 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4906 4e0a20a4 2020-03-23 tracey if (worktree)
4907 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4909 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4910 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4911 5de5890b 2018-10-18 stsp if (error != NULL)
4912 5de5890b 2018-10-18 stsp goto done;
4913 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4914 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4915 5de5890b 2018-10-18 stsp if (error != NULL)
4916 5de5890b 2018-10-18 stsp goto done;
4918 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4919 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4920 30837e32 2019-07-25 stsp if (error)
4921 5de5890b 2018-10-18 stsp goto done;
4924 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4925 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4927 5de5890b 2018-10-18 stsp free(in_repo_path);
4928 5de5890b 2018-10-18 stsp free(repo_path);
4929 5de5890b 2018-10-18 stsp free(cwd);
4930 5de5890b 2018-10-18 stsp free(commit_id);
4931 7a2c19d6 2019-02-05 stsp if (worktree)
4932 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4933 5de5890b 2018-10-18 stsp if (repo) {
4934 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4935 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4936 5de5890b 2018-10-18 stsp if (error == NULL)
4937 5de5890b 2018-10-18 stsp error = repo_error;
4939 5de5890b 2018-10-18 stsp return error;
4942 6bad629b 2019-02-04 stsp __dead static void
4943 6bad629b 2019-02-04 stsp usage_status(void)
4945 081470ac 2020-08-13 stsp fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4946 081470ac 2020-08-13 stsp getprogname());
4950 b72f483a 2019-02-05 stsp static const struct got_error *
4951 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4952 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4953 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4954 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4956 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4957 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4958 081470ac 2020-08-13 stsp if (arg) {
4959 081470ac 2020-08-13 stsp char *status_codes = arg;
4960 081470ac 2020-08-13 stsp size_t ncodes = strlen(status_codes);
4962 081470ac 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4963 081470ac 2020-08-13 stsp if (status == status_codes[i] ||
4964 081470ac 2020-08-13 stsp staged_status == status_codes[i])
4967 081470ac 2020-08-13 stsp if (i == ncodes)
4968 081470ac 2020-08-13 stsp return NULL;
4970 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4971 b72f483a 2019-02-05 stsp return NULL;
4974 6bad629b 2019-02-04 stsp static const struct got_error *
4975 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4977 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4978 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4979 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4980 081470ac 2020-08-13 stsp char *cwd = NULL, *status_codes = NULL;;
4981 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4982 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4983 081470ac 2020-08-13 stsp int ch, i;
4985 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4987 081470ac 2020-08-13 stsp while ((ch = getopt(argc, argv, "s:")) != -1) {
4988 6bad629b 2019-02-04 stsp switch (ch) {
4990 081470ac 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
4991 081470ac 2020-08-13 stsp switch (optarg[i]) {
4992 081470ac 2020-08-13 stsp case GOT_STATUS_MODIFY:
4993 081470ac 2020-08-13 stsp case GOT_STATUS_ADD:
4994 081470ac 2020-08-13 stsp case GOT_STATUS_DELETE:
4995 081470ac 2020-08-13 stsp case GOT_STATUS_CONFLICT:
4996 081470ac 2020-08-13 stsp case GOT_STATUS_MISSING:
4997 081470ac 2020-08-13 stsp case GOT_STATUS_OBSTRUCTED:
4998 081470ac 2020-08-13 stsp case GOT_STATUS_UNVERSIONED:
4999 081470ac 2020-08-13 stsp case GOT_STATUS_MODE_CHANGE:
5000 081470ac 2020-08-13 stsp case GOT_STATUS_NONEXISTENT:
5003 081470ac 2020-08-13 stsp errx(1, "invalid status code '%c'",
5004 081470ac 2020-08-13 stsp optarg[i]);
5007 081470ac 2020-08-13 stsp status_codes = optarg;
5010 2deda0b9 2019-03-07 stsp usage_status();
5011 6bad629b 2019-02-04 stsp /* NOTREACHED */
5015 6bad629b 2019-02-04 stsp argc -= optind;
5016 6bad629b 2019-02-04 stsp argv += optind;
5018 6bad629b 2019-02-04 stsp #ifndef PROFILE
5019 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5020 6bad629b 2019-02-04 stsp NULL) == -1)
5021 6bad629b 2019-02-04 stsp err(1, "pledge");
5023 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
5024 927df6b7 2019-02-10 stsp if (cwd == NULL) {
5025 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5026 927df6b7 2019-02-10 stsp goto done;
5029 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
5030 fa51e947 2020-03-27 stsp if (error) {
5031 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5032 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
5033 a5edda0a 2019-07-27 stsp goto done;
5036 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5038 6bad629b 2019-02-04 stsp if (error != NULL)
5039 6bad629b 2019-02-04 stsp goto done;
5041 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5042 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5043 087fb88c 2019-08-04 stsp if (error)
5044 087fb88c 2019-08-04 stsp goto done;
5046 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5047 6bad629b 2019-02-04 stsp if (error)
5048 6bad629b 2019-02-04 stsp goto done;
5050 081470ac 2020-08-13 stsp error = got_worktree_status(worktree, &paths, repo, print_status,
5051 081470ac 2020-08-13 stsp status_codes, check_cancelled, NULL);
5053 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
5054 a5edda0a 2019-07-27 stsp free((char *)pe->path);
5055 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
5056 927df6b7 2019-02-10 stsp free(cwd);
5057 d0eebce4 2019-03-11 stsp return error;
5060 d0eebce4 2019-03-11 stsp __dead static void
5061 d0eebce4 2019-03-11 stsp usage_ref(void)
5063 d0eebce4 2019-03-11 stsp fprintf(stderr,
5064 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5065 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
5066 d0eebce4 2019-03-11 stsp getprogname());
5070 d0eebce4 2019-03-11 stsp static const struct got_error *
5071 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
5073 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
5074 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
5075 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
5077 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
5078 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5080 d0eebce4 2019-03-11 stsp return err;
5082 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5083 d0eebce4 2019-03-11 stsp char *refstr;
5084 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
5085 d0eebce4 2019-03-11 stsp if (refstr == NULL)
5086 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
5087 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5088 d0eebce4 2019-03-11 stsp free(refstr);
5091 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5092 d0eebce4 2019-03-11 stsp return NULL;
5095 d0eebce4 2019-03-11 stsp static const struct got_error *
5096 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
5098 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5099 d0eebce4 2019-03-11 stsp struct got_reference *ref;
5101 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
5103 d0eebce4 2019-03-11 stsp return err;
5105 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
5106 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5107 d0eebce4 2019-03-11 stsp return err;
5110 d0eebce4 2019-03-11 stsp static const struct got_error *
5111 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
5113 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
5114 d0eebce4 2019-03-11 stsp struct got_object_id *id;
5115 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
5118 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5119 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
5120 d1644381 2019-07-14 stsp * an unintended typo.
5122 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5123 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5125 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5127 d83d9d5c 2019-05-13 stsp if (err) {
5128 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
5130 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5131 d83d9d5c 2019-05-13 stsp return err;
5132 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
5134 d83d9d5c 2019-05-13 stsp return err;
5135 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
5136 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
5138 d83d9d5c 2019-05-13 stsp return err;
5141 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
5143 d0eebce4 2019-03-11 stsp goto done;
5145 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
5148 d0eebce4 2019-03-11 stsp got_ref_close(ref);
5150 d1c1ae5f 2019-08-12 stsp return err;
5153 d1c1ae5f 2019-08-12 stsp static const struct got_error *
5154 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
5156 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
5157 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
5158 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
5161 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
5162 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
5163 d1c1ae5f 2019-08-12 stsp * an unintended typo.
5165 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
5166 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5168 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
5170 d1c1ae5f 2019-08-12 stsp return err;
5172 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
5174 d1c1ae5f 2019-08-12 stsp goto done;
5176 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
5178 d1c1ae5f 2019-08-12 stsp if (target_ref)
5179 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
5181 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
5182 d0eebce4 2019-03-11 stsp return err;
5185 d0eebce4 2019-03-11 stsp static const struct got_error *
5186 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
5188 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
5189 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
5190 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
5191 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
5192 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
5193 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
5194 b2070a3f 2020-03-22 stsp char *refname = NULL;
5196 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5197 d0eebce4 2019-03-11 stsp switch (ch) {
5199 e31abbf2 2020-03-22 stsp obj_arg = optarg;
5202 e31abbf2 2020-03-22 stsp do_delete = 1;
5205 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
5206 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5207 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5209 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
5212 d0eebce4 2019-03-11 stsp do_list = 1;
5215 e31abbf2 2020-03-22 stsp symref_target = optarg;
5218 d0eebce4 2019-03-11 stsp usage_ref();
5219 d0eebce4 2019-03-11 stsp /* NOTREACHED */
5223 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
5224 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
5225 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
5226 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
5227 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
5228 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
5229 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
5230 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
5231 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
5232 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
5233 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
5234 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
5236 d0eebce4 2019-03-11 stsp argc -= optind;
5237 d0eebce4 2019-03-11 stsp argv += optind;
5239 e31abbf2 2020-03-22 stsp if (do_list) {
5240 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
5241 d0eebce4 2019-03-11 stsp usage_ref();
5242 b2070a3f 2020-03-22 stsp if (argc == 1) {
5243 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5244 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5245 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5246 b2070a3f 2020-03-22 stsp goto done;
5250 e31abbf2 2020-03-22 stsp if (argc != 1)
5251 e31abbf2 2020-03-22 stsp usage_ref();
5252 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
5253 b2070a3f 2020-03-22 stsp if (refname == NULL) {
5254 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
5255 b2070a3f 2020-03-22 stsp goto done;
5259 b2070a3f 2020-03-22 stsp if (refname)
5260 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
5262 d0eebce4 2019-03-11 stsp #ifndef PROFILE
5263 e0b57350 2019-03-12 stsp if (do_list) {
5264 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5265 e0b57350 2019-03-12 stsp NULL) == -1)
5266 e0b57350 2019-03-12 stsp err(1, "pledge");
5268 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5269 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
5270 e0b57350 2019-03-12 stsp err(1, "pledge");
5273 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
5274 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
5275 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5276 d0eebce4 2019-03-11 stsp goto done;
5279 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5280 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
5281 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5282 d0eebce4 2019-03-11 stsp goto done;
5284 d0eebce4 2019-03-11 stsp error = NULL;
5285 d0eebce4 2019-03-11 stsp if (worktree) {
5286 d0eebce4 2019-03-11 stsp repo_path =
5287 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
5288 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
5289 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5290 d0eebce4 2019-03-11 stsp if (error)
5291 d0eebce4 2019-03-11 stsp goto done;
5293 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
5294 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
5295 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
5296 d0eebce4 2019-03-11 stsp goto done;
5301 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5302 d0eebce4 2019-03-11 stsp if (error != NULL)
5303 d0eebce4 2019-03-11 stsp goto done;
5305 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5306 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5307 c02c541e 2019-03-29 stsp if (error)
5308 c02c541e 2019-03-29 stsp goto done;
5310 d0eebce4 2019-03-11 stsp if (do_list)
5311 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
5312 e31abbf2 2020-03-22 stsp else if (do_delete)
5313 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
5314 e31abbf2 2020-03-22 stsp else if (symref_target)
5315 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
5317 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
5318 e31abbf2 2020-03-22 stsp usage_ref();
5319 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
5322 b2070a3f 2020-03-22 stsp free(refname);
5324 4e759de4 2019-06-26 stsp got_repo_close(repo);
5325 4e759de4 2019-06-26 stsp if (worktree)
5326 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
5327 4e759de4 2019-06-26 stsp free(cwd);
5328 4e759de4 2019-06-26 stsp free(repo_path);
5329 4e759de4 2019-06-26 stsp return error;
5332 4e759de4 2019-06-26 stsp __dead static void
5333 4e759de4 2019-06-26 stsp usage_branch(void)
5335 4e759de4 2019-06-26 stsp fprintf(stderr,
5336 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5337 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
5341 4e759de4 2019-06-26 stsp static const struct got_error *
5342 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
5343 4e99b47e 2019-10-04 stsp struct got_reference *ref)
5345 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
5346 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
5347 4e99b47e 2019-10-04 stsp char *refstr;
5349 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
5350 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
5351 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
5352 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
5354 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
5356 4e99b47e 2019-10-04 stsp return err;
5357 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
5358 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
5359 4e99b47e 2019-10-04 stsp marker = "* ";
5361 4e99b47e 2019-10-04 stsp marker = "~ ";
5365 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5366 4e99b47e 2019-10-04 stsp refname += 11;
5367 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5368 4e99b47e 2019-10-04 stsp refname += 18;
5370 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
5371 4e99b47e 2019-10-04 stsp if (refstr == NULL)
5372 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
5374 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
5375 4e99b47e 2019-10-04 stsp free(refstr);
5376 4e99b47e 2019-10-04 stsp return NULL;
5379 4e99b47e 2019-10-04 stsp static const struct got_error *
5380 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5382 ad89fa31 2019-10-04 stsp const char *refname;
5384 ad89fa31 2019-10-04 stsp if (worktree == NULL)
5385 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
5387 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
5389 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
5390 ad89fa31 2019-10-04 stsp refname += 11;
5391 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5392 ad89fa31 2019-10-04 stsp refname += 18;
5394 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
5396 ad89fa31 2019-10-04 stsp return NULL;
5399 ad89fa31 2019-10-04 stsp static const struct got_error *
5400 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
5402 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
5403 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
5404 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
5405 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
5406 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
5408 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
5410 4e99b47e 2019-10-04 stsp if (worktree) {
5411 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
5412 4e99b47e 2019-10-04 stsp worktree);
5414 4e99b47e 2019-10-04 stsp return err;
5416 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5417 4e99b47e 2019-10-04 stsp worktree);
5419 4e99b47e 2019-10-04 stsp return err;
5421 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5422 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5423 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5425 4e99b47e 2019-10-04 stsp return err;
5426 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5427 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5431 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5432 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5434 4e759de4 2019-06-26 stsp return err;
5436 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
5437 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5439 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5440 4e759de4 2019-06-26 stsp return NULL;
5443 4e759de4 2019-06-26 stsp static const struct got_error *
5444 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5445 45cd4e47 2019-08-25 stsp const char *branch_name)
5447 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5448 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5449 4e759de4 2019-06-26 stsp char *refname;
5451 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5452 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5454 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5456 4e759de4 2019-06-26 stsp goto done;
5458 45cd4e47 2019-08-25 stsp if (worktree &&
5459 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5460 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5461 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5462 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5463 45cd4e47 2019-08-25 stsp goto done;
5466 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5469 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5470 4e759de4 2019-06-26 stsp free(refname);
5471 4e759de4 2019-06-26 stsp return err;
5474 4e759de4 2019-06-26 stsp static const struct got_error *
5475 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5476 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5478 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5479 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5480 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5483 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5484 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5485 d3f84d51 2019-07-11 stsp * an unintended typo.
5487 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5488 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5490 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5491 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5492 62d463ca 2020-10-20 naddy goto done;
5495 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5496 4e759de4 2019-06-26 stsp if (err == NULL) {
5497 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5498 4e759de4 2019-06-26 stsp goto done;
5499 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5500 4e759de4 2019-06-26 stsp goto done;
5502 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5504 4e759de4 2019-06-26 stsp goto done;
5506 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5509 4e759de4 2019-06-26 stsp got_ref_close(ref);
5510 4e759de4 2019-06-26 stsp free(base_refname);
5511 4e759de4 2019-06-26 stsp free(refname);
5512 4e759de4 2019-06-26 stsp return err;
5515 4e759de4 2019-06-26 stsp static const struct got_error *
5516 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5518 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5519 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5520 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5521 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5522 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5523 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5524 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5525 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5526 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5527 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5528 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5530 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5532 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5533 4e759de4 2019-06-26 stsp switch (ch) {
5535 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5538 4e759de4 2019-06-26 stsp delref = optarg;
5541 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5542 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5543 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5545 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5548 4e759de4 2019-06-26 stsp do_list = 1;
5551 da76fce2 2020-02-24 stsp do_update = 0;
5554 4e759de4 2019-06-26 stsp usage_branch();
5555 4e759de4 2019-06-26 stsp /* NOTREACHED */
5559 4e759de4 2019-06-26 stsp if (do_list && delref)
5560 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
5562 4e759de4 2019-06-26 stsp argc -= optind;
5563 4e759de4 2019-06-26 stsp argv += optind;
5565 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5566 ad89fa31 2019-10-04 stsp do_show = 1;
5568 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5569 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5571 4e759de4 2019-06-26 stsp if (do_list || delref) {
5572 4e759de4 2019-06-26 stsp if (argc > 0)
5573 4e759de4 2019-06-26 stsp usage_branch();
5574 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5575 4e759de4 2019-06-26 stsp usage_branch();
5577 4e759de4 2019-06-26 stsp #ifndef PROFILE
5578 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5579 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5580 4e759de4 2019-06-26 stsp NULL) == -1)
5581 4e759de4 2019-06-26 stsp err(1, "pledge");
5583 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5584 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5585 4e759de4 2019-06-26 stsp err(1, "pledge");
5588 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5589 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5590 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5591 4e759de4 2019-06-26 stsp goto done;
5594 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5595 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5596 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5597 4e759de4 2019-06-26 stsp goto done;
5599 4e759de4 2019-06-26 stsp error = NULL;
5600 4e759de4 2019-06-26 stsp if (worktree) {
5601 4e759de4 2019-06-26 stsp repo_path =
5602 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5603 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5604 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5605 4e759de4 2019-06-26 stsp if (error)
5606 4e759de4 2019-06-26 stsp goto done;
5608 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5609 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5610 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5611 4e759de4 2019-06-26 stsp goto done;
5616 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5617 4e759de4 2019-06-26 stsp if (error != NULL)
5618 4e759de4 2019-06-26 stsp goto done;
5620 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5621 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5622 4e759de4 2019-06-26 stsp if (error)
5623 4e759de4 2019-06-26 stsp goto done;
5625 ad89fa31 2019-10-04 stsp if (do_show)
5626 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5627 ad89fa31 2019-10-04 stsp else if (do_list)
5628 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5629 4e759de4 2019-06-26 stsp else if (delref)
5630 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5632 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5633 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5634 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5635 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5636 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5637 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5638 a74f7e83 2019-11-10 stsp if (error)
5639 a74f7e83 2019-11-10 stsp goto done;
5640 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5641 da76fce2 2020-02-24 stsp if (error)
5642 da76fce2 2020-02-24 stsp goto done;
5643 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5644 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5645 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5647 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5648 da76fce2 2020-02-24 stsp if (error)
5649 da76fce2 2020-02-24 stsp goto done;
5650 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5651 da76fce2 2020-02-24 stsp worktree);
5652 da76fce2 2020-02-24 stsp if (error)
5653 da76fce2 2020-02-24 stsp goto done;
5654 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5656 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5657 da76fce2 2020-02-24 stsp goto done;
5659 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5660 da76fce2 2020-02-24 stsp free(branch_refname);
5661 da76fce2 2020-02-24 stsp if (error)
5662 da76fce2 2020-02-24 stsp goto done;
5663 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5665 da76fce2 2020-02-24 stsp if (error)
5666 da76fce2 2020-02-24 stsp goto done;
5667 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5668 da76fce2 2020-02-24 stsp commit_id);
5669 da76fce2 2020-02-24 stsp if (error)
5670 da76fce2 2020-02-24 stsp goto done;
5671 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5672 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5673 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5675 da76fce2 2020-02-24 stsp if (error)
5676 da76fce2 2020-02-24 stsp goto done;
5677 9627c110 2020-04-18 stsp if (upa.did_something)
5678 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5679 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5684 da76fce2 2020-02-24 stsp got_ref_close(ref);
5686 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5687 d0eebce4 2019-03-11 stsp if (worktree)
5688 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5689 d0eebce4 2019-03-11 stsp free(cwd);
5690 d0eebce4 2019-03-11 stsp free(repo_path);
5691 da76fce2 2020-02-24 stsp free(commit_id);
5692 da76fce2 2020-02-24 stsp free(commit_id_str);
5693 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5694 da76fce2 2020-02-24 stsp free((char *)pe->path);
5695 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5696 d00136be 2019-03-26 stsp return error;
5700 d00136be 2019-03-26 stsp __dead static void
5701 8e7bd50a 2019-08-22 stsp usage_tag(void)
5703 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5704 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5705 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5710 b8bad2ba 2019-08-23 stsp static const struct got_error *
5711 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5713 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5714 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5715 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5716 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5717 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5719 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5720 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5721 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5722 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5724 b8bad2ba 2019-08-23 stsp return err;
5725 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5728 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5731 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5732 b8bad2ba 2019-08-23 stsp free(re_id);
5735 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5736 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5739 b8bad2ba 2019-08-23 stsp while (se) {
5740 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5743 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5744 b8bad2ba 2019-08-23 stsp free(se_id);
5747 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5748 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5750 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5751 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5753 b8bad2ba 2019-08-23 stsp return err;
5754 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5757 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5762 b8bad2ba 2019-08-23 stsp return err;
5766 b8bad2ba 2019-08-23 stsp static const struct got_error *
5767 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5769 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5770 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5771 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5773 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5775 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5777 8e7bd50a 2019-08-22 stsp return err;
5779 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5780 8e7bd50a 2019-08-22 stsp const char *refname;
5781 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5782 8e7bd50a 2019-08-22 stsp char datebuf[26];
5783 d4efa91b 2020-01-14 stsp const char *tagger;
5784 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5785 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5786 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5787 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5789 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5790 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5792 8e7bd50a 2019-08-22 stsp refname += 10;
5793 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5794 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5795 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5798 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5799 8e7bd50a 2019-08-22 stsp free(refstr);
5801 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5804 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5805 d4efa91b 2020-01-14 stsp if (err) {
5806 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5810 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5811 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5812 d4efa91b 2020-01-14 stsp if (err) {
5816 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5817 d4efa91b 2020-01-14 stsp tagger_time =
5818 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5819 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5825 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5826 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5827 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5828 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5832 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5833 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5834 2417344c 2019-08-23 stsp if (datestr)
5835 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5836 d4efa91b 2020-01-14 stsp if (commit)
5837 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5839 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5840 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5841 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5844 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5845 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5848 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5849 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5852 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5853 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5860 8e7bd50a 2019-08-22 stsp free(id_str);
5861 d4efa91b 2020-01-14 stsp if (commit) {
5862 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5865 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5867 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5868 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5869 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5870 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5875 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5877 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5879 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5880 8e7bd50a 2019-08-22 stsp } while (line);
5881 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5884 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5885 8e7bd50a 2019-08-22 stsp return NULL;
5888 8e7bd50a 2019-08-22 stsp static const struct got_error *
5889 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5890 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5892 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5893 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5894 f372d5cd 2019-10-21 stsp char *editor = NULL;
5895 1601cb9f 2020-09-11 naddy int initial_content_len;
5896 8e7bd50a 2019-08-22 stsp int fd = -1;
5898 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5899 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5900 8e7bd50a 2019-08-22 stsp goto done;
5903 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
5904 1601cb9f 2020-09-11 naddy "\n# tagging commit %s as %s\n",
5905 1601cb9f 2020-09-11 naddy commit_id_str, tag_name);
5906 1601cb9f 2020-09-11 naddy if (initial_content_len == -1) {
5907 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5908 8e7bd50a 2019-08-22 stsp goto done;
5911 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5913 8e7bd50a 2019-08-22 stsp goto done;
5915 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
5916 97972933 2020-09-11 stsp err = got_error_from_errno2("write", *tagmsg_path);
5917 97972933 2020-09-11 stsp goto done;
5920 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5922 8e7bd50a 2019-08-22 stsp goto done;
5923 bfa12d5e 2020-09-26 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
5924 bfa12d5e 2020-09-26 stsp initial_content_len);
5926 8e7bd50a 2019-08-22 stsp free(initial_content);
5927 8e7bd50a 2019-08-22 stsp free(template);
5928 8e7bd50a 2019-08-22 stsp free(editor);
5930 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5931 97972933 2020-09-11 stsp err = got_error_from_errno2("close", *tagmsg_path);
5933 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5934 59f86c76 2020-09-11 stsp if (err == NULL)
5935 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5936 59f86c76 2020-09-11 stsp if (err) {
5937 59f86c76 2020-09-11 stsp free(*tagmsg);
5938 59f86c76 2020-09-11 stsp *tagmsg = NULL;
5940 8e7bd50a 2019-08-22 stsp return err;
5943 8e7bd50a 2019-08-22 stsp static const struct got_error *
5944 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
5945 50b0790e 2020-09-11 stsp const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5947 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5948 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5949 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5950 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5951 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5952 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5953 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5956 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5957 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5958 8e7bd50a 2019-08-22 stsp * an unintended typo.
5960 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5961 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5963 50b0790e 2020-09-11 stsp err = get_author(&tagger, repo, worktree);
5965 8e7bd50a 2019-08-22 stsp return err;
5967 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5968 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5970 8e7bd50a 2019-08-22 stsp goto done;
5972 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5974 8e7bd50a 2019-08-22 stsp goto done;
5976 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5977 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5978 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5979 62d463ca 2020-10-20 naddy err = got_error_from_errno("strdup");
5980 62d463ca 2020-10-20 naddy goto done;
5982 8e7bd50a 2019-08-22 stsp tag_name += 10;
5983 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5984 62d463ca 2020-10-20 naddy err = got_error_from_errno("asprintf");
5985 62d463ca 2020-10-20 naddy goto done;
5988 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5989 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5990 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5991 8e7bd50a 2019-08-22 stsp goto done;
5992 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5993 8e7bd50a 2019-08-22 stsp goto done;
5995 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5996 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5997 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5998 f372d5cd 2019-10-21 stsp if (err) {
5999 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6000 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
6001 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6002 8e7bd50a 2019-08-22 stsp goto done;
6006 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
6007 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6008 f372d5cd 2019-10-21 stsp if (err) {
6009 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6010 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6011 8e7bd50a 2019-08-22 stsp goto done;
6014 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
6015 f372d5cd 2019-10-21 stsp if (err) {
6016 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6017 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6018 8e7bd50a 2019-08-22 stsp goto done;
6021 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
6022 f372d5cd 2019-10-21 stsp if (err) {
6023 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6024 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6025 f372d5cd 2019-10-21 stsp goto done;
6028 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
6029 f372d5cd 2019-10-21 stsp if (err) {
6030 f372d5cd 2019-10-21 stsp if (tagmsg_path)
6031 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
6032 f372d5cd 2019-10-21 stsp goto done;
6034 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
6036 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
6037 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
6038 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
6039 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6040 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
6041 f372d5cd 2019-10-21 stsp free(tag_id_str);
6043 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
6044 8e7bd50a 2019-08-22 stsp free(commit_id);
6045 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6046 8e7bd50a 2019-08-22 stsp free(refname);
6047 8e7bd50a 2019-08-22 stsp free(tagmsg);
6048 f372d5cd 2019-10-21 stsp free(tagmsg_path);
6049 aba9c984 2019-09-08 stsp free(tagger);
6050 8e7bd50a 2019-08-22 stsp return err;
6053 8e7bd50a 2019-08-22 stsp static const struct got_error *
6054 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
6056 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
6057 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
6058 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
6059 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6060 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
6061 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6062 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
6064 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6065 8e7bd50a 2019-08-22 stsp switch (ch) {
6067 80106605 2020-02-24 stsp commit_id_arg = optarg;
6070 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
6073 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6074 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6075 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6077 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6080 8e7bd50a 2019-08-22 stsp do_list = 1;
6083 8e7bd50a 2019-08-22 stsp usage_tag();
6084 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
6088 8e7bd50a 2019-08-22 stsp argc -= optind;
6089 8e7bd50a 2019-08-22 stsp argv += optind;
6091 8e7bd50a 2019-08-22 stsp if (do_list) {
6092 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
6094 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
6095 8e7bd50a 2019-08-22 stsp if (tagmsg)
6096 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
6097 8e7bd50a 2019-08-22 stsp if (argc > 0)
6098 8e7bd50a 2019-08-22 stsp usage_tag();
6099 80106605 2020-02-24 stsp } else if (argc != 1)
6100 8e7bd50a 2019-08-22 stsp usage_tag();
6102 a2887370 2019-08-23 stsp tag_name = argv[0];
6104 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
6105 8e7bd50a 2019-08-22 stsp if (do_list) {
6106 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6107 8e7bd50a 2019-08-22 stsp NULL) == -1)
6108 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6110 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6111 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
6112 8e7bd50a 2019-08-22 stsp err(1, "pledge");
6115 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
6116 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
6117 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
6118 8e7bd50a 2019-08-22 stsp goto done;
6121 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6122 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6123 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6124 8e7bd50a 2019-08-22 stsp goto done;
6126 8e7bd50a 2019-08-22 stsp error = NULL;
6127 8e7bd50a 2019-08-22 stsp if (worktree) {
6128 8e7bd50a 2019-08-22 stsp repo_path =
6129 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
6130 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
6131 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6132 8e7bd50a 2019-08-22 stsp if (error)
6133 8e7bd50a 2019-08-22 stsp goto done;
6135 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
6136 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
6137 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
6138 8e7bd50a 2019-08-22 stsp goto done;
6143 8e7bd50a 2019-08-22 stsp if (do_list) {
6144 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6145 c9956ddf 2019-09-08 stsp if (error != NULL)
6146 c9956ddf 2019-09-08 stsp goto done;
6147 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6148 8e7bd50a 2019-08-22 stsp if (error)
6149 8e7bd50a 2019-08-22 stsp goto done;
6150 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
6152 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6153 c9956ddf 2019-09-08 stsp if (error)
6154 c9956ddf 2019-09-08 stsp goto done;
6155 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
6156 c9956ddf 2019-09-08 stsp if (error != NULL)
6157 c9956ddf 2019-09-08 stsp goto done;
6159 8e7bd50a 2019-08-22 stsp if (tagmsg) {
6160 42a285e2 2020-10-01 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6161 8e7bd50a 2019-08-22 stsp if (error)
6162 8e7bd50a 2019-08-22 stsp goto done;
6165 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
6166 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
6167 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
6168 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
6169 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
6170 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
6171 8e7bd50a 2019-08-22 stsp if (error)
6172 8e7bd50a 2019-08-22 stsp goto done;
6173 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6174 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
6175 8e7bd50a 2019-08-22 stsp if (error)
6176 8e7bd50a 2019-08-22 stsp goto done;
6177 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
6178 8e7bd50a 2019-08-22 stsp free(commit_id);
6179 8e7bd50a 2019-08-22 stsp if (error)
6180 8e7bd50a 2019-08-22 stsp goto done;
6183 50b0790e 2020-09-11 stsp error = add_tag(repo, worktree, tag_name,
6184 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6188 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
6189 8e7bd50a 2019-08-22 stsp if (worktree)
6190 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
6191 8e7bd50a 2019-08-22 stsp free(cwd);
6192 8e7bd50a 2019-08-22 stsp free(repo_path);
6193 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6194 8e7bd50a 2019-08-22 stsp free(commit_id_str);
6195 8e7bd50a 2019-08-22 stsp return error;
6198 8e7bd50a 2019-08-22 stsp __dead static void
6199 d00136be 2019-03-26 stsp usage_add(void)
6201 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6202 022fae89 2019-12-06 tracey getprogname());
6206 d00136be 2019-03-26 stsp static const struct got_error *
6207 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
6209 4e68cba3 2019-11-23 stsp while (path[0] == '/')
6211 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
6212 4e68cba3 2019-11-23 stsp return NULL;
6215 4e68cba3 2019-11-23 stsp static const struct got_error *
6216 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
6218 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
6219 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
6220 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
6221 1dd54920 2019-05-11 stsp char *cwd = NULL;
6222 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
6223 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
6224 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
6226 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
6228 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
6229 d00136be 2019-03-26 stsp switch (ch) {
6230 022fae89 2019-12-06 tracey case 'I':
6231 022fae89 2019-12-06 tracey no_ignores = 1;
6234 4e68cba3 2019-11-23 stsp can_recurse = 1;
6237 d00136be 2019-03-26 stsp usage_add();
6238 d00136be 2019-03-26 stsp /* NOTREACHED */
6242 d00136be 2019-03-26 stsp argc -= optind;
6243 d00136be 2019-03-26 stsp argv += optind;
6245 43012d58 2019-07-14 stsp #ifndef PROFILE
6246 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6247 43012d58 2019-07-14 stsp NULL) == -1)
6248 43012d58 2019-07-14 stsp err(1, "pledge");
6250 723c305c 2019-05-11 jcs if (argc < 1)
6251 d00136be 2019-03-26 stsp usage_add();
6253 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
6254 d00136be 2019-03-26 stsp if (cwd == NULL) {
6255 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6256 d00136be 2019-03-26 stsp goto done;
6259 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6260 fa51e947 2020-03-27 stsp if (error) {
6261 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6262 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
6263 d00136be 2019-03-26 stsp goto done;
6266 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6268 031a5338 2019-03-26 stsp if (error != NULL)
6269 031a5338 2019-03-26 stsp goto done;
6271 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6272 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6273 d00136be 2019-03-26 stsp if (error)
6274 d00136be 2019-03-26 stsp goto done;
6276 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6277 6d022e97 2019-08-04 stsp if (error)
6278 022fae89 2019-12-06 tracey goto done;
6280 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
6281 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6282 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
6283 6d022e97 2019-08-04 stsp goto done;
6287 4e68cba3 2019-11-23 stsp if (!can_recurse) {
6288 4e68cba3 2019-11-23 stsp char *ondisk_path;
6289 4e68cba3 2019-11-23 stsp struct stat sb;
6290 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
6291 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
6292 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
6293 62d463ca 2020-10-20 naddy pe->path) == -1) {
6294 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
6295 4e68cba3 2019-11-23 stsp goto done;
6297 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
6298 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
6299 4e68cba3 2019-11-23 stsp free(ondisk_path);
6302 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
6303 4e68cba3 2019-11-23 stsp ondisk_path);
6304 4e68cba3 2019-11-23 stsp free(ondisk_path);
6305 4e68cba3 2019-11-23 stsp goto done;
6307 4e68cba3 2019-11-23 stsp free(ondisk_path);
6308 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
6309 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6310 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
6311 4e68cba3 2019-11-23 stsp goto done;
6316 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
6317 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
6320 031a5338 2019-03-26 stsp got_repo_close(repo);
6321 d00136be 2019-03-26 stsp if (worktree)
6322 d00136be 2019-03-26 stsp got_worktree_close(worktree);
6323 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
6324 1dd54920 2019-05-11 stsp free((char *)pe->path);
6325 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
6326 2ec1f75b 2019-03-26 stsp free(cwd);
6327 2ec1f75b 2019-03-26 stsp return error;
6330 2ec1f75b 2019-03-26 stsp __dead static void
6331 648e4ef7 2019-07-09 stsp usage_remove(void)
6333 766841c2 2020-08-13 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6334 766841c2 2020-08-13 stsp "path ...\n", getprogname());
6338 2a06fe5f 2019-08-24 stsp static const struct got_error *
6339 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
6340 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
6342 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
6344 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6345 2a06fe5f 2019-08-24 stsp return NULL;
6346 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
6347 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
6348 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
6349 2a06fe5f 2019-08-24 stsp return NULL;
6352 2ec1f75b 2019-03-26 stsp static const struct got_error *
6353 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
6355 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
6356 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
6357 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
6358 766841c2 2020-08-13 stsp const char *status_codes = NULL;
6359 17ed4618 2019-06-02 stsp char *cwd = NULL;
6360 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
6361 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
6362 766841c2 2020-08-13 stsp int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6364 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
6366 766841c2 2020-08-13 stsp while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6367 2ec1f75b 2019-03-26 stsp switch (ch) {
6369 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
6371 70e3e7f5 2019-12-13 tracey case 'k':
6372 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
6374 f2a9dc41 2019-12-13 tracey case 'R':
6375 f2a9dc41 2019-12-13 tracey can_recurse = 1;
6378 766841c2 2020-08-13 stsp for (i = 0; i < strlen(optarg); i++) {
6379 766841c2 2020-08-13 stsp switch (optarg[i]) {
6380 766841c2 2020-08-13 stsp case GOT_STATUS_MODIFY:
6381 766841c2 2020-08-13 stsp delete_local_mods = 1;
6383 766841c2 2020-08-13 stsp case GOT_STATUS_MISSING:
6386 766841c2 2020-08-13 stsp errx(1, "invalid status code '%c'",
6387 766841c2 2020-08-13 stsp optarg[i]);
6390 766841c2 2020-08-13 stsp status_codes = optarg;
6393 f2a9dc41 2019-12-13 tracey usage_remove();
6394 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
6398 2ec1f75b 2019-03-26 stsp argc -= optind;
6399 2ec1f75b 2019-03-26 stsp argv += optind;
6401 43012d58 2019-07-14 stsp #ifndef PROFILE
6402 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6403 43012d58 2019-07-14 stsp NULL) == -1)
6404 43012d58 2019-07-14 stsp err(1, "pledge");
6406 17ed4618 2019-06-02 stsp if (argc < 1)
6407 648e4ef7 2019-07-09 stsp usage_remove();
6409 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
6410 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
6411 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6412 2ec1f75b 2019-03-26 stsp goto done;
6414 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
6415 fa51e947 2020-03-27 stsp if (error) {
6416 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6417 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
6418 2ec1f75b 2019-03-26 stsp goto done;
6421 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6424 2ec1f75b 2019-03-26 stsp goto done;
6426 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6427 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6428 2ec1f75b 2019-03-26 stsp if (error)
6429 2ec1f75b 2019-03-26 stsp goto done;
6431 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6432 6d022e97 2019-08-04 stsp if (error)
6433 6d022e97 2019-08-04 stsp goto done;
6435 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
6436 f2a9dc41 2019-12-13 tracey char *ondisk_path;
6437 f2a9dc41 2019-12-13 tracey struct stat sb;
6438 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
6439 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6440 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6441 62d463ca 2020-10-20 naddy pe->path) == -1) {
6442 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6443 f2a9dc41 2019-12-13 tracey goto done;
6445 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6446 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6447 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6448 f2a9dc41 2019-12-13 tracey continue;
6450 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6451 f2a9dc41 2019-12-13 tracey ondisk_path);
6452 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6453 f2a9dc41 2019-12-13 tracey goto done;
6455 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6456 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6457 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6458 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6459 f2a9dc41 2019-12-13 tracey goto done;
6464 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6465 766841c2 2020-08-13 stsp delete_local_mods, status_codes, print_remove_status, NULL,
6466 766841c2 2020-08-13 stsp repo, keep_on_disk);
6469 a129376b 2019-03-28 stsp got_repo_close(repo);
6470 a129376b 2019-03-28 stsp if (worktree)
6471 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6472 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6473 17ed4618 2019-06-02 stsp free((char *)pe->path);
6474 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6475 a129376b 2019-03-28 stsp free(cwd);
6476 a129376b 2019-03-28 stsp return error;
6479 a129376b 2019-03-28 stsp __dead static void
6480 a129376b 2019-03-28 stsp usage_revert(void)
6482 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6483 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6487 1ee397ad 2019-07-12 stsp static const struct got_error *
6488 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6490 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6491 fb9704af 2020-01-27 stsp return NULL;
6493 a129376b 2019-03-28 stsp while (path[0] == '/')
6495 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6496 33aa809d 2019-08-08 stsp return NULL;
6499 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6500 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6501 33aa809d 2019-08-08 stsp const char *action;
6504 33aa809d 2019-08-08 stsp static const struct got_error *
6505 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6506 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6508 33aa809d 2019-08-08 stsp char *line = NULL;
6509 33aa809d 2019-08-08 stsp size_t linesize = 0;
6510 33aa809d 2019-08-08 stsp ssize_t linelen;
6512 33aa809d 2019-08-08 stsp switch (status) {
6513 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6514 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6516 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6517 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6519 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6520 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6521 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6522 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6523 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6524 33aa809d 2019-08-08 stsp printf("%s", line);
6525 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6526 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6527 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6528 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6529 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6532 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6535 33aa809d 2019-08-08 stsp return NULL;
6538 33aa809d 2019-08-08 stsp static const struct got_error *
6539 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6540 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6542 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6543 33aa809d 2019-08-08 stsp char *line = NULL;
6544 33aa809d 2019-08-08 stsp size_t linesize = 0;
6545 33aa809d 2019-08-08 stsp ssize_t linelen;
6546 33aa809d 2019-08-08 stsp int resp = ' ';
6547 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6549 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6551 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6553 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6554 33aa809d 2019-08-08 stsp a->action);
6556 33aa809d 2019-08-08 stsp return err;
6557 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6558 33aa809d 2019-08-08 stsp if (linelen == -1) {
6559 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6560 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6561 33aa809d 2019-08-08 stsp return NULL;
6563 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6565 33aa809d 2019-08-08 stsp *nl = '\0';
6566 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6567 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6568 33aa809d 2019-08-08 stsp printf("y\n");
6569 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6570 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6571 33aa809d 2019-08-08 stsp printf("n\n");
6572 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6573 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6574 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6575 33aa809d 2019-08-08 stsp printf("q\n");
6577 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6578 33aa809d 2019-08-08 stsp free(line);
6579 33aa809d 2019-08-08 stsp return NULL;
6582 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6583 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6584 33aa809d 2019-08-08 stsp a->action);
6586 33aa809d 2019-08-08 stsp return err;
6587 33aa809d 2019-08-08 stsp resp = getchar();
6588 33aa809d 2019-08-08 stsp if (resp == '\n')
6589 33aa809d 2019-08-08 stsp resp = getchar();
6590 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6591 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6592 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6593 33aa809d 2019-08-08 stsp resp = ' ';
6595 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6596 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6597 33aa809d 2019-08-08 stsp resp = ' ';
6601 33aa809d 2019-08-08 stsp if (resp == 'y')
6602 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6603 33aa809d 2019-08-08 stsp else if (resp == 'n')
6604 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6605 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6606 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6608 1ee397ad 2019-07-12 stsp return NULL;
6612 a129376b 2019-03-28 stsp static const struct got_error *
6613 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6615 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6616 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6617 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6618 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6619 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6620 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6621 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6622 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6623 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6624 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6626 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6628 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6629 a129376b 2019-03-28 stsp switch (ch) {
6631 33aa809d 2019-08-08 stsp pflag = 1;
6634 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6637 0f6d7415 2019-08-08 stsp can_recurse = 1;
6640 a129376b 2019-03-28 stsp usage_revert();
6641 a129376b 2019-03-28 stsp /* NOTREACHED */
6645 a129376b 2019-03-28 stsp argc -= optind;
6646 a129376b 2019-03-28 stsp argv += optind;
6648 43012d58 2019-07-14 stsp #ifndef PROFILE
6649 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6650 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6651 43012d58 2019-07-14 stsp err(1, "pledge");
6653 e20a8b6f 2019-06-04 stsp if (argc < 1)
6654 a129376b 2019-03-28 stsp usage_revert();
6655 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6656 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6658 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6659 a129376b 2019-03-28 stsp if (cwd == NULL) {
6660 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6661 a129376b 2019-03-28 stsp goto done;
6663 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6664 fa51e947 2020-03-27 stsp if (error) {
6665 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6666 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6667 2ec1f75b 2019-03-26 stsp goto done;
6670 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6672 a129376b 2019-03-28 stsp if (error != NULL)
6673 a129376b 2019-03-28 stsp goto done;
6675 33aa809d 2019-08-08 stsp if (patch_script_path) {
6676 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6677 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6678 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6679 33aa809d 2019-08-08 stsp patch_script_path);
6680 33aa809d 2019-08-08 stsp goto done;
6683 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6684 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6685 a129376b 2019-03-28 stsp if (error)
6686 a129376b 2019-03-28 stsp goto done;
6688 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6689 6d022e97 2019-08-04 stsp if (error)
6690 6d022e97 2019-08-04 stsp goto done;
6692 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6693 0f6d7415 2019-08-08 stsp char *ondisk_path;
6694 0f6d7415 2019-08-08 stsp struct stat sb;
6695 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6696 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6697 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6698 62d463ca 2020-10-20 naddy pe->path) == -1) {
6699 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6700 0f6d7415 2019-08-08 stsp goto done;
6702 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6703 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6704 0f6d7415 2019-08-08 stsp free(ondisk_path);
6707 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6708 0f6d7415 2019-08-08 stsp ondisk_path);
6709 0f6d7415 2019-08-08 stsp free(ondisk_path);
6710 0f6d7415 2019-08-08 stsp goto done;
6712 0f6d7415 2019-08-08 stsp free(ondisk_path);
6713 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6714 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6715 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6716 0f6d7415 2019-08-08 stsp goto done;
6721 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6722 33aa809d 2019-08-08 stsp cpa.action = "revert";
6723 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6724 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6726 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6727 33aa809d 2019-08-08 stsp error == NULL)
6728 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6730 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6731 2ec1f75b 2019-03-26 stsp if (worktree)
6732 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6733 2ec1f75b 2019-03-26 stsp free(path);
6734 d00136be 2019-03-26 stsp free(cwd);
6735 6bad629b 2019-02-04 stsp return error;
6738 c4296144 2019-05-09 stsp __dead static void
6739 c4296144 2019-05-09 stsp usage_commit(void)
6741 35213c7c 2020-07-23 stsp fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6742 5c1e53bc 2019-07-28 stsp getprogname());
6746 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6747 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6748 e2ba3d07 2019-05-13 stsp const char *editor;
6749 e0870e44 2019-05-13 stsp const char *worktree_path;
6750 76d98825 2019-06-03 stsp const char *branch_name;
6751 314a6357 2019-05-13 stsp const char *repo_path;
6752 e0870e44 2019-05-13 stsp char *logmsg_path;
6756 33ad4cbe 2019-05-12 jcs static const struct got_error *
6757 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6760 76d98825 2019-06-03 stsp char *initial_content = NULL;
6761 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6762 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6763 e0870e44 2019-05-13 stsp char *template = NULL;
6764 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6765 1601cb9f 2020-09-11 naddy int initial_content_len;
6766 97972933 2020-09-11 stsp int fd = -1;
6767 33ad4cbe 2019-05-12 jcs size_t len;
6769 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6770 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6771 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6772 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6773 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6774 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6775 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6776 33ad4cbe 2019-05-12 jcs return NULL;
6779 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6780 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6782 1601cb9f 2020-09-11 naddy initial_content_len = asprintf(&initial_content,
6783 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6784 1601cb9f 2020-09-11 naddy a->branch_name);
6785 1601cb9f 2020-09-11 naddy if (initial_content_len == -1)
6786 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6788 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6790 e0870e44 2019-05-13 stsp goto done;
6792 97972933 2020-09-11 stsp if (write(fd, initial_content, initial_content_len) == -1) {
6793 97972933 2020-09-11 stsp err = got_error_from_errno2("write", a->logmsg_path);
6794 97972933 2020-09-11 stsp goto done;
6797 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6798 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6799 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6800 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6801 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6804 bfa12d5e 2020-09-26 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6805 bfa12d5e 2020-09-26 stsp initial_content_len);
6807 76d98825 2019-06-03 stsp free(initial_content);
6808 e0870e44 2019-05-13 stsp free(template);
6810 97972933 2020-09-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
6811 97972933 2020-09-11 stsp err = got_error_from_errno2("close", a->logmsg_path);
6813 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6814 59f86c76 2020-09-11 stsp if (err == NULL)
6815 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6816 59f86c76 2020-09-11 stsp if (err) {
6817 59f86c76 2020-09-11 stsp free(*logmsg);
6818 59f86c76 2020-09-11 stsp *logmsg = NULL;
6820 33ad4cbe 2019-05-12 jcs return err;
6823 c4296144 2019-05-09 stsp static const struct got_error *
6824 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6826 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6827 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6828 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6829 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6830 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6831 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6832 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6833 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6834 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6835 35213c7c 2020-07-23 stsp int allow_bad_symlinks = 0;
6836 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6838 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6839 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6841 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "m:S")) != -1) {
6842 c4296144 2019-05-09 stsp switch (ch) {
6844 c4296144 2019-05-09 stsp logmsg = optarg;
6847 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
6850 c4296144 2019-05-09 stsp usage_commit();
6851 c4296144 2019-05-09 stsp /* NOTREACHED */
6855 c4296144 2019-05-09 stsp argc -= optind;
6856 c4296144 2019-05-09 stsp argv += optind;
6858 43012d58 2019-07-14 stsp #ifndef PROFILE
6859 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6860 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6861 43012d58 2019-07-14 stsp err(1, "pledge");
6863 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6864 c4296144 2019-05-09 stsp if (cwd == NULL) {
6865 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6866 c4296144 2019-05-09 stsp goto done;
6868 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6869 fa51e947 2020-03-27 stsp if (error) {
6870 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6871 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6872 7d5807f4 2019-07-11 stsp goto done;
6875 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6876 c4296144 2019-05-09 stsp if (error)
6877 a698f62e 2019-07-25 stsp goto done;
6878 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6879 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6880 c4296144 2019-05-09 stsp goto done;
6883 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6884 916f288c 2019-07-30 stsp worktree);
6885 5c1e53bc 2019-07-28 stsp if (error)
6886 5c1e53bc 2019-07-28 stsp goto done;
6888 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6889 c9956ddf 2019-09-08 stsp if (error)
6890 c9956ddf 2019-09-08 stsp goto done;
6891 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6892 c9956ddf 2019-09-08 stsp gitconfig_path);
6893 c4296144 2019-05-09 stsp if (error != NULL)
6894 c4296144 2019-05-09 stsp goto done;
6896 50b0790e 2020-09-11 stsp error = get_author(&author, repo, worktree);
6897 aba9c984 2019-09-08 stsp if (error)
6898 aba9c984 2019-09-08 stsp return error;
6901 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6902 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6904 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6905 314a6357 2019-05-13 stsp error = get_editor(&editor);
6907 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6908 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6909 c4296144 2019-05-09 stsp if (error)
6910 c4296144 2019-05-09 stsp goto done;
6912 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6913 087fb88c 2019-08-04 stsp if (error)
6914 087fb88c 2019-08-04 stsp goto done;
6916 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6917 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6918 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6919 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6920 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6921 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6922 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6923 916f288c 2019-07-30 stsp goto done;
6925 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6927 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6928 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6929 35213c7c 2020-07-23 stsp allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6930 35213c7c 2020-07-23 stsp print_status, NULL, repo);
6931 e0870e44 2019-05-13 stsp if (error) {
6932 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6933 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6934 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6935 c4296144 2019-05-09 stsp goto done;
6938 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6939 c4296144 2019-05-09 stsp if (error)
6940 c4296144 2019-05-09 stsp goto done;
6941 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6943 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6944 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6945 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6946 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6947 7266f21f 2019-10-21 stsp error == NULL)
6948 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6949 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6951 c4296144 2019-05-09 stsp got_repo_close(repo);
6952 c4296144 2019-05-09 stsp if (worktree)
6953 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6954 c4296144 2019-05-09 stsp free(cwd);
6955 c4296144 2019-05-09 stsp free(id_str);
6956 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6957 e2ba3d07 2019-05-13 stsp free(editor);
6958 aba9c984 2019-09-08 stsp free(author);
6959 234035bc 2019-06-01 stsp return error;
6962 234035bc 2019-06-01 stsp __dead static void
6963 234035bc 2019-06-01 stsp usage_cherrypick(void)
6965 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6969 234035bc 2019-06-01 stsp static const struct got_error *
6970 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6972 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6973 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6974 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6975 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6976 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6977 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6978 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6979 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6981 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6983 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6984 234035bc 2019-06-01 stsp switch (ch) {
6986 234035bc 2019-06-01 stsp usage_cherrypick();
6987 234035bc 2019-06-01 stsp /* NOTREACHED */
6991 234035bc 2019-06-01 stsp argc -= optind;
6992 234035bc 2019-06-01 stsp argv += optind;
6994 43012d58 2019-07-14 stsp #ifndef PROFILE
6995 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6996 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6997 43012d58 2019-07-14 stsp err(1, "pledge");
6999 234035bc 2019-06-01 stsp if (argc != 1)
7000 234035bc 2019-06-01 stsp usage_cherrypick();
7002 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
7003 234035bc 2019-06-01 stsp if (cwd == NULL) {
7004 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
7005 234035bc 2019-06-01 stsp goto done;
7007 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
7008 fa51e947 2020-03-27 stsp if (error) {
7009 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7010 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
7012 234035bc 2019-06-01 stsp goto done;
7015 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7017 234035bc 2019-06-01 stsp if (error != NULL)
7018 234035bc 2019-06-01 stsp goto done;
7020 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7021 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7022 234035bc 2019-06-01 stsp if (error)
7023 234035bc 2019-06-01 stsp goto done;
7025 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7026 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7027 234035bc 2019-06-01 stsp if (error != NULL) {
7028 234035bc 2019-06-01 stsp struct got_reference *ref;
7029 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7030 234035bc 2019-06-01 stsp goto done;
7031 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7032 234035bc 2019-06-01 stsp if (error != NULL)
7033 234035bc 2019-06-01 stsp goto done;
7034 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
7035 234035bc 2019-06-01 stsp got_ref_close(ref);
7036 234035bc 2019-06-01 stsp if (error != NULL)
7037 234035bc 2019-06-01 stsp goto done;
7039 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
7040 234035bc 2019-06-01 stsp if (error)
7041 234035bc 2019-06-01 stsp goto done;
7043 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
7044 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
7045 234035bc 2019-06-01 stsp if (error != NULL)
7046 234035bc 2019-06-01 stsp goto done;
7048 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7049 234035bc 2019-06-01 stsp if (error) {
7050 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
7051 234035bc 2019-06-01 stsp goto done;
7052 234035bc 2019-06-01 stsp error = NULL;
7054 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
7055 234035bc 2019-06-01 stsp goto done;
7058 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7059 234035bc 2019-06-01 stsp if (error)
7060 234035bc 2019-06-01 stsp goto done;
7061 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7062 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7063 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7064 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
7066 234035bc 2019-06-01 stsp if (error != NULL)
7067 234035bc 2019-06-01 stsp goto done;
7069 9627c110 2020-04-18 stsp if (upa.did_something)
7070 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
7071 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7073 234035bc 2019-06-01 stsp if (commit)
7074 234035bc 2019-06-01 stsp got_object_commit_close(commit);
7075 234035bc 2019-06-01 stsp free(commit_id_str);
7076 234035bc 2019-06-01 stsp if (head_ref)
7077 234035bc 2019-06-01 stsp got_ref_close(head_ref);
7078 234035bc 2019-06-01 stsp if (worktree)
7079 234035bc 2019-06-01 stsp got_worktree_close(worktree);
7081 234035bc 2019-06-01 stsp got_repo_close(repo);
7082 c4296144 2019-05-09 stsp return error;
7085 5ef14e63 2019-06-02 stsp __dead static void
7086 5ef14e63 2019-06-02 stsp usage_backout(void)
7088 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7092 5ef14e63 2019-06-02 stsp static const struct got_error *
7093 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
7095 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
7096 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
7097 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
7098 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
7099 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
7100 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
7101 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
7102 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
7104 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7106 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7107 5ef14e63 2019-06-02 stsp switch (ch) {
7109 5ef14e63 2019-06-02 stsp usage_backout();
7110 5ef14e63 2019-06-02 stsp /* NOTREACHED */
7114 5ef14e63 2019-06-02 stsp argc -= optind;
7115 5ef14e63 2019-06-02 stsp argv += optind;
7117 43012d58 2019-07-14 stsp #ifndef PROFILE
7118 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7119 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7120 43012d58 2019-07-14 stsp err(1, "pledge");
7122 5ef14e63 2019-06-02 stsp if (argc != 1)
7123 5ef14e63 2019-06-02 stsp usage_backout();
7125 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
7126 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
7127 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
7128 5ef14e63 2019-06-02 stsp goto done;
7130 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
7131 fa51e947 2020-03-27 stsp if (error) {
7132 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7133 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
7134 5ef14e63 2019-06-02 stsp goto done;
7137 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7139 5ef14e63 2019-06-02 stsp if (error != NULL)
7140 5ef14e63 2019-06-02 stsp goto done;
7142 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7143 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7144 5ef14e63 2019-06-02 stsp if (error)
7145 5ef14e63 2019-06-02 stsp goto done;
7147 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7148 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
7149 5ef14e63 2019-06-02 stsp if (error != NULL) {
7150 5ef14e63 2019-06-02 stsp struct got_reference *ref;
7151 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7152 5ef14e63 2019-06-02 stsp goto done;
7153 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
7154 5ef14e63 2019-06-02 stsp if (error != NULL)
7155 5ef14e63 2019-06-02 stsp goto done;
7156 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
7157 5ef14e63 2019-06-02 stsp got_ref_close(ref);
7158 5ef14e63 2019-06-02 stsp if (error != NULL)
7159 5ef14e63 2019-06-02 stsp goto done;
7161 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
7162 5ef14e63 2019-06-02 stsp if (error)
7163 5ef14e63 2019-06-02 stsp goto done;
7165 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
7166 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
7167 5ef14e63 2019-06-02 stsp if (error != NULL)
7168 5ef14e63 2019-06-02 stsp goto done;
7170 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
7171 5ef14e63 2019-06-02 stsp if (error)
7172 5ef14e63 2019-06-02 stsp goto done;
7174 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7175 5ef14e63 2019-06-02 stsp if (error)
7176 5ef14e63 2019-06-02 stsp goto done;
7177 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7178 5ef14e63 2019-06-02 stsp if (pid == NULL) {
7179 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
7180 5ef14e63 2019-06-02 stsp goto done;
7183 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7184 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7185 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7186 5ef14e63 2019-06-02 stsp if (error != NULL)
7187 5ef14e63 2019-06-02 stsp goto done;
7189 9627c110 2020-04-18 stsp if (upa.did_something)
7190 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
7191 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7193 5ef14e63 2019-06-02 stsp if (commit)
7194 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
7195 5ef14e63 2019-06-02 stsp free(commit_id_str);
7196 5ef14e63 2019-06-02 stsp if (head_ref)
7197 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
7198 818c7501 2019-07-11 stsp if (worktree)
7199 818c7501 2019-07-11 stsp got_worktree_close(worktree);
7201 818c7501 2019-07-11 stsp got_repo_close(repo);
7202 818c7501 2019-07-11 stsp return error;
7205 818c7501 2019-07-11 stsp __dead static void
7206 818c7501 2019-07-11 stsp usage_rebase(void)
7208 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7209 af54c8f8 2019-07-11 stsp getprogname());
7214 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
7217 0ebf8283 2019-07-24 stsp size_t len;
7219 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
7220 0ebf8283 2019-07-24 stsp if (len > limit)
7221 0ebf8283 2019-07-24 stsp len = limit;
7222 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
7223 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
7225 0ebf8283 2019-07-24 stsp *nl = '\0';
7228 0ebf8283 2019-07-24 stsp static const struct got_error *
7229 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7231 5943eee2 2019-08-13 stsp const struct got_error *err;
7232 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
7233 5943eee2 2019-08-13 stsp const char *s;
7235 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
7237 5943eee2 2019-08-13 stsp return err;
7239 5943eee2 2019-08-13 stsp s = logmsg0;
7240 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
7243 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
7244 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
7245 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
7246 5943eee2 2019-08-13 stsp goto done;
7249 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
7251 5943eee2 2019-08-13 stsp free(logmsg0);
7252 a0ea4fc0 2020-02-28 stsp return err;
7255 a0ea4fc0 2020-02-28 stsp static const struct got_error *
7256 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7258 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
7259 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
7260 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
7262 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
7264 a0ea4fc0 2020-02-28 stsp return err;
7266 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
7268 a0ea4fc0 2020-02-28 stsp goto done;
7270 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
7272 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
7274 a0ea4fc0 2020-02-28 stsp goto done;
7276 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
7278 a0ea4fc0 2020-02-28 stsp free(id_str);
7279 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
7280 a0ea4fc0 2020-02-28 stsp free(logmsg);
7281 5943eee2 2019-08-13 stsp return err;
7284 818c7501 2019-07-11 stsp static const struct got_error *
7285 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
7286 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
7288 818c7501 2019-07-11 stsp const struct got_error *err;
7289 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7291 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
7293 818c7501 2019-07-11 stsp goto done;
7295 ff0d2220 2019-07-11 stsp if (new_id) {
7296 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
7298 ff0d2220 2019-07-11 stsp goto done;
7301 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
7302 ff0d2220 2019-07-11 stsp if (new_id_str)
7303 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
7305 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7307 0ebf8283 2019-07-24 stsp goto done;
7309 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
7310 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7312 818c7501 2019-07-11 stsp free(old_id_str);
7313 818c7501 2019-07-11 stsp free(new_id_str);
7314 272a1371 2020-02-28 stsp free(logmsg);
7315 818c7501 2019-07-11 stsp return err;
7318 1ee397ad 2019-07-12 stsp static const struct got_error *
7319 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7320 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
7321 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
7323 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
7324 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
7325 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
7328 818c7501 2019-07-11 stsp static const struct got_error *
7329 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
7330 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7331 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
7332 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7334 ff0d2220 2019-07-11 stsp const struct got_error *error;
7335 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
7336 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
7338 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7339 ff0d2220 2019-07-11 stsp if (error)
7340 ff0d2220 2019-07-11 stsp return error;
7342 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7343 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
7344 ff0d2220 2019-07-11 stsp if (error) {
7345 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7346 ff0d2220 2019-07-11 stsp goto done;
7347 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
7349 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
7350 ff0d2220 2019-07-11 stsp free(new_commit_id);
7353 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
7354 ff0d2220 2019-07-11 stsp return error;
7357 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
7358 64c6d990 2019-07-11 stsp const char *path_prefix;
7359 64c6d990 2019-07-11 stsp size_t len;
7360 8ca9bd68 2019-07-25 stsp int errcode;
7363 64c6d990 2019-07-11 stsp static const struct got_error *
7364 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7365 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
7366 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
7367 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
7369 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
7371 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7372 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7373 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
7375 64c6d990 2019-07-11 stsp return NULL;
7378 64c6d990 2019-07-11 stsp static const struct got_error *
7379 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
7380 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
7381 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
7383 64c6d990 2019-07-11 stsp const struct got_error *err;
7384 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7385 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
7386 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
7388 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
7389 64c6d990 2019-07-11 stsp return NULL;
7391 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7393 64c6d990 2019-07-11 stsp goto done;
7395 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7397 64c6d990 2019-07-11 stsp goto done;
7399 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
7400 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
7402 64c6d990 2019-07-11 stsp goto done;
7404 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
7405 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
7407 64c6d990 2019-07-11 stsp goto done;
7409 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
7410 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
7411 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
7412 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
7413 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
7414 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
7415 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
7417 64c6d990 2019-07-11 stsp if (tree1)
7418 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
7419 64c6d990 2019-07-11 stsp if (tree2)
7420 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
7421 64c6d990 2019-07-11 stsp if (commit)
7422 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
7423 64c6d990 2019-07-11 stsp if (parent_commit)
7424 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
7425 64c6d990 2019-07-11 stsp return err;
7428 ff0d2220 2019-07-11 stsp static const struct got_error *
7429 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
7430 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
7431 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7432 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
7433 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
7435 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
7436 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
7437 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
7438 af61c510 2019-07-19 stsp struct got_object_qid *qid;
7439 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
7441 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
7443 af61c510 2019-07-19 stsp return err;
7445 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7446 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7448 af61c510 2019-07-19 stsp goto done;
7449 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7450 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
7451 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
7452 af61c510 2019-07-19 stsp if (err) {
7453 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7454 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7455 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7456 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7457 af61c510 2019-07-19 stsp "been reached?!?");
7459 ee780d5c 2020-01-04 stsp goto done;
7461 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7462 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7464 af61c510 2019-07-19 stsp goto done;
7466 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7468 af61c510 2019-07-19 stsp goto done;
7469 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7470 af61c510 2019-07-19 stsp commit_id = parent_id;
7474 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7475 af61c510 2019-07-19 stsp return err;
7478 af61c510 2019-07-19 stsp static const struct got_error *
7479 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7481 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7482 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7483 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7484 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7485 818c7501 2019-07-11 stsp char *cwd = NULL;
7486 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7487 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7488 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7489 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7490 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7491 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7492 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7493 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7494 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7495 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7496 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7497 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7498 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7500 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7501 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7503 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7504 818c7501 2019-07-11 stsp switch (ch) {
7506 818c7501 2019-07-11 stsp abort_rebase = 1;
7509 818c7501 2019-07-11 stsp continue_rebase = 1;
7512 818c7501 2019-07-11 stsp usage_rebase();
7513 818c7501 2019-07-11 stsp /* NOTREACHED */
7517 818c7501 2019-07-11 stsp argc -= optind;
7518 818c7501 2019-07-11 stsp argv += optind;
7520 43012d58 2019-07-14 stsp #ifndef PROFILE
7521 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7522 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7523 43012d58 2019-07-14 stsp err(1, "pledge");
7525 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7526 818c7501 2019-07-11 stsp usage_rebase();
7527 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7528 818c7501 2019-07-11 stsp if (argc != 0)
7529 818c7501 2019-07-11 stsp usage_rebase();
7530 818c7501 2019-07-11 stsp } else if (argc != 1)
7531 818c7501 2019-07-11 stsp usage_rebase();
7533 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7534 818c7501 2019-07-11 stsp if (cwd == NULL) {
7535 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7536 818c7501 2019-07-11 stsp goto done;
7538 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7539 fa51e947 2020-03-27 stsp if (error) {
7540 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7541 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7542 818c7501 2019-07-11 stsp goto done;
7545 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7547 818c7501 2019-07-11 stsp if (error != NULL)
7548 818c7501 2019-07-11 stsp goto done;
7550 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7551 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7552 7ef62c4e 2020-02-24 stsp if (error)
7553 7ef62c4e 2020-02-24 stsp goto done;
7555 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7556 7ef62c4e 2020-02-24 stsp worktree);
7557 818c7501 2019-07-11 stsp if (error)
7558 7ef62c4e 2020-02-24 stsp goto done;
7559 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7560 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7561 818c7501 2019-07-11 stsp goto done;
7564 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7565 818c7501 2019-07-11 stsp if (error)
7566 818c7501 2019-07-11 stsp goto done;
7568 f6794adc 2019-07-23 stsp if (abort_rebase) {
7569 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7570 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7571 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7572 f6794adc 2019-07-23 stsp goto done;
7574 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7575 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7576 3e3a69f1 2019-07-25 stsp worktree, repo);
7577 818c7501 2019-07-11 stsp if (error)
7578 818c7501 2019-07-11 stsp goto done;
7579 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7580 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7581 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7582 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7583 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7584 818c7501 2019-07-11 stsp if (error)
7585 818c7501 2019-07-11 stsp goto done;
7586 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7587 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7588 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7591 818c7501 2019-07-11 stsp if (continue_rebase) {
7592 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7593 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7594 f6794adc 2019-07-23 stsp goto done;
7596 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7597 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7598 3e3a69f1 2019-07-25 stsp worktree, repo);
7599 818c7501 2019-07-11 stsp if (error)
7600 818c7501 2019-07-11 stsp goto done;
7602 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7603 01757395 2019-07-12 stsp resume_commit_id, repo);
7604 818c7501 2019-07-11 stsp if (error)
7605 818c7501 2019-07-11 stsp goto done;
7607 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7608 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7609 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7610 818c7501 2019-07-11 stsp goto done;
7613 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7614 818c7501 2019-07-11 stsp if (error != NULL)
7615 818c7501 2019-07-11 stsp goto done;
7618 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7619 ff0d2220 2019-07-11 stsp if (error)
7620 ff0d2220 2019-07-11 stsp goto done;
7622 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7623 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7625 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7626 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7627 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7628 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7629 818c7501 2019-07-11 stsp if (error)
7630 818c7501 2019-07-11 stsp goto done;
7631 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7632 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7633 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7634 818c7501 2019-07-11 stsp "with work tree's branch");
7635 818c7501 2019-07-11 stsp goto done;
7638 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7639 a51a74b3 2019-07-27 stsp if (error) {
7640 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7641 a51a74b3 2019-07-27 stsp goto done;
7642 a51a74b3 2019-07-27 stsp error = NULL;
7644 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7645 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7646 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7647 a51a74b3 2019-07-27 stsp goto done;
7649 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7650 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7651 818c7501 2019-07-11 stsp if (error)
7652 818c7501 2019-07-11 stsp goto done;
7655 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7656 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7657 818c7501 2019-07-11 stsp if (error)
7658 818c7501 2019-07-11 stsp goto done;
7660 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7661 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7662 fc66b545 2019-08-12 stsp if (pid == NULL) {
7663 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7664 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7665 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7666 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7667 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7668 fc66b545 2019-08-12 stsp if (error)
7669 fc66b545 2019-08-12 stsp goto done;
7670 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7671 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7672 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7675 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7676 fc66b545 2019-08-12 stsp goto done;
7678 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7679 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7680 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7681 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7682 818c7501 2019-07-11 stsp commit = NULL;
7683 818c7501 2019-07-11 stsp if (error)
7684 818c7501 2019-07-11 stsp goto done;
7686 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7687 38b0338b 2019-11-29 stsp if (continue_rebase) {
7688 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7689 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7690 38b0338b 2019-11-29 stsp goto done;
7692 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7693 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7694 38b0338b 2019-11-29 stsp char *id_str;
7695 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7696 38b0338b 2019-11-29 stsp new_base_branch);
7697 38b0338b 2019-11-29 stsp if (error)
7698 38b0338b 2019-11-29 stsp goto done;
7699 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7700 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7701 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7702 38b0338b 2019-11-29 stsp free(id_str);
7703 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7704 38b0338b 2019-11-29 stsp new_head_commit_id);
7705 38b0338b 2019-11-29 stsp if (error)
7706 38b0338b 2019-11-29 stsp goto done;
7710 818c7501 2019-07-11 stsp pid = NULL;
7711 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7712 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7714 818c7501 2019-07-11 stsp commit_id = qid->id;
7715 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7716 818c7501 2019-07-11 stsp pid = qid;
7718 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7719 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7720 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7721 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7722 818c7501 2019-07-11 stsp if (error)
7723 818c7501 2019-07-11 stsp goto done;
7725 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7726 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7727 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7729 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7730 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7731 a0ea4fc0 2020-02-28 stsp if (error)
7732 a0ea4fc0 2020-02-28 stsp goto done;
7733 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7737 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7738 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7739 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7740 818c7501 2019-07-11 stsp if (error)
7741 818c7501 2019-07-11 stsp goto done;
7744 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7745 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7746 818c7501 2019-07-11 stsp if (error)
7747 818c7501 2019-07-11 stsp goto done;
7748 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7749 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7751 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7752 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7754 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7755 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7756 818c7501 2019-07-11 stsp free(resume_commit_id);
7757 818c7501 2019-07-11 stsp free(yca_id);
7758 818c7501 2019-07-11 stsp if (commit)
7759 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7760 818c7501 2019-07-11 stsp if (branch)
7761 818c7501 2019-07-11 stsp got_ref_close(branch);
7762 818c7501 2019-07-11 stsp if (new_base_branch)
7763 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7764 818c7501 2019-07-11 stsp if (tmp_branch)
7765 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7766 5ef14e63 2019-06-02 stsp if (worktree)
7767 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7769 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7770 5ef14e63 2019-06-02 stsp return error;
7773 0ebf8283 2019-07-24 stsp __dead static void
7774 0ebf8283 2019-07-24 stsp usage_histedit(void)
7776 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7777 0ebf8283 2019-07-24 stsp getprogname());
7781 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7782 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7783 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7784 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7785 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7787 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7788 0ebf8283 2019-07-24 stsp unsigned char code;
7789 0ebf8283 2019-07-24 stsp const char *name;
7790 0ebf8283 2019-07-24 stsp const char *desc;
7791 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7792 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7793 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7794 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7795 82997472 2020-01-29 stsp "be used" },
7796 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7797 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7798 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7801 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7802 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7803 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7804 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7805 0ebf8283 2019-07-24 stsp char *logmsg;
7807 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7809 0ebf8283 2019-07-24 stsp static const struct got_error *
7810 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7811 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7813 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7814 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7815 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7818 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7820 0ebf8283 2019-07-24 stsp goto done;
7822 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7824 0ebf8283 2019-07-24 stsp goto done;
7826 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7828 0ebf8283 2019-07-24 stsp goto done;
7830 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7831 0ebf8283 2019-07-24 stsp if (n < 0)
7832 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7834 0ebf8283 2019-07-24 stsp if (commit)
7835 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7836 0ebf8283 2019-07-24 stsp free(id_str);
7837 0ebf8283 2019-07-24 stsp free(logmsg);
7838 0ebf8283 2019-07-24 stsp return err;
7841 0ebf8283 2019-07-24 stsp static const struct got_error *
7842 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7843 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7845 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7846 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7848 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7849 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7851 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7852 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7856 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7857 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7858 083957f4 2020-02-24 stsp if (n < 0) {
7859 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7865 0ebf8283 2019-07-24 stsp return err;
7868 0ebf8283 2019-07-24 stsp static const struct got_error *
7869 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7870 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7872 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7874 514f2ffe 2020-01-29 stsp char *id_str;
7875 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7877 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7878 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7880 514f2ffe 2020-01-29 stsp return err;
7882 514f2ffe 2020-01-29 stsp n = fprintf(f,
7883 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7884 514f2ffe 2020-01-29 stsp "# commit %s\n"
7885 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7886 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7887 514f2ffe 2020-01-29 stsp if (n < 0) {
7888 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7889 514f2ffe 2020-01-29 stsp goto done;
7892 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7893 514f2ffe 2020-01-29 stsp if (n < 0) {
7894 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7895 514f2ffe 2020-01-29 stsp goto done;
7898 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7899 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7900 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7901 0ebf8283 2019-07-24 stsp cmd->desc);
7902 0ebf8283 2019-07-24 stsp if (n < 0) {
7903 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7908 514f2ffe 2020-01-29 stsp free(id_str);
7909 0ebf8283 2019-07-24 stsp return err;
7912 0ebf8283 2019-07-24 stsp static const struct got_error *
7913 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7915 0ebf8283 2019-07-24 stsp static char msg[42];
7918 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7920 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7921 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7923 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7926 0ebf8283 2019-07-24 stsp static const struct got_error *
7927 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7928 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7930 0ebf8283 2019-07-24 stsp const struct got_error *err;
7931 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7932 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7934 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7936 0ebf8283 2019-07-24 stsp return err;
7938 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7940 0ebf8283 2019-07-24 stsp goto done;
7942 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7944 5943eee2 2019-08-13 stsp goto done;
7945 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7946 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7947 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7948 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7951 0ebf8283 2019-07-24 stsp if (folded_commit)
7952 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7953 0ebf8283 2019-07-24 stsp free(id_str);
7954 5943eee2 2019-08-13 stsp free(folded_logmsg);
7955 0ebf8283 2019-07-24 stsp return err;
7958 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7959 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7961 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7963 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7964 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7965 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7966 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7967 3f9de99f 2019-07-24 stsp folded = prev;
7968 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7971 0ebf8283 2019-07-24 stsp return folded;
7974 0ebf8283 2019-07-24 stsp static const struct got_error *
7975 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7976 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7978 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7979 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7980 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7981 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7982 1601cb9f 2020-09-11 naddy int logmsg_len;
7984 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7986 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7988 0ebf8283 2019-07-24 stsp return err;
7990 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7991 0ebf8283 2019-07-24 stsp if (folded) {
7992 0ebf8283 2019-07-24 stsp while (folded != hle) {
7993 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7994 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7997 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7998 0ebf8283 2019-07-24 stsp logmsg, repo);
8000 0ebf8283 2019-07-24 stsp goto done;
8001 0ebf8283 2019-07-24 stsp free(logmsg);
8002 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8003 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
8007 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8009 0ebf8283 2019-07-24 stsp goto done;
8010 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8012 5943eee2 2019-08-13 stsp goto done;
8013 1601cb9f 2020-09-11 naddy logmsg_len = asprintf(&new_msg,
8014 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
8015 1601cb9f 2020-09-11 naddy logmsg ? logmsg : "", id_str, orig_logmsg);
8016 1601cb9f 2020-09-11 naddy if (logmsg_len == -1) {
8017 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
8018 0ebf8283 2019-07-24 stsp goto done;
8020 0ebf8283 2019-07-24 stsp free(logmsg);
8021 0ebf8283 2019-07-24 stsp logmsg = new_msg;
8023 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
8025 0ebf8283 2019-07-24 stsp goto done;
8027 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
8028 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
8030 0ebf8283 2019-07-24 stsp goto done;
8032 1601cb9f 2020-09-11 naddy write(fd, logmsg, logmsg_len);
8033 0ebf8283 2019-07-24 stsp close(fd);
8035 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8037 0ebf8283 2019-07-24 stsp goto done;
8039 bfa12d5e 2020-09-26 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8040 bfa12d5e 2020-09-26 stsp logmsg_len);
8041 0ebf8283 2019-07-24 stsp if (err) {
8042 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8043 0ebf8283 2019-07-24 stsp goto done;
8044 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
8047 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8048 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
8049 0ebf8283 2019-07-24 stsp free(logmsg_path);
8050 0ebf8283 2019-07-24 stsp free(logmsg);
8051 5943eee2 2019-08-13 stsp free(orig_logmsg);
8052 0ebf8283 2019-07-24 stsp free(editor);
8053 0ebf8283 2019-07-24 stsp if (commit)
8054 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8055 0ebf8283 2019-07-24 stsp return err;
8058 0ebf8283 2019-07-24 stsp static const struct got_error *
8059 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
8060 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
8062 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8063 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
8064 0ebf8283 2019-07-24 stsp size_t size;
8065 0ebf8283 2019-07-24 stsp ssize_t len;
8066 0ebf8283 2019-07-24 stsp int lineno = 0, i;
8067 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
8068 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
8069 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
8071 0ebf8283 2019-07-24 stsp for (;;) {
8072 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
8073 0ebf8283 2019-07-24 stsp if (len == -1) {
8074 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
8075 0ebf8283 2019-07-24 stsp if (feof(f))
8077 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
8078 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
8083 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8085 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
8086 0ebf8283 2019-07-24 stsp free(line);
8087 0ebf8283 2019-07-24 stsp line = NULL;
8090 0ebf8283 2019-07-24 stsp cmd = NULL;
8091 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
8092 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
8093 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8094 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
8095 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
8098 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8103 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
8104 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8107 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
8109 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
8110 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
8111 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
8114 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
8115 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8119 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
8120 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
8121 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8125 0ebf8283 2019-07-24 stsp free(line);
8126 0ebf8283 2019-07-24 stsp line = NULL;
8130 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
8132 0ebf8283 2019-07-24 stsp *end = '\0';
8134 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
8135 0ebf8283 2019-07-24 stsp if (err) {
8136 0ebf8283 2019-07-24 stsp /* override error code */
8137 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
8141 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
8142 0ebf8283 2019-07-24 stsp if (hle == NULL) {
8143 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
8146 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
8147 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
8148 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
8149 0ebf8283 2019-07-24 stsp commit_id = NULL;
8150 0ebf8283 2019-07-24 stsp free(line);
8151 0ebf8283 2019-07-24 stsp line = NULL;
8152 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8155 0ebf8283 2019-07-24 stsp free(line);
8156 0ebf8283 2019-07-24 stsp free(commit_id);
8157 0ebf8283 2019-07-24 stsp return err;
8160 0ebf8283 2019-07-24 stsp static const struct got_error *
8161 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
8162 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
8164 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
8165 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
8166 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8167 5b87815e 2020-03-05 stsp static char msg[92];
8168 bfce7f83 2019-07-27 stsp char *id_str;
8170 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
8171 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8172 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
8173 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
8174 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
8176 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8177 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
8178 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8179 5b87815e 2020-03-05 stsp if (hle == hle2)
8181 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
8182 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
8184 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
8186 5b87815e 2020-03-05 stsp return err;
8187 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
8188 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
8189 5b87815e 2020-03-05 stsp free(id_str);
8190 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8194 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
8195 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8196 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8199 bfce7f83 2019-07-27 stsp if (hle == NULL) {
8200 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
8202 bfce7f83 2019-07-27 stsp return err;
8203 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
8204 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
8205 bfce7f83 2019-07-27 stsp free(id_str);
8206 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8210 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8211 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8212 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8213 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
8215 bfce7f83 2019-07-27 stsp return NULL;
8218 bfce7f83 2019-07-27 stsp static const struct got_error *
8219 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
8220 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
8221 bfce7f83 2019-07-27 stsp struct got_repository *repo)
8223 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8224 0ebf8283 2019-07-24 stsp char *editor;
8225 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8227 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
8229 0ebf8283 2019-07-24 stsp return err;
8231 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
8232 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
8233 0ebf8283 2019-07-24 stsp goto done;
8236 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8237 0ebf8283 2019-07-24 stsp if (f == NULL) {
8238 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
8239 0ebf8283 2019-07-24 stsp goto done;
8241 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8243 bfce7f83 2019-07-27 stsp goto done;
8245 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
8247 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8248 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8249 0ebf8283 2019-07-24 stsp free(editor);
8250 0ebf8283 2019-07-24 stsp return err;
8253 0ebf8283 2019-07-24 stsp static const struct got_error *
8254 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8255 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
8256 514f2ffe 2020-01-29 stsp struct got_repository *);
8258 0ebf8283 2019-07-24 stsp static const struct got_error *
8259 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
8260 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
8261 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
8263 0ebf8283 2019-07-24 stsp const struct got_error *err;
8264 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8265 0ebf8283 2019-07-24 stsp char *path = NULL;
8267 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
8269 0ebf8283 2019-07-24 stsp return err;
8271 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
8273 0ebf8283 2019-07-24 stsp goto done;
8275 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
8277 0ebf8283 2019-07-24 stsp goto done;
8279 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
8280 083957f4 2020-02-24 stsp rewind(f);
8281 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8283 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
8284 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
8285 0ebf8283 2019-07-24 stsp goto done;
8288 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
8289 083957f4 2020-02-24 stsp if (err) {
8290 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8291 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8292 083957f4 2020-02-24 stsp goto done;
8293 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
8294 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
8298 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8299 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8300 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
8301 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
8302 0ebf8283 2019-07-24 stsp free(path);
8303 0ebf8283 2019-07-24 stsp return err;
8306 0ebf8283 2019-07-24 stsp static const struct got_error *
8307 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
8308 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8310 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8311 0ebf8283 2019-07-24 stsp char *path = NULL;
8312 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8313 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8314 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8316 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
8318 0ebf8283 2019-07-24 stsp return err;
8320 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
8321 0ebf8283 2019-07-24 stsp if (f == NULL) {
8322 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8323 0ebf8283 2019-07-24 stsp goto done;
8325 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
8326 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8331 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8332 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
8333 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
8334 0ebf8283 2019-07-24 stsp if (n < 0) {
8335 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
8341 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8342 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8343 0ebf8283 2019-07-24 stsp free(path);
8344 0ebf8283 2019-07-24 stsp if (commit)
8345 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8346 0ebf8283 2019-07-24 stsp return err;
8350 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
8352 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
8354 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
8355 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
8356 bfce7f83 2019-07-27 stsp free(hle);
8360 0ebf8283 2019-07-24 stsp static const struct got_error *
8361 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
8362 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
8364 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
8365 0ebf8283 2019-07-24 stsp FILE *f = NULL;
8367 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
8368 0ebf8283 2019-07-24 stsp if (f == NULL) {
8369 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
8370 0ebf8283 2019-07-24 stsp goto done;
8373 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
8375 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
8376 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
8377 0ebf8283 2019-07-24 stsp return err;
8380 0ebf8283 2019-07-24 stsp static const struct got_error *
8381 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8382 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
8383 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
8385 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
8386 0ebf8283 2019-07-24 stsp int resp = ' ';
8388 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
8389 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8390 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
8391 0ebf8283 2019-07-24 stsp resp = getchar();
8392 a61a4414 2019-08-07 stsp if (resp == '\n')
8393 a61a4414 2019-08-07 stsp resp = getchar();
8394 426ebf2e 2019-07-25 stsp if (resp == 'c') {
8395 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8396 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
8398 426ebf2e 2019-07-25 stsp if (err) {
8399 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8400 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8402 bfce7f83 2019-07-27 stsp prev_err = err;
8403 426ebf2e 2019-07-25 stsp resp = ' ';
8407 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
8408 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
8409 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
8410 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
8411 426ebf2e 2019-07-25 stsp if (err) {
8412 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8413 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
8415 bfce7f83 2019-07-27 stsp prev_err = err;
8416 426ebf2e 2019-07-25 stsp resp = ' ';
8420 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
8421 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8424 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
8427 0ebf8283 2019-07-24 stsp return err;
8430 0ebf8283 2019-07-24 stsp static const struct got_error *
8431 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
8432 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8433 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
8435 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8436 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8437 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8438 3e3a69f1 2019-07-25 stsp branch, repo);
8441 0ebf8283 2019-07-24 stsp static const struct got_error *
8442 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
8443 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8445 0ebf8283 2019-07-24 stsp const struct got_error *err;
8446 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8448 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
8450 0ebf8283 2019-07-24 stsp goto done;
8452 0ebf8283 2019-07-24 stsp if (new_id) {
8453 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
8455 0ebf8283 2019-07-24 stsp goto done;
8458 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8459 0ebf8283 2019-07-24 stsp if (new_id_str)
8460 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8462 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8463 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8464 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8465 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8466 0ebf8283 2019-07-24 stsp goto done;
8468 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8470 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8472 0ebf8283 2019-07-24 stsp goto done;
8475 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8476 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8477 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8478 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8479 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8481 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8482 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8483 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8490 0ebf8283 2019-07-24 stsp free(old_id_str);
8491 0ebf8283 2019-07-24 stsp free(new_id_str);
8492 0ebf8283 2019-07-24 stsp return err;
8495 0ebf8283 2019-07-24 stsp static const struct got_error *
8496 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8497 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8498 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8499 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8501 0ebf8283 2019-07-24 stsp const struct got_error *err;
8502 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8503 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8505 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8506 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8507 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8509 0ebf8283 2019-07-24 stsp return err;
8512 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8514 0ebf8283 2019-07-24 stsp return err;
8516 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8517 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8518 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8519 0ebf8283 2019-07-24 stsp if (err) {
8520 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8521 0ebf8283 2019-07-24 stsp goto done;
8522 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8524 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8525 0ebf8283 2019-07-24 stsp free(new_commit_id);
8528 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8529 0ebf8283 2019-07-24 stsp return err;
8532 0ebf8283 2019-07-24 stsp static const struct got_error *
8533 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8534 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8536 0ebf8283 2019-07-24 stsp const struct got_error *error;
8537 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8539 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8541 0ebf8283 2019-07-24 stsp if (error)
8542 0ebf8283 2019-07-24 stsp return error;
8544 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8545 0ebf8283 2019-07-24 stsp if (error)
8546 0ebf8283 2019-07-24 stsp return error;
8548 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8549 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8550 0ebf8283 2019-07-24 stsp return error;
8553 ab20a43a 2020-01-29 stsp static const struct got_error *
8554 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8555 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8556 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8557 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8559 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8561 ab20a43a 2020-01-29 stsp switch (status) {
8562 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8563 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8564 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8565 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8566 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8567 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8572 ab20a43a 2020-01-29 stsp switch (staged_status) {
8573 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8574 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8575 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8576 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8577 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8582 ab20a43a 2020-01-29 stsp return NULL;
8585 0ebf8283 2019-07-24 stsp static const struct got_error *
8586 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8588 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8589 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8590 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8591 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8592 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8593 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8594 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8595 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8596 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8597 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8598 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8599 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8600 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8601 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8602 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
8603 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8604 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8605 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8606 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8607 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8608 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8609 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8610 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8612 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8613 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8614 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8615 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8617 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8618 0ebf8283 2019-07-24 stsp switch (ch) {
8620 0ebf8283 2019-07-24 stsp abort_edit = 1;
8623 0ebf8283 2019-07-24 stsp continue_edit = 1;
8626 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8629 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8632 0ebf8283 2019-07-24 stsp usage_histedit();
8633 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8637 0ebf8283 2019-07-24 stsp argc -= optind;
8638 0ebf8283 2019-07-24 stsp argv += optind;
8640 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8641 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8642 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8643 0ebf8283 2019-07-24 stsp err(1, "pledge");
8645 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8646 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
8647 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8648 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
8649 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8650 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
8651 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8652 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
8653 0ebf8283 2019-07-24 stsp if (argc != 0)
8654 0ebf8283 2019-07-24 stsp usage_histedit();
8657 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8658 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8659 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8660 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8661 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8662 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8665 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8666 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8667 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8668 0ebf8283 2019-07-24 stsp goto done;
8670 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8671 fa51e947 2020-03-27 stsp if (error) {
8672 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8673 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8674 0ebf8283 2019-07-24 stsp goto done;
8677 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8679 0ebf8283 2019-07-24 stsp if (error != NULL)
8680 0ebf8283 2019-07-24 stsp goto done;
8682 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8683 0ebf8283 2019-07-24 stsp if (error)
8684 0ebf8283 2019-07-24 stsp goto done;
8685 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8686 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8687 0ebf8283 2019-07-24 stsp goto done;
8690 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8691 0ebf8283 2019-07-24 stsp if (error)
8692 0ebf8283 2019-07-24 stsp goto done;
8694 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8695 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8696 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8697 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8698 083957f4 2020-02-24 stsp "before the -m option can be used");
8699 083957f4 2020-02-24 stsp goto done;
8702 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8703 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8704 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8705 3e3a69f1 2019-07-25 stsp worktree, repo);
8706 0ebf8283 2019-07-24 stsp if (error)
8707 0ebf8283 2019-07-24 stsp goto done;
8708 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8709 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8710 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8711 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8712 0ebf8283 2019-07-24 stsp if (error)
8713 0ebf8283 2019-07-24 stsp goto done;
8714 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8715 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8716 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8717 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8718 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8719 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8720 0ebf8283 2019-07-24 stsp goto done;
8723 0ebf8283 2019-07-24 stsp if (continue_edit) {
8724 0ebf8283 2019-07-24 stsp char *path;
8726 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8727 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8728 0ebf8283 2019-07-24 stsp goto done;
8731 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8732 0ebf8283 2019-07-24 stsp if (error)
8733 0ebf8283 2019-07-24 stsp goto done;
8735 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8736 0ebf8283 2019-07-24 stsp free(path);
8737 0ebf8283 2019-07-24 stsp if (error)
8738 0ebf8283 2019-07-24 stsp goto done;
8740 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8741 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8742 3e3a69f1 2019-07-25 stsp worktree, repo);
8743 0ebf8283 2019-07-24 stsp if (error)
8744 0ebf8283 2019-07-24 stsp goto done;
8746 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8747 0ebf8283 2019-07-24 stsp if (error)
8748 0ebf8283 2019-07-24 stsp goto done;
8750 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8751 0ebf8283 2019-07-24 stsp head_commit_id);
8752 0ebf8283 2019-07-24 stsp if (error)
8753 0ebf8283 2019-07-24 stsp goto done;
8754 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8755 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8756 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8757 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8758 3aac7cf7 2019-07-25 stsp goto done;
8760 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8761 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8762 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8763 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8764 0ebf8283 2019-07-24 stsp commit = NULL;
8765 0ebf8283 2019-07-24 stsp if (error)
8766 0ebf8283 2019-07-24 stsp goto done;
8768 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8769 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8770 0ebf8283 2019-07-24 stsp goto done;
8773 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8774 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8775 0ebf8283 2019-07-24 stsp if (error != NULL)
8776 0ebf8283 2019-07-24 stsp goto done;
8778 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8779 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8780 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8781 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8782 c7d20a3f 2019-07-30 stsp goto done;
8785 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8786 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8787 bfce7f83 2019-07-27 stsp branch = NULL;
8788 0ebf8283 2019-07-24 stsp if (error)
8789 0ebf8283 2019-07-24 stsp goto done;
8791 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8792 0ebf8283 2019-07-24 stsp head_commit_id);
8793 0ebf8283 2019-07-24 stsp if (error)
8794 0ebf8283 2019-07-24 stsp goto done;
8795 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8796 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8797 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8798 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8799 3aac7cf7 2019-07-25 stsp goto done;
8801 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8802 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8803 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8804 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8805 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8806 0ebf8283 2019-07-24 stsp commit = NULL;
8807 0ebf8283 2019-07-24 stsp if (error)
8808 0ebf8283 2019-07-24 stsp goto done;
8810 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8811 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8812 c5996fff 2020-01-29 stsp goto done;
8815 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8816 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8817 bfce7f83 2019-07-27 stsp if (error)
8818 bfce7f83 2019-07-27 stsp goto done;
8820 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8821 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8822 0ebf8283 2019-07-24 stsp edit_script_path, repo);
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;
8831 514f2ffe 2020-01-29 stsp const char *branch_name;
8832 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8833 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8834 514f2ffe 2020-01-29 stsp branch_name += 11;
8835 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8836 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8837 6ba2bea2 2019-07-27 stsp if (error) {
8838 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8839 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8840 9627c110 2020-04-18 stsp update_progress, &upa);
8841 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8842 0ebf8283 2019-07-24 stsp goto done;
8847 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8849 6ba2bea2 2019-07-27 stsp if (error) {
8850 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8851 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8852 9627c110 2020-04-18 stsp update_progress, &upa);
8853 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8854 0ebf8283 2019-07-24 stsp goto done;
8859 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8860 4ec14e60 2019-08-28 hiltjo if (error)
8861 0ebf8283 2019-07-24 stsp goto done;
8863 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8864 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8865 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8866 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8869 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8870 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8871 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8872 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8874 ab20a43a 2020-01-29 stsp if (error)
8875 ab20a43a 2020-01-29 stsp goto done;
8877 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8878 ab20a43a 2020-01-29 stsp int have_changes = 0;
8880 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8881 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8882 ab20a43a 2020-01-29 stsp if (error)
8883 ab20a43a 2020-01-29 stsp goto done;
8884 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8885 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8886 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8887 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8888 ab20a43a 2020-01-29 stsp if (error) {
8889 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8890 ab20a43a 2020-01-29 stsp goto done;
8891 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8892 ab20a43a 2020-01-29 stsp goto done;
8894 ab20a43a 2020-01-29 stsp if (have_changes) {
8895 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8896 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8897 ab20a43a 2020-01-29 stsp if (error)
8898 ab20a43a 2020-01-29 stsp goto done;
8900 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8901 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8902 ab20a43a 2020-01-29 stsp if (error)
8903 ab20a43a 2020-01-29 stsp goto done;
8904 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8905 ab20a43a 2020-01-29 stsp hle, NULL);
8906 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8907 ab20a43a 2020-01-29 stsp commit = NULL;
8908 ab20a43a 2020-01-29 stsp if (error)
8909 ab20a43a 2020-01-29 stsp goto done;
8915 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8916 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8917 0ebf8283 2019-07-24 stsp if (error)
8918 0ebf8283 2019-07-24 stsp goto done;
8922 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8923 0ebf8283 2019-07-24 stsp hle->commit_id);
8924 0ebf8283 2019-07-24 stsp if (error)
8925 0ebf8283 2019-07-24 stsp goto done;
8926 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8927 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8929 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8930 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8931 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8932 0ebf8283 2019-07-24 stsp if (error)
8933 0ebf8283 2019-07-24 stsp goto done;
8934 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8935 0ebf8283 2019-07-24 stsp commit = NULL;
8937 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8938 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8939 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8941 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8942 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8944 a0ea4fc0 2020-02-28 stsp if (error)
8945 a0ea4fc0 2020-02-28 stsp goto done;
8946 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8950 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8951 0ebf8283 2019-07-24 stsp char *id_str;
8952 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8953 0ebf8283 2019-07-24 stsp if (error)
8954 0ebf8283 2019-07-24 stsp goto done;
8955 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8957 0ebf8283 2019-07-24 stsp free(id_str);
8958 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8959 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8960 3e3a69f1 2019-07-25 stsp fileindex);
8961 0ebf8283 2019-07-24 stsp goto done;
8964 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8965 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8966 0ebf8283 2019-07-24 stsp if (error)
8967 0ebf8283 2019-07-24 stsp goto done;
8971 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8972 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8973 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8974 0ebf8283 2019-07-24 stsp if (error)
8975 0ebf8283 2019-07-24 stsp goto done;
8978 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8979 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8980 0ebf8283 2019-07-24 stsp if (error)
8981 0ebf8283 2019-07-24 stsp goto done;
8982 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8983 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8985 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8986 3e3a69f1 2019-07-25 stsp branch, repo);
8988 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8989 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8990 0ebf8283 2019-07-24 stsp free(head_commit_id);
8991 0ebf8283 2019-07-24 stsp free(base_commit_id);
8992 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8993 0ebf8283 2019-07-24 stsp if (commit)
8994 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8995 0ebf8283 2019-07-24 stsp if (branch)
8996 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8997 0ebf8283 2019-07-24 stsp if (tmp_branch)
8998 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8999 0ebf8283 2019-07-24 stsp if (worktree)
9000 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
9002 2822a352 2019-10-15 stsp got_repo_close(repo);
9003 2822a352 2019-10-15 stsp return error;
9006 2822a352 2019-10-15 stsp __dead static void
9007 2822a352 2019-10-15 stsp usage_integrate(void)
9009 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9013 2822a352 2019-10-15 stsp static const struct got_error *
9014 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
9016 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
9017 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
9018 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
9019 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9020 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
9021 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9022 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
9023 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9025 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9027 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9028 2822a352 2019-10-15 stsp switch (ch) {
9030 2822a352 2019-10-15 stsp usage_integrate();
9031 2822a352 2019-10-15 stsp /* NOTREACHED */
9035 2822a352 2019-10-15 stsp argc -= optind;
9036 2822a352 2019-10-15 stsp argv += optind;
9038 2822a352 2019-10-15 stsp if (argc != 1)
9039 2822a352 2019-10-15 stsp usage_integrate();
9040 2822a352 2019-10-15 stsp branch_arg = argv[0];
9041 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
9042 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9043 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
9044 2822a352 2019-10-15 stsp err(1, "pledge");
9046 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
9047 2822a352 2019-10-15 stsp if (cwd == NULL) {
9048 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
9049 2822a352 2019-10-15 stsp goto done;
9052 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
9053 fa51e947 2020-03-27 stsp if (error) {
9054 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9055 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
9057 2822a352 2019-10-15 stsp goto done;
9060 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
9061 2822a352 2019-10-15 stsp if (error)
9062 2822a352 2019-10-15 stsp goto done;
9064 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9066 2822a352 2019-10-15 stsp if (error != NULL)
9067 2822a352 2019-10-15 stsp goto done;
9069 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9070 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
9071 2822a352 2019-10-15 stsp if (error)
9072 2822a352 2019-10-15 stsp goto done;
9074 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9075 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
9076 2822a352 2019-10-15 stsp goto done;
9079 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9080 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
9081 2822a352 2019-10-15 stsp if (error)
9082 2822a352 2019-10-15 stsp goto done;
9084 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
9085 2822a352 2019-10-15 stsp if (refname == NULL) {
9086 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9087 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9088 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9089 2822a352 2019-10-15 stsp goto done;
9091 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
9092 2822a352 2019-10-15 stsp if (base_refname == NULL) {
9093 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
9094 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9095 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9096 2822a352 2019-10-15 stsp goto done;
9099 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
9100 2822a352 2019-10-15 stsp if (error)
9101 2822a352 2019-10-15 stsp goto done;
9103 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9104 2822a352 2019-10-15 stsp if (error)
9105 2822a352 2019-10-15 stsp goto done;
9107 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9108 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
9109 2822a352 2019-10-15 stsp "specified branch has already been integrated");
9110 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9111 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9112 2822a352 2019-10-15 stsp goto done;
9115 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9116 2822a352 2019-10-15 stsp if (error) {
9117 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
9118 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
9119 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
9120 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
9121 2822a352 2019-10-15 stsp goto done;
9124 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9125 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
9126 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
9127 2822a352 2019-10-15 stsp check_cancelled, NULL);
9128 2822a352 2019-10-15 stsp if (error)
9129 2822a352 2019-10-15 stsp goto done;
9131 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
9132 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9135 715dc77e 2019-08-03 stsp got_repo_close(repo);
9136 2822a352 2019-10-15 stsp if (worktree)
9137 2822a352 2019-10-15 stsp got_worktree_close(worktree);
9138 2822a352 2019-10-15 stsp free(cwd);
9139 2822a352 2019-10-15 stsp free(base_commit_id);
9140 2822a352 2019-10-15 stsp free(commit_id);
9141 2822a352 2019-10-15 stsp free(refname);
9142 2822a352 2019-10-15 stsp free(base_refname);
9143 715dc77e 2019-08-03 stsp return error;
9146 715dc77e 2019-08-03 stsp __dead static void
9147 715dc77e 2019-08-03 stsp usage_stage(void)
9149 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9150 35213c7c 2020-07-23 stsp "[-S] [file-path ...]\n",
9151 715dc77e 2019-08-03 stsp getprogname());
9155 715dc77e 2019-08-03 stsp static const struct got_error *
9156 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
9157 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
9158 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9159 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
9161 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
9162 408b4ebc 2019-08-03 stsp char *id_str = NULL;
9164 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
9165 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
9166 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
9167 408b4ebc 2019-08-03 stsp return NULL;
9169 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
9170 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
9171 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
9173 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
9175 408b4ebc 2019-08-03 stsp return err;
9177 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
9178 408b4ebc 2019-08-03 stsp free(id_str);
9179 dc424a06 2019-08-07 stsp return NULL;
9182 dc424a06 2019-08-07 stsp static const struct got_error *
9183 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
9185 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
9186 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
9187 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
9188 715dc77e 2019-08-03 stsp char *cwd = NULL;
9189 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
9190 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
9191 35213c7c 2020-07-23 stsp int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9192 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
9193 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9194 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9196 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
9198 35213c7c 2020-07-23 stsp while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9199 715dc77e 2019-08-03 stsp switch (ch) {
9201 408b4ebc 2019-08-03 stsp list_stage = 1;
9204 dc424a06 2019-08-07 stsp pflag = 1;
9207 dc424a06 2019-08-07 stsp patch_script_path = optarg;
9210 35213c7c 2020-07-23 stsp allow_bad_symlinks = 1;
9213 715dc77e 2019-08-03 stsp usage_stage();
9214 715dc77e 2019-08-03 stsp /* NOTREACHED */
9218 715dc77e 2019-08-03 stsp argc -= optind;
9219 715dc77e 2019-08-03 stsp argv += optind;
9221 715dc77e 2019-08-03 stsp #ifndef PROFILE
9222 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9223 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
9224 715dc77e 2019-08-03 stsp err(1, "pledge");
9226 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
9227 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
9228 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
9229 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
9231 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
9232 715dc77e 2019-08-03 stsp if (cwd == NULL) {
9233 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
9234 715dc77e 2019-08-03 stsp goto done;
9237 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9238 fa51e947 2020-03-27 stsp if (error) {
9239 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9240 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
9241 715dc77e 2019-08-03 stsp goto done;
9244 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9246 715dc77e 2019-08-03 stsp if (error != NULL)
9247 715dc77e 2019-08-03 stsp goto done;
9249 dc424a06 2019-08-07 stsp if (patch_script_path) {
9250 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
9251 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
9252 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
9253 dc424a06 2019-08-07 stsp patch_script_path);
9254 dc424a06 2019-08-07 stsp goto done;
9257 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9258 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
9259 715dc77e 2019-08-03 stsp if (error)
9260 715dc77e 2019-08-03 stsp goto done;
9262 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9263 6d022e97 2019-08-04 stsp if (error)
9264 6d022e97 2019-08-04 stsp goto done;
9266 6d022e97 2019-08-04 stsp if (list_stage)
9267 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
9268 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
9270 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9271 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
9272 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
9273 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
9274 35213c7c 2020-07-23 stsp pflag ? choose_patch : NULL, &cpa,
9275 35213c7c 2020-07-23 stsp allow_bad_symlinks, repo);
9278 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9279 2e1f37b0 2019-08-08 stsp error == NULL)
9280 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9282 ad493afc 2019-08-03 stsp got_repo_close(repo);
9283 ad493afc 2019-08-03 stsp if (worktree)
9284 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
9285 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9286 ad493afc 2019-08-03 stsp free((char *)pe->path);
9287 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
9288 ad493afc 2019-08-03 stsp free(cwd);
9289 ad493afc 2019-08-03 stsp return error;
9292 ad493afc 2019-08-03 stsp __dead static void
9293 ad493afc 2019-08-03 stsp usage_unstage(void)
9295 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9296 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
9297 ad493afc 2019-08-03 stsp getprogname());
9302 ad493afc 2019-08-03 stsp static const struct got_error *
9303 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
9305 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
9306 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
9307 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
9308 ad493afc 2019-08-03 stsp char *cwd = NULL;
9309 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
9310 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9311 9627c110 2020-04-18 stsp int ch, pflag = 0;
9312 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
9313 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
9314 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
9315 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
9317 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
9319 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
9320 ad493afc 2019-08-03 stsp switch (ch) {
9322 2e1f37b0 2019-08-08 stsp pflag = 1;
9325 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
9328 ad493afc 2019-08-03 stsp usage_unstage();
9329 ad493afc 2019-08-03 stsp /* NOTREACHED */
9333 ad493afc 2019-08-03 stsp argc -= optind;
9334 ad493afc 2019-08-03 stsp argv += optind;
9336 ad493afc 2019-08-03 stsp #ifndef PROFILE
9337 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9338 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
9339 ad493afc 2019-08-03 stsp err(1, "pledge");
9341 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
9342 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
9344 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
9345 ad493afc 2019-08-03 stsp if (cwd == NULL) {
9346 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
9347 ad493afc 2019-08-03 stsp goto done;
9350 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
9351 fa51e947 2020-03-27 stsp if (error) {
9352 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9353 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
9354 ad493afc 2019-08-03 stsp goto done;
9357 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9359 ad493afc 2019-08-03 stsp if (error != NULL)
9360 ad493afc 2019-08-03 stsp goto done;
9362 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
9363 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
9364 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
9365 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
9366 2e1f37b0 2019-08-08 stsp patch_script_path);
9367 2e1f37b0 2019-08-08 stsp goto done;
9371 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
9372 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
9373 ad493afc 2019-08-03 stsp if (error)
9374 ad493afc 2019-08-03 stsp goto done;
9376 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9377 ad493afc 2019-08-03 stsp if (error)
9378 ad493afc 2019-08-03 stsp goto done;
9380 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
9381 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
9382 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
9383 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
9384 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
9385 9627c110 2020-04-18 stsp if (!error)
9386 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
9388 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
9389 2e1f37b0 2019-08-08 stsp error == NULL)
9390 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
9392 0ebf8283 2019-07-24 stsp got_repo_close(repo);
9393 715dc77e 2019-08-03 stsp if (worktree)
9394 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
9395 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
9396 715dc77e 2019-08-03 stsp free((char *)pe->path);
9397 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
9398 715dc77e 2019-08-03 stsp free(cwd);
9399 01073a5d 2019-08-22 stsp return error;
9402 01073a5d 2019-08-22 stsp __dead static void
9403 01073a5d 2019-08-22 stsp usage_cat(void)
9405 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9406 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
9410 01073a5d 2019-08-22 stsp static const struct got_error *
9411 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9413 01073a5d 2019-08-22 stsp const struct got_error *err;
9414 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
9416 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
9418 01073a5d 2019-08-22 stsp return err;
9420 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9421 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
9422 01073a5d 2019-08-22 stsp return err;
9425 01073a5d 2019-08-22 stsp static const struct got_error *
9426 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9428 01073a5d 2019-08-22 stsp const struct got_error *err;
9429 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
9430 56e0773d 2019-11-28 stsp int nentries, i;
9432 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
9434 01073a5d 2019-08-22 stsp return err;
9436 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
9437 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
9438 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
9439 01073a5d 2019-08-22 stsp char *id_str;
9440 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
9442 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
9443 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9446 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
9447 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
9448 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
9449 01073a5d 2019-08-22 stsp free(id_str);
9452 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
9453 01073a5d 2019-08-22 stsp return err;
9456 01073a5d 2019-08-22 stsp static const struct got_error *
9457 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9459 01073a5d 2019-08-22 stsp const struct got_error *err;
9460 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
9461 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9462 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9463 01073a5d 2019-08-22 stsp char *id_str = NULL;
9464 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9466 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9468 01073a5d 2019-08-22 stsp return err;
9470 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9472 01073a5d 2019-08-22 stsp goto done;
9474 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9475 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9476 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9477 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9478 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9479 01073a5d 2019-08-22 stsp char *pid_str;
9480 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9482 01073a5d 2019-08-22 stsp goto done;
9483 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9484 01073a5d 2019-08-22 stsp free(pid_str);
9486 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9487 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9488 1367695b 2020-09-26 naddy (long long)got_object_commit_get_author_time(commit));
9490 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9491 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9492 1367695b 2020-09-26 naddy (long long)got_object_commit_get_committer_time(commit));
9494 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9495 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9496 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9498 01073a5d 2019-08-22 stsp free(id_str);
9499 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9500 01073a5d 2019-08-22 stsp return err;
9503 01073a5d 2019-08-22 stsp static const struct got_error *
9504 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9506 01073a5d 2019-08-22 stsp const struct got_error *err;
9507 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9508 01073a5d 2019-08-22 stsp char *id_str = NULL;
9509 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9511 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9513 01073a5d 2019-08-22 stsp return err;
9515 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9517 01073a5d 2019-08-22 stsp goto done;
9519 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9521 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9522 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9523 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9524 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9526 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9527 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9528 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9530 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9531 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9532 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9534 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9535 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9536 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9542 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9543 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9545 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9546 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9547 1367695b 2020-09-26 naddy (long long)got_object_tag_get_tagger_time(tag));
9549 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9550 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9551 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9553 01073a5d 2019-08-22 stsp free(id_str);
9554 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9555 01073a5d 2019-08-22 stsp return err;
9558 01073a5d 2019-08-22 stsp static const struct got_error *
9559 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9561 01073a5d 2019-08-22 stsp const struct got_error *error;
9562 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9563 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9564 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9565 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9566 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9567 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9569 01073a5d 2019-08-22 stsp #ifndef PROFILE
9570 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9571 01073a5d 2019-08-22 stsp NULL) == -1)
9572 01073a5d 2019-08-22 stsp err(1, "pledge");
9575 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9576 01073a5d 2019-08-22 stsp switch (ch) {
9578 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9581 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9582 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9583 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9585 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9588 896e9b6f 2019-08-26 stsp force_path = 1;
9591 01073a5d 2019-08-22 stsp usage_cat();
9592 01073a5d 2019-08-22 stsp /* NOTREACHED */
9596 01073a5d 2019-08-22 stsp argc -= optind;
9597 01073a5d 2019-08-22 stsp argv += optind;
9599 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9600 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9601 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9602 01073a5d 2019-08-22 stsp goto done;
9604 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9605 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9606 01073a5d 2019-08-22 stsp goto done;
9607 01073a5d 2019-08-22 stsp if (worktree) {
9608 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9609 01073a5d 2019-08-22 stsp repo_path = strdup(
9610 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9611 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9612 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9613 01073a5d 2019-08-22 stsp goto done;
9618 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9619 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9620 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9621 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9624 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9625 01073a5d 2019-08-22 stsp free(repo_path);
9626 01073a5d 2019-08-22 stsp if (error != NULL)
9627 01073a5d 2019-08-22 stsp goto done;
9629 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9630 896e9b6f 2019-08-26 stsp if (error)
9631 896e9b6f 2019-08-26 stsp goto done;
9633 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9634 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9635 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9636 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9637 01073a5d 2019-08-22 stsp if (error)
9638 01073a5d 2019-08-22 stsp goto done;
9640 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9641 896e9b6f 2019-08-26 stsp if (force_path) {
9642 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9644 896e9b6f 2019-08-26 stsp if (error)
9647 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9648 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9649 896e9b6f 2019-08-26 stsp if (error) {
9650 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9651 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9653 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9654 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9655 896e9b6f 2019-08-26 stsp if (error)
9660 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9661 01073a5d 2019-08-22 stsp if (error)
9664 01073a5d 2019-08-22 stsp switch (obj_type) {
9665 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9666 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9668 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9669 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9671 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9672 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9674 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9675 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9678 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9681 01073a5d 2019-08-22 stsp if (error)
9683 01073a5d 2019-08-22 stsp free(label);
9684 01073a5d 2019-08-22 stsp label = NULL;
9686 01073a5d 2019-08-22 stsp id = NULL;
9689 01073a5d 2019-08-22 stsp free(label);
9691 896e9b6f 2019-08-26 stsp free(commit_id);
9692 01073a5d 2019-08-22 stsp if (worktree)
9693 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9694 01073a5d 2019-08-22 stsp if (repo) {
9695 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9696 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9697 01073a5d 2019-08-22 stsp if (error == NULL)
9698 01073a5d 2019-08-22 stsp error = repo_error;
9700 b2118c49 2020-07-28 stsp return error;
9703 b2118c49 2020-07-28 stsp __dead static void
9704 b2118c49 2020-07-28 stsp usage_info(void)
9706 b2118c49 2020-07-28 stsp fprintf(stderr, "usage: %s info [path ...]\n",
9707 b2118c49 2020-07-28 stsp getprogname());
9711 b2118c49 2020-07-28 stsp static const struct got_error *
9712 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9713 b2118c49 2020-07-28 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9714 b2118c49 2020-07-28 stsp struct got_object_id *commit_id)
9716 b2118c49 2020-07-28 stsp const struct got_error *err = NULL;
9717 b2118c49 2020-07-28 stsp char *id_str = NULL;
9718 b2118c49 2020-07-28 stsp char datebuf[128];
9719 b2118c49 2020-07-28 stsp struct tm mytm, *tm;
9720 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths = arg;
9721 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9724 b2118c49 2020-07-28 stsp * Clear error indication from any of the path arguments which
9725 b2118c49 2020-07-28 stsp * would cause this file index entry to be displayed.
9727 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
9728 b2118c49 2020-07-28 stsp if (got_path_cmp(path, pe->path, strlen(path),
9729 b2118c49 2020-07-28 stsp pe->path_len) == 0 ||
9730 b2118c49 2020-07-28 stsp got_path_is_child(path, pe->path, pe->path_len))
9731 b2118c49 2020-07-28 stsp pe->data = NULL; /* no error */
9734 b2118c49 2020-07-28 stsp printf(GOT_COMMIT_SEP_STR);
9735 b2118c49 2020-07-28 stsp if (S_ISLNK(mode))
9736 b2118c49 2020-07-28 stsp printf("symlink: %s\n", path);
9737 b2118c49 2020-07-28 stsp else if (S_ISREG(mode)) {
9738 b2118c49 2020-07-28 stsp printf("file: %s\n", path);
9739 b2118c49 2020-07-28 stsp printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9740 b2118c49 2020-07-28 stsp } else if (S_ISDIR(mode))
9741 b2118c49 2020-07-28 stsp printf("directory: %s\n", path);
9743 b2118c49 2020-07-28 stsp printf("something: %s\n", path);
9745 b2118c49 2020-07-28 stsp tm = localtime_r(&mtime, &mytm);
9746 b2118c49 2020-07-28 stsp if (tm == NULL)
9747 b2118c49 2020-07-28 stsp return NULL;
9748 b2118c49 2020-07-28 stsp if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9749 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_NO_SPACE);
9750 b2118c49 2020-07-28 stsp printf("timestamp: %s\n", datebuf);
9752 b2118c49 2020-07-28 stsp if (blob_id) {
9753 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, blob_id);
9755 b2118c49 2020-07-28 stsp return err;
9756 b2118c49 2020-07-28 stsp printf("based on blob: %s\n", id_str);
9757 b2118c49 2020-07-28 stsp free(id_str);
9760 b2118c49 2020-07-28 stsp if (staged_blob_id) {
9761 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, staged_blob_id);
9763 b2118c49 2020-07-28 stsp return err;
9764 b2118c49 2020-07-28 stsp printf("based on staged blob: %s\n", id_str);
9765 b2118c49 2020-07-28 stsp free(id_str);
9768 b2118c49 2020-07-28 stsp if (commit_id) {
9769 b2118c49 2020-07-28 stsp err = got_object_id_str(&id_str, commit_id);
9771 b2118c49 2020-07-28 stsp return err;
9772 b2118c49 2020-07-28 stsp printf("based on commit: %s\n", id_str);
9773 b2118c49 2020-07-28 stsp free(id_str);
9776 b2118c49 2020-07-28 stsp return NULL;
9779 b2118c49 2020-07-28 stsp static const struct got_error *
9780 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
9782 b2118c49 2020-07-28 stsp const struct got_error *error = NULL;
9783 b2118c49 2020-07-28 stsp struct got_worktree *worktree = NULL;
9784 b2118c49 2020-07-28 stsp char *cwd = NULL, *id_str = NULL;
9785 b2118c49 2020-07-28 stsp struct got_pathlist_head paths;
9786 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9787 b2118c49 2020-07-28 stsp char *uuidstr = NULL;
9788 b2118c49 2020-07-28 stsp int ch, show_files = 0;
9790 b2118c49 2020-07-28 stsp TAILQ_INIT(&paths);
9792 b2118c49 2020-07-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
9793 b2118c49 2020-07-28 stsp switch (ch) {
9795 b2118c49 2020-07-28 stsp usage_info();
9796 b2118c49 2020-07-28 stsp /* NOTREACHED */
9800 b2118c49 2020-07-28 stsp argc -= optind;
9801 b2118c49 2020-07-28 stsp argv += optind;
9803 b2118c49 2020-07-28 stsp #ifndef PROFILE
9804 b2118c49 2020-07-28 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9805 b2118c49 2020-07-28 stsp NULL) == -1)
9806 b2118c49 2020-07-28 stsp err(1, "pledge");
9808 b2118c49 2020-07-28 stsp cwd = getcwd(NULL, 0);
9809 b2118c49 2020-07-28 stsp if (cwd == NULL) {
9810 b2118c49 2020-07-28 stsp error = got_error_from_errno("getcwd");
9811 b2118c49 2020-07-28 stsp goto done;
9814 b2118c49 2020-07-28 stsp error = got_worktree_open(&worktree, cwd);
9815 b2118c49 2020-07-28 stsp if (error) {
9816 b2118c49 2020-07-28 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
9817 b2118c49 2020-07-28 stsp error = wrap_not_worktree_error(error, "status", cwd);
9818 b2118c49 2020-07-28 stsp goto done;
9821 b2118c49 2020-07-28 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9822 b2118c49 2020-07-28 stsp if (error)
9823 b2118c49 2020-07-28 stsp goto done;
9825 b2118c49 2020-07-28 stsp if (argc >= 1) {
9826 b2118c49 2020-07-28 stsp error = get_worktree_paths_from_argv(&paths, argc, argv,
9827 b2118c49 2020-07-28 stsp worktree);
9828 b2118c49 2020-07-28 stsp if (error)
9829 b2118c49 2020-07-28 stsp goto done;
9830 b2118c49 2020-07-28 stsp show_files = 1;
9833 b2118c49 2020-07-28 stsp error = got_object_id_str(&id_str,
9834 b2118c49 2020-07-28 stsp got_worktree_get_base_commit_id(worktree));
9835 b2118c49 2020-07-28 stsp if (error)
9836 b2118c49 2020-07-28 stsp goto done;
9838 b2118c49 2020-07-28 stsp error = got_worktree_get_uuid(&uuidstr, worktree);
9839 b2118c49 2020-07-28 stsp if (error)
9840 b2118c49 2020-07-28 stsp goto done;
9842 b2118c49 2020-07-28 stsp printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9843 b2118c49 2020-07-28 stsp printf("work tree base commit: %s\n", id_str);
9844 b2118c49 2020-07-28 stsp printf("work tree path prefix: %s\n",
9845 b2118c49 2020-07-28 stsp got_worktree_get_path_prefix(worktree));
9846 b2118c49 2020-07-28 stsp printf("work tree branch reference: %s\n",
9847 b2118c49 2020-07-28 stsp got_worktree_get_head_ref_name(worktree));
9848 b2118c49 2020-07-28 stsp printf("work tree UUID: %s\n", uuidstr);
9849 b2118c49 2020-07-28 stsp printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9851 b2118c49 2020-07-28 stsp if (show_files) {
9852 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9853 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9854 b2118c49 2020-07-28 stsp if (pe->path_len == 0)
9857 b2118c49 2020-07-28 stsp * Assume this path will fail. This will be corrected
9858 b2118c49 2020-07-28 stsp * in print_path_info() in case the path does suceeed.
9860 b2118c49 2020-07-28 stsp pe->data = (void *)got_error_path(pe->path,
9861 b2118c49 2020-07-28 stsp GOT_ERR_BAD_PATH);
9863 b2118c49 2020-07-28 stsp error = got_worktree_path_info(worktree, &paths,
9864 b2118c49 2020-07-28 stsp print_path_info, &paths, check_cancelled, NULL);
9865 b2118c49 2020-07-28 stsp if (error)
9866 b2118c49 2020-07-28 stsp goto done;
9867 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry) {
9868 b2118c49 2020-07-28 stsp if (pe->data != NULL) {
9869 b2118c49 2020-07-28 stsp error = pe->data; /* bad path */
9875 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, &paths, entry)
9876 b2118c49 2020-07-28 stsp free((char *)pe->path);
9877 b2118c49 2020-07-28 stsp got_pathlist_free(&paths);
9878 b2118c49 2020-07-28 stsp free(cwd);
9879 b2118c49 2020-07-28 stsp free(id_str);
9880 b2118c49 2020-07-28 stsp free(uuidstr);
9881 0ebf8283 2019-07-24 stsp return error;
