?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
gotwebd: add actions in the diff view too
[got-portable.git] / got / got.c
blob802320b0b95a53b2c163b2e107f19f76d99309cd
1 /*
2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */
18
19 #include "got_compat.h"
20
21 #include <sys/queue.h>
22 #include <sys/time.h>
23 #include <sys/types.h>
24 #include <sys/stat.h>
25 #include <sys/wait.h>
26
27 #include <err.h>
28 #include <errno.h>
29 #include <fcntl.h>
30 #include <limits.h>
31 #include <locale.h>
32 #include <ctype.h>
33 #include <signal.h>
34 #include <stdio.h>
35 #include <stdlib.h>
36 #include <string.h>
37 #include <unistd.h>
38 #include <libgen.h>
39 #include <time.h>
40 #include <paths.h>
41 #include <regex.h>
42 #include <getopt.h>
43
44 #include "got_version.h"
45 #include "got_error.h"
46 #include "got_object.h"
47 #include "got_reference.h"
48 #include "got_repository.h"
49 #include "got_path.h"
50 #include "got_cancel.h"
51 #include "got_worktree.h"
52 #include "got_diff.h"
53 #include "got_commit_graph.h"
54 #include "got_fetch.h"
55 #include "got_send.h"
56 #include "got_blame.h"
57 #include "got_privsep.h"
58 #include "got_opentemp.h"
59 #include "got_gotconfig.h"
60 #include "got_dial.h"
61 #include "got_patch.h"
62 #include "got_sigs.h"
63 #include "got_date.h"
64 #include "got_keyword.h"
65
66 #ifndef nitems
67 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
68 #endif
69
70 static volatile sig_atomic_t sigint_received;
71 static volatile sig_atomic_t sigpipe_received;
72
73 static void
74 catch_sigint(int signo)
75 {
76 sigint_received = 1;
77 }
78
79 static void
80 catch_sigpipe(int signo)
81 {
82 sigpipe_received = 1;
83 }
84
85
86 struct got_cmd {
87 const char *cmd_name;
88 const struct got_error *(*cmd_main)(int, char *[]);
89 void (*cmd_usage)(void);
90 const char *cmd_alias;
91 };
92
93 __dead static void usage(int, int);
94 __dead static void usage_import(void);
95 __dead static void usage_clone(void);
96 __dead static void usage_fetch(void);
97 __dead static void usage_checkout(void);
98 __dead static void usage_update(void);
99 __dead static void usage_log(void);
100 __dead static void usage_diff(void);
101 __dead static void usage_blame(void);
102 __dead static void usage_tree(void);
103 __dead static void usage_status(void);
104 __dead static void usage_ref(void);
105 __dead static void usage_branch(void);
106 __dead static void usage_tag(void);
107 __dead static void usage_add(void);
108 __dead static void usage_remove(void);
109 __dead static void usage_patch(void);
110 __dead static void usage_revert(void);
111 __dead static void usage_commit(void);
112 __dead static void usage_send(void);
113 __dead static void usage_cherrypick(void);
114 __dead static void usage_backout(void);
115 __dead static void usage_rebase(void);
116 __dead static void usage_histedit(void);
117 __dead static void usage_integrate(void);
118 __dead static void usage_merge(void);
119 __dead static void usage_stage(void);
120 __dead static void usage_unstage(void);
121 __dead static void usage_cat(void);
122 __dead static void usage_info(void);
123
124 static const struct got_error* cmd_import(int, char *[]);
125 static const struct got_error* cmd_clone(int, char *[]);
126 static const struct got_error* cmd_fetch(int, char *[]);
127 static const struct got_error* cmd_checkout(int, char *[]);
128 static const struct got_error* cmd_update(int, char *[]);
129 static const struct got_error* cmd_log(int, char *[]);
130 static const struct got_error* cmd_diff(int, char *[]);
131 static const struct got_error* cmd_blame(int, char *[]);
132 static const struct got_error* cmd_tree(int, char *[]);
133 static const struct got_error* cmd_status(int, char *[]);
134 static const struct got_error* cmd_ref(int, char *[]);
135 static const struct got_error* cmd_branch(int, char *[]);
136 static const struct got_error* cmd_tag(int, char *[]);
137 static const struct got_error* cmd_add(int, char *[]);
138 static const struct got_error* cmd_remove(int, char *[]);
139 static const struct got_error* cmd_patch(int, char *[]);
140 static const struct got_error* cmd_revert(int, char *[]);
141 static const struct got_error* cmd_commit(int, char *[]);
142 static const struct got_error* cmd_send(int, char *[]);
143 static const struct got_error* cmd_cherrypick(int, char *[]);
144 static const struct got_error* cmd_backout(int, char *[]);
145 static const struct got_error* cmd_rebase(int, char *[]);
146 static const struct got_error* cmd_histedit(int, char *[]);
147 static const struct got_error* cmd_integrate(int, char *[]);
148 static const struct got_error* cmd_merge(int, char *[]);
149 static const struct got_error* cmd_stage(int, char *[]);
150 static const struct got_error* cmd_unstage(int, char *[]);
151 static const struct got_error* cmd_cat(int, char *[]);
152 static const struct got_error* cmd_info(int, char *[]);
153
154 static const struct got_cmd got_commands[] = {
155 { "import", cmd_import, usage_import, "im" },
156 { "clone", cmd_clone, usage_clone, "cl" },
157 { "fetch", cmd_fetch, usage_fetch, "fe" },
158 { "checkout", cmd_checkout, usage_checkout, "co" },
159 { "update", cmd_update, usage_update, "up" },
160 { "log", cmd_log, usage_log, "" },
161 { "diff", cmd_diff, usage_diff, "di" },
162 { "blame", cmd_blame, usage_blame, "bl" },
163 { "tree", cmd_tree, usage_tree, "tr" },
164 { "status", cmd_status, usage_status, "st" },
165 { "ref", cmd_ref, usage_ref, "" },
166 { "branch", cmd_branch, usage_branch, "br" },
167 { "tag", cmd_tag, usage_tag, "" },
168 { "add", cmd_add, usage_add, "" },
169 { "remove", cmd_remove, usage_remove, "rm" },
170 { "patch", cmd_patch, usage_patch, "pa" },
171 { "revert", cmd_revert, usage_revert, "rv" },
172 { "commit", cmd_commit, usage_commit, "ci" },
173 { "send", cmd_send, usage_send, "se" },
174 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
175 { "backout", cmd_backout, usage_backout, "bo" },
176 { "rebase", cmd_rebase, usage_rebase, "rb" },
177 { "histedit", cmd_histedit, usage_histedit, "he" },
178 { "integrate", cmd_integrate, usage_integrate,"ig" },
179 { "merge", cmd_merge, usage_merge, "mg" },
180 { "stage", cmd_stage, usage_stage, "sg" },
181 { "unstage", cmd_unstage, usage_unstage, "ug" },
182 { "cat", cmd_cat, usage_cat, "" },
183 { "info", cmd_info, usage_info, "" },
184 };
185
186 static void
187 list_commands(FILE *fp)
188 {
189 size_t i;
190
191 fprintf(fp, "commands:");
192 for (i = 0; i < nitems(got_commands); i++) {
193 const struct got_cmd *cmd = &got_commands[i];
194 fprintf(fp, " %s", cmd->cmd_name);
195 }
196 fputc('\n', fp);
197 }
198
199 __dead static void
200 option_conflict(char a, char b)
201 {
202 errx(1, "-%c and -%c options are mutually exclusive", a, b);
203 }
204
205 int
206 main(int argc, char *argv[])
207 {
208 const struct got_cmd *cmd;
209 size_t i;
210 int ch;
211 int hflag = 0, Vflag = 0;
212 static const struct option longopts[] = {
213 { "version", no_argument, NULL, 'V' },
214 { NULL, 0, NULL, 0 }
215 };
216
217 setlocale(LC_CTYPE, "");
218
219 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
220 switch (ch) {
221 case 'h':
222 hflag = 1;
223 break;
224 case 'V':
225 Vflag = 1;
226 break;
227 default:
228 usage(hflag, 1);
229 /* NOTREACHED */
230 }
231 }
232
233 argc -= optind;
234 argv += optind;
235 optind = 1;
236 optreset = 1;
237
238 if (Vflag) {
239 got_version_print_str();
240 return 0;
241 }
242
243 if (argc <= 0)
244 usage(hflag, hflag ? 0 : 1);
245
246 signal(SIGINT, catch_sigint);
247 signal(SIGPIPE, catch_sigpipe);
248
249 for (i = 0; i < nitems(got_commands); i++) {
250 const struct got_error *error;
251
252 cmd = &got_commands[i];
253
254 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
255 strcmp(cmd->cmd_alias, argv[0]) != 0)
256 continue;
257
258 if (hflag)
259 cmd->cmd_usage();
260
261 error = cmd->cmd_main(argc, argv);
262 if (error && error->code != GOT_ERR_CANCELLED &&
263 error->code != GOT_ERR_PRIVSEP_EXIT &&
264 !(sigpipe_received &&
265 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
266 !(sigint_received &&
267 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
268 fflush(stdout);
269 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
270 return 1;
271 }
272
273 return 0;
274 }
275
276 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
277 list_commands(stderr);
278 return 1;
279 }
280
281 __dead static void
282 usage(int hflag, int status)
283 {
284 FILE *fp = (status == 0) ? stdout : stderr;
285
286 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
287 getprogname());
288 if (hflag)
289 list_commands(fp);
290 exit(status);
291 }
292
293 static const struct got_error *
294 get_editor(char **abspath)
295 {
296 const struct got_error *err = NULL;
297 const char *editor;
298
299 *abspath = NULL;
300
301 editor = getenv("VISUAL");
302 if (editor == NULL)
303 editor = getenv("EDITOR");
304
305 if (editor) {
306 err = got_path_find_prog(abspath, editor);
307 if (err)
308 return err;
309 }
310
311 if (*abspath == NULL) {
312 *abspath = strdup("/usr/bin/vi");
313 if (*abspath == NULL)
314 return got_error_from_errno("strdup");
315 }
316
317 return NULL;
318 }
319
320 static const struct got_error *
321 apply_unveil(const char *repo_path, int repo_read_only,
322 const char *worktree_path)
323 {
324 const struct got_error *err;
325
326 #ifdef PROFILE
327 if (unveil("gmon.out", "rwc") != 0)
328 return got_error_from_errno2("unveil", "gmon.out");
329 #endif
330 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
331 return got_error_from_errno2("unveil", repo_path);
332
333 if (worktree_path && unveil(worktree_path, "rwc") != 0)
334 return got_error_from_errno2("unveil", worktree_path);
335
336 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
337 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
338
339 err = got_privsep_unveil_exec_helpers();
340 if (err != NULL)
341 return err;
342
343 if (unveil(NULL, NULL) != 0)
344 return got_error_from_errno("unveil");
345
346 return NULL;
347 }
348
349 __dead static void
350 usage_import(void)
351 {
352 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
353 "[-r repository-path] directory\n", getprogname());
354 exit(1);
355 }
356
357 static int
358 spawn_editor(const char *editor, const char *file)
359 {
360 pid_t pid;
361 sig_t sighup, sigint, sigquit;
362 int st = -1;
363
364 sighup = signal(SIGHUP, SIG_IGN);
365 sigint = signal(SIGINT, SIG_IGN);
366 sigquit = signal(SIGQUIT, SIG_IGN);
367
368 switch (pid = fork()) {
369 case -1:
370 goto doneediting;
371 case 0:
372 execl(editor, editor, file, (char *)NULL);
373 _exit(127);
374 }
375
376 while (waitpid(pid, &st, 0) == -1)
377 if (errno != EINTR)
378 break;
379
380 doneediting:
381 (void)signal(SIGHUP, sighup);
382 (void)signal(SIGINT, sigint);
383 (void)signal(SIGQUIT, sigquit);
384
385 if (!WIFEXITED(st)) {
386 errno = EINTR;
387 return -1;
388 }
389
390 return WEXITSTATUS(st);
391 }
392
393 static const struct got_error *
394 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
395 {
396 const struct got_error *err = NULL;
397 char *line = NULL;
398 size_t linesize = 0;
399
400 *logmsg = NULL;
401 *len = 0;
402
403 if (fseeko(fp, 0L, SEEK_SET) == -1)
404 return got_error_from_errno("fseeko");
405
406 *logmsg = malloc(filesize + 1);
407 if (*logmsg == NULL)
408 return got_error_from_errno("malloc");
409 (*logmsg)[0] = '\0';
410
411 while (getline(&line, &linesize, fp) != -1) {
412 if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
413 continue; /* remove comments and leading empty lines */
414 *len = strlcat(*logmsg, line, filesize + 1);
415 if (*len >= filesize + 1) {
416 err = got_error(GOT_ERR_NO_SPACE);
417 goto done;
418 }
419 }
420 if (ferror(fp)) {
421 err = got_ferror(fp, GOT_ERR_IO);
422 goto done;
423 }
424
425 while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
426 (*logmsg)[*len - 1] = '\0';
427 (*len)--;
428 }
429 done:
430 free(line);
431 if (err) {
432 free(*logmsg);
433 *logmsg = NULL;
434 *len = 0;
435 }
436 return err;
437 }
438
439 static const struct got_error *
440 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
441 const char *initial_content, size_t initial_content_len,
442 int require_modification)
443 {
444 const struct got_error *err = NULL;
445 struct stat st, st2;
446 FILE *fp = NULL;
447 size_t logmsg_len;
448
449 *logmsg = NULL;
450
451 if (stat(logmsg_path, &st) == -1)
452 return got_error_from_errno2("stat", logmsg_path);
453
454 if (spawn_editor(editor, logmsg_path) == -1)
455 return got_error_from_errno("failed spawning editor");
456
457 if (require_modification) {
458 struct timespec timeout;
459
460 timeout.tv_sec = 0;
461 timeout.tv_nsec = 1;
462 nanosleep(&timeout, NULL);
463 }
464
465 if (stat(logmsg_path, &st2) == -1)
466 return got_error_from_errno2("stat", logmsg_path);
467
468 if (require_modification && st.st_size == st2.st_size &&
469 timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
470 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
471 "no changes made to commit message, aborting");
472
473 fp = fopen(logmsg_path, "re");
474 if (fp == NULL) {
475 err = got_error_from_errno("fopen");
476 goto done;
477 }
478
479 /* strip comments and leading/trailing newlines */
480 err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
481 if (err)
482 goto done;
483 if (logmsg_len == 0) {
484 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
485 "commit message cannot be empty, aborting");
486 goto done;
487 }
488 done:
489 if (fp && fclose(fp) == EOF && err == NULL)
490 err = got_error_from_errno("fclose");
491 if (err) {
492 free(*logmsg);
493 *logmsg = NULL;
494 }
495 return err;
496 }
497
498 static const struct got_error *
499 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
500 const char *path_dir, const char *branch_name)
501 {
502 char *initial_content = NULL;
503 const struct got_error *err = NULL;
504 int initial_content_len;
505 int fd = -1;
506
507 initial_content_len = asprintf(&initial_content,
508 "\n# %s to be imported to branch %s\n", path_dir,
509 branch_name);
510 if (initial_content_len == -1)
511 return got_error_from_errno("asprintf");
512
513 err = got_opentemp_named_fd(logmsg_path, &fd,
514 GOT_TMPDIR_STR "/got-importmsg", "");
515 if (err)
516 goto done;
517
518 if (write(fd, initial_content, initial_content_len) == -1) {
519 err = got_error_from_errno2("write", *logmsg_path);
520 goto done;
521 }
522 if (close(fd) == -1) {
523 err = got_error_from_errno2("close", *logmsg_path);
524 goto done;
525 }
526 fd = -1;
527
528 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
529 initial_content_len, 1);
530 done:
531 if (fd != -1 && close(fd) == -1 && err == NULL)
532 err = got_error_from_errno2("close", *logmsg_path);
533 free(initial_content);
534 if (err) {
535 free(*logmsg_path);
536 *logmsg_path = NULL;
537 }
538 return err;
539 }
540
541 static const struct got_error *
542 import_progress(void *arg, const char *path)
543 {
544 printf("A %s\n", path);
545 return NULL;
546 }
547
548 static const struct got_error *
549 valid_author(const char *author)
550 {
551 const char *email = author;
552
553 /*
554 * Git' expects the author (or committer) to be in the form
555 * "name <email>", which are mostly free form (see the
556 * "committer" description in git-fast-import(1)). We're only
557 * doing this to avoid git's object parser breaking on commits
558 * we create.
559 */
560
561 while (*author && *author != '\n' && *author != '<' && *author != '>')
562 author++;
563 if (author != email && *author == '<' && *(author - 1) != ' ')
564 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
565 "between author name and email required", email);
566 if (*author++ != '<')
567 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
568 while (*author && *author != '\n' && *author != '<' && *author != '>')
569 author++;
570 if (strcmp(author, ">") != 0)
571 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
572 return NULL;
573 }
574
575 static const struct got_error *
576 get_author(char **author, struct got_repository *repo,
577 struct got_worktree *worktree)
578 {
579 const struct got_error *err = NULL;
580 const char *got_author = NULL, *name, *email;
581 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
582
583 *author = NULL;
584
585 if (worktree)
586 worktree_conf = got_worktree_get_gotconfig(worktree);
587 repo_conf = got_repo_get_gotconfig(repo);
588
589 /*
590 * Priority of potential author information sources, from most
591 * significant to least significant:
592 * 1) work tree's .got/got.conf file
593 * 2) repository's got.conf file
594 * 3) repository's git config file
595 * 4) environment variables
596 * 5) global git config files (in user's home directory or /etc)
597 */
598
599 if (worktree_conf)
600 got_author = got_gotconfig_get_author(worktree_conf);
601 if (got_author == NULL)
602 got_author = got_gotconfig_get_author(repo_conf);
603 if (got_author == NULL) {
604 name = got_repo_get_gitconfig_author_name(repo);
605 email = got_repo_get_gitconfig_author_email(repo);
606 if (name && email) {
607 if (asprintf(author, "%s <%s>", name, email) == -1)
608 return got_error_from_errno("asprintf");
609 return NULL;
610 }
611
612 got_author = getenv("GOT_AUTHOR");
613 if (got_author == NULL) {
614 name = got_repo_get_global_gitconfig_author_name(repo);
615 email = got_repo_get_global_gitconfig_author_email(
616 repo);
617 if (name && email) {
618 if (asprintf(author, "%s <%s>", name, email)
619 == -1)
620 return got_error_from_errno("asprintf");
621 return NULL;
622 }
623 /* TODO: Look up user in password database? */
624 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
625 }
626 }
627
628 *author = strdup(got_author);
629 if (*author == NULL)
630 return got_error_from_errno("strdup");
631
632 err = valid_author(*author);
633 if (err) {
634 free(*author);
635 *author = NULL;
636 }
637 return err;
638 }
639
640 static const struct got_error *
641 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
642 struct got_worktree *worktree)
643 {
644 const char *got_allowed_signers = NULL;
645 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
646
647 *allowed_signers = NULL;
648
649 if (worktree)
650 worktree_conf = got_worktree_get_gotconfig(worktree);
651 repo_conf = got_repo_get_gotconfig(repo);
652
653 /*
654 * Priority of potential author information sources, from most
655 * significant to least significant:
656 * 1) work tree's .got/got.conf file
657 * 2) repository's got.conf file
658 */
659
660 if (worktree_conf)
661 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
662 worktree_conf);
663 if (got_allowed_signers == NULL)
664 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
665 repo_conf);
666
667 if (got_allowed_signers) {
668 *allowed_signers = strdup(got_allowed_signers);
669 if (*allowed_signers == NULL)
670 return got_error_from_errno("strdup");
671 }
672 return NULL;
673 }
674
675 static const struct got_error *
676 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
677 struct got_worktree *worktree)
678 {
679 const char *got_revoked_signers = NULL;
680 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
681
682 *revoked_signers = NULL;
683
684 if (worktree)
685 worktree_conf = got_worktree_get_gotconfig(worktree);
686 repo_conf = got_repo_get_gotconfig(repo);
687
688 /*
689 * Priority of potential author information sources, from most
690 * significant to least significant:
691 * 1) work tree's .got/got.conf file
692 * 2) repository's got.conf file
693 */
694
695 if (worktree_conf)
696 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
697 worktree_conf);
698 if (got_revoked_signers == NULL)
699 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
700 repo_conf);
701
702 if (got_revoked_signers) {
703 *revoked_signers = strdup(got_revoked_signers);
704 if (*revoked_signers == NULL)
705 return got_error_from_errno("strdup");
706 }
707 return NULL;
708 }
709
710 static const char *
711 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
712 {
713 const char *got_signer_id = NULL;
714 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
715
716 if (worktree)
717 worktree_conf = got_worktree_get_gotconfig(worktree);
718 repo_conf = got_repo_get_gotconfig(repo);
719
720 /*
721 * Priority of potential author information sources, from most
722 * significant to least significant:
723 * 1) work tree's .got/got.conf file
724 * 2) repository's got.conf file
725 */
726
727 if (worktree_conf)
728 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
729 if (got_signer_id == NULL)
730 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
731
732 return got_signer_id;
733 }
734
735 static const struct got_error *
736 get_gitconfig_path(char **gitconfig_path)
737 {
738 const char *homedir = getenv("HOME");
739
740 *gitconfig_path = NULL;
741 if (homedir) {
742 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
743 return got_error_from_errno("asprintf");
744
745 }
746 return NULL;
747 }
748
749 static const struct got_error *
750 cmd_import(int argc, char *argv[])
751 {
752 const struct got_error *error = NULL;
753 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
754 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
755 const char *branch_name = NULL;
756 char *id_str = NULL, *logmsg_path = NULL;
757 char refname[PATH_MAX] = "refs/heads/";
758 struct got_repository *repo = NULL;
759 struct got_reference *branch_ref = NULL, *head_ref = NULL;
760 struct got_object_id *new_commit_id = NULL;
761 int ch, n = 0;
762 struct got_pathlist_head ignores;
763 struct got_pathlist_entry *pe;
764 int preserve_logmsg = 0;
765 int *pack_fds = NULL;
766
767 TAILQ_INIT(&ignores);
768
769 #ifndef PROFILE
770 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
771 "unveil",
772 NULL) == -1)
773 err(1, "pledge");
774 #endif
775
776 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
777 switch (ch) {
778 case 'b':
779 branch_name = optarg;
780 break;
781 case 'I':
782 if (optarg[0] == '\0')
783 break;
784 error = got_pathlist_insert(&pe, &ignores, optarg,
785 NULL);
786 if (error)
787 goto done;
788 break;
789 case 'm':
790 logmsg = strdup(optarg);
791 if (logmsg == NULL) {
792 error = got_error_from_errno("strdup");
793 goto done;
794 }
795 break;
796 case 'r':
797 repo_path = realpath(optarg, NULL);
798 if (repo_path == NULL) {
799 error = got_error_from_errno2("realpath",
800 optarg);
801 goto done;
802 }
803 break;
804 default:
805 usage_import();
806 /* NOTREACHED */
807 }
808 }
809
810 argc -= optind;
811 argv += optind;
812
813 if (argc != 1)
814 usage_import();
815
816 if (repo_path == NULL) {
817 repo_path = getcwd(NULL, 0);
818 if (repo_path == NULL)
819 return got_error_from_errno("getcwd");
820 }
821 got_path_strip_trailing_slashes(repo_path);
822 error = get_gitconfig_path(&gitconfig_path);
823 if (error)
824 goto done;
825 error = got_repo_pack_fds_open(&pack_fds);
826 if (error != NULL)
827 goto done;
828 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
829 if (error)
830 goto done;
831
832 error = get_author(&author, repo, NULL);
833 if (error)
834 return error;
835
836 /*
837 * Don't let the user create a branch name with a leading '-'.
838 * While technically a valid reference name, this case is usually
839 * an unintended typo.
840 */
841 if (branch_name && branch_name[0] == '-')
842 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
843
844 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
845 if (error && error->code != GOT_ERR_NOT_REF)
846 goto done;
847
848 if (branch_name)
849 n = strlcat(refname, branch_name, sizeof(refname));
850 else if (head_ref && got_ref_is_symbolic(head_ref))
851 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
852 sizeof(refname));
853 else
854 n = strlcat(refname, "main", sizeof(refname));
855 if (n >= sizeof(refname)) {
856 error = got_error(GOT_ERR_NO_SPACE);
857 goto done;
858 }
859
860 error = got_ref_open(&branch_ref, repo, refname, 0);
861 if (error) {
862 if (error->code != GOT_ERR_NOT_REF)
863 goto done;
864 } else {
865 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
866 "import target branch already exists");
867 goto done;
868 }
869
870 path_dir = realpath(argv[0], NULL);
871 if (path_dir == NULL) {
872 error = got_error_from_errno2("realpath", argv[0]);
873 goto done;
874 }
875 got_path_strip_trailing_slashes(path_dir);
876
877 /*
878 * unveil(2) traverses exec(2); if an editor is used we have
879 * to apply unveil after the log message has been written.
880 */
881 if (logmsg == NULL || *logmsg == '\0') {
882 error = get_editor(&editor);
883 if (error)
884 goto done;
885 free(logmsg);
886 error = collect_import_msg(&logmsg, &logmsg_path, editor,
887 path_dir, refname);
888 if (error) {
889 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
890 logmsg_path != NULL)
891 preserve_logmsg = 1;
892 goto done;
893 }
894 }
895
896 if (unveil(path_dir, "r") != 0) {
897 error = got_error_from_errno2("unveil", path_dir);
898 if (logmsg_path)
899 preserve_logmsg = 1;
900 goto done;
901 }
902
903 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
904 if (error) {
905 if (logmsg_path)
906 preserve_logmsg = 1;
907 goto done;
908 }
909
910 error = got_repo_import(&new_commit_id, path_dir, logmsg,
911 author, &ignores, repo, import_progress, NULL);
912 if (error) {
913 if (logmsg_path)
914 preserve_logmsg = 1;
915 goto done;
916 }
917
918 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
919 if (error) {
920 if (logmsg_path)
921 preserve_logmsg = 1;
922 goto done;
923 }
924
925 error = got_ref_write(branch_ref, repo);
926 if (error) {
927 if (logmsg_path)
928 preserve_logmsg = 1;
929 goto done;
930 }
931
932 error = got_object_id_str(&id_str, new_commit_id);
933 if (error) {
934 if (logmsg_path)
935 preserve_logmsg = 1;
936 goto done;
937 }
938
939 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
940 if (error) {
941 if (error->code != GOT_ERR_NOT_REF) {
942 if (logmsg_path)
943 preserve_logmsg = 1;
944 goto done;
945 }
946
947 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
948 branch_ref);
949 if (error) {
950 if (logmsg_path)
951 preserve_logmsg = 1;
952 goto done;
953 }
954
955 error = got_ref_write(head_ref, repo);
956 if (error) {
957 if (logmsg_path)
958 preserve_logmsg = 1;
959 goto done;
960 }
961 }
962
963 printf("Created branch %s with commit %s\n",
964 got_ref_get_name(branch_ref), id_str);
965 done:
966 if (pack_fds) {
967 const struct got_error *pack_err =
968 got_repo_pack_fds_close(pack_fds);
969 if (error == NULL)
970 error = pack_err;
971 }
972 if (repo) {
973 const struct got_error *close_err = got_repo_close(repo);
974 if (error == NULL)
975 error = close_err;
976 }
977 if (preserve_logmsg) {
978 fprintf(stderr, "%s: log message preserved in %s\n",
979 getprogname(), logmsg_path);
980 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
981 error = got_error_from_errno2("unlink", logmsg_path);
982 free(logmsg);
983 free(logmsg_path);
984 free(repo_path);
985 free(editor);
986 free(new_commit_id);
987 free(id_str);
988 free(author);
989 free(gitconfig_path);
990 if (branch_ref)
991 got_ref_close(branch_ref);
992 if (head_ref)
993 got_ref_close(head_ref);
994 return error;
995 }
996
997 __dead static void
998 usage_clone(void)
999 {
1000 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1001 "repository-URL [directory]\n", getprogname());
1002 exit(1);
1003 }
1004
1005 struct got_fetch_progress_arg {
1006 char last_scaled_size[FMT_SCALED_STRSIZE];
1007 int last_p_indexed;
1008 int last_p_resolved;
1009 int verbosity;
1010
1011 struct got_repository *repo;
1012
1013 int create_configs;
1014 int configs_created;
1015 struct {
1016 struct got_pathlist_head *symrefs;
1017 struct got_pathlist_head *wanted_branches;
1018 struct got_pathlist_head *wanted_refs;
1019 const char *proto;
1020 const char *host;
1021 const char *port;
1022 const char *remote_repo_path;
1023 const char *git_url;
1024 int fetch_all_branches;
1025 int mirror_references;
1026 } config_info;
1027 };
1028
1029 /* XXX forward declaration */
1030 static const struct got_error *
1031 create_config_files(const char *proto, const char *host, const char *port,
1032 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1033 int mirror_references, struct got_pathlist_head *symrefs,
1034 struct got_pathlist_head *wanted_branches,
1035 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1036
1037 static const struct got_error *
1038 fetch_progress(void *arg, const char *message, off_t packfile_size,
1039 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1040 {
1041 const struct got_error *err = NULL;
1042 struct got_fetch_progress_arg *a = arg;
1043 char scaled_size[FMT_SCALED_STRSIZE];
1044 int p_indexed, p_resolved;
1045 int print_size = 0, print_indexed = 0, print_resolved = 0;
1046
1047 /*
1048 * In order to allow a failed clone to be resumed with 'got fetch'
1049 * we try to create configuration files as soon as possible.
1050 * Once the server has sent information about its default branch
1051 * we have all required information.
1052 */
1053 if (a->create_configs && !a->configs_created &&
1054 !TAILQ_EMPTY(a->config_info.symrefs)) {
1055 err = create_config_files(a->config_info.proto,
1056 a->config_info.host, a->config_info.port,
1057 a->config_info.remote_repo_path,
1058 a->config_info.git_url,
1059 a->config_info.fetch_all_branches,
1060 a->config_info.mirror_references,
1061 a->config_info.symrefs,
1062 a->config_info.wanted_branches,
1063 a->config_info.wanted_refs, a->repo);
1064 if (err)
1065 return err;
1066 a->configs_created = 1;
1067 }
1068
1069 if (a->verbosity < 0)
1070 return NULL;
1071
1072 if (message && message[0] != '\0') {
1073 printf("\rserver: %s", message);
1074 fflush(stdout);
1075 return NULL;
1076 }
1077
1078 if (packfile_size > 0 || nobj_indexed > 0) {
1079 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1080 (a->last_scaled_size[0] == '\0' ||
1081 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1082 print_size = 1;
1083 if (strlcpy(a->last_scaled_size, scaled_size,
1084 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1085 return got_error(GOT_ERR_NO_SPACE);
1086 }
1087 if (nobj_indexed > 0) {
1088 p_indexed = (nobj_indexed * 100) / nobj_total;
1089 if (p_indexed != a->last_p_indexed) {
1090 a->last_p_indexed = p_indexed;
1091 print_indexed = 1;
1092 print_size = 1;
1093 }
1094 }
1095 if (nobj_resolved > 0) {
1096 p_resolved = (nobj_resolved * 100) /
1097 (nobj_total - nobj_loose);
1098 if (p_resolved != a->last_p_resolved) {
1099 a->last_p_resolved = p_resolved;
1100 print_resolved = 1;
1101 print_indexed = 1;
1102 print_size = 1;
1103 }
1104 }
1105
1106 }
1107 if (print_size || print_indexed || print_resolved)
1108 printf("\r");
1109 if (print_size)
1110 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1111 if (print_indexed)
1112 printf("; indexing %d%%", p_indexed);
1113 if (print_resolved)
1114 printf("; resolving deltas %d%%", p_resolved);
1115 if (print_size || print_indexed || print_resolved)
1116 fflush(stdout);
1117
1118 return NULL;
1119 }
1120
1121 static const struct got_error *
1122 create_symref(const char *refname, struct got_reference *target_ref,
1123 int verbosity, struct got_repository *repo)
1124 {
1125 const struct got_error *err;
1126 struct got_reference *head_symref;
1127
1128 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1129 if (err)
1130 return err;
1131
1132 err = got_ref_write(head_symref, repo);
1133 if (err == NULL && verbosity > 0) {
1134 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1135 got_ref_get_name(target_ref));
1136 }
1137 got_ref_close(head_symref);
1138 return err;
1139 }
1140
1141 static const struct got_error *
1142 list_remote_refs(struct got_pathlist_head *symrefs,
1143 struct got_pathlist_head *refs)
1144 {
1145 const struct got_error *err;
1146 struct got_pathlist_entry *pe;
1147
1148 TAILQ_FOREACH(pe, symrefs, entry) {
1149 const char *refname = pe->path;
1150 const char *targetref = pe->data;
1151
1152 printf("%s: %s\n", refname, targetref);
1153 }
1154
1155 TAILQ_FOREACH(pe, refs, entry) {
1156 const char *refname = pe->path;
1157 struct got_object_id *id = pe->data;
1158 char *id_str;
1159
1160 err = got_object_id_str(&id_str, id);
1161 if (err)
1162 return err;
1163 printf("%s: %s\n", refname, id_str);
1164 free(id_str);
1165 }
1166
1167 return NULL;
1168 }
1169
1170 static const struct got_error *
1171 create_ref(const char *refname, struct got_object_id *id,
1172 int verbosity, struct got_repository *repo)
1173 {
1174 const struct got_error *err = NULL;
1175 struct got_reference *ref;
1176 char *id_str;
1177
1178 err = got_object_id_str(&id_str, id);
1179 if (err)
1180 return err;
1181
1182 err = got_ref_alloc(&ref, refname, id);
1183 if (err)
1184 goto done;
1185
1186 err = got_ref_write(ref, repo);
1187 got_ref_close(ref);
1188
1189 if (err == NULL && verbosity >= 0)
1190 printf("Created reference %s: %s\n", refname, id_str);
1191 done:
1192 free(id_str);
1193 return err;
1194 }
1195
1196 static int
1197 match_wanted_ref(const char *refname, const char *wanted_ref)
1198 {
1199 if (strncmp(refname, "refs/", 5) != 0)
1200 return 0;
1201 refname += 5;
1202
1203 /*
1204 * Prevent fetching of references that won't make any
1205 * sense outside of the remote repository's context.
1206 */
1207 if (strncmp(refname, "got/", 4) == 0)
1208 return 0;
1209 if (strncmp(refname, "remotes/", 8) == 0)
1210 return 0;
1211
1212 if (strncmp(wanted_ref, "refs/", 5) == 0)
1213 wanted_ref += 5;
1214
1215 /* Allow prefix match. */
1216 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1217 return 1;
1218
1219 /* Allow exact match. */
1220 return (strcmp(refname, wanted_ref) == 0);
1221 }
1222
1223 static int
1224 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1225 {
1226 struct got_pathlist_entry *pe;
1227
1228 TAILQ_FOREACH(pe, wanted_refs, entry) {
1229 if (match_wanted_ref(refname, pe->path))
1230 return 1;
1231 }
1232
1233 return 0;
1234 }
1235
1236 static const struct got_error *
1237 create_wanted_ref(const char *refname, struct got_object_id *id,
1238 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1239 {
1240 const struct got_error *err;
1241 char *remote_refname;
1242
1243 if (strncmp("refs/", refname, 5) == 0)
1244 refname += 5;
1245
1246 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1247 remote_repo_name, refname) == -1)
1248 return got_error_from_errno("asprintf");
1249
1250 err = create_ref(remote_refname, id, verbosity, repo);
1251 free(remote_refname);
1252 return err;
1253 }
1254
1255 static const struct got_error *
1256 create_gotconfig(const char *proto, const char *host, const char *port,
1257 const char *remote_repo_path, const char *default_branch,
1258 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1259 struct got_pathlist_head *wanted_refs, int mirror_references,
1260 struct got_repository *repo)
1261 {
1262 const struct got_error *err = NULL;
1263 char *gotconfig_path = NULL;
1264 char *gotconfig = NULL;
1265 FILE *gotconfig_file = NULL;
1266 const char *branchname = NULL;
1267 char *branches = NULL, *refs = NULL;
1268 ssize_t n;
1269
1270 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1271 struct got_pathlist_entry *pe;
1272 TAILQ_FOREACH(pe, wanted_branches, entry) {
1273 char *s;
1274 branchname = pe->path;
1275 if (strncmp(branchname, "refs/heads/", 11) == 0)
1276 branchname += 11;
1277 if (asprintf(&s, "%s\"%s\" ",
1278 branches ? branches : "", branchname) == -1) {
1279 err = got_error_from_errno("asprintf");
1280 goto done;
1281 }
1282 free(branches);
1283 branches = s;
1284 }
1285 } else if (!fetch_all_branches && default_branch) {
1286 branchname = default_branch;
1287 if (strncmp(branchname, "refs/heads/", 11) == 0)
1288 branchname += 11;
1289 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1290 err = got_error_from_errno("asprintf");
1291 goto done;
1292 }
1293 }
1294 if (!TAILQ_EMPTY(wanted_refs)) {
1295 struct got_pathlist_entry *pe;
1296 TAILQ_FOREACH(pe, wanted_refs, entry) {
1297 char *s;
1298 const char *refname = pe->path;
1299 if (strncmp(refname, "refs/", 5) == 0)
1300 branchname += 5;
1301 if (asprintf(&s, "%s\"%s\" ",
1302 refs ? refs : "", refname) == -1) {
1303 err = got_error_from_errno("asprintf");
1304 goto done;
1305 }
1306 free(refs);
1307 refs = s;
1308 }
1309 }
1310
1311 /* Create got.conf(5). */
1312 gotconfig_path = got_repo_get_path_gotconfig(repo);
1313 if (gotconfig_path == NULL) {
1314 err = got_error_from_errno("got_repo_get_path_gotconfig");
1315 goto done;
1316 }
1317 gotconfig_file = fopen(gotconfig_path, "ae");
1318 if (gotconfig_file == NULL) {
1319 err = got_error_from_errno2("fopen", gotconfig_path);
1320 goto done;
1321 }
1322 if (asprintf(&gotconfig,
1323 "remote \"%s\" {\n"
1324 "\tserver %s\n"
1325 "\tprotocol %s\n"
1326 "%s%s%s"
1327 "\trepository \"%s\"\n"
1328 "%s%s%s"
1329 "%s%s%s"
1330 "%s"
1331 "%s"
1332 "}\n",
1333 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1334 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1335 remote_repo_path, branches ? "\tbranch { " : "",
1336 branches ? branches : "", branches ? "}\n" : "",
1337 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1338 mirror_references ? "\tmirror_references yes\n" : "",
1339 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1340 err = got_error_from_errno("asprintf");
1341 goto done;
1342 }
1343 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1344 if (n != strlen(gotconfig)) {
1345 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1346 goto done;
1347 }
1348
1349 done:
1350 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1351 err = got_error_from_errno2("fclose", gotconfig_path);
1352 free(gotconfig_path);
1353 free(branches);
1354 return err;
1355 }
1356
1357 static const struct got_error *
1358 create_gitconfig(const char *git_url, const char *default_branch,
1359 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1360 struct got_pathlist_head *wanted_refs, int mirror_references,
1361 struct got_repository *repo)
1362 {
1363 const struct got_error *err = NULL;
1364 char *gitconfig_path = NULL;
1365 char *gitconfig = NULL;
1366 FILE *gitconfig_file = NULL;
1367 char *branches = NULL, *refs = NULL;
1368 const char *branchname;
1369 ssize_t n;
1370
1371 /* Create a config file Git can understand. */
1372 gitconfig_path = got_repo_get_path_gitconfig(repo);
1373 if (gitconfig_path == NULL) {
1374 err = got_error_from_errno("got_repo_get_path_gitconfig");
1375 goto done;
1376 }
1377 gitconfig_file = fopen(gitconfig_path, "ae");
1378 if (gitconfig_file == NULL) {
1379 err = got_error_from_errno2("fopen", gitconfig_path);
1380 goto done;
1381 }
1382 if (fetch_all_branches) {
1383 if (mirror_references) {
1384 if (asprintf(&branches,
1385 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1386 err = got_error_from_errno("asprintf");
1387 goto done;
1388 }
1389 } else if (asprintf(&branches,
1390 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1391 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1392 err = got_error_from_errno("asprintf");
1393 goto done;
1394 }
1395 } else if (!TAILQ_EMPTY(wanted_branches)) {
1396 struct got_pathlist_entry *pe;
1397 TAILQ_FOREACH(pe, wanted_branches, entry) {
1398 char *s;
1399 branchname = pe->path;
1400 if (strncmp(branchname, "refs/heads/", 11) == 0)
1401 branchname += 11;
1402 if (mirror_references) {
1403 if (asprintf(&s,
1404 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1405 branches ? branches : "",
1406 branchname, branchname) == -1) {
1407 err = got_error_from_errno("asprintf");
1408 goto done;
1409 }
1410 } else if (asprintf(&s,
1411 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1412 branches ? branches : "",
1413 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1414 branchname) == -1) {
1415 err = got_error_from_errno("asprintf");
1416 goto done;
1417 }
1418 free(branches);
1419 branches = s;
1420 }
1421 } else {
1422 /*
1423 * If the server specified a default branch, use just that one.
1424 * Otherwise fall back to fetching all branches on next fetch.
1425 */
1426 if (default_branch) {
1427 branchname = default_branch;
1428 if (strncmp(branchname, "refs/heads/", 11) == 0)
1429 branchname += 11;
1430 } else
1431 branchname = "*"; /* fall back to all branches */
1432 if (mirror_references) {
1433 if (asprintf(&branches,
1434 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1435 branchname, branchname) == -1) {
1436 err = got_error_from_errno("asprintf");
1437 goto done;
1438 }
1439 } else if (asprintf(&branches,
1440 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1441 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1442 branchname) == -1) {
1443 err = got_error_from_errno("asprintf");
1444 goto done;
1445 }
1446 }
1447 if (!TAILQ_EMPTY(wanted_refs)) {
1448 struct got_pathlist_entry *pe;
1449 TAILQ_FOREACH(pe, wanted_refs, entry) {
1450 char *s;
1451 const char *refname = pe->path;
1452 if (strncmp(refname, "refs/", 5) == 0)
1453 refname += 5;
1454 if (mirror_references) {
1455 if (asprintf(&s,
1456 "%s\tfetch = refs/%s:refs/%s\n",
1457 refs ? refs : "", refname, refname) == -1) {
1458 err = got_error_from_errno("asprintf");
1459 goto done;
1460 }
1461 } else if (asprintf(&s,
1462 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1463 refs ? refs : "",
1464 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1465 refname) == -1) {
1466 err = got_error_from_errno("asprintf");
1467 goto done;
1468 }
1469 free(refs);
1470 refs = s;
1471 }
1472 }
1473
1474 if (asprintf(&gitconfig,
1475 "[remote \"%s\"]\n"
1476 "\turl = %s\n"
1477 "%s"
1478 "%s"
1479 "\tfetch = refs/tags/*:refs/tags/*\n",
1480 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1481 refs ? refs : "") == -1) {
1482 err = got_error_from_errno("asprintf");
1483 goto done;
1484 }
1485 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1486 if (n != strlen(gitconfig)) {
1487 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1488 goto done;
1489 }
1490 done:
1491 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1492 err = got_error_from_errno2("fclose", gitconfig_path);
1493 free(gitconfig_path);
1494 free(branches);
1495 return err;
1496 }
1497
1498 static const struct got_error *
1499 create_config_files(const char *proto, const char *host, const char *port,
1500 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1501 int mirror_references, struct got_pathlist_head *symrefs,
1502 struct got_pathlist_head *wanted_branches,
1503 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1504 {
1505 const struct got_error *err = NULL;
1506 const char *default_branch = NULL;
1507 struct got_pathlist_entry *pe;
1508
1509 /*
1510 * If we asked for a set of wanted branches then use the first
1511 * one of those.
1512 */
1513 if (!TAILQ_EMPTY(wanted_branches)) {
1514 pe = TAILQ_FIRST(wanted_branches);
1515 default_branch = pe->path;
1516 } else {
1517 /* First HEAD ref listed by server is the default branch. */
1518 TAILQ_FOREACH(pe, symrefs, entry) {
1519 const char *refname = pe->path;
1520 const char *target = pe->data;
1521
1522 if (strcmp(refname, GOT_REF_HEAD) != 0)
1523 continue;
1524
1525 default_branch = target;
1526 break;
1527 }
1528 }
1529
1530 /* Create got.conf(5). */
1531 err = create_gotconfig(proto, host, port, remote_repo_path,
1532 default_branch, fetch_all_branches, wanted_branches,
1533 wanted_refs, mirror_references, repo);
1534 if (err)
1535 return err;
1536
1537 /* Create a config file Git can understand. */
1538 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1539 wanted_branches, wanted_refs, mirror_references, repo);
1540 }
1541
1542 static const struct got_error *
1543 cmd_clone(int argc, char *argv[])
1544 {
1545 const struct got_error *error = NULL;
1546 const char *uri, *dirname;
1547 char *proto, *host, *port, *repo_name, *server_path;
1548 char *default_destdir = NULL, *id_str = NULL;
1549 const char *repo_path;
1550 struct got_repository *repo = NULL;
1551 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1552 struct got_pathlist_entry *pe;
1553 struct got_object_id *pack_hash = NULL;
1554 int ch, fetchfd = -1, fetchstatus;
1555 pid_t fetchpid = -1;
1556 struct got_fetch_progress_arg fpa;
1557 char *git_url = NULL;
1558 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1559 int bflag = 0, list_refs_only = 0;
1560 int *pack_fds = NULL;
1561
1562 TAILQ_INIT(&refs);
1563 TAILQ_INIT(&symrefs);
1564 TAILQ_INIT(&wanted_branches);
1565 TAILQ_INIT(&wanted_refs);
1566
1567 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1568 switch (ch) {
1569 case 'a':
1570 fetch_all_branches = 1;
1571 break;
1572 case 'b':
1573 error = got_pathlist_append(&wanted_branches,
1574 optarg, NULL);
1575 if (error)
1576 return error;
1577 bflag = 1;
1578 break;
1579 case 'l':
1580 list_refs_only = 1;
1581 break;
1582 case 'm':
1583 mirror_references = 1;
1584 break;
1585 case 'q':
1586 verbosity = -1;
1587 break;
1588 case 'R':
1589 error = got_pathlist_append(&wanted_refs,
1590 optarg, NULL);
1591 if (error)
1592 return error;
1593 break;
1594 case 'v':
1595 if (verbosity < 0)
1596 verbosity = 0;
1597 else if (verbosity < 3)
1598 verbosity++;
1599 break;
1600 default:
1601 usage_clone();
1602 break;
1603 }
1604 }
1605 argc -= optind;
1606 argv += optind;
1607
1608 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1609 option_conflict('a', 'b');
1610 if (list_refs_only) {
1611 if (!TAILQ_EMPTY(&wanted_branches))
1612 option_conflict('l', 'b');
1613 if (fetch_all_branches)
1614 option_conflict('l', 'a');
1615 if (mirror_references)
1616 option_conflict('l', 'm');
1617 if (!TAILQ_EMPTY(&wanted_refs))
1618 option_conflict('l', 'R');
1619 }
1620
1621 uri = argv[0];
1622
1623 if (argc == 1)
1624 dirname = NULL;
1625 else if (argc == 2)
1626 dirname = argv[1];
1627 else
1628 usage_clone();
1629
1630 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1631 &repo_name, uri);
1632 if (error)
1633 goto done;
1634
1635 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1636 host, port ? ":" : "", port ? port : "",
1637 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1638 error = got_error_from_errno("asprintf");
1639 goto done;
1640 }
1641
1642 if (strcmp(proto, "git") == 0) {
1643 #ifndef PROFILE
1644 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1645 "sendfd dns inet unveil", NULL) == -1)
1646 err(1, "pledge");
1647 #endif
1648 } else if (strcmp(proto, "git+ssh") == 0 ||
1649 strcmp(proto, "ssh") == 0) {
1650 #ifndef PROFILE
1651 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1652 "sendfd unveil", NULL) == -1)
1653 err(1, "pledge");
1654 #endif
1655 } else if (strcmp(proto, "http") == 0 ||
1656 strcmp(proto, "git+http") == 0) {
1657 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1658 goto done;
1659 } else {
1660 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1661 goto done;
1662 }
1663 if (dirname == NULL) {
1664 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1665 error = got_error_from_errno("asprintf");
1666 goto done;
1667 }
1668 repo_path = default_destdir;
1669 } else
1670 repo_path = dirname;
1671
1672 if (!list_refs_only) {
1673 error = got_path_mkdir(repo_path);
1674 if (error &&
1675 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1676 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1677 goto done;
1678 if (!got_path_dir_is_empty(repo_path)) {
1679 error = got_error_path(repo_path,
1680 GOT_ERR_DIR_NOT_EMPTY);
1681 goto done;
1682 }
1683 }
1684
1685 error = got_dial_apply_unveil(proto);
1686 if (error)
1687 goto done;
1688
1689 error = apply_unveil(repo_path, 0, NULL);
1690 if (error)
1691 goto done;
1692
1693 if (verbosity >= 0)
1694 printf("Connecting to %s\n", git_url);
1695
1696 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1697 server_path, verbosity);
1698 if (error)
1699 goto done;
1700
1701 if (!list_refs_only) {
1702 error = got_repo_init(repo_path, NULL);
1703 if (error)
1704 goto done;
1705 error = got_repo_pack_fds_open(&pack_fds);
1706 if (error != NULL)
1707 goto done;
1708 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1709 if (error)
1710 goto done;
1711 }
1712
1713 fpa.last_scaled_size[0] = '\0';
1714 fpa.last_p_indexed = -1;
1715 fpa.last_p_resolved = -1;
1716 fpa.verbosity = verbosity;
1717 fpa.create_configs = 1;
1718 fpa.configs_created = 0;
1719 fpa.repo = repo;
1720 fpa.config_info.symrefs = &symrefs;
1721 fpa.config_info.wanted_branches = &wanted_branches;
1722 fpa.config_info.wanted_refs = &wanted_refs;
1723 fpa.config_info.proto = proto;
1724 fpa.config_info.host = host;
1725 fpa.config_info.port = port;
1726 fpa.config_info.remote_repo_path = server_path;
1727 fpa.config_info.git_url = git_url;
1728 fpa.config_info.fetch_all_branches = fetch_all_branches;
1729 fpa.config_info.mirror_references = mirror_references;
1730 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1731 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1732 fetch_all_branches, &wanted_branches, &wanted_refs,
1733 list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1734 fetch_progress, &fpa);
1735 if (error)
1736 goto done;
1737
1738 if (list_refs_only) {
1739 error = list_remote_refs(&symrefs, &refs);
1740 goto done;
1741 }
1742
1743 if (pack_hash == NULL) {
1744 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1745 "server sent an empty pack file");
1746 goto done;
1747 }
1748 error = got_object_id_str(&id_str, pack_hash);
1749 if (error)
1750 goto done;
1751 if (verbosity >= 0)
1752 printf("\nFetched %s.pack\n", id_str);
1753 free(id_str);
1754
1755 /* Set up references provided with the pack file. */
1756 TAILQ_FOREACH(pe, &refs, entry) {
1757 const char *refname = pe->path;
1758 struct got_object_id *id = pe->data;
1759 char *remote_refname;
1760
1761 if (is_wanted_ref(&wanted_refs, refname) &&
1762 !mirror_references) {
1763 error = create_wanted_ref(refname, id,
1764 GOT_FETCH_DEFAULT_REMOTE_NAME,
1765 verbosity - 1, repo);
1766 if (error)
1767 goto done;
1768 continue;
1769 }
1770
1771 error = create_ref(refname, id, verbosity - 1, repo);
1772 if (error)
1773 goto done;
1774
1775 if (mirror_references)
1776 continue;
1777
1778 if (strncmp("refs/heads/", refname, 11) != 0)
1779 continue;
1780
1781 if (asprintf(&remote_refname,
1782 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1783 refname + 11) == -1) {
1784 error = got_error_from_errno("asprintf");
1785 goto done;
1786 }
1787 error = create_ref(remote_refname, id, verbosity - 1, repo);
1788 free(remote_refname);
1789 if (error)
1790 goto done;
1791 }
1792
1793 /* Set the HEAD reference if the server provided one. */
1794 TAILQ_FOREACH(pe, &symrefs, entry) {
1795 struct got_reference *target_ref;
1796 const char *refname = pe->path;
1797 const char *target = pe->data;
1798 char *remote_refname = NULL, *remote_target = NULL;
1799
1800 if (strcmp(refname, GOT_REF_HEAD) != 0)
1801 continue;
1802
1803 error = got_ref_open(&target_ref, repo, target, 0);
1804 if (error) {
1805 if (error->code == GOT_ERR_NOT_REF) {
1806 error = NULL;
1807 continue;
1808 }
1809 goto done;
1810 }
1811
1812 error = create_symref(refname, target_ref, verbosity, repo);
1813 got_ref_close(target_ref);
1814 if (error)
1815 goto done;
1816
1817 if (mirror_references)
1818 continue;
1819
1820 if (strncmp("refs/heads/", target, 11) != 0)
1821 continue;
1822
1823 if (asprintf(&remote_refname,
1824 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1825 refname) == -1) {
1826 error = got_error_from_errno("asprintf");
1827 goto done;
1828 }
1829 if (asprintf(&remote_target,
1830 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1831 target + 11) == -1) {
1832 error = got_error_from_errno("asprintf");
1833 free(remote_refname);
1834 goto done;
1835 }
1836 error = got_ref_open(&target_ref, repo, remote_target, 0);
1837 if (error) {
1838 free(remote_refname);
1839 free(remote_target);
1840 if (error->code == GOT_ERR_NOT_REF) {
1841 error = NULL;
1842 continue;
1843 }
1844 goto done;
1845 }
1846 error = create_symref(remote_refname, target_ref,
1847 verbosity - 1, repo);
1848 free(remote_refname);
1849 free(remote_target);
1850 got_ref_close(target_ref);
1851 if (error)
1852 goto done;
1853 }
1854 if (pe == NULL) {
1855 /*
1856 * We failed to set the HEAD reference. If we asked for
1857 * a set of wanted branches use the first of one of those
1858 * which could be fetched instead.
1859 */
1860 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1861 const char *target = pe->path;
1862 struct got_reference *target_ref;
1863
1864 error = got_ref_open(&target_ref, repo, target, 0);
1865 if (error) {
1866 if (error->code == GOT_ERR_NOT_REF) {
1867 error = NULL;
1868 continue;
1869 }
1870 goto done;
1871 }
1872
1873 error = create_symref(GOT_REF_HEAD, target_ref,
1874 verbosity, repo);
1875 got_ref_close(target_ref);
1876 if (error)
1877 goto done;
1878 break;
1879 }
1880
1881 if (!fpa.configs_created && pe != NULL) {
1882 error = create_config_files(fpa.config_info.proto,
1883 fpa.config_info.host, fpa.config_info.port,
1884 fpa.config_info.remote_repo_path,
1885 fpa.config_info.git_url,
1886 fpa.config_info.fetch_all_branches,
1887 fpa.config_info.mirror_references,
1888 fpa.config_info.symrefs,
1889 fpa.config_info.wanted_branches,
1890 fpa.config_info.wanted_refs, fpa.repo);
1891 if (error)
1892 goto done;
1893 }
1894 }
1895
1896 if (verbosity >= 0)
1897 printf("Created %s repository '%s'\n",
1898 mirror_references ? "mirrored" : "cloned", repo_path);
1899 done:
1900 if (pack_fds) {
1901 const struct got_error *pack_err =
1902 got_repo_pack_fds_close(pack_fds);
1903 if (error == NULL)
1904 error = pack_err;
1905 }
1906 if (fetchpid > 0) {
1907 if (kill(fetchpid, SIGTERM) == -1)
1908 error = got_error_from_errno("kill");
1909 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1910 error = got_error_from_errno("waitpid");
1911 }
1912 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1913 error = got_error_from_errno("close");
1914 if (repo) {
1915 const struct got_error *close_err = got_repo_close(repo);
1916 if (error == NULL)
1917 error = close_err;
1918 }
1919 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1920 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1921 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1922 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1923 free(pack_hash);
1924 free(proto);
1925 free(host);
1926 free(port);
1927 free(server_path);
1928 free(repo_name);
1929 free(default_destdir);
1930 free(git_url);
1931 return error;
1932 }
1933
1934 static const struct got_error *
1935 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1936 int replace_tags, int verbosity, struct got_repository *repo)
1937 {
1938 const struct got_error *err = NULL;
1939 char *new_id_str = NULL;
1940 struct got_object_id *old_id = NULL;
1941
1942 err = got_object_id_str(&new_id_str, new_id);
1943 if (err)
1944 goto done;
1945
1946 if (!replace_tags &&
1947 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1948 err = got_ref_resolve(&old_id, repo, ref);
1949 if (err)
1950 goto done;
1951 if (got_object_id_cmp(old_id, new_id) == 0)
1952 goto done;
1953 if (verbosity >= 0) {
1954 printf("Rejecting update of existing tag %s: %s\n",
1955 got_ref_get_name(ref), new_id_str);
1956 }
1957 goto done;
1958 }
1959
1960 if (got_ref_is_symbolic(ref)) {
1961 if (verbosity >= 0) {
1962 printf("Replacing reference %s: %s\n",
1963 got_ref_get_name(ref),
1964 got_ref_get_symref_target(ref));
1965 }
1966 err = got_ref_change_symref_to_ref(ref, new_id);
1967 if (err)
1968 goto done;
1969 err = got_ref_write(ref, repo);
1970 if (err)
1971 goto done;
1972 } else {
1973 err = got_ref_resolve(&old_id, repo, ref);
1974 if (err)
1975 goto done;
1976 if (got_object_id_cmp(old_id, new_id) == 0)
1977 goto done;
1978
1979 err = got_ref_change_ref(ref, new_id);
1980 if (err)
1981 goto done;
1982 err = got_ref_write(ref, repo);
1983 if (err)
1984 goto done;
1985 }
1986
1987 if (verbosity >= 0)
1988 printf("Updated %s: %s\n", got_ref_get_name(ref),
1989 new_id_str);
1990 done:
1991 free(old_id);
1992 free(new_id_str);
1993 return err;
1994 }
1995
1996 static const struct got_error *
1997 update_symref(const char *refname, struct got_reference *target_ref,
1998 int verbosity, struct got_repository *repo)
1999 {
2000 const struct got_error *err = NULL, *unlock_err;
2001 struct got_reference *symref;
2002 int symref_is_locked = 0;
2003
2004 err = got_ref_open(&symref, repo, refname, 1);
2005 if (err) {
2006 if (err->code != GOT_ERR_NOT_REF)
2007 return err;
2008 err = got_ref_alloc_symref(&symref, refname, target_ref);
2009 if (err)
2010 goto done;
2011
2012 err = got_ref_write(symref, repo);
2013 if (err)
2014 goto done;
2015
2016 if (verbosity >= 0)
2017 printf("Created reference %s: %s\n",
2018 got_ref_get_name(symref),
2019 got_ref_get_symref_target(symref));
2020 } else {
2021 symref_is_locked = 1;
2022
2023 if (strcmp(got_ref_get_symref_target(symref),
2024 got_ref_get_name(target_ref)) == 0)
2025 goto done;
2026
2027 err = got_ref_change_symref(symref,
2028 got_ref_get_name(target_ref));
2029 if (err)
2030 goto done;
2031
2032 err = got_ref_write(symref, repo);
2033 if (err)
2034 goto done;
2035
2036 if (verbosity >= 0)
2037 printf("Updated %s: %s\n", got_ref_get_name(symref),
2038 got_ref_get_symref_target(symref));
2039
2040 }
2041 done:
2042 if (symref_is_locked) {
2043 unlock_err = got_ref_unlock(symref);
2044 if (unlock_err && err == NULL)
2045 err = unlock_err;
2046 }
2047 got_ref_close(symref);
2048 return err;
2049 }
2050
2051 __dead static void
2052 usage_fetch(void)
2053 {
2054 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2055 "[-R reference] [-r repository-path] [remote-repository]\n",
2056 getprogname());
2057 exit(1);
2058 }
2059
2060 static const struct got_error *
2061 delete_missing_ref(struct got_reference *ref,
2062 int verbosity, struct got_repository *repo)
2063 {
2064 const struct got_error *err = NULL;
2065 struct got_object_id *id = NULL;
2066 char *id_str = NULL;
2067
2068 if (got_ref_is_symbolic(ref)) {
2069 err = got_ref_delete(ref, repo);
2070 if (err)
2071 return err;
2072 if (verbosity >= 0) {
2073 printf("Deleted %s: %s\n",
2074 got_ref_get_name(ref),
2075 got_ref_get_symref_target(ref));
2076 }
2077 } else {
2078 err = got_ref_resolve(&id, repo, ref);
2079 if (err)
2080 return err;
2081 err = got_object_id_str(&id_str, id);
2082 if (err)
2083 goto done;
2084
2085 err = got_ref_delete(ref, repo);
2086 if (err)
2087 goto done;
2088 if (verbosity >= 0) {
2089 printf("Deleted %s: %s\n",
2090 got_ref_get_name(ref), id_str);
2091 }
2092 }
2093 done:
2094 free(id);
2095 free(id_str);
2096 return err;
2097 }
2098
2099 static const struct got_error *
2100 delete_missing_refs(struct got_pathlist_head *their_refs,
2101 struct got_pathlist_head *their_symrefs,
2102 const struct got_remote_repo *remote,
2103 int verbosity, struct got_repository *repo)
2104 {
2105 const struct got_error *err = NULL, *unlock_err;
2106 struct got_reflist_head my_refs;
2107 struct got_reflist_entry *re;
2108 struct got_pathlist_entry *pe;
2109 char *remote_namespace = NULL;
2110 char *local_refname = NULL;
2111
2112 TAILQ_INIT(&my_refs);
2113
2114 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2115 == -1)
2116 return got_error_from_errno("asprintf");
2117
2118 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2119 if (err)
2120 goto done;
2121
2122 TAILQ_FOREACH(re, &my_refs, entry) {
2123 const char *refname = got_ref_get_name(re->ref);
2124 const char *their_refname;
2125
2126 if (remote->mirror_references) {
2127 their_refname = refname;
2128 } else {
2129 if (strncmp(refname, remote_namespace,
2130 strlen(remote_namespace)) == 0) {
2131 if (strcmp(refname + strlen(remote_namespace),
2132 GOT_REF_HEAD) == 0)
2133 continue;
2134 if (asprintf(&local_refname, "refs/heads/%s",
2135 refname + strlen(remote_namespace)) == -1) {
2136 err = got_error_from_errno("asprintf");
2137 goto done;
2138 }
2139 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2140 continue;
2141
2142 their_refname = local_refname;
2143 }
2144
2145 TAILQ_FOREACH(pe, their_refs, entry) {
2146 if (strcmp(their_refname, pe->path) == 0)
2147 break;
2148 }
2149 if (pe != NULL)
2150 continue;
2151
2152 TAILQ_FOREACH(pe, their_symrefs, entry) {
2153 if (strcmp(their_refname, pe->path) == 0)
2154 break;
2155 }
2156 if (pe != NULL)
2157 continue;
2158
2159 err = delete_missing_ref(re->ref, verbosity, repo);
2160 if (err)
2161 break;
2162
2163 if (local_refname) {
2164 struct got_reference *ref;
2165 err = got_ref_open(&ref, repo, local_refname, 1);
2166 if (err) {
2167 if (err->code != GOT_ERR_NOT_REF)
2168 break;
2169 free(local_refname);
2170 local_refname = NULL;
2171 continue;
2172 }
2173 err = delete_missing_ref(ref, verbosity, repo);
2174 if (err)
2175 break;
2176 unlock_err = got_ref_unlock(ref);
2177 got_ref_close(ref);
2178 if (unlock_err && err == NULL) {
2179 err = unlock_err;
2180 break;
2181 }
2182
2183 free(local_refname);
2184 local_refname = NULL;
2185 }
2186 }
2187 done:
2188 got_ref_list_free(&my_refs);
2189 free(remote_namespace);
2190 free(local_refname);
2191 return err;
2192 }
2193
2194 static const struct got_error *
2195 update_wanted_ref(const char *refname, struct got_object_id *id,
2196 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2197 {
2198 const struct got_error *err, *unlock_err;
2199 char *remote_refname;
2200 struct got_reference *ref;
2201
2202 if (strncmp("refs/", refname, 5) == 0)
2203 refname += 5;
2204
2205 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2206 remote_repo_name, refname) == -1)
2207 return got_error_from_errno("asprintf");
2208
2209 err = got_ref_open(&ref, repo, remote_refname, 1);
2210 if (err) {
2211 if (err->code != GOT_ERR_NOT_REF)
2212 goto done;
2213 err = create_ref(remote_refname, id, verbosity, repo);
2214 } else {
2215 err = update_ref(ref, id, 0, verbosity, repo);
2216 unlock_err = got_ref_unlock(ref);
2217 if (unlock_err && err == NULL)
2218 err = unlock_err;
2219 got_ref_close(ref);
2220 }
2221 done:
2222 free(remote_refname);
2223 return err;
2224 }
2225
2226 static const struct got_error *
2227 delete_ref(struct got_repository *repo, struct got_reference *ref)
2228 {
2229 const struct got_error *err = NULL;
2230 struct got_object_id *id = NULL;
2231 char *id_str = NULL;
2232 const char *target;
2233
2234 if (got_ref_is_symbolic(ref)) {
2235 target = got_ref_get_symref_target(ref);
2236 } else {
2237 err = got_ref_resolve(&id, repo, ref);
2238 if (err)
2239 goto done;
2240 err = got_object_id_str(&id_str, id);
2241 if (err)
2242 goto done;
2243 target = id_str;
2244 }
2245
2246 err = got_ref_delete(ref, repo);
2247 if (err)
2248 goto done;
2249
2250 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2251 done:
2252 free(id);
2253 free(id_str);
2254 return err;
2255 }
2256
2257 static const struct got_error *
2258 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2259 {
2260 const struct got_error *err = NULL;
2261 struct got_reflist_head refs;
2262 struct got_reflist_entry *re;
2263 char *prefix;
2264
2265 TAILQ_INIT(&refs);
2266
2267 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2268 err = got_error_from_errno("asprintf");
2269 goto done;
2270 }
2271 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2272 if (err)
2273 goto done;
2274
2275 TAILQ_FOREACH(re, &refs, entry)
2276 delete_ref(repo, re->ref);
2277 done:
2278 got_ref_list_free(&refs);
2279 return err;
2280 }
2281
2282 static const struct got_error *
2283 cmd_fetch(int argc, char *argv[])
2284 {
2285 const struct got_error *error = NULL, *unlock_err;
2286 char *cwd = NULL, *repo_path = NULL;
2287 const char *remote_name;
2288 char *proto = NULL, *host = NULL, *port = NULL;
2289 char *repo_name = NULL, *server_path = NULL;
2290 const struct got_remote_repo *remotes;
2291 struct got_remote_repo *remote = NULL;
2292 int nremotes;
2293 char *id_str = NULL;
2294 struct got_repository *repo = NULL;
2295 struct got_worktree *worktree = NULL;
2296 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2297 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2298 char *head_refname = NULL;
2299 struct got_pathlist_entry *pe;
2300 struct got_reflist_head remote_refs;
2301 struct got_reflist_entry *re;
2302 struct got_object_id *pack_hash = NULL;
2303 int i, ch, fetchfd = -1, fetchstatus;
2304 pid_t fetchpid = -1;
2305 struct got_fetch_progress_arg fpa;
2306 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2307 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2308 int *pack_fds = NULL, have_bflag = 0;
2309 const char *remote_head = NULL, *worktree_branch = NULL;
2310
2311 TAILQ_INIT(&refs);
2312 TAILQ_INIT(&symrefs);
2313 TAILQ_INIT(&remote_refs);
2314 TAILQ_INIT(&wanted_branches);
2315 TAILQ_INIT(&wanted_refs);
2316
2317 while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2318 switch (ch) {
2319 case 'a':
2320 fetch_all_branches = 1;
2321 break;
2322 case 'b':
2323 error = got_pathlist_append(&wanted_branches,
2324 optarg, NULL);
2325 if (error)
2326 return error;
2327 have_bflag = 1;
2328 break;
2329 case 'd':
2330 delete_refs = 1;
2331 break;
2332 case 'l':
2333 list_refs_only = 1;
2334 break;
2335 case 'q':
2336 verbosity = -1;
2337 break;
2338 case 'R':
2339 error = got_pathlist_append(&wanted_refs,
2340 optarg, NULL);
2341 if (error)
2342 return error;
2343 break;
2344 case 'r':
2345 repo_path = realpath(optarg, NULL);
2346 if (repo_path == NULL)
2347 return got_error_from_errno2("realpath",
2348 optarg);
2349 got_path_strip_trailing_slashes(repo_path);
2350 break;
2351 case 't':
2352 replace_tags = 1;
2353 break;
2354 case 'v':
2355 if (verbosity < 0)
2356 verbosity = 0;
2357 else if (verbosity < 3)
2358 verbosity++;
2359 break;
2360 case 'X':
2361 delete_remote = 1;
2362 break;
2363 default:
2364 usage_fetch();
2365 break;
2366 }
2367 }
2368 argc -= optind;
2369 argv += optind;
2370
2371 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2372 option_conflict('a', 'b');
2373 if (list_refs_only) {
2374 if (!TAILQ_EMPTY(&wanted_branches))
2375 option_conflict('l', 'b');
2376 if (fetch_all_branches)
2377 option_conflict('l', 'a');
2378 if (delete_refs)
2379 option_conflict('l', 'd');
2380 if (delete_remote)
2381 option_conflict('l', 'X');
2382 }
2383 if (delete_remote) {
2384 if (fetch_all_branches)
2385 option_conflict('X', 'a');
2386 if (!TAILQ_EMPTY(&wanted_branches))
2387 option_conflict('X', 'b');
2388 if (delete_refs)
2389 option_conflict('X', 'd');
2390 if (replace_tags)
2391 option_conflict('X', 't');
2392 if (!TAILQ_EMPTY(&wanted_refs))
2393 option_conflict('X', 'R');
2394 }
2395
2396 if (argc == 0) {
2397 if (delete_remote)
2398 errx(1, "-X option requires a remote name");
2399 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2400 } else if (argc == 1)
2401 remote_name = argv[0];
2402 else
2403 usage_fetch();
2404
2405 cwd = getcwd(NULL, 0);
2406 if (cwd == NULL) {
2407 error = got_error_from_errno("getcwd");
2408 goto done;
2409 }
2410
2411 error = got_repo_pack_fds_open(&pack_fds);
2412 if (error != NULL)
2413 goto done;
2414
2415 if (repo_path == NULL) {
2416 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
2417 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2418 goto done;
2419 else
2420 error = NULL;
2421 if (worktree) {
2422 repo_path =
2423 strdup(got_worktree_get_repo_path(worktree));
2424 if (repo_path == NULL)
2425 error = got_error_from_errno("strdup");
2426 if (error)
2427 goto done;
2428 } else {
2429 repo_path = strdup(cwd);
2430 if (repo_path == NULL) {
2431 error = got_error_from_errno("strdup");
2432 goto done;
2433 }
2434 }
2435 }
2436
2437 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2438 if (error)
2439 goto done;
2440
2441 if (delete_remote) {
2442 error = delete_refs_for_remote(repo, remote_name);
2443 goto done; /* nothing else to do */
2444 }
2445
2446 if (worktree) {
2447 worktree_conf = got_worktree_get_gotconfig(worktree);
2448 if (worktree_conf) {
2449 got_gotconfig_get_remotes(&nremotes, &remotes,
2450 worktree_conf);
2451 for (i = 0; i < nremotes; i++) {
2452 if (strcmp(remotes[i].name, remote_name) == 0) {
2453 error = got_repo_remote_repo_dup(&remote,
2454 &remotes[i]);
2455 if (error)
2456 goto done;
2457 break;
2458 }
2459 }
2460 }
2461 }
2462 if (remote == NULL) {
2463 repo_conf = got_repo_get_gotconfig(repo);
2464 if (repo_conf) {
2465 got_gotconfig_get_remotes(&nremotes, &remotes,
2466 repo_conf);
2467 for (i = 0; i < nremotes; i++) {
2468 if (strcmp(remotes[i].name, remote_name) == 0) {
2469 error = got_repo_remote_repo_dup(&remote,
2470 &remotes[i]);
2471 if (error)
2472 goto done;
2473 break;
2474 }
2475 }
2476 }
2477 }
2478 if (remote == NULL) {
2479 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2480 for (i = 0; i < nremotes; i++) {
2481 if (strcmp(remotes[i].name, remote_name) == 0) {
2482 error = got_repo_remote_repo_dup(&remote,
2483 &remotes[i]);
2484 if (error)
2485 goto done;
2486 break;
2487 }
2488 }
2489 }
2490 if (remote == NULL) {
2491 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2492 goto done;
2493 }
2494
2495 if (TAILQ_EMPTY(&wanted_branches)) {
2496 if (!fetch_all_branches)
2497 fetch_all_branches = remote->fetch_all_branches;
2498 for (i = 0; i < remote->nfetch_branches; i++) {
2499 error = got_pathlist_append(&wanted_branches,
2500 remote->fetch_branches[i], NULL);
2501 if (error)
2502 goto done;
2503 }
2504 }
2505 if (TAILQ_EMPTY(&wanted_refs)) {
2506 for (i = 0; i < remote->nfetch_refs; i++) {
2507 error = got_pathlist_append(&wanted_refs,
2508 remote->fetch_refs[i], NULL);
2509 if (error)
2510 goto done;
2511 }
2512 }
2513
2514 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2515 &repo_name, remote->fetch_url);
2516 if (error)
2517 goto done;
2518
2519 if (strcmp(proto, "git") == 0) {
2520 #ifndef PROFILE
2521 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2522 "sendfd dns inet unveil", NULL) == -1)
2523 err(1, "pledge");
2524 #endif
2525 } else if (strcmp(proto, "git+ssh") == 0 ||
2526 strcmp(proto, "ssh") == 0) {
2527 #ifndef PROFILE
2528 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2529 "sendfd unveil", NULL) == -1)
2530 err(1, "pledge");
2531 #endif
2532 } else if (strcmp(proto, "http") == 0 ||
2533 strcmp(proto, "git+http") == 0) {
2534 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2535 goto done;
2536 } else {
2537 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2538 goto done;
2539 }
2540
2541 error = got_dial_apply_unveil(proto);
2542 if (error)
2543 goto done;
2544
2545 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2546 if (error)
2547 goto done;
2548
2549 if (worktree) {
2550 head_refname = strdup(got_worktree_get_head_ref_name(worktree));
2551 if (head_refname == NULL) {
2552 error = got_error_from_errno("strdup");
2553 goto done;
2554 }
2555
2556 /* Release work tree lock. */
2557 got_worktree_close(worktree);
2558 worktree = NULL;
2559 }
2560
2561 if (verbosity >= 0) {
2562 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2563 remote->name, proto, host,
2564 port ? ":" : "", port ? port : "",
2565 *server_path == '/' ? "" : "/", server_path);
2566 }
2567
2568 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2569 server_path, verbosity);
2570 if (error)
2571 goto done;
2572
2573 if (!have_bflag) {
2574 /*
2575 * If set, get this remote's HEAD ref target so
2576 * if it has changed on the server we can fetch it.
2577 */
2578 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2579 got_ref_cmp_by_name, repo);
2580 if (error)
2581 goto done;
2582
2583 TAILQ_FOREACH(re, &remote_refs, entry) {
2584 const char *remote_refname, *remote_target;
2585 size_t remote_name_len;
2586
2587 if (!got_ref_is_symbolic(re->ref))
2588 continue;
2589
2590 remote_name_len = strlen(remote->name);
2591 remote_refname = got_ref_get_name(re->ref);
2592
2593 /* we only want refs/remotes/$remote->name/HEAD */
2594 if (strncmp(remote_refname + 13, remote->name,
2595 remote_name_len) != 0)
2596 continue;
2597
2598 if (strcmp(remote_refname + remote_name_len + 14,
2599 GOT_REF_HEAD) != 0)
2600 continue;
2601
2602 /*
2603 * Take the name itself because we already
2604 * only match with refs/heads/ in fetch_pack().
2605 */
2606 remote_target = got_ref_get_symref_target(re->ref);
2607 remote_head = remote_target + remote_name_len + 14;
2608 break;
2609 }
2610
2611 if (head_refname &&
2612 strncmp(head_refname, "refs/heads/", 11) == 0)
2613 worktree_branch = head_refname;
2614 }
2615
2616 fpa.last_scaled_size[0] = '\0';
2617 fpa.last_p_indexed = -1;
2618 fpa.last_p_resolved = -1;
2619 fpa.verbosity = verbosity;
2620 fpa.repo = repo;
2621 fpa.create_configs = 0;
2622 fpa.configs_created = 0;
2623 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2624
2625 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2626 remote->mirror_references, fetch_all_branches, &wanted_branches,
2627 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2628 worktree_branch, remote_head, have_bflag, fetch_progress, &fpa);
2629 if (error)
2630 goto done;
2631
2632 if (list_refs_only) {
2633 error = list_remote_refs(&symrefs, &refs);
2634 goto done;
2635 }
2636
2637 if (pack_hash == NULL) {
2638 if (verbosity >= 0)
2639 printf("Already up-to-date\n");
2640 } else if (verbosity >= 0) {
2641 error = got_object_id_str(&id_str, pack_hash);
2642 if (error)
2643 goto done;
2644 printf("\nFetched %s.pack\n", id_str);
2645 free(id_str);
2646 id_str = NULL;
2647 }
2648
2649 /* Update references provided with the pack file. */
2650 TAILQ_FOREACH(pe, &refs, entry) {
2651 const char *refname = pe->path;
2652 struct got_object_id *id = pe->data;
2653 struct got_reference *ref;
2654 char *remote_refname;
2655
2656 if (is_wanted_ref(&wanted_refs, refname) &&
2657 !remote->mirror_references) {
2658 error = update_wanted_ref(refname, id,
2659 remote->name, verbosity, repo);
2660 if (error)
2661 goto done;
2662 continue;
2663 }
2664
2665 if (remote->mirror_references ||
2666 strncmp("refs/tags/", refname, 10) == 0) {
2667 error = got_ref_open(&ref, repo, refname, 1);
2668 if (error) {
2669 if (error->code != GOT_ERR_NOT_REF)
2670 goto done;
2671 error = create_ref(refname, id, verbosity,
2672 repo);
2673 if (error)
2674 goto done;
2675 } else {
2676 error = update_ref(ref, id, replace_tags,
2677 verbosity, repo);
2678 unlock_err = got_ref_unlock(ref);
2679 if (unlock_err && error == NULL)
2680 error = unlock_err;
2681 got_ref_close(ref);
2682 if (error)
2683 goto done;
2684 }
2685 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2686 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2687 remote_name, refname + 11) == -1) {
2688 error = got_error_from_errno("asprintf");
2689 goto done;
2690 }
2691
2692 error = got_ref_open(&ref, repo, remote_refname, 1);
2693 if (error) {
2694 if (error->code != GOT_ERR_NOT_REF)
2695 goto done;
2696 error = create_ref(remote_refname, id,
2697 verbosity, repo);
2698 if (error)
2699 goto done;
2700 } else {
2701 error = update_ref(ref, id, replace_tags,
2702 verbosity, repo);
2703 unlock_err = got_ref_unlock(ref);
2704 if (unlock_err && error == NULL)
2705 error = unlock_err;
2706 got_ref_close(ref);
2707 if (error)
2708 goto done;
2709 }
2710
2711 /* Also create a local branch if none exists yet. */
2712 error = got_ref_open(&ref, repo, refname, 1);
2713 if (error) {
2714 if (error->code != GOT_ERR_NOT_REF)
2715 goto done;
2716 error = create_ref(refname, id, verbosity,
2717 repo);
2718 if (error)
2719 goto done;
2720 } else {
2721 unlock_err = got_ref_unlock(ref);
2722 if (unlock_err && error == NULL)
2723 error = unlock_err;
2724 got_ref_close(ref);
2725 }
2726 }
2727 }
2728 if (delete_refs) {
2729 error = delete_missing_refs(&refs, &symrefs, remote,
2730 verbosity, repo);
2731 if (error)
2732 goto done;
2733 }
2734
2735 if (!remote->mirror_references) {
2736 /* Update remote HEAD reference if the server provided one. */
2737 TAILQ_FOREACH(pe, &symrefs, entry) {
2738 struct got_reference *target_ref;
2739 const char *refname = pe->path;
2740 const char *target = pe->data;
2741 char *remote_refname = NULL, *remote_target = NULL;
2742
2743 if (strcmp(refname, GOT_REF_HEAD) != 0)
2744 continue;
2745
2746 if (strncmp("refs/heads/", target, 11) != 0)
2747 continue;
2748
2749 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2750 remote->name, refname) == -1) {
2751 error = got_error_from_errno("asprintf");
2752 goto done;
2753 }
2754 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2755 remote->name, target + 11) == -1) {
2756 error = got_error_from_errno("asprintf");
2757 free(remote_refname);
2758 goto done;
2759 }
2760
2761 error = got_ref_open(&target_ref, repo, remote_target,
2762 0);
2763 if (error) {
2764 free(remote_refname);
2765 free(remote_target);
2766 if (error->code == GOT_ERR_NOT_REF) {
2767 error = NULL;
2768 continue;
2769 }
2770 goto done;
2771 }
2772 error = update_symref(remote_refname, target_ref,
2773 verbosity, repo);
2774 free(remote_refname);
2775 free(remote_target);
2776 got_ref_close(target_ref);
2777 if (error)
2778 goto done;
2779 }
2780 }
2781 done:
2782 if (fetchpid > 0) {
2783 if (kill(fetchpid, SIGTERM) == -1)
2784 error = got_error_from_errno("kill");
2785 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2786 error = got_error_from_errno("waitpid");
2787 }
2788 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2789 error = got_error_from_errno("close");
2790 if (repo) {
2791 const struct got_error *close_err = got_repo_close(repo);
2792 if (error == NULL)
2793 error = close_err;
2794 }
2795 if (worktree)
2796 got_worktree_close(worktree);
2797 if (pack_fds) {
2798 const struct got_error *pack_err =
2799 got_repo_pack_fds_close(pack_fds);
2800 if (error == NULL)
2801 error = pack_err;
2802 }
2803 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2804 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2805 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2806 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2807 got_ref_list_free(&remote_refs);
2808 got_repo_free_remote_repo_data(remote);
2809 free(remote);
2810 free(head_refname);
2811 free(id_str);
2812 free(cwd);
2813 free(repo_path);
2814 free(pack_hash);
2815 free(proto);
2816 free(host);
2817 free(port);
2818 free(server_path);
2819 free(repo_name);
2820 return error;
2821 }
2822
2823
2824 __dead static void
2825 usage_checkout(void)
2826 {
2827 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2828 "[-p path-prefix] repository-path [work-tree-path]\n",
2829 getprogname());
2830 exit(1);
2831 }
2832
2833 static void
2834 show_worktree_base_ref_warning(void)
2835 {
2836 fprintf(stderr, "%s: warning: could not create a reference "
2837 "to the work tree's base commit; the commit could be "
2838 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2839 "repository writable and running 'got update' will prevent this\n",
2840 getprogname());
2841 }
2842
2843 struct got_checkout_progress_arg {
2844 const char *worktree_path;
2845 int had_base_commit_ref_error;
2846 int verbosity;
2847 };
2848
2849 static const struct got_error *
2850 checkout_progress(void *arg, unsigned char status, const char *path)
2851 {
2852 struct got_checkout_progress_arg *a = arg;
2853
2854 /* Base commit bump happens silently. */
2855 if (status == GOT_STATUS_BUMP_BASE)
2856 return NULL;
2857
2858 if (status == GOT_STATUS_BASE_REF_ERR) {
2859 a->had_base_commit_ref_error = 1;
2860 return NULL;
2861 }
2862
2863 while (path[0] == '/')
2864 path++;
2865
2866 if (a->verbosity >= 0)
2867 printf("%c %s/%s\n", status, a->worktree_path, path);
2868
2869 return NULL;
2870 }
2871
2872 static const struct got_error *
2873 check_cancelled(void *arg)
2874 {
2875 if (sigint_received || sigpipe_received)
2876 return got_error(GOT_ERR_CANCELLED);
2877 return NULL;
2878 }
2879
2880 static const struct got_error *
2881 check_linear_ancestry(struct got_object_id *commit_id,
2882 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2883 struct got_repository *repo)
2884 {
2885 const struct got_error *err = NULL;
2886 struct got_object_id *yca_id;
2887
2888 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2889 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2890 if (err)
2891 return err;
2892
2893 if (yca_id == NULL)
2894 return got_error(GOT_ERR_ANCESTRY);
2895
2896 /*
2897 * Require a straight line of history between the target commit
2898 * and the work tree's base commit.
2899 *
2900 * Non-linear situations such as this require a rebase:
2901 *
2902 * (commit) D F (base_commit)
2903 * \ /
2904 * C E
2905 * \ /
2906 * B (yca)
2907 * |
2908 * A
2909 *
2910 * 'got update' only handles linear cases:
2911 * Update forwards in time: A (base/yca) - B - C - D (commit)
2912 * Update backwards in time: D (base) - C - B - A (commit/yca)
2913 */
2914 if (allow_forwards_in_time_only) {
2915 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2916 return got_error(GOT_ERR_ANCESTRY);
2917 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2918 got_object_id_cmp(base_commit_id, yca_id) != 0)
2919 return got_error(GOT_ERR_ANCESTRY);
2920
2921 free(yca_id);
2922 return NULL;
2923 }
2924
2925 static const struct got_error *
2926 check_same_branch(struct got_object_id *commit_id,
2927 struct got_reference *head_ref, struct got_repository *repo)
2928 {
2929 const struct got_error *err = NULL;
2930 struct got_commit_graph *graph = NULL;
2931 struct got_object_id *head_commit_id = NULL;
2932
2933 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2934 if (err)
2935 goto done;
2936
2937 if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2938 goto done;
2939
2940 err = got_commit_graph_open(&graph, "/", 1);
2941 if (err)
2942 goto done;
2943
2944 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2945 check_cancelled, NULL);
2946 if (err)
2947 goto done;
2948
2949 for (;;) {
2950 struct got_object_id id;
2951
2952 err = got_commit_graph_iter_next(&id, graph, repo,
2953 check_cancelled, NULL);
2954 if (err) {
2955 if (err->code == GOT_ERR_ITER_COMPLETED)
2956 err = got_error(GOT_ERR_ANCESTRY);
2957 break;
2958 }
2959
2960 if (got_object_id_cmp(&id, commit_id) == 0)
2961 break;
2962 }
2963 done:
2964 if (graph)
2965 got_commit_graph_close(graph);
2966 free(head_commit_id);
2967 return err;
2968 }
2969
2970 static const struct got_error *
2971 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2972 {
2973 static char msg[512];
2974 const char *branch_name;
2975
2976 if (got_ref_is_symbolic(ref))
2977 branch_name = got_ref_get_symref_target(ref);
2978 else
2979 branch_name = got_ref_get_name(ref);
2980
2981 if (strncmp("refs/heads/", branch_name, 11) == 0)
2982 branch_name += 11;
2983
2984 snprintf(msg, sizeof(msg),
2985 "target commit is not contained in branch '%s'; "
2986 "the branch to use must be specified with -b; "
2987 "if necessary a new branch can be created for "
2988 "this commit with 'got branch -c %s BRANCH_NAME'",
2989 branch_name, commit_id_str);
2990
2991 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2992 }
2993
2994 static const struct got_error *
2995 cmd_checkout(int argc, char *argv[])
2996 {
2997 const struct got_error *error = NULL;
2998 struct got_repository *repo = NULL;
2999 struct got_reference *head_ref = NULL, *ref = NULL;
3000 struct got_worktree *worktree = NULL;
3001 char *repo_path = NULL;
3002 char *worktree_path = NULL;
3003 const char *path_prefix = "";
3004 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
3005 char *commit_id_str = NULL, *keyword_idstr = NULL;
3006 struct got_object_id *commit_id = NULL;
3007 char *cwd = NULL;
3008 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
3009 struct got_pathlist_head paths;
3010 struct got_checkout_progress_arg cpa;
3011 int *pack_fds = NULL;
3012
3013 TAILQ_INIT(&paths);
3014
3015 #ifndef PROFILE
3016 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3017 "unveil", NULL) == -1)
3018 err(1, "pledge");
3019 #endif
3020
3021 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
3022 switch (ch) {
3023 case 'b':
3024 branch_name = optarg;
3025 break;
3026 case 'c':
3027 commit_id_str = strdup(optarg);
3028 if (commit_id_str == NULL)
3029 return got_error_from_errno("strdup");
3030 break;
3031 case 'E':
3032 allow_nonempty = 1;
3033 break;
3034 case 'p':
3035 path_prefix = optarg;
3036 break;
3037 case 'q':
3038 verbosity = -1;
3039 break;
3040 default:
3041 usage_checkout();
3042 /* NOTREACHED */
3043 }
3044 }
3045
3046 argc -= optind;
3047 argv += optind;
3048
3049 if (argc == 1) {
3050 char *base, *dotgit;
3051 const char *path;
3052 repo_path = realpath(argv[0], NULL);
3053 if (repo_path == NULL)
3054 return got_error_from_errno2("realpath", argv[0]);
3055 cwd = getcwd(NULL, 0);
3056 if (cwd == NULL) {
3057 error = got_error_from_errno("getcwd");
3058 goto done;
3059 }
3060 if (path_prefix[0])
3061 path = path_prefix;
3062 else
3063 path = repo_path;
3064 error = got_path_basename(&base, path);
3065 if (error)
3066 goto done;
3067 dotgit = strstr(base, ".git");
3068 if (dotgit)
3069 *dotgit = '\0';
3070 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3071 error = got_error_from_errno("asprintf");
3072 free(base);
3073 goto done;
3074 }
3075 free(base);
3076 } else if (argc == 2) {
3077 repo_path = realpath(argv[0], NULL);
3078 if (repo_path == NULL) {
3079 error = got_error_from_errno2("realpath", argv[0]);
3080 goto done;
3081 }
3082 worktree_path = realpath(argv[1], NULL);
3083 if (worktree_path == NULL) {
3084 if (errno != ENOENT) {
3085 error = got_error_from_errno2("realpath",
3086 argv[1]);
3087 goto done;
3088 }
3089 worktree_path = strdup(argv[1]);
3090 if (worktree_path == NULL) {
3091 error = got_error_from_errno("strdup");
3092 goto done;
3093 }
3094 }
3095 } else
3096 usage_checkout();
3097
3098 got_path_strip_trailing_slashes(repo_path);
3099 got_path_strip_trailing_slashes(worktree_path);
3100
3101 if (got_path_is_child(worktree_path, repo_path, strlen(repo_path)) ||
3102 got_path_is_child(repo_path, worktree_path,
3103 strlen(worktree_path))) {
3104 error = got_error_fmt(GOT_ERR_BAD_PATH,
3105 "work tree and repository paths may not overlap: %s",
3106 worktree_path);
3107 goto done;
3108 }
3109
3110 error = got_repo_pack_fds_open(&pack_fds);
3111 if (error != NULL)
3112 goto done;
3113
3114 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3115 if (error != NULL)
3116 goto done;
3117
3118 /* Pre-create work tree path for unveil(2) */
3119 error = got_path_mkdir(worktree_path);
3120 if (error) {
3121 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3122 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3123 goto done;
3124 if (!allow_nonempty &&
3125 !got_path_dir_is_empty(worktree_path)) {
3126 error = got_error_path(worktree_path,
3127 GOT_ERR_DIR_NOT_EMPTY);
3128 goto done;
3129 }
3130 }
3131
3132 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3133 if (error)
3134 goto done;
3135
3136 error = got_ref_open(&head_ref, repo, branch_name, 0);
3137 if (error != NULL)
3138 goto done;
3139
3140 error = got_worktree_init(worktree_path, head_ref, path_prefix,
3141 GOT_WORKTREE_GOT_DIR, repo);
3142 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3143 goto done;
3144
3145 error = got_worktree_open(&worktree, worktree_path,
3146 GOT_WORKTREE_GOT_DIR);
3147 if (error != NULL)
3148 goto done;
3149
3150 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3151 path_prefix);
3152 if (error != NULL)
3153 goto done;
3154 if (!same_path_prefix) {
3155 error = got_error(GOT_ERR_PATH_PREFIX);
3156 goto done;
3157 }
3158
3159 if (commit_id_str) {
3160 struct got_reflist_head refs;
3161 TAILQ_INIT(&refs);
3162 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3163 NULL);
3164 if (error)
3165 goto done;
3166
3167 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3168 repo, worktree);
3169 if (error != NULL)
3170 goto done;
3171 if (keyword_idstr != NULL) {
3172 free(commit_id_str);
3173 commit_id_str = keyword_idstr;
3174 }
3175
3176 error = got_repo_match_object_id(&commit_id, NULL,
3177 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3178 got_ref_list_free(&refs);
3179 if (error)
3180 goto done;
3181 error = check_linear_ancestry(commit_id,
3182 got_worktree_get_base_commit_id(worktree), 0, repo);
3183 if (error != NULL) {
3184 if (error->code == GOT_ERR_ANCESTRY) {
3185 error = checkout_ancestry_error(
3186 head_ref, commit_id_str);
3187 }
3188 goto done;
3189 }
3190 error = check_same_branch(commit_id, head_ref, repo);
3191 if (error) {
3192 if (error->code == GOT_ERR_ANCESTRY) {
3193 error = checkout_ancestry_error(
3194 head_ref, commit_id_str);
3195 }
3196 goto done;
3197 }
3198 error = got_worktree_set_base_commit_id(worktree, repo,
3199 commit_id);
3200 if (error)
3201 goto done;
3202 /* Expand potentially abbreviated commit ID string. */
3203 free(commit_id_str);
3204 error = got_object_id_str(&commit_id_str, commit_id);
3205 if (error)
3206 goto done;
3207 } else {
3208 commit_id = got_object_id_dup(
3209 got_worktree_get_base_commit_id(worktree));
3210 if (commit_id == NULL) {
3211 error = got_error_from_errno("got_object_id_dup");
3212 goto done;
3213 }
3214 error = got_object_id_str(&commit_id_str, commit_id);
3215 if (error)
3216 goto done;
3217 }
3218
3219 error = got_pathlist_append(&paths, "", NULL);
3220 if (error)
3221 goto done;
3222 cpa.worktree_path = worktree_path;
3223 cpa.had_base_commit_ref_error = 0;
3224 cpa.verbosity = verbosity;
3225 error = got_worktree_checkout_files(worktree, &paths, repo,
3226 checkout_progress, &cpa, check_cancelled, NULL);
3227 if (error != NULL)
3228 goto done;
3229
3230 if (got_ref_is_symbolic(head_ref)) {
3231 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3232 if (error)
3233 goto done;
3234 refname = got_ref_get_name(ref);
3235 } else
3236 refname = got_ref_get_name(head_ref);
3237 printf("Checked out %s: %s\n", refname, commit_id_str);
3238 printf("Now shut up and hack\n");
3239 if (cpa.had_base_commit_ref_error)
3240 show_worktree_base_ref_warning();
3241 done:
3242 if (pack_fds) {
3243 const struct got_error *pack_err =
3244 got_repo_pack_fds_close(pack_fds);
3245 if (error == NULL)
3246 error = pack_err;
3247 }
3248 if (head_ref)
3249 got_ref_close(head_ref);
3250 if (ref)
3251 got_ref_close(ref);
3252 if (repo) {
3253 const struct got_error *close_err = got_repo_close(repo);
3254 if (error == NULL)
3255 error = close_err;
3256 }
3257 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3258 free(commit_id_str);
3259 free(commit_id);
3260 free(repo_path);
3261 free(worktree_path);
3262 free(cwd);
3263 return error;
3264 }
3265
3266 struct got_update_progress_arg {
3267 int did_something;
3268 int conflicts;
3269 int obstructed;
3270 int not_updated;
3271 int missing;
3272 int not_deleted;
3273 int unversioned;
3274 int verbosity;
3275 };
3276
3277 static void
3278 print_update_progress_stats(struct got_update_progress_arg *upa)
3279 {
3280 if (!upa->did_something)
3281 return;
3282
3283 if (upa->conflicts > 0)
3284 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3285 if (upa->obstructed > 0)
3286 printf("File paths obstructed by a non-regular file: %d\n",
3287 upa->obstructed);
3288 if (upa->not_updated > 0)
3289 printf("Files not updated because of existing merge "
3290 "conflicts: %d\n", upa->not_updated);
3291 }
3292
3293 /*
3294 * The meaning of some status codes differs between merge-style operations and
3295 * update operations. For example, the ! status code means "file was missing"
3296 * if changes were merged into the work tree, and "missing file was restored"
3297 * if the work tree was updated. This function should be used by any operation
3298 * which merges changes into the work tree without updating the work tree.
3299 */
3300 static void
3301 print_merge_progress_stats(struct got_update_progress_arg *upa)
3302 {
3303 if (!upa->did_something)
3304 return;
3305
3306 if (upa->conflicts > 0)
3307 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3308 if (upa->obstructed > 0)
3309 printf("File paths obstructed by a non-regular file: %d\n",
3310 upa->obstructed);
3311 if (upa->missing > 0)
3312 printf("Files which had incoming changes but could not be "
3313 "found in the work tree: %d\n", upa->missing);
3314 if (upa->not_deleted > 0)
3315 printf("Files not deleted due to differences in deleted "
3316 "content: %d\n", upa->not_deleted);
3317 if (upa->unversioned > 0)
3318 printf("Files not merged because an unversioned file was "
3319 "found in the work tree: %d\n", upa->unversioned);
3320 }
3321
3322 __dead static void
3323 usage_update(void)
3324 {
3325 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3326 "[path ...]\n", getprogname());
3327 exit(1);
3328 }
3329
3330 static const struct got_error *
3331 update_progress(void *arg, unsigned char status, const char *path)
3332 {
3333 struct got_update_progress_arg *upa = arg;
3334
3335 if (status == GOT_STATUS_EXISTS ||
3336 status == GOT_STATUS_BASE_REF_ERR)
3337 return NULL;
3338
3339 upa->did_something = 1;
3340
3341 /* Base commit bump happens silently. */
3342 if (status == GOT_STATUS_BUMP_BASE)
3343 return NULL;
3344
3345 if (status == GOT_STATUS_CONFLICT)
3346 upa->conflicts++;
3347 if (status == GOT_STATUS_OBSTRUCTED)
3348 upa->obstructed++;
3349 if (status == GOT_STATUS_CANNOT_UPDATE)
3350 upa->not_updated++;
3351 if (status == GOT_STATUS_MISSING)
3352 upa->missing++;
3353 if (status == GOT_STATUS_CANNOT_DELETE)
3354 upa->not_deleted++;
3355 if (status == GOT_STATUS_UNVERSIONED)
3356 upa->unversioned++;
3357
3358 while (path[0] == '/')
3359 path++;
3360 if (upa->verbosity >= 0)
3361 printf("%c %s\n", status, path);
3362
3363 return NULL;
3364 }
3365
3366 static const struct got_error *
3367 switch_head_ref(struct got_reference *head_ref,
3368 struct got_object_id *commit_id, struct got_worktree *worktree,
3369 struct got_repository *repo)
3370 {
3371 const struct got_error *err = NULL;
3372 char *base_id_str;
3373 int ref_has_moved = 0;
3374
3375 /* Trivial case: switching between two different references. */
3376 if (strcmp(got_ref_get_name(head_ref),
3377 got_worktree_get_head_ref_name(worktree)) != 0) {
3378 printf("Switching work tree from %s to %s\n",
3379 got_worktree_get_head_ref_name(worktree),
3380 got_ref_get_name(head_ref));
3381 return got_worktree_set_head_ref(worktree, head_ref);
3382 }
3383
3384 err = check_linear_ancestry(commit_id,
3385 got_worktree_get_base_commit_id(worktree), 0, repo);
3386 if (err) {
3387 if (err->code != GOT_ERR_ANCESTRY)
3388 return err;
3389 ref_has_moved = 1;
3390 }
3391 if (!ref_has_moved)
3392 return NULL;
3393
3394 /* Switching to a rebased branch with the same reference name. */
3395 err = got_object_id_str(&base_id_str,
3396 got_worktree_get_base_commit_id(worktree));
3397 if (err)
3398 return err;
3399 printf("Reference %s now points at a different branch\n",
3400 got_worktree_get_head_ref_name(worktree));
3401 printf("Switching work tree from %s to %s\n", base_id_str,
3402 got_worktree_get_head_ref_name(worktree));
3403 return NULL;
3404 }
3405
3406 static const struct got_error *
3407 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3408 {
3409 const struct got_error *err;
3410 int in_progress;
3411
3412 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3413 if (err)
3414 return err;
3415 if (in_progress)
3416 return got_error(GOT_ERR_REBASING);
3417
3418 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3419 if (err)
3420 return err;
3421 if (in_progress)
3422 return got_error(GOT_ERR_HISTEDIT_BUSY);
3423
3424 return NULL;
3425 }
3426
3427 static const struct got_error *
3428 check_merge_in_progress(struct got_worktree *worktree,
3429 struct got_repository *repo)
3430 {
3431 const struct got_error *err;
3432 int in_progress;
3433
3434 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3435 if (err)
3436 return err;
3437 if (in_progress)
3438 return got_error(GOT_ERR_MERGE_BUSY);
3439
3440 return NULL;
3441 }
3442
3443 static const struct got_error *
3444 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3445 char *argv[], struct got_worktree *worktree)
3446 {
3447 const struct got_error *err = NULL;
3448 char *path;
3449 struct got_pathlist_entry *new;
3450 int i;
3451
3452 if (argc == 0) {
3453 path = strdup("");
3454 if (path == NULL)
3455 return got_error_from_errno("strdup");
3456 return got_pathlist_append(paths, path, NULL);
3457 }
3458
3459 for (i = 0; i < argc; i++) {
3460 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3461 if (err)
3462 break;
3463 err = got_pathlist_insert(&new, paths, path, NULL);
3464 if (err || new == NULL /* duplicate */) {
3465 free(path);
3466 if (err)
3467 break;
3468 }
3469 }
3470
3471 return err;
3472 }
3473
3474 static const struct got_error *
3475 wrap_not_worktree_error(const struct got_error *orig_err,
3476 const char *cmdname, const char *path)
3477 {
3478 const struct got_error *err;
3479 struct got_repository *repo;
3480 static char msg[512];
3481 int *pack_fds = NULL;
3482
3483 err = got_repo_pack_fds_open(&pack_fds);
3484 if (err)
3485 return err;
3486
3487 err = got_repo_open(&repo, path, NULL, pack_fds);
3488 if (err)
3489 return orig_err;
3490
3491 snprintf(msg, sizeof(msg),
3492 "'got %s' needs a work tree in addition to a git repository\n"
3493 "Work trees can be checked out from this Git repository with "
3494 "'got checkout'.\n"
3495 "The got(1) manual page contains more information.", cmdname);
3496 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3497 if (repo) {
3498 const struct got_error *close_err = got_repo_close(repo);
3499 if (err == NULL)
3500 err = close_err;
3501 }
3502 if (pack_fds) {
3503 const struct got_error *pack_err =
3504 got_repo_pack_fds_close(pack_fds);
3505 if (err == NULL)
3506 err = pack_err;
3507 }
3508 return err;
3509 }
3510
3511 static const struct got_error *
3512 cmd_update(int argc, char *argv[])
3513 {
3514 const struct got_error *error = NULL;
3515 struct got_repository *repo = NULL;
3516 struct got_worktree *worktree = NULL;
3517 char *worktree_path = NULL;
3518 struct got_object_id *commit_id = NULL;
3519 char *commit_id_str = NULL;
3520 const char *branch_name = NULL;
3521 struct got_reference *head_ref = NULL;
3522 struct got_pathlist_head paths;
3523 struct got_pathlist_entry *pe;
3524 int ch, verbosity = 0;
3525 struct got_update_progress_arg upa;
3526 int *pack_fds = NULL;
3527
3528 TAILQ_INIT(&paths);
3529
3530 #ifndef PROFILE
3531 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3532 "unveil", NULL) == -1)
3533 err(1, "pledge");
3534 #endif
3535
3536 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3537 switch (ch) {
3538 case 'b':
3539 branch_name = optarg;
3540 break;
3541 case 'c':
3542 commit_id_str = strdup(optarg);
3543 if (commit_id_str == NULL)
3544 return got_error_from_errno("strdup");
3545 break;
3546 case 'q':
3547 verbosity = -1;
3548 break;
3549 default:
3550 usage_update();
3551 /* NOTREACHED */
3552 }
3553 }
3554
3555 argc -= optind;
3556 argv += optind;
3557
3558 worktree_path = getcwd(NULL, 0);
3559 if (worktree_path == NULL) {
3560 error = got_error_from_errno("getcwd");
3561 goto done;
3562 }
3563
3564 error = got_repo_pack_fds_open(&pack_fds);
3565 if (error != NULL)
3566 goto done;
3567
3568 error = got_worktree_open(&worktree, worktree_path,
3569 GOT_WORKTREE_GOT_DIR);
3570 if (error) {
3571 if (error->code == GOT_ERR_NOT_WORKTREE)
3572 error = wrap_not_worktree_error(error, "update",
3573 worktree_path);
3574 goto done;
3575 }
3576
3577 error = check_rebase_or_histedit_in_progress(worktree);
3578 if (error)
3579 goto done;
3580
3581 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3582 NULL, pack_fds);
3583 if (error != NULL)
3584 goto done;
3585
3586 error = apply_unveil(got_repo_get_path(repo), 0,
3587 got_worktree_get_root_path(worktree));
3588 if (error)
3589 goto done;
3590
3591 error = check_merge_in_progress(worktree, repo);
3592 if (error)
3593 goto done;
3594
3595 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3596 if (error)
3597 goto done;
3598
3599 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3600 got_worktree_get_head_ref_name(worktree), 0);
3601 if (error != NULL)
3602 goto done;
3603 if (commit_id_str == NULL) {
3604 error = got_ref_resolve(&commit_id, repo, head_ref);
3605 if (error != NULL)
3606 goto done;
3607 error = got_object_id_str(&commit_id_str, commit_id);
3608 if (error != NULL)
3609 goto done;
3610 } else {
3611 struct got_reflist_head refs;
3612 char *keyword_idstr = NULL;
3613
3614 TAILQ_INIT(&refs);
3615
3616 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3617 NULL);
3618 if (error)
3619 goto done;
3620
3621 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3622 repo, worktree);
3623 if (error != NULL)
3624 goto done;
3625 if (keyword_idstr != NULL) {
3626 free(commit_id_str);
3627 commit_id_str = keyword_idstr;
3628 }
3629
3630 error = got_repo_match_object_id(&commit_id, NULL,
3631 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3632 got_ref_list_free(&refs);
3633 free(commit_id_str);
3634 commit_id_str = NULL;
3635 if (error)
3636 goto done;
3637 error = got_object_id_str(&commit_id_str, commit_id);
3638 if (error)
3639 goto done;
3640 }
3641
3642 if (branch_name) {
3643 struct got_object_id *head_commit_id;
3644 TAILQ_FOREACH(pe, &paths, entry) {
3645 if (pe->path_len == 0)
3646 continue;
3647 error = got_error_msg(GOT_ERR_BAD_PATH,
3648 "switching between branches requires that "
3649 "the entire work tree gets updated");
3650 goto done;
3651 }
3652 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3653 if (error)
3654 goto done;
3655 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3656 repo);
3657 free(head_commit_id);
3658 if (error != NULL)
3659 goto done;
3660 error = check_same_branch(commit_id, head_ref, repo);
3661 if (error)
3662 goto done;
3663 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3664 if (error)
3665 goto done;
3666 } else {
3667 error = check_linear_ancestry(commit_id,
3668 got_worktree_get_base_commit_id(worktree), 0, repo);
3669 if (error != NULL) {
3670 if (error->code == GOT_ERR_ANCESTRY)
3671 error = got_error(GOT_ERR_BRANCH_MOVED);
3672 goto done;
3673 }
3674 error = check_same_branch(commit_id, head_ref, repo);
3675 if (error)
3676 goto done;
3677 }
3678
3679 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3680 commit_id) != 0) {
3681 error = got_worktree_set_base_commit_id(worktree, repo,
3682 commit_id);
3683 if (error)
3684 goto done;
3685 }
3686
3687 memset(&upa, 0, sizeof(upa));
3688 upa.verbosity = verbosity;
3689 error = got_worktree_checkout_files(worktree, &paths, repo,
3690 update_progress, &upa, check_cancelled, NULL);
3691 if (error != NULL)
3692 goto done;
3693
3694 if (upa.did_something) {
3695 printf("Updated to %s: %s\n",
3696 got_worktree_get_head_ref_name(worktree), commit_id_str);
3697 } else
3698 printf("Already up-to-date\n");
3699
3700 print_update_progress_stats(&upa);
3701 done:
3702 if (pack_fds) {
3703 const struct got_error *pack_err =
3704 got_repo_pack_fds_close(pack_fds);
3705 if (error == NULL)
3706 error = pack_err;
3707 }
3708 if (repo) {
3709 const struct got_error *close_err = got_repo_close(repo);
3710 if (error == NULL)
3711 error = close_err;
3712 }
3713 if (head_ref != NULL)
3714 got_ref_close(head_ref);
3715 free(worktree_path);
3716 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3717 free(commit_id);
3718 free(commit_id_str);
3719 return error;
3720 }
3721
3722 static const struct got_error *
3723 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3724 const char *path, int diff_context, int ignore_whitespace,
3725 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3726 struct got_repository *repo, FILE *outfile)
3727 {
3728 const struct got_error *err = NULL;
3729 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3730 FILE *f1 = NULL, *f2 = NULL;
3731 int fd1 = -1, fd2 = -1;
3732
3733 fd1 = got_opentempfd();
3734 if (fd1 == -1)
3735 return got_error_from_errno("got_opentempfd");
3736 fd2 = got_opentempfd();
3737 if (fd2 == -1) {
3738 err = got_error_from_errno("got_opentempfd");
3739 goto done;
3740 }
3741
3742 if (blob_id1) {
3743 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3744 fd1);
3745 if (err)
3746 goto done;
3747 }
3748
3749 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3750 if (err)
3751 goto done;
3752
3753 f1 = got_opentemp();
3754 if (f1 == NULL) {
3755 err = got_error_from_errno("got_opentemp");
3756 goto done;
3757 }
3758 f2 = got_opentemp();
3759 if (f2 == NULL) {
3760 err = got_error_from_errno("got_opentemp");
3761 goto done;
3762 }
3763
3764 while (path[0] == '/')
3765 path++;
3766 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3767 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3768 force_text_diff, dsa, outfile);
3769 done:
3770 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3771 err = got_error_from_errno("close");
3772 if (blob1)
3773 got_object_blob_close(blob1);
3774 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3775 err = got_error_from_errno("close");
3776 if (blob2)
3777 got_object_blob_close(blob2);
3778 if (f1 && fclose(f1) == EOF && err == NULL)
3779 err = got_error_from_errno("fclose");
3780 if (f2 && fclose(f2) == EOF && err == NULL)
3781 err = got_error_from_errno("fclose");
3782 return err;
3783 }
3784
3785 static const struct got_error *
3786 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3787 const char *path, int diff_context, int ignore_whitespace,
3788 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3789 struct got_repository *repo, FILE *outfile)
3790 {
3791 const struct got_error *err = NULL;
3792 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3793 struct got_diff_blob_output_unidiff_arg arg;
3794 FILE *f1 = NULL, *f2 = NULL;
3795 int fd1 = -1, fd2 = -1;
3796
3797 if (tree_id1) {
3798 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3799 if (err)
3800 goto done;
3801 fd1 = got_opentempfd();
3802 if (fd1 == -1) {
3803 err = got_error_from_errno("got_opentempfd");
3804 goto done;
3805 }
3806 }
3807
3808 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3809 if (err)
3810 goto done;
3811
3812 f1 = got_opentemp();
3813 if (f1 == NULL) {
3814 err = got_error_from_errno("got_opentemp");
3815 goto done;
3816 }
3817
3818 f2 = got_opentemp();
3819 if (f2 == NULL) {
3820 err = got_error_from_errno("got_opentemp");
3821 goto done;
3822 }
3823 fd2 = got_opentempfd();
3824 if (fd2 == -1) {
3825 err = got_error_from_errno("got_opentempfd");
3826 goto done;
3827 }
3828 arg.diff_context = diff_context;
3829 arg.ignore_whitespace = ignore_whitespace;
3830 arg.force_text_diff = force_text_diff;
3831 arg.diffstat = dsa;
3832 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3833 arg.outfile = outfile;
3834 arg.lines = NULL;
3835 arg.nlines = 0;
3836 while (path[0] == '/')
3837 path++;
3838 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3839 got_diff_blob_output_unidiff, &arg, 1);
3840 done:
3841 if (tree1)
3842 got_object_tree_close(tree1);
3843 if (tree2)
3844 got_object_tree_close(tree2);
3845 if (f1 && fclose(f1) == EOF && err == NULL)
3846 err = got_error_from_errno("fclose");
3847 if (f2 && fclose(f2) == EOF && err == NULL)
3848 err = got_error_from_errno("fclose");
3849 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3850 err = got_error_from_errno("close");
3851 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3852 err = got_error_from_errno("close");
3853 return err;
3854 }
3855
3856 static const struct got_error *
3857 get_changed_paths(struct got_pathlist_head *paths,
3858 struct got_commit_object *commit, struct got_repository *repo,
3859 struct got_diffstat_cb_arg *dsa)
3860 {
3861 const struct got_error *err = NULL;
3862 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3863 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3864 struct got_object_qid *qid;
3865 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3866 FILE *f1 = NULL, *f2 = NULL;
3867 int fd1 = -1, fd2 = -1;
3868
3869 if (dsa) {
3870 cb = got_diff_tree_compute_diffstat;
3871
3872 f1 = got_opentemp();
3873 if (f1 == NULL) {
3874 err = got_error_from_errno("got_opentemp");
3875 goto done;
3876 }
3877 f2 = got_opentemp();
3878 if (f2 == NULL) {
3879 err = got_error_from_errno("got_opentemp");
3880 goto done;
3881 }
3882 fd1 = got_opentempfd();
3883 if (fd1 == -1) {
3884 err = got_error_from_errno("got_opentempfd");
3885 goto done;
3886 }
3887 fd2 = got_opentempfd();
3888 if (fd2 == -1) {
3889 err = got_error_from_errno("got_opentempfd");
3890 goto done;
3891 }
3892 }
3893
3894 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3895 if (qid != NULL) {
3896 struct got_commit_object *pcommit;
3897 err = got_object_open_as_commit(&pcommit, repo,
3898 &qid->id);
3899 if (err)
3900 return err;
3901
3902 tree_id1 = got_object_id_dup(
3903 got_object_commit_get_tree_id(pcommit));
3904 if (tree_id1 == NULL) {
3905 got_object_commit_close(pcommit);
3906 return got_error_from_errno("got_object_id_dup");
3907 }
3908 got_object_commit_close(pcommit);
3909
3910 }
3911
3912 if (tree_id1) {
3913 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3914 if (err)
3915 goto done;
3916 }
3917
3918 tree_id2 = got_object_commit_get_tree_id(commit);
3919 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3920 if (err)
3921 goto done;
3922
3923 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3924 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3925 done:
3926 if (tree1)
3927 got_object_tree_close(tree1);
3928 if (tree2)
3929 got_object_tree_close(tree2);
3930 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3931 err = got_error_from_errno("close");
3932 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3933 err = got_error_from_errno("close");
3934 if (f1 && fclose(f1) == EOF && err == NULL)
3935 err = got_error_from_errno("fclose");
3936 if (f2 && fclose(f2) == EOF && err == NULL)
3937 err = got_error_from_errno("fclose");
3938 free(tree_id1);
3939 return err;
3940 }
3941
3942 static const struct got_error *
3943 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3944 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3945 struct got_repository *repo, FILE *outfile)
3946 {
3947 const struct got_error *err = NULL;
3948 struct got_commit_object *pcommit = NULL;
3949 char *id_str1 = NULL, *id_str2 = NULL;
3950 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3951 struct got_object_qid *qid;
3952
3953 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3954 if (qid != NULL) {
3955 err = got_object_open_as_commit(&pcommit, repo,
3956 &qid->id);
3957 if (err)
3958 return err;
3959 err = got_object_id_str(&id_str1, &qid->id);
3960 if (err)
3961 goto done;
3962 }
3963
3964 err = got_object_id_str(&id_str2, id);
3965 if (err)
3966 goto done;
3967
3968 if (path && path[0] != '\0') {
3969 int obj_type;
3970 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3971 if (err)
3972 goto done;
3973 if (pcommit) {
3974 err = got_object_id_by_path(&obj_id1, repo,
3975 pcommit, path);
3976 if (err) {
3977 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3978 free(obj_id2);
3979 goto done;
3980 }
3981 }
3982 }
3983 err = got_object_get_type(&obj_type, repo, obj_id2);
3984 if (err) {
3985 free(obj_id2);
3986 goto done;
3987 }
3988 fprintf(outfile,
3989 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3990 fprintf(outfile, "commit - %s\n",
3991 id_str1 ? id_str1 : "/dev/null");
3992 fprintf(outfile, "commit + %s\n", id_str2);
3993 switch (obj_type) {
3994 case GOT_OBJ_TYPE_BLOB:
3995 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3996 0, 0, dsa, repo, outfile);
3997 break;
3998 case GOT_OBJ_TYPE_TREE:
3999 err = diff_trees(obj_id1, obj_id2, path, diff_context,
4000 0, 0, dsa, repo, outfile);
4001 break;
4002 default:
4003 err = got_error(GOT_ERR_OBJ_TYPE);
4004 break;
4005 }
4006 free(obj_id1);
4007 free(obj_id2);
4008 } else {
4009 obj_id2 = got_object_commit_get_tree_id(commit);
4010 if (pcommit)
4011 obj_id1 = got_object_commit_get_tree_id(pcommit);
4012 fprintf(outfile,
4013 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4014 fprintf(outfile, "commit - %s\n",
4015 id_str1 ? id_str1 : "/dev/null");
4016 fprintf(outfile, "commit + %s\n", id_str2);
4017 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
4018 dsa, repo, outfile);
4019 }
4020 done:
4021 free(id_str1);
4022 free(id_str2);
4023 if (pcommit)
4024 got_object_commit_close(pcommit);
4025 return err;
4026 }
4027
4028 static char *
4029 get_datestr(time_t *time, char *datebuf)
4030 {
4031 struct tm mytm, *tm;
4032 char *p, *s;
4033
4034 tm = gmtime_r(time, &mytm);
4035 if (tm == NULL)
4036 return NULL;
4037 s = asctime_r(tm, datebuf);
4038 if (s == NULL)
4039 return NULL;
4040 p = strchr(s, '\n');
4041 if (p)
4042 *p = '\0';
4043 return s;
4044 }
4045
4046 static const struct got_error *
4047 match_commit(int *have_match, struct got_object_id *id,
4048 struct got_commit_object *commit, regex_t *regex)
4049 {
4050 const struct got_error *err = NULL;
4051 regmatch_t regmatch;
4052 char *id_str = NULL, *logmsg = NULL;
4053
4054 *have_match = 0;
4055
4056 err = got_object_id_str(&id_str, id);
4057 if (err)
4058 return err;
4059
4060 err = got_object_commit_get_logmsg(&logmsg, commit);
4061 if (err)
4062 goto done;
4063
4064 if (regexec(regex, got_object_commit_get_author(commit), 1,
4065 &regmatch, 0) == 0 ||
4066 regexec(regex, got_object_commit_get_committer(commit), 1,
4067 &regmatch, 0) == 0 ||
4068 regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
4069 regexec(regex, logmsg, 1, &regmatch, 0) == 0)
4070 *have_match = 1;
4071 done:
4072 free(id_str);
4073 free(logmsg);
4074 return err;
4075 }
4076
4077 static void
4078 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
4079 regex_t *regex)
4080 {
4081 regmatch_t regmatch;
4082 struct got_pathlist_entry *pe;
4083
4084 *have_match = 0;
4085
4086 TAILQ_FOREACH(pe, changed_paths, entry) {
4087 if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
4088 *have_match = 1;
4089 break;
4090 }
4091 }
4092 }
4093
4094 static const struct got_error *
4095 match_patch(int *have_match, struct got_commit_object *commit,
4096 struct got_object_id *id, const char *path, int diff_context,
4097 struct got_repository *repo, regex_t *regex, FILE *f)
4098 {
4099 const struct got_error *err = NULL;
4100 char *line = NULL;
4101 size_t linesize = 0;
4102 regmatch_t regmatch;
4103
4104 *have_match = 0;
4105
4106 err = got_opentemp_truncate(f);
4107 if (err)
4108 return err;
4109
4110 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
4111 if (err)
4112 goto done;
4113
4114 if (fseeko(f, 0L, SEEK_SET) == -1) {
4115 err = got_error_from_errno("fseeko");
4116 goto done;
4117 }
4118
4119 while (getline(&line, &linesize, f) != -1) {
4120 if (regexec(regex, line, 1, &regmatch, 0) == 0) {
4121 *have_match = 1;
4122 break;
4123 }
4124 }
4125 done:
4126 free(line);
4127 return err;
4128 }
4129
4130 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4131
4132 static const struct got_error*
4133 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4134 struct got_object_id *id, struct got_repository *repo,
4135 int local_only)
4136 {
4137 static const struct got_error *err = NULL;
4138 struct got_reflist_entry *re;
4139 char *s;
4140 const char *name;
4141
4142 *refs_str = NULL;
4143
4144 TAILQ_FOREACH(re, refs, entry) {
4145 struct got_tag_object *tag = NULL;
4146 struct got_object_id *ref_id;
4147 int cmp;
4148
4149 name = got_ref_get_name(re->ref);
4150 if (strcmp(name, GOT_REF_HEAD) == 0)
4151 continue;
4152 if (strncmp(name, "refs/", 5) == 0)
4153 name += 5;
4154 if (strncmp(name, "got/", 4) == 0)
4155 continue;
4156 if (strncmp(name, "heads/", 6) == 0)
4157 name += 6;
4158 if (strncmp(name, "remotes/", 8) == 0) {
4159 if (local_only)
4160 continue;
4161 name += 8;
4162 s = strstr(name, "/" GOT_REF_HEAD);
4163 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
4164 continue;
4165 }
4166 err = got_ref_resolve(&ref_id, repo, re->ref);
4167 if (err)
4168 break;
4169 if (strncmp(name, "tags/", 5) == 0) {
4170 err = got_object_open_as_tag(&tag, repo, ref_id);
4171 if (err) {
4172 if (err->code != GOT_ERR_OBJ_TYPE) {
4173 free(ref_id);
4174 break;
4175 }
4176 /* Ref points at something other than a tag. */
4177 err = NULL;
4178 tag = NULL;
4179 }
4180 }
4181 cmp = got_object_id_cmp(tag ?
4182 got_object_tag_get_object_id(tag) : ref_id, id);
4183 free(ref_id);
4184 if (tag)
4185 got_object_tag_close(tag);
4186 if (cmp != 0)
4187 continue;
4188 s = *refs_str;
4189 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4190 s ? ", " : "", name) == -1) {
4191 err = got_error_from_errno("asprintf");
4192 free(s);
4193 *refs_str = NULL;
4194 break;
4195 }
4196 free(s);
4197 }
4198
4199 return err;
4200 }
4201
4202 static const struct got_error *
4203 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4204 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4205 {
4206 const struct got_error *err = NULL;
4207 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4208 char *comma, *s, *nl;
4209 struct got_reflist_head *refs;
4210 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4211 struct tm tm;
4212 time_t committer_time;
4213
4214 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4215 if (refs) {
4216 err = build_refs_str(&ref_str, refs, id, repo, 1);
4217 if (err)
4218 return err;
4219
4220 /* Display the first matching ref only. */
4221 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4222 *comma = '\0';
4223 }
4224
4225 if (ref_str == NULL) {
4226 err = got_object_id_str(&id_str, id);
4227 if (err)
4228 return err;
4229 }
4230
4231 committer_time = got_object_commit_get_committer_time(commit);
4232 if (gmtime_r(&committer_time, &tm) == NULL) {
4233 err = got_error_from_errno("gmtime_r");
4234 goto done;
4235 }
4236 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4237 err = got_error(GOT_ERR_NO_SPACE);
4238 goto done;
4239 }
4240
4241 err = got_object_commit_get_logmsg(&logmsg0, commit);
4242 if (err)
4243 goto done;
4244
4245 s = logmsg0;
4246 while (isspace((unsigned char)s[0]))
4247 s++;
4248
4249 nl = strchr(s, '\n');
4250 if (nl) {
4251 *nl = '\0';
4252 }
4253
4254 if (ref_str)
4255 printf("%s%-7s %s\n", datebuf, ref_str, s);
4256 else
4257 printf("%s%.7s %s\n", datebuf, id_str, s);
4258
4259 if (fflush(stdout) != 0 && err == NULL)
4260 err = got_error_from_errno("fflush");
4261 done:
4262 free(id_str);
4263 free(ref_str);
4264 free(logmsg0);
4265 return err;
4266 }
4267
4268 static const struct got_error *
4269 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
4270 {
4271 struct got_pathlist_entry *pe;
4272
4273 if (header != NULL)
4274 printf("%s\n", header);
4275
4276 TAILQ_FOREACH(pe, dsa->paths, entry) {
4277 struct got_diff_changed_path *cp = pe->data;
4278 int pad = dsa->max_path_len - pe->path_len + 1;
4279
4280 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4281 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4282 }
4283 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
4284 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4285 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4286
4287 if (fflush(stdout) != 0)
4288 return got_error_from_errno("fflush");
4289
4290 return NULL;
4291 }
4292
4293 static const struct got_error *
4294 printfile(FILE *f)
4295 {
4296 char buf[8192];
4297 size_t r;
4298
4299 if (fseeko(f, 0L, SEEK_SET) == -1)
4300 return got_error_from_errno("fseek");
4301
4302 for (;;) {
4303 r = fread(buf, 1, sizeof(buf), f);
4304 if (r == 0) {
4305 if (ferror(f))
4306 return got_error_from_errno("fread");
4307 if (feof(f))
4308 break;
4309 }
4310 if (fwrite(buf, 1, r, stdout) != r)
4311 return got_ferror(stdout, GOT_ERR_IO);
4312 }
4313
4314 return NULL;
4315 }
4316
4317 static const struct got_error *
4318 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4319 struct got_repository *repo, const char *path,
4320 struct got_pathlist_head *changed_paths,
4321 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
4322 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
4323 const char *prefix)
4324 {
4325 const struct got_error *err = NULL;
4326 FILE *f = NULL;
4327 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4328 char datebuf[26];
4329 time_t committer_time;
4330 const char *author, *committer;
4331 char *refs_str = NULL;
4332
4333 err = got_object_id_str(&id_str, id);
4334 if (err)
4335 return err;
4336
4337 if (custom_refs_str == NULL) {
4338 struct got_reflist_head *refs;
4339 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4340 if (refs) {
4341 err = build_refs_str(&refs_str, refs, id, repo, 0);
4342 if (err)
4343 goto done;
4344 }
4345 }
4346
4347 printf(GOT_COMMIT_SEP_STR);
4348 if (custom_refs_str)
4349 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
4350 custom_refs_str);
4351 else
4352 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
4353 refs_str ? " (" : "", refs_str ? refs_str : "",
4354 refs_str ? ")" : "");
4355 free(id_str);
4356 id_str = NULL;
4357 free(refs_str);
4358 refs_str = NULL;
4359 printf("from: %s\n", got_object_commit_get_author(commit));
4360 author = got_object_commit_get_author(commit);
4361 committer = got_object_commit_get_committer(commit);
4362 if (strcmp(author, committer) != 0)
4363 printf("via: %s\n", committer);
4364 committer_time = got_object_commit_get_committer_time(commit);
4365 datestr = get_datestr(&committer_time, datebuf);
4366 if (datestr)
4367 printf("date: %s UTC\n", datestr);
4368 if (got_object_commit_get_nparents(commit) > 1) {
4369 const struct got_object_id_queue *parent_ids;
4370 struct got_object_qid *qid;
4371 int n = 1;
4372 parent_ids = got_object_commit_get_parent_ids(commit);
4373 STAILQ_FOREACH(qid, parent_ids, entry) {
4374 err = got_object_id_str(&id_str, &qid->id);
4375 if (err)
4376 goto done;
4377 printf("parent %d: %s\n", n++, id_str);
4378 free(id_str);
4379 id_str = NULL;
4380 }
4381 }
4382
4383 err = got_object_commit_get_logmsg(&logmsg0, commit);
4384 if (err)
4385 goto done;
4386
4387 logmsg = logmsg0;
4388 do {
4389 line = strsep(&logmsg, "\n");
4390 if (line)
4391 printf(" %s\n", line);
4392 } while (line);
4393 free(logmsg0);
4394
4395 if (changed_paths && diffstat == NULL) {
4396 struct got_pathlist_entry *pe;
4397
4398 TAILQ_FOREACH(pe, changed_paths, entry) {
4399 struct got_diff_changed_path *cp = pe->data;
4400
4401 printf(" %c %s\n", cp->status, pe->path);
4402 }
4403 printf("\n");
4404 }
4405 if (show_patch) {
4406 if (diffstat) {
4407 f = got_opentemp();
4408 if (f == NULL) {
4409 err = got_error_from_errno("got_opentemp");
4410 goto done;
4411 }
4412 }
4413
4414 err = print_patch(commit, id, path, diff_context, diffstat,
4415 repo, diffstat == NULL ? stdout : f);
4416 if (err)
4417 goto done;
4418 }
4419 if (diffstat) {
4420 err = print_diffstat(diffstat, NULL);
4421 if (err)
4422 goto done;
4423 if (show_patch) {
4424 err = printfile(f);
4425 if (err)
4426 goto done;
4427 }
4428 }
4429 if (show_patch)
4430 printf("\n");
4431
4432 if (fflush(stdout) != 0 && err == NULL)
4433 err = got_error_from_errno("fflush");
4434 done:
4435 if (f && fclose(f) == EOF && err == NULL)
4436 err = got_error_from_errno("fclose");
4437 free(id_str);
4438 free(refs_str);
4439 return err;
4440 }
4441
4442 static const struct got_error *
4443 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4444 struct got_repository *repo, const char *path, int show_changed_paths,
4445 int show_diffstat, int show_patch, const char *search_pattern,
4446 int diff_context, int limit, int log_branches, int reverse_display_order,
4447 struct got_reflist_object_id_map *refs_idmap, int one_line,
4448 FILE *tmpfile)
4449 {
4450 const struct got_error *err;
4451 struct got_commit_graph *graph;
4452 regex_t regex;
4453 int have_match;
4454 struct got_object_id_queue reversed_commits;
4455 struct got_object_qid *qid;
4456 struct got_commit_object *commit;
4457 struct got_pathlist_head changed_paths;
4458
4459 STAILQ_INIT(&reversed_commits);
4460 TAILQ_INIT(&changed_paths);
4461
4462 if (search_pattern && regcomp(&regex, search_pattern,
4463 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4464 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4465
4466 err = got_commit_graph_open(&graph, path, !log_branches);
4467 if (err)
4468 return err;
4469 err = got_commit_graph_iter_start(graph, root_id, repo,
4470 check_cancelled, NULL);
4471 if (err)
4472 goto done;
4473 for (;;) {
4474 struct got_object_id id;
4475 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4476 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4477
4478 if (sigint_received || sigpipe_received)
4479 break;
4480
4481 err = got_commit_graph_iter_next(&id, graph, repo,
4482 check_cancelled, NULL);
4483 if (err) {
4484 if (err->code == GOT_ERR_ITER_COMPLETED)
4485 err = NULL;
4486 break;
4487 }
4488
4489 err = got_object_open_as_commit(&commit, repo, &id);
4490 if (err)
4491 break;
4492
4493 if (((show_changed_paths && !show_diffstat) ||
4494 (show_diffstat && !show_patch))
4495 && !reverse_display_order) {
4496 err = get_changed_paths(&changed_paths, commit, repo,
4497 show_diffstat ? &dsa : NULL);
4498 if (err)
4499 break;
4500 }
4501
4502 if (search_pattern) {
4503 err = match_commit(&have_match, &id, commit, &regex);
4504 if (err) {
4505 got_object_commit_close(commit);
4506 break;
4507 }
4508 if (have_match == 0 && show_changed_paths)
4509 match_changed_paths(&have_match,
4510 &changed_paths, &regex);
4511 if (have_match == 0 && show_patch) {
4512 err = match_patch(&have_match, commit, &id,
4513 path, diff_context, repo, &regex, tmpfile);
4514 if (err)
4515 break;
4516 }
4517 if (have_match == 0) {
4518 got_object_commit_close(commit);
4519 got_pathlist_free(&changed_paths,
4520 GOT_PATHLIST_FREE_ALL);
4521 continue;
4522 }
4523 }
4524
4525 if (reverse_display_order) {
4526 err = got_object_qid_alloc(&qid, &id);
4527 if (err)
4528 break;
4529 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4530 got_object_commit_close(commit);
4531 } else {
4532 if (one_line)
4533 err = print_commit_oneline(commit, &id,
4534 repo, refs_idmap);
4535 else
4536 err = print_commit(commit, &id, repo, path,
4537 (show_changed_paths || show_diffstat) ?
4538 &changed_paths : NULL,
4539 show_diffstat ? &dsa : NULL, show_patch,
4540 diff_context, refs_idmap, NULL, NULL);
4541 got_object_commit_close(commit);
4542 if (err)
4543 break;
4544 }
4545 if ((limit && --limit == 0) ||
4546 (end_id && got_object_id_cmp(&id, end_id) == 0))
4547 break;
4548
4549 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4550 }
4551 if (reverse_display_order) {
4552 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4553 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4554 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4555
4556 err = got_object_open_as_commit(&commit, repo,
4557 &qid->id);
4558 if (err)
4559 break;
4560 if ((show_changed_paths && !show_diffstat) ||
4561 (show_diffstat && !show_patch)) {
4562 err = get_changed_paths(&changed_paths, commit,
4563 repo, show_diffstat ? &dsa : NULL);
4564 if (err)
4565 break;
4566 }
4567 if (one_line)
4568 err = print_commit_oneline(commit, &qid->id,
4569 repo, refs_idmap);
4570 else
4571 err = print_commit(commit, &qid->id, repo, path,
4572 (show_changed_paths || show_diffstat) ?
4573 &changed_paths : NULL,
4574 show_diffstat ? &dsa : NULL, show_patch,
4575 diff_context, refs_idmap, NULL, NULL);
4576 got_object_commit_close(commit);
4577 if (err)
4578 break;
4579 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4580 }
4581 }
4582 done:
4583 while (!STAILQ_EMPTY(&reversed_commits)) {
4584 qid = STAILQ_FIRST(&reversed_commits);
4585 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4586 got_object_qid_free(qid);
4587 }
4588 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4589 if (search_pattern)
4590 regfree(&regex);
4591 got_commit_graph_close(graph);
4592 return err;
4593 }
4594
4595 __dead static void
4596 usage_log(void)
4597 {
4598 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
4599 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4600 "[path]\n", getprogname());
4601 exit(1);
4602 }
4603
4604 static int
4605 get_default_log_limit(void)
4606 {
4607 const char *got_default_log_limit;
4608 long long n;
4609 const char *errstr;
4610
4611 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4612 if (got_default_log_limit == NULL)
4613 return 0;
4614 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4615 if (errstr != NULL)
4616 return 0;
4617 return n;
4618 }
4619
4620 static const struct got_error *
4621 cmd_log(int argc, char *argv[])
4622 {
4623 const struct got_error *error;
4624 struct got_repository *repo = NULL;
4625 struct got_worktree *worktree = NULL;
4626 struct got_object_id *start_id = NULL, *end_id = NULL;
4627 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4628 char *keyword_idstr = NULL;
4629 const char *start_commit = NULL, *end_commit = NULL;
4630 const char *search_pattern = NULL;
4631 int diff_context = -1, ch;
4632 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4633 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4634 const char *errstr;
4635 struct got_reflist_head refs;
4636 struct got_reflist_object_id_map *refs_idmap = NULL;
4637 FILE *tmpfile = NULL;
4638 int *pack_fds = NULL;
4639
4640 TAILQ_INIT(&refs);
4641
4642 #ifndef PROFILE
4643 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4644 NULL)
4645 == -1)
4646 err(1, "pledge");
4647 #endif
4648
4649 limit = get_default_log_limit();
4650
4651 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
4652 switch (ch) {
4653 case 'b':
4654 log_branches = 1;
4655 break;
4656 case 'C':
4657 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4658 &errstr);
4659 if (errstr != NULL)
4660 errx(1, "number of context lines is %s: %s",
4661 errstr, optarg);
4662 break;
4663 case 'c':
4664 start_commit = optarg;
4665 break;
4666 case 'd':
4667 show_diffstat = 1;
4668 break;
4669 case 'l':
4670 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4671 if (errstr != NULL)
4672 errx(1, "number of commits is %s: %s",
4673 errstr, optarg);
4674 break;
4675 case 'P':
4676 show_changed_paths = 1;
4677 break;
4678 case 'p':
4679 show_patch = 1;
4680 break;
4681 case 'R':
4682 reverse_display_order = 1;
4683 break;
4684 case 'r':
4685 repo_path = realpath(optarg, NULL);
4686 if (repo_path == NULL)
4687 return got_error_from_errno2("realpath",
4688 optarg);
4689 got_path_strip_trailing_slashes(repo_path);
4690 break;
4691 case 'S':
4692 search_pattern = optarg;
4693 break;
4694 case 's':
4695 one_line = 1;
4696 break;
4697 case 'x':
4698 end_commit = optarg;
4699 break;
4700 default:
4701 usage_log();
4702 /* NOTREACHED */
4703 }
4704 }
4705
4706 argc -= optind;
4707 argv += optind;
4708
4709 if (diff_context == -1)
4710 diff_context = 3;
4711 else if (!show_patch)
4712 errx(1, "-C requires -p");
4713
4714 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4715 errx(1, "cannot use -s with -d, -p or -P");
4716
4717 cwd = getcwd(NULL, 0);
4718 if (cwd == NULL) {
4719 error = got_error_from_errno("getcwd");
4720 goto done;
4721 }
4722
4723 error = got_repo_pack_fds_open(&pack_fds);
4724 if (error != NULL)
4725 goto done;
4726
4727 if (repo_path == NULL) {
4728 error = got_worktree_open(&worktree, cwd,
4729 GOT_WORKTREE_GOT_DIR);
4730 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4731 goto done;
4732 error = NULL;
4733 }
4734
4735 if (argc == 1) {
4736 if (worktree) {
4737 error = got_worktree_resolve_path(&path, worktree,
4738 argv[0]);
4739 if (error)
4740 goto done;
4741 } else {
4742 path = strdup(argv[0]);
4743 if (path == NULL) {
4744 error = got_error_from_errno("strdup");
4745 goto done;
4746 }
4747 }
4748 } else if (argc != 0)
4749 usage_log();
4750
4751 if (repo_path == NULL) {
4752 repo_path = worktree ?
4753 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4754 }
4755 if (repo_path == NULL) {
4756 error = got_error_from_errno("strdup");
4757 goto done;
4758 }
4759
4760 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4761 if (error != NULL)
4762 goto done;
4763
4764 error = apply_unveil(got_repo_get_path(repo), 1,
4765 worktree ? got_worktree_get_root_path(worktree) : NULL);
4766 if (error)
4767 goto done;
4768
4769 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4770 if (error)
4771 goto done;
4772
4773 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4774 if (error)
4775 goto done;
4776
4777 if (start_commit == NULL) {
4778 struct got_reference *head_ref;
4779 struct got_commit_object *commit = NULL;
4780 error = got_ref_open(&head_ref, repo,
4781 worktree ? got_worktree_get_head_ref_name(worktree)
4782 : GOT_REF_HEAD, 0);
4783 if (error != NULL)
4784 goto done;
4785 error = got_ref_resolve(&start_id, repo, head_ref);
4786 got_ref_close(head_ref);
4787 if (error != NULL)
4788 goto done;
4789 error = got_object_open_as_commit(&commit, repo,
4790 start_id);
4791 if (error != NULL)
4792 goto done;
4793 got_object_commit_close(commit);
4794 } else {
4795 error = got_keyword_to_idstr(&keyword_idstr, start_commit,
4796 repo, worktree);
4797 if (error != NULL)
4798 goto done;
4799 if (keyword_idstr != NULL)
4800 start_commit = keyword_idstr;
4801
4802 error = got_repo_match_object_id(&start_id, NULL,
4803 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4804 if (error != NULL)
4805 goto done;
4806 }
4807 if (end_commit != NULL) {
4808 error = got_keyword_to_idstr(&keyword_idstr, end_commit,
4809 repo, worktree);
4810 if (error != NULL)
4811 goto done;
4812 if (keyword_idstr != NULL)
4813 end_commit = keyword_idstr;
4814
4815 error = got_repo_match_object_id(&end_id, NULL,
4816 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4817 if (error != NULL)
4818 goto done;
4819 }
4820
4821 if (worktree) {
4822 /*
4823 * If a path was specified on the command line it was resolved
4824 * to a path in the work tree above. Prepend the work tree's
4825 * path prefix to obtain the corresponding in-repository path.
4826 */
4827 if (path) {
4828 const char *prefix;
4829 prefix = got_worktree_get_path_prefix(worktree);
4830 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4831 (path[0] != '\0') ? "/" : "", path) == -1) {
4832 error = got_error_from_errno("asprintf");
4833 goto done;
4834 }
4835 }
4836 } else
4837 error = got_repo_map_path(&in_repo_path, repo,
4838 path ? path : "");
4839 if (error != NULL)
4840 goto done;
4841 if (in_repo_path) {
4842 free(path);
4843 path = in_repo_path;
4844 }
4845
4846 if (worktree) {
4847 /* Release work tree lock. */
4848 got_worktree_close(worktree);
4849 worktree = NULL;
4850 }
4851
4852 if (search_pattern && show_patch) {
4853 tmpfile = got_opentemp();
4854 if (tmpfile == NULL) {
4855 error = got_error_from_errno("got_opentemp");
4856 goto done;
4857 }
4858 }
4859
4860 error = print_commits(start_id, end_id, repo, path ? path : "",
4861 show_changed_paths, show_diffstat, show_patch, search_pattern,
4862 diff_context, limit, log_branches, reverse_display_order,
4863 refs_idmap, one_line, tmpfile);
4864 done:
4865 free(path);
4866 free(repo_path);
4867 free(cwd);
4868 free(start_id);
4869 free(end_id);
4870 free(keyword_idstr);
4871 if (worktree)
4872 got_worktree_close(worktree);
4873 if (repo) {
4874 const struct got_error *close_err = got_repo_close(repo);
4875 if (error == NULL)
4876 error = close_err;
4877 }
4878 if (pack_fds) {
4879 const struct got_error *pack_err =
4880 got_repo_pack_fds_close(pack_fds);
4881 if (error == NULL)
4882 error = pack_err;
4883 }
4884 if (refs_idmap)
4885 got_reflist_object_id_map_free(refs_idmap);
4886 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4887 error = got_error_from_errno("fclose");
4888 got_ref_list_free(&refs);
4889 return error;
4890 }
4891
4892 __dead static void
4893 usage_diff(void)
4894 {
4895 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4896 "[-r repository-path] [object1 object2 | path ...]\n",
4897 getprogname());
4898 exit(1);
4899 }
4900
4901 struct print_diff_arg {
4902 struct got_repository *repo;
4903 struct got_worktree *worktree;
4904 struct got_diffstat_cb_arg *diffstat;
4905 int diff_context;
4906 const char *id_str;
4907 int header_shown;
4908 int diff_staged;
4909 enum got_diff_algorithm diff_algo;
4910 int ignore_whitespace;
4911 int force_text_diff;
4912 FILE *f1;
4913 FILE *f2;
4914 FILE *outfile;
4915 };
4916
4917 /*
4918 * Create a file which contains the target path of a symlink so we can feed
4919 * it as content to the diff engine.
4920 */
4921 static const struct got_error *
4922 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4923 const char *abspath)
4924 {
4925 const struct got_error *err = NULL;
4926 char target_path[PATH_MAX];
4927 ssize_t target_len, outlen;
4928
4929 *fd = -1;
4930
4931 if (dirfd != -1) {
4932 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4933 if (target_len == -1)
4934 return got_error_from_errno2("readlinkat", abspath);
4935 } else {
4936 target_len = readlink(abspath, target_path, PATH_MAX);
4937 if (target_len == -1)
4938 return got_error_from_errno2("readlink", abspath);
4939 }
4940
4941 *fd = got_opentempfd();
4942 if (*fd == -1)
4943 return got_error_from_errno("got_opentempfd");
4944
4945 outlen = write(*fd, target_path, target_len);
4946 if (outlen == -1) {
4947 err = got_error_from_errno("got_opentempfd");
4948 goto done;
4949 }
4950
4951 if (lseek(*fd, 0, SEEK_SET) == -1) {
4952 err = got_error_from_errno2("lseek", abspath);
4953 goto done;
4954 }
4955 done:
4956 if (err) {
4957 close(*fd);
4958 *fd = -1;
4959 }
4960 return err;
4961 }
4962
4963 static const struct got_error *
4964 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4965 const char *path, struct got_object_id *blob_id,
4966 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4967 int dirfd, const char *de_name)
4968 {
4969 struct print_diff_arg *a = arg;
4970 const struct got_error *err = NULL;
4971 struct got_blob_object *blob1 = NULL;
4972 int fd = -1, fd1 = -1, fd2 = -1;
4973 FILE *f2 = NULL;
4974 char *abspath = NULL, *label1 = NULL;
4975 struct stat sb;
4976 off_t size1 = 0;
4977 int f2_exists = 0;
4978
4979 memset(&sb, 0, sizeof(sb));
4980
4981 if (a->diff_staged) {
4982 if (staged_status != GOT_STATUS_MODIFY &&
4983 staged_status != GOT_STATUS_ADD &&
4984 staged_status != GOT_STATUS_DELETE)
4985 return NULL;
4986 } else {
4987 if (staged_status == GOT_STATUS_DELETE)
4988 return NULL;
4989 if (status == GOT_STATUS_NONEXISTENT)
4990 return got_error_set_errno(ENOENT, path);
4991 if (status != GOT_STATUS_MODIFY &&
4992 status != GOT_STATUS_ADD &&
4993 status != GOT_STATUS_DELETE &&
4994 status != GOT_STATUS_CONFLICT)
4995 return NULL;
4996 }
4997
4998 err = got_opentemp_truncate(a->f1);
4999 if (err)
5000 return got_error_from_errno("got_opentemp_truncate");
5001 err = got_opentemp_truncate(a->f2);
5002 if (err)
5003 return got_error_from_errno("got_opentemp_truncate");
5004
5005 if (!a->header_shown) {
5006 if (fprintf(a->outfile, "diff %s%s\n",
5007 a->diff_staged ? "-s " : "",
5008 got_worktree_get_root_path(a->worktree)) < 0) {
5009 err = got_error_from_errno("fprintf");
5010 goto done;
5011 }
5012 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
5013 err = got_error_from_errno("fprintf");
5014 goto done;
5015 }
5016 if (fprintf(a->outfile, "path + %s%s\n",
5017 got_worktree_get_root_path(a->worktree),
5018 a->diff_staged ? " (staged changes)" : "") < 0) {
5019 err = got_error_from_errno("fprintf");
5020 goto done;
5021 }
5022 a->header_shown = 1;
5023 }
5024
5025 if (a->diff_staged) {
5026 const char *label1 = NULL, *label2 = NULL;
5027 switch (staged_status) {
5028 case GOT_STATUS_MODIFY:
5029 label1 = path;
5030 label2 = path;
5031 break;
5032 case GOT_STATUS_ADD:
5033 label2 = path;
5034 break;
5035 case GOT_STATUS_DELETE:
5036 label1 = path;
5037 break;
5038 default:
5039 return got_error(GOT_ERR_FILE_STATUS);
5040 }
5041 fd1 = got_opentempfd();
5042 if (fd1 == -1) {
5043 err = got_error_from_errno("got_opentempfd");
5044 goto done;
5045 }
5046 fd2 = got_opentempfd();
5047 if (fd2 == -1) {
5048 err = got_error_from_errno("got_opentempfd");
5049 goto done;
5050 }
5051 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
5052 fd1, fd2, blob_id, staged_blob_id, label1, label2,
5053 a->diff_algo, a->diff_context, a->ignore_whitespace,
5054 a->force_text_diff, a->diffstat, a->repo, a->outfile);
5055 goto done;
5056 }
5057
5058 fd1 = got_opentempfd();
5059 if (fd1 == -1) {
5060 err = got_error_from_errno("got_opentempfd");
5061 goto done;
5062 }
5063
5064 if (staged_status == GOT_STATUS_ADD ||
5065 staged_status == GOT_STATUS_MODIFY) {
5066 char *id_str;
5067 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
5068 8192, fd1);
5069 if (err)
5070 goto done;
5071 err = got_object_id_str(&id_str, staged_blob_id);
5072 if (err)
5073 goto done;
5074 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
5075 err = got_error_from_errno("asprintf");
5076 free(id_str);
5077 goto done;
5078 }
5079 free(id_str);
5080 } else if (status != GOT_STATUS_ADD) {
5081 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
5082 fd1);
5083 if (err)
5084 goto done;
5085 }
5086
5087 if (status != GOT_STATUS_DELETE) {
5088 if (asprintf(&abspath, "%s/%s",
5089 got_worktree_get_root_path(a->worktree), path) == -1) {
5090 err = got_error_from_errno("asprintf");
5091 goto done;
5092 }
5093
5094 if (dirfd != -1) {
5095 fd = openat(dirfd, de_name,
5096 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5097 if (fd == -1) {
5098 if (!got_err_open_nofollow_on_symlink()) {
5099 err = got_error_from_errno2("openat",
5100 abspath);
5101 goto done;
5102 }
5103 err = get_symlink_target_file(&fd, dirfd,
5104 de_name, abspath);
5105 if (err)
5106 goto done;
5107 }
5108 } else {
5109 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5110 if (fd == -1) {
5111 if (!got_err_open_nofollow_on_symlink()) {
5112 err = got_error_from_errno2("open",
5113 abspath);
5114 goto done;
5115 }
5116 err = get_symlink_target_file(&fd, dirfd,
5117 de_name, abspath);
5118 if (err)
5119 goto done;
5120 }
5121 }
5122 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
5123 err = got_error_from_errno2("fstatat", abspath);
5124 goto done;
5125 }
5126 f2 = fdopen(fd, "r");
5127 if (f2 == NULL) {
5128 err = got_error_from_errno2("fdopen", abspath);
5129 goto done;
5130 }
5131 fd = -1;
5132 f2_exists = 1;
5133 }
5134
5135 if (blob1) {
5136 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5137 a->f1, blob1);
5138 if (err)
5139 goto done;
5140 }
5141
5142 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
5143 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
5144 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
5145 done:
5146 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5147 err = got_error_from_errno("close");
5148 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5149 err = got_error_from_errno("close");
5150 if (blob1)
5151 got_object_blob_close(blob1);
5152 if (fd != -1 && close(fd) == -1 && err == NULL)
5153 err = got_error_from_errno("close");
5154 if (f2 && fclose(f2) == EOF && err == NULL)
5155 err = got_error_from_errno("fclose");
5156 free(abspath);
5157 return err;
5158 }
5159
5160 static const struct got_error *
5161 cmd_diff(int argc, char *argv[])
5162 {
5163 const struct got_error *error;
5164 struct got_repository *repo = NULL;
5165 struct got_worktree *worktree = NULL;
5166 char *cwd = NULL, *repo_path = NULL;
5167 const char *commit_args[2] = { NULL, NULL };
5168 int ncommit_args = 0;
5169 struct got_object_id *ids[2] = { NULL, NULL };
5170 char *labels[2] = { NULL, NULL };
5171 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5172 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5173 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5174 const char *errstr;
5175 struct got_reflist_head refs;
5176 struct got_pathlist_head diffstat_paths, paths;
5177 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5178 int fd1 = -1, fd2 = -1;
5179 int *pack_fds = NULL;
5180 struct got_diffstat_cb_arg dsa;
5181
5182 memset(&dsa, 0, sizeof(dsa));
5183
5184 TAILQ_INIT(&refs);
5185 TAILQ_INIT(&paths);
5186 TAILQ_INIT(&diffstat_paths);
5187
5188 #ifndef PROFILE
5189 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5190 NULL) == -1)
5191 err(1, "pledge");
5192 #endif
5193
5194 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5195 switch (ch) {
5196 case 'a':
5197 force_text_diff = 1;
5198 break;
5199 case 'C':
5200 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5201 &errstr);
5202 if (errstr != NULL)
5203 errx(1, "number of context lines is %s: %s",
5204 errstr, optarg);
5205 break;
5206 case 'c':
5207 if (ncommit_args >= 2)
5208 errx(1, "too many -c options used");
5209 commit_args[ncommit_args++] = optarg;
5210 break;
5211 case 'd':
5212 show_diffstat = 1;
5213 break;
5214 case 'P':
5215 force_path = 1;
5216 break;
5217 case 'r':
5218 repo_path = realpath(optarg, NULL);
5219 if (repo_path == NULL)
5220 return got_error_from_errno2("realpath",
5221 optarg);
5222 got_path_strip_trailing_slashes(repo_path);
5223 rflag = 1;
5224 break;
5225 case 's':
5226 diff_staged = 1;
5227 break;
5228 case 'w':
5229 ignore_whitespace = 1;
5230 break;
5231 default:
5232 usage_diff();
5233 /* NOTREACHED */
5234 }
5235 }
5236
5237 argc -= optind;
5238 argv += optind;
5239
5240 cwd = getcwd(NULL, 0);
5241 if (cwd == NULL) {
5242 error = got_error_from_errno("getcwd");
5243 goto done;
5244 }
5245
5246 error = got_repo_pack_fds_open(&pack_fds);
5247 if (error != NULL)
5248 goto done;
5249
5250 if (repo_path == NULL) {
5251 error = got_worktree_open(&worktree, cwd,
5252 GOT_WORKTREE_GOT_DIR);
5253 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5254 goto done;
5255 else
5256 error = NULL;
5257 if (worktree) {
5258 repo_path =
5259 strdup(got_worktree_get_repo_path(worktree));
5260 if (repo_path == NULL) {
5261 error = got_error_from_errno("strdup");
5262 goto done;
5263 }
5264 } else {
5265 repo_path = strdup(cwd);
5266 if (repo_path == NULL) {
5267 error = got_error_from_errno("strdup");
5268 goto done;
5269 }
5270 }
5271 }
5272
5273 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5274 free(repo_path);
5275 if (error != NULL)
5276 goto done;
5277
5278 if (show_diffstat) {
5279 dsa.paths = &diffstat_paths;
5280 dsa.force_text = force_text_diff;
5281 dsa.ignore_ws = ignore_whitespace;
5282 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5283 }
5284
5285 if (rflag || worktree == NULL || ncommit_args > 0) {
5286 if (force_path) {
5287 error = got_error_msg(GOT_ERR_NOT_IMPL,
5288 "-P option can only be used when diffing "
5289 "a work tree");
5290 goto done;
5291 }
5292 if (diff_staged) {
5293 error = got_error_msg(GOT_ERR_NOT_IMPL,
5294 "-s option can only be used when diffing "
5295 "a work tree");
5296 goto done;
5297 }
5298 }
5299
5300 error = apply_unveil(got_repo_get_path(repo), 1,
5301 worktree ? got_worktree_get_root_path(worktree) : NULL);
5302 if (error)
5303 goto done;
5304
5305 if ((!force_path && argc == 2) || ncommit_args > 0) {
5306 int obj_type = (ncommit_args > 0 ?
5307 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5308 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5309 NULL);
5310 if (error)
5311 goto done;
5312 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5313 const char *arg;
5314 char *keyword_idstr = NULL;
5315
5316 if (ncommit_args > 0)
5317 arg = commit_args[i];
5318 else
5319 arg = argv[i];
5320
5321 error = got_keyword_to_idstr(&keyword_idstr, arg,
5322 repo, worktree);
5323 if (error != NULL)
5324 goto done;
5325 if (keyword_idstr != NULL)
5326 arg = keyword_idstr;
5327
5328 error = got_repo_match_object_id(&ids[i], &labels[i],
5329 arg, obj_type, &refs, repo);
5330 free(keyword_idstr);
5331 if (error) {
5332 if (error->code != GOT_ERR_NOT_REF &&
5333 error->code != GOT_ERR_NO_OBJ)
5334 goto done;
5335 if (ncommit_args > 0)
5336 goto done;
5337 error = NULL;
5338 break;
5339 }
5340 }
5341 }
5342
5343 f1 = got_opentemp();
5344 if (f1 == NULL) {
5345 error = got_error_from_errno("got_opentemp");
5346 goto done;
5347 }
5348
5349 f2 = got_opentemp();
5350 if (f2 == NULL) {
5351 error = got_error_from_errno("got_opentemp");
5352 goto done;
5353 }
5354
5355 outfile = got_opentemp();
5356 if (outfile == NULL) {
5357 error = got_error_from_errno("got_opentemp");
5358 goto done;
5359 }
5360
5361 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5362 struct print_diff_arg arg;
5363 char *id_str;
5364
5365 if (worktree == NULL) {
5366 if (argc == 2 && ids[0] == NULL) {
5367 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5368 goto done;
5369 } else if (argc == 2 && ids[1] == NULL) {
5370 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5371 goto done;
5372 } else if (argc > 0) {
5373 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5374 "%s", "specified paths cannot be resolved");
5375 goto done;
5376 } else {
5377 error = got_error(GOT_ERR_NOT_WORKTREE);
5378 goto done;
5379 }
5380 }
5381
5382 error = get_worktree_paths_from_argv(&paths, argc, argv,
5383 worktree);
5384 if (error)
5385 goto done;
5386
5387 error = got_object_id_str(&id_str,
5388 got_worktree_get_base_commit_id(worktree));
5389 if (error)
5390 goto done;
5391 arg.repo = repo;
5392 arg.worktree = worktree;
5393 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5394 arg.diff_context = diff_context;
5395 arg.id_str = id_str;
5396 arg.header_shown = 0;
5397 arg.diff_staged = diff_staged;
5398 arg.ignore_whitespace = ignore_whitespace;
5399 arg.force_text_diff = force_text_diff;
5400 arg.diffstat = show_diffstat ? &dsa : NULL;
5401 arg.f1 = f1;
5402 arg.f2 = f2;
5403 arg.outfile = outfile;
5404
5405 error = got_worktree_status(worktree, &paths, repo, 0,
5406 print_diff, &arg, check_cancelled, NULL);
5407 free(id_str);
5408 if (error)
5409 goto done;
5410
5411 if (show_diffstat && dsa.nfiles > 0) {
5412 char *header;
5413
5414 if (asprintf(&header, "diffstat %s%s",
5415 diff_staged ? "-s " : "",
5416 got_worktree_get_root_path(worktree)) == -1) {
5417 error = got_error_from_errno("asprintf");
5418 goto done;
5419 }
5420
5421 error = print_diffstat(&dsa, header);
5422 free(header);
5423 if (error)
5424 goto done;
5425 }
5426
5427 error = printfile(outfile);
5428 goto done;
5429 }
5430
5431 if (ncommit_args == 1) {
5432 struct got_commit_object *commit;
5433 error = got_object_open_as_commit(&commit, repo, ids[0]);
5434 if (error)
5435 goto done;
5436
5437 labels[1] = labels[0];
5438 ids[1] = ids[0];
5439 if (got_object_commit_get_nparents(commit) > 0) {
5440 const struct got_object_id_queue *pids;
5441 struct got_object_qid *pid;
5442 pids = got_object_commit_get_parent_ids(commit);
5443 pid = STAILQ_FIRST(pids);
5444 ids[0] = got_object_id_dup(&pid->id);
5445 if (ids[0] == NULL) {
5446 error = got_error_from_errno(
5447 "got_object_id_dup");
5448 got_object_commit_close(commit);
5449 goto done;
5450 }
5451 error = got_object_id_str(&labels[0], ids[0]);
5452 if (error) {
5453 got_object_commit_close(commit);
5454 goto done;
5455 }
5456 } else {
5457 ids[0] = NULL;
5458 labels[0] = strdup("/dev/null");
5459 if (labels[0] == NULL) {
5460 error = got_error_from_errno("strdup");
5461 got_object_commit_close(commit);
5462 goto done;
5463 }
5464 }
5465
5466 got_object_commit_close(commit);
5467 }
5468
5469 if (ncommit_args == 0 && argc > 2) {
5470 error = got_error_msg(GOT_ERR_BAD_PATH,
5471 "path arguments cannot be used when diffing two objects");
5472 goto done;
5473 }
5474
5475 if (ids[0]) {
5476 error = got_object_get_type(&type1, repo, ids[0]);
5477 if (error)
5478 goto done;
5479 }
5480
5481 error = got_object_get_type(&type2, repo, ids[1]);
5482 if (error)
5483 goto done;
5484 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5485 error = got_error(GOT_ERR_OBJ_TYPE);
5486 goto done;
5487 }
5488 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5489 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5490 "path arguments cannot be used when diffing blobs");
5491 goto done;
5492 }
5493
5494 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5495 char *in_repo_path;
5496 struct got_pathlist_entry *new;
5497 if (worktree) {
5498 const char *prefix;
5499 char *p;
5500 error = got_worktree_resolve_path(&p, worktree,
5501 argv[i]);
5502 if (error)
5503 goto done;
5504 prefix = got_worktree_get_path_prefix(worktree);
5505 while (prefix[0] == '/')
5506 prefix++;
5507 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5508 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5509 p) == -1) {
5510 error = got_error_from_errno("asprintf");
5511 free(p);
5512 goto done;
5513 }
5514 free(p);
5515 } else {
5516 char *mapped_path, *s;
5517 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5518 if (error)
5519 goto done;
5520 s = mapped_path;
5521 while (s[0] == '/')
5522 s++;
5523 in_repo_path = strdup(s);
5524 if (in_repo_path == NULL) {
5525 error = got_error_from_errno("asprintf");
5526 free(mapped_path);
5527 goto done;
5528 }
5529 free(mapped_path);
5530
5531 }
5532 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5533 if (error || new == NULL /* duplicate */)
5534 free(in_repo_path);
5535 if (error)
5536 goto done;
5537 }
5538
5539 if (worktree) {
5540 /* Release work tree lock. */
5541 got_worktree_close(worktree);
5542 worktree = NULL;
5543 }
5544
5545 fd1 = got_opentempfd();
5546 if (fd1 == -1) {
5547 error = got_error_from_errno("got_opentempfd");
5548 goto done;
5549 }
5550
5551 fd2 = got_opentempfd();
5552 if (fd2 == -1) {
5553 error = got_error_from_errno("got_opentempfd");
5554 goto done;
5555 }
5556
5557 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5558 case GOT_OBJ_TYPE_BLOB:
5559 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5560 fd1, fd2, ids[0], ids[1], NULL, NULL,
5561 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5562 ignore_whitespace, force_text_diff,
5563 show_diffstat ? &dsa : NULL, repo, outfile);
5564 break;
5565 case GOT_OBJ_TYPE_TREE:
5566 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5567 ids[0], ids[1], &paths, "", "",
5568 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5569 ignore_whitespace, force_text_diff,
5570 show_diffstat ? &dsa : NULL, repo, outfile);
5571 break;
5572 case GOT_OBJ_TYPE_COMMIT:
5573 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5574 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5575 fd1, fd2, ids[0], ids[1], &paths,
5576 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5577 ignore_whitespace, force_text_diff,
5578 show_diffstat ? &dsa : NULL, repo, outfile);
5579 break;
5580 default:
5581 error = got_error(GOT_ERR_OBJ_TYPE);
5582 }
5583 if (error)
5584 goto done;
5585
5586 if (show_diffstat && dsa.nfiles > 0) {
5587 char *header = NULL;
5588
5589 if (asprintf(&header, "diffstat %s %s",
5590 labels[0], labels[1]) == -1) {
5591 error = got_error_from_errno("asprintf");
5592 goto done;
5593 }
5594
5595 error = print_diffstat(&dsa, header);
5596 free(header);
5597 if (error)
5598 goto done;
5599 }
5600
5601 error = printfile(outfile);
5602
5603 done:
5604 free(labels[0]);
5605 free(labels[1]);
5606 free(ids[0]);
5607 free(ids[1]);
5608 if (worktree)
5609 got_worktree_close(worktree);
5610 if (repo) {
5611 const struct got_error *close_err = got_repo_close(repo);
5612 if (error == NULL)
5613 error = close_err;
5614 }
5615 if (pack_fds) {
5616 const struct got_error *pack_err =
5617 got_repo_pack_fds_close(pack_fds);
5618 if (error == NULL)
5619 error = pack_err;
5620 }
5621 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5622 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5623 got_ref_list_free(&refs);
5624 if (outfile && fclose(outfile) == EOF && error == NULL)
5625 error = got_error_from_errno("fclose");
5626 if (f1 && fclose(f1) == EOF && error == NULL)
5627 error = got_error_from_errno("fclose");
5628 if (f2 && fclose(f2) == EOF && error == NULL)
5629 error = got_error_from_errno("fclose");
5630 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5631 error = got_error_from_errno("close");
5632 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5633 error = got_error_from_errno("close");
5634 return error;
5635 }
5636
5637 __dead static void
5638 usage_blame(void)
5639 {
5640 fprintf(stderr,
5641 "usage: %s blame [-c commit] [-r repository-path] path\n",
5642 getprogname());
5643 exit(1);
5644 }
5645
5646 struct blame_line {
5647 int annotated;
5648 char *id_str;
5649 char *committer;
5650 char datebuf[11]; /* YYYY-MM-DD + NUL */
5651 };
5652
5653 struct blame_cb_args {
5654 struct blame_line *lines;
5655 int nlines;
5656 int nlines_prec;
5657 int lineno_cur;
5658 off_t *line_offsets;
5659 FILE *f;
5660 struct got_repository *repo;
5661 };
5662
5663 static const struct got_error *
5664 blame_cb(void *arg, int nlines, int lineno,
5665 struct got_commit_object *commit, struct got_object_id *id)
5666 {
5667 const struct got_error *err = NULL;
5668 struct blame_cb_args *a = arg;
5669 struct blame_line *bline;
5670 char *line = NULL;
5671 size_t linesize = 0;
5672 off_t offset;
5673 struct tm tm;
5674 time_t committer_time;
5675
5676 if (nlines != a->nlines ||
5677 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5678 return got_error(GOT_ERR_RANGE);
5679
5680 if (sigint_received)
5681 return got_error(GOT_ERR_ITER_COMPLETED);
5682
5683 if (lineno == -1)
5684 return NULL; /* no change in this commit */
5685
5686 /* Annotate this line. */
5687 bline = &a->lines[lineno - 1];
5688 if (bline->annotated)
5689 return NULL;
5690 err = got_object_id_str(&bline->id_str, id);
5691 if (err)
5692 return err;
5693
5694 bline->committer = strdup(got_object_commit_get_committer(commit));
5695 if (bline->committer == NULL) {
5696 err = got_error_from_errno("strdup");
5697 goto done;
5698 }
5699
5700 committer_time = got_object_commit_get_committer_time(commit);
5701 if (gmtime_r(&committer_time, &tm) == NULL)
5702 return got_error_from_errno("gmtime_r");
5703 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5704 &tm) == 0) {
5705 err = got_error(GOT_ERR_NO_SPACE);
5706 goto done;
5707 }
5708 bline->annotated = 1;
5709
5710 /* Print lines annotated so far. */
5711 bline = &a->lines[a->lineno_cur - 1];
5712 if (!bline->annotated)
5713 goto done;
5714
5715 offset = a->line_offsets[a->lineno_cur - 1];
5716 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5717 err = got_error_from_errno("fseeko");
5718 goto done;
5719 }
5720
5721 while (a->lineno_cur <= a->nlines && bline->annotated) {
5722 char *smallerthan, *at, *nl, *committer;
5723 size_t len;
5724
5725 if (getline(&line, &linesize, a->f) == -1) {
5726 if (ferror(a->f))
5727 err = got_error_from_errno("getline");
5728 break;
5729 }
5730
5731 committer = bline->committer;
5732 smallerthan = strchr(committer, '<');
5733 if (smallerthan && smallerthan[1] != '\0')
5734 committer = smallerthan + 1;
5735 at = strchr(committer, '@');
5736 if (at)
5737 *at = '\0';
5738 len = strlen(committer);
5739 if (len >= 9)
5740 committer[8] = '\0';
5741
5742 nl = strchr(line, '\n');
5743 if (nl)
5744 *nl = '\0';
5745 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5746 bline->id_str, bline->datebuf, committer, line);
5747
5748 a->lineno_cur++;
5749 bline = &a->lines[a->lineno_cur - 1];
5750 }
5751 done:
5752 free(line);
5753 return err;
5754 }
5755
5756 static const struct got_error *
5757 cmd_blame(int argc, char *argv[])
5758 {
5759 const struct got_error *error;
5760 struct got_repository *repo = NULL;
5761 struct got_worktree *worktree = NULL;
5762 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5763 char *link_target = NULL;
5764 struct got_object_id *obj_id = NULL;
5765 struct got_object_id *commit_id = NULL;
5766 struct got_commit_object *commit = NULL;
5767 struct got_blob_object *blob = NULL;
5768 char *commit_id_str = NULL, *keyword_idstr = NULL;
5769 struct blame_cb_args bca;
5770 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5771 off_t filesize;
5772 int *pack_fds = NULL;
5773 FILE *f1 = NULL, *f2 = NULL;
5774
5775 fd1 = got_opentempfd();
5776 if (fd1 == -1)
5777 return got_error_from_errno("got_opentempfd");
5778
5779 memset(&bca, 0, sizeof(bca));
5780
5781 #ifndef PROFILE
5782 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5783 NULL) == -1)
5784 err(1, "pledge");
5785 #endif
5786
5787 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5788 switch (ch) {
5789 case 'c':
5790 commit_id_str = optarg;
5791 break;
5792 case 'r':
5793 repo_path = realpath(optarg, NULL);
5794 if (repo_path == NULL)
5795 return got_error_from_errno2("realpath",
5796 optarg);
5797 got_path_strip_trailing_slashes(repo_path);
5798 break;
5799 default:
5800 usage_blame();
5801 /* NOTREACHED */
5802 }
5803 }
5804
5805 argc -= optind;
5806 argv += optind;
5807
5808 if (argc == 1)
5809 path = argv[0];
5810 else
5811 usage_blame();
5812
5813 cwd = getcwd(NULL, 0);
5814 if (cwd == NULL) {
5815 error = got_error_from_errno("getcwd");
5816 goto done;
5817 }
5818
5819 error = got_repo_pack_fds_open(&pack_fds);
5820 if (error != NULL)
5821 goto done;
5822
5823 if (repo_path == NULL) {
5824 error = got_worktree_open(&worktree, cwd,
5825 GOT_WORKTREE_GOT_DIR);
5826 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5827 goto done;
5828 else
5829 error = NULL;
5830 if (worktree) {
5831 repo_path =
5832 strdup(got_worktree_get_repo_path(worktree));
5833 if (repo_path == NULL) {
5834 error = got_error_from_errno("strdup");
5835 if (error)
5836 goto done;
5837 }
5838 } else {
5839 repo_path = strdup(cwd);
5840 if (repo_path == NULL) {
5841 error = got_error_from_errno("strdup");
5842 goto done;
5843 }
5844 }
5845 }
5846
5847 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5848 if (error != NULL)
5849 goto done;
5850
5851 if (worktree) {
5852 const char *prefix = got_worktree_get_path_prefix(worktree);
5853 char *p;
5854
5855 error = got_worktree_resolve_path(&p, worktree, path);
5856 if (error)
5857 goto done;
5858 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5859 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5860 p) == -1) {
5861 error = got_error_from_errno("asprintf");
5862 free(p);
5863 goto done;
5864 }
5865 free(p);
5866 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5867 } else {
5868 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5869 if (error)
5870 goto done;
5871 error = got_repo_map_path(&in_repo_path, repo, path);
5872 }
5873 if (error)
5874 goto done;
5875
5876 if (commit_id_str == NULL) {
5877 struct got_reference *head_ref;
5878 error = got_ref_open(&head_ref, repo, worktree ?
5879 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5880 if (error != NULL)
5881 goto done;
5882 error = got_ref_resolve(&commit_id, repo, head_ref);
5883 got_ref_close(head_ref);
5884 if (error != NULL)
5885 goto done;
5886 } else {
5887 struct got_reflist_head refs;
5888
5889 TAILQ_INIT(&refs);
5890 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5891 NULL);
5892 if (error)
5893 goto done;
5894
5895 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
5896 repo, worktree);
5897 if (error != NULL)
5898 goto done;
5899 if (keyword_idstr != NULL)
5900 commit_id_str = keyword_idstr;
5901
5902 error = got_repo_match_object_id(&commit_id, NULL,
5903 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5904 got_ref_list_free(&refs);
5905 if (error)
5906 goto done;
5907 }
5908
5909 if (worktree) {
5910 /* Release work tree lock. */
5911 got_worktree_close(worktree);
5912 worktree = NULL;
5913 }
5914
5915 error = got_object_open_as_commit(&commit, repo, commit_id);
5916 if (error)
5917 goto done;
5918
5919 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5920 commit, repo);
5921 if (error)
5922 goto done;
5923
5924 error = got_object_id_by_path(&obj_id, repo, commit,
5925 link_target ? link_target : in_repo_path);
5926 if (error)
5927 goto done;
5928
5929 error = got_object_get_type(&obj_type, repo, obj_id);
5930 if (error)
5931 goto done;
5932
5933 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5934 error = got_error_path(link_target ? link_target : in_repo_path,
5935 GOT_ERR_OBJ_TYPE);
5936 goto done;
5937 }
5938
5939 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5940 if (error)
5941 goto done;
5942 bca.f = got_opentemp();
5943 if (bca.f == NULL) {
5944 error = got_error_from_errno("got_opentemp");
5945 goto done;
5946 }
5947 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5948 &bca.line_offsets, bca.f, blob);
5949 if (error || bca.nlines == 0)
5950 goto done;
5951
5952 /* Don't include \n at EOF in the blame line count. */
5953 if (bca.line_offsets[bca.nlines - 1] == filesize)
5954 bca.nlines--;
5955
5956 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5957 if (bca.lines == NULL) {
5958 error = got_error_from_errno("calloc");
5959 goto done;
5960 }
5961 bca.lineno_cur = 1;
5962 bca.nlines_prec = 0;
5963 i = bca.nlines;
5964 while (i > 0) {
5965 i /= 10;
5966 bca.nlines_prec++;
5967 }
5968 bca.repo = repo;
5969
5970 fd2 = got_opentempfd();
5971 if (fd2 == -1) {
5972 error = got_error_from_errno("got_opentempfd");
5973 goto done;
5974 }
5975 fd3 = got_opentempfd();
5976 if (fd3 == -1) {
5977 error = got_error_from_errno("got_opentempfd");
5978 goto done;
5979 }
5980 f1 = got_opentemp();
5981 if (f1 == NULL) {
5982 error = got_error_from_errno("got_opentemp");
5983 goto done;
5984 }
5985 f2 = got_opentemp();
5986 if (f2 == NULL) {
5987 error = got_error_from_errno("got_opentemp");
5988 goto done;
5989 }
5990 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5991 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5992 check_cancelled, NULL, fd2, fd3, f1, f2);
5993 done:
5994 free(keyword_idstr);
5995 free(in_repo_path);
5996 free(link_target);
5997 free(repo_path);
5998 free(cwd);
5999 free(commit_id);
6000 free(obj_id);
6001 if (commit)
6002 got_object_commit_close(commit);
6003
6004 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
6005 error = got_error_from_errno("close");
6006 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
6007 error = got_error_from_errno("close");
6008 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
6009 error = got_error_from_errno("close");
6010 if (f1 && fclose(f1) == EOF && error == NULL)
6011 error = got_error_from_errno("fclose");
6012 if (f2 && fclose(f2) == EOF && error == NULL)
6013 error = got_error_from_errno("fclose");
6014
6015 if (blob)
6016 got_object_blob_close(blob);
6017 if (worktree)
6018 got_worktree_close(worktree);
6019 if (repo) {
6020 const struct got_error *close_err = got_repo_close(repo);
6021 if (error == NULL)
6022 error = close_err;
6023 }
6024 if (pack_fds) {
6025 const struct got_error *pack_err =
6026 got_repo_pack_fds_close(pack_fds);
6027 if (error == NULL)
6028 error = pack_err;
6029 }
6030 if (bca.lines) {
6031 for (i = 0; i < bca.nlines; i++) {
6032 struct blame_line *bline = &bca.lines[i];
6033 free(bline->id_str);
6034 free(bline->committer);
6035 }
6036 free(bca.lines);
6037 }
6038 free(bca.line_offsets);
6039 if (bca.f && fclose(bca.f) == EOF && error == NULL)
6040 error = got_error_from_errno("fclose");
6041 return error;
6042 }
6043
6044 __dead static void
6045 usage_tree(void)
6046 {
6047 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
6048 "[path]\n", getprogname());
6049 exit(1);
6050 }
6051
6052 static const struct got_error *
6053 print_entry(struct got_tree_entry *te, const char *id, const char *path,
6054 const char *root_path, struct got_repository *repo)
6055 {
6056 const struct got_error *err = NULL;
6057 int is_root_path = (strcmp(path, root_path) == 0);
6058 const char *modestr = "";
6059 mode_t mode = got_tree_entry_get_mode(te);
6060 char *link_target = NULL;
6061
6062 path += strlen(root_path);
6063 while (path[0] == '/')
6064 path++;
6065
6066 if (got_object_tree_entry_is_submodule(te))
6067 modestr = "$";
6068 else if (S_ISLNK(mode)) {
6069 int i;
6070
6071 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
6072 if (err)
6073 return err;
6074 for (i = 0; link_target[i] != '\0'; i++) {
6075 if (!isprint((unsigned char)link_target[i]))
6076 link_target[i] = '?';
6077 }
6078
6079 modestr = "@";
6080 }
6081 else if (S_ISDIR(mode))
6082 modestr = "/";
6083 else if (mode & S_IXUSR)
6084 modestr = "*";
6085
6086 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
6087 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
6088 link_target ? " -> ": "", link_target ? link_target : "");
6089
6090 free(link_target);
6091 return NULL;
6092 }
6093
6094 static const struct got_error *
6095 print_tree(const char *path, struct got_commit_object *commit,
6096 int show_ids, int recurse, const char *root_path,
6097 struct got_repository *repo)
6098 {
6099 const struct got_error *err = NULL;
6100 struct got_object_id *tree_id = NULL;
6101 struct got_tree_object *tree = NULL;
6102 int nentries, i;
6103
6104 err = got_object_id_by_path(&tree_id, repo, commit, path);
6105 if (err)
6106 goto done;
6107
6108 err = got_object_open_as_tree(&tree, repo, tree_id);
6109 if (err)
6110 goto done;
6111 nentries = got_object_tree_get_nentries(tree);
6112 for (i = 0; i < nentries; i++) {
6113 struct got_tree_entry *te;
6114 char *id = NULL;
6115
6116 if (sigint_received || sigpipe_received)
6117 break;
6118
6119 te = got_object_tree_get_entry(tree, i);
6120 if (show_ids) {
6121 char *id_str;
6122 err = got_object_id_str(&id_str,
6123 got_tree_entry_get_id(te));
6124 if (err)
6125 goto done;
6126 if (asprintf(&id, "%s ", id_str) == -1) {
6127 err = got_error_from_errno("asprintf");
6128 free(id_str);
6129 goto done;
6130 }
6131 free(id_str);
6132 }
6133 err = print_entry(te, id, path, root_path, repo);
6134 free(id);
6135 if (err)
6136 goto done;
6137
6138 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
6139 char *child_path;
6140 if (asprintf(&child_path, "%s%s%s", path,
6141 path[0] == '/' && path[1] == '\0' ? "" : "/",
6142 got_tree_entry_get_name(te)) == -1) {
6143 err = got_error_from_errno("asprintf");
6144 goto done;
6145 }
6146 err = print_tree(child_path, commit, show_ids, 1,
6147 root_path, repo);
6148 free(child_path);
6149 if (err)
6150 goto done;
6151 }
6152 }
6153 done:
6154 if (tree)
6155 got_object_tree_close(tree);
6156 free(tree_id);
6157 return err;
6158 }
6159
6160 static const struct got_error *
6161 cmd_tree(int argc, char *argv[])
6162 {
6163 const struct got_error *error;
6164 struct got_repository *repo = NULL;
6165 struct got_worktree *worktree = NULL;
6166 const char *path, *refname = NULL;
6167 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6168 struct got_object_id *commit_id = NULL;
6169 struct got_commit_object *commit = NULL;
6170 char *commit_id_str = NULL, *keyword_idstr = NULL;
6171 int show_ids = 0, recurse = 0;
6172 int ch;
6173 int *pack_fds = NULL;
6174
6175 #ifndef PROFILE
6176 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6177 NULL) == -1)
6178 err(1, "pledge");
6179 #endif
6180
6181 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6182 switch (ch) {
6183 case 'c':
6184 commit_id_str = optarg;
6185 break;
6186 case 'i':
6187 show_ids = 1;
6188 break;
6189 case 'R':
6190 recurse = 1;
6191 break;
6192 case 'r':
6193 repo_path = realpath(optarg, NULL);
6194 if (repo_path == NULL)
6195 return got_error_from_errno2("realpath",
6196 optarg);
6197 got_path_strip_trailing_slashes(repo_path);
6198 break;
6199 default:
6200 usage_tree();
6201 /* NOTREACHED */
6202 }
6203 }
6204
6205 argc -= optind;
6206 argv += optind;
6207
6208 if (argc == 1)
6209 path = argv[0];
6210 else if (argc > 1)
6211 usage_tree();
6212 else
6213 path = NULL;
6214
6215 cwd = getcwd(NULL, 0);
6216 if (cwd == NULL) {
6217 error = got_error_from_errno("getcwd");
6218 goto done;
6219 }
6220
6221 error = got_repo_pack_fds_open(&pack_fds);
6222 if (error != NULL)
6223 goto done;
6224
6225 if (repo_path == NULL) {
6226 error = got_worktree_open(&worktree, cwd,
6227 GOT_WORKTREE_GOT_DIR);
6228 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6229 goto done;
6230 else
6231 error = NULL;
6232 if (worktree) {
6233 repo_path =
6234 strdup(got_worktree_get_repo_path(worktree));
6235 if (repo_path == NULL)
6236 error = got_error_from_errno("strdup");
6237 if (error)
6238 goto done;
6239 } else {
6240 repo_path = strdup(cwd);
6241 if (repo_path == NULL) {
6242 error = got_error_from_errno("strdup");
6243 goto done;
6244 }
6245 }
6246 }
6247
6248 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6249 if (error != NULL)
6250 goto done;
6251
6252 if (worktree) {
6253 const char *prefix = got_worktree_get_path_prefix(worktree);
6254 char *p;
6255
6256 if (path == NULL || got_path_is_root_dir(path))
6257 path = "";
6258 error = got_worktree_resolve_path(&p, worktree, path);
6259 if (error)
6260 goto done;
6261 if (asprintf(&in_repo_path, "%s%s%s", prefix,
6262 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
6263 p) == -1) {
6264 error = got_error_from_errno("asprintf");
6265 free(p);
6266 goto done;
6267 }
6268 free(p);
6269 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6270 if (error)
6271 goto done;
6272 } else {
6273 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6274 if (error)
6275 goto done;
6276 if (path == NULL)
6277 path = "/";
6278 error = got_repo_map_path(&in_repo_path, repo, path);
6279 if (error != NULL)
6280 goto done;
6281 }
6282
6283 if (commit_id_str == NULL) {
6284 struct got_reference *head_ref;
6285 if (worktree)
6286 refname = got_worktree_get_head_ref_name(worktree);
6287 else
6288 refname = GOT_REF_HEAD;
6289 error = got_ref_open(&head_ref, repo, refname, 0);
6290 if (error != NULL)
6291 goto done;
6292 error = got_ref_resolve(&commit_id, repo, head_ref);
6293 got_ref_close(head_ref);
6294 if (error != NULL)
6295 goto done;
6296 } else {
6297 struct got_reflist_head refs;
6298
6299 TAILQ_INIT(&refs);
6300 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6301 NULL);
6302 if (error)
6303 goto done;
6304
6305 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
6306 repo, worktree);
6307 if (error != NULL)
6308 goto done;
6309 if (keyword_idstr != NULL)
6310 commit_id_str = keyword_idstr;
6311
6312 error = got_repo_match_object_id(&commit_id, NULL,
6313 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6314 got_ref_list_free(&refs);
6315 if (error)
6316 goto done;
6317 }
6318
6319 if (worktree) {
6320 /* Release work tree lock. */
6321 got_worktree_close(worktree);
6322 worktree = NULL;
6323 }
6324
6325 error = got_object_open_as_commit(&commit, repo, commit_id);
6326 if (error)
6327 goto done;
6328
6329 error = print_tree(in_repo_path, commit, show_ids, recurse,
6330 in_repo_path, repo);
6331 done:
6332 free(keyword_idstr);
6333 free(in_repo_path);
6334 free(repo_path);
6335 free(cwd);
6336 free(commit_id);
6337 if (commit)
6338 got_object_commit_close(commit);
6339 if (worktree)
6340 got_worktree_close(worktree);
6341 if (repo) {
6342 const struct got_error *close_err = got_repo_close(repo);
6343 if (error == NULL)
6344 error = close_err;
6345 }
6346 if (pack_fds) {
6347 const struct got_error *pack_err =
6348 got_repo_pack_fds_close(pack_fds);
6349 if (error == NULL)
6350 error = pack_err;
6351 }
6352 return error;
6353 }
6354
6355 __dead static void
6356 usage_status(void)
6357 {
6358 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6359 "[-s status-codes] [path ...]\n", getprogname());
6360 exit(1);
6361 }
6362
6363 struct got_status_arg {
6364 char *status_codes;
6365 int suppress;
6366 };
6367
6368 static const struct got_error *
6369 print_status(void *arg, unsigned char status, unsigned char staged_status,
6370 const char *path, struct got_object_id *blob_id,
6371 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6372 int dirfd, const char *de_name)
6373 {
6374 struct got_status_arg *st = arg;
6375
6376 if (status == staged_status && (status == GOT_STATUS_DELETE))
6377 status = GOT_STATUS_NO_CHANGE;
6378 if (st != NULL && st->status_codes) {
6379 size_t ncodes = strlen(st->status_codes);
6380 int i, j = 0;
6381
6382 for (i = 0; i < ncodes ; i++) {
6383 if (st->suppress) {
6384 if (status == st->status_codes[i] ||
6385 staged_status == st->status_codes[i]) {
6386 j++;
6387 continue;
6388 }
6389 } else {
6390 if (status == st->status_codes[i] ||
6391 staged_status == st->status_codes[i])
6392 break;
6393 }
6394 }
6395
6396 if (st->suppress && j == 0)
6397 goto print;
6398
6399 if (i == ncodes)
6400 return NULL;
6401 }
6402 print:
6403 printf("%c%c %s\n", status, staged_status, path);
6404 return NULL;
6405 }
6406
6407 static const struct got_error *
6408 cmd_status(int argc, char *argv[])
6409 {
6410 const struct got_error *error = NULL;
6411 struct got_repository *repo = NULL;
6412 struct got_worktree *worktree = NULL;
6413 struct got_status_arg st;
6414 char *cwd = NULL;
6415 struct got_pathlist_head paths;
6416 int ch, i, no_ignores = 0;
6417 int *pack_fds = NULL;
6418
6419 TAILQ_INIT(&paths);
6420
6421 memset(&st, 0, sizeof(st));
6422 st.status_codes = NULL;
6423 st.suppress = 0;
6424
6425 #ifndef PROFILE
6426 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6427 NULL) == -1)
6428 err(1, "pledge");
6429 #endif
6430
6431 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6432 switch (ch) {
6433 case 'I':
6434 no_ignores = 1;
6435 break;
6436 case 'S':
6437 if (st.status_codes != NULL && st.suppress == 0)
6438 option_conflict('S', 's');
6439 st.suppress = 1;
6440 /* fallthrough */
6441 case 's':
6442 for (i = 0; optarg[i] != '\0'; i++) {
6443 switch (optarg[i]) {
6444 case GOT_STATUS_MODIFY:
6445 case GOT_STATUS_ADD:
6446 case GOT_STATUS_DELETE:
6447 case GOT_STATUS_CONFLICT:
6448 case GOT_STATUS_MISSING:
6449 case GOT_STATUS_OBSTRUCTED:
6450 case GOT_STATUS_UNVERSIONED:
6451 case GOT_STATUS_MODE_CHANGE:
6452 case GOT_STATUS_NONEXISTENT:
6453 break;
6454 default:
6455 errx(1, "invalid status code '%c'",
6456 optarg[i]);
6457 }
6458 }
6459 if (ch == 's' && st.suppress)
6460 option_conflict('s', 'S');
6461 st.status_codes = optarg;
6462 break;
6463 default:
6464 usage_status();
6465 /* NOTREACHED */
6466 }
6467 }
6468
6469 argc -= optind;
6470 argv += optind;
6471
6472 cwd = getcwd(NULL, 0);
6473 if (cwd == NULL) {
6474 error = got_error_from_errno("getcwd");
6475 goto done;
6476 }
6477
6478 error = got_repo_pack_fds_open(&pack_fds);
6479 if (error != NULL)
6480 goto done;
6481
6482 error = got_worktree_open(&worktree, cwd,
6483 GOT_WORKTREE_GOT_DIR);
6484 if (error) {
6485 if (error->code == GOT_ERR_NOT_WORKTREE)
6486 error = wrap_not_worktree_error(error, "status", cwd);
6487 goto done;
6488 }
6489
6490 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6491 NULL, pack_fds);
6492 if (error != NULL)
6493 goto done;
6494
6495 error = apply_unveil(got_repo_get_path(repo), 1,
6496 got_worktree_get_root_path(worktree));
6497 if (error)
6498 goto done;
6499
6500 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6501 if (error)
6502 goto done;
6503
6504 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6505 print_status, &st, check_cancelled, NULL);
6506 done:
6507 if (pack_fds) {
6508 const struct got_error *pack_err =
6509 got_repo_pack_fds_close(pack_fds);
6510 if (error == NULL)
6511 error = pack_err;
6512 }
6513 if (repo) {
6514 const struct got_error *close_err = got_repo_close(repo);
6515 if (error == NULL)
6516 error = close_err;
6517 }
6518
6519 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6520 free(cwd);
6521 return error;
6522 }
6523
6524 __dead static void
6525 usage_ref(void)
6526 {
6527 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6528 "[-s reference] [name]\n", getprogname());
6529 exit(1);
6530 }
6531
6532 static const struct got_error *
6533 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6534 {
6535 static const struct got_error *err = NULL;
6536 struct got_reflist_head refs;
6537 struct got_reflist_entry *re;
6538
6539 TAILQ_INIT(&refs);
6540 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6541 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6542 repo);
6543 if (err)
6544 return err;
6545
6546 TAILQ_FOREACH(re, &refs, entry) {
6547 char *refstr;
6548 refstr = got_ref_to_str(re->ref);
6549 if (refstr == NULL) {
6550 err = got_error_from_errno("got_ref_to_str");
6551 break;
6552 }
6553 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6554 free(refstr);
6555 }
6556
6557 got_ref_list_free(&refs);
6558 return err;
6559 }
6560
6561 static const struct got_error *
6562 delete_ref_by_name(struct got_repository *repo, const char *refname)
6563 {
6564 const struct got_error *err;
6565 struct got_reference *ref;
6566
6567 err = got_ref_open(&ref, repo, refname, 0);
6568 if (err)
6569 return err;
6570
6571 err = delete_ref(repo, ref);
6572 got_ref_close(ref);
6573 return err;
6574 }
6575
6576 static const struct got_error *
6577 add_ref(struct got_repository *repo, const char *refname, const char *target)
6578 {
6579 const struct got_error *err = NULL;
6580 struct got_object_id *id = NULL;
6581 struct got_reference *ref = NULL;
6582 struct got_reflist_head refs;
6583
6584 /*
6585 * Don't let the user create a reference name with a leading '-'.
6586 * While technically a valid reference name, this case is usually
6587 * an unintended typo.
6588 */
6589 if (refname[0] == '-')
6590 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6591
6592 TAILQ_INIT(&refs);
6593 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6594 if (err)
6595 goto done;
6596 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6597 &refs, repo);
6598 got_ref_list_free(&refs);
6599 if (err)
6600 goto done;
6601
6602 err = got_ref_alloc(&ref, refname, id);
6603 if (err)
6604 goto done;
6605
6606 err = got_ref_write(ref, repo);
6607 done:
6608 if (ref)
6609 got_ref_close(ref);
6610 free(id);
6611 return err;
6612 }
6613
6614 static const struct got_error *
6615 add_symref(struct got_repository *repo, const char *refname, const char *target)
6616 {
6617 const struct got_error *err = NULL;
6618 struct got_reference *ref = NULL;
6619 struct got_reference *target_ref = NULL;
6620
6621 /*
6622 * Don't let the user create a reference name with a leading '-'.
6623 * While technically a valid reference name, this case is usually
6624 * an unintended typo.
6625 */
6626 if (refname[0] == '-')
6627 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6628
6629 err = got_ref_open(&target_ref, repo, target, 0);
6630 if (err)
6631 return err;
6632
6633 err = got_ref_alloc_symref(&ref, refname, target_ref);
6634 if (err)
6635 goto done;
6636
6637 err = got_ref_write(ref, repo);
6638 done:
6639 if (target_ref)
6640 got_ref_close(target_ref);
6641 if (ref)
6642 got_ref_close(ref);
6643 return err;
6644 }
6645
6646 static const struct got_error *
6647 cmd_ref(int argc, char *argv[])
6648 {
6649 const struct got_error *error = NULL;
6650 struct got_repository *repo = NULL;
6651 struct got_worktree *worktree = NULL;
6652 char *cwd = NULL, *repo_path = NULL;
6653 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6654 const char *obj_arg = NULL, *symref_target= NULL;
6655 char *refname = NULL, *keyword_idstr = NULL;
6656 int *pack_fds = NULL;
6657
6658 #ifndef PROFILE
6659 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6660 "sendfd unveil", NULL) == -1)
6661 err(1, "pledge");
6662 #endif
6663
6664 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6665 switch (ch) {
6666 case 'c':
6667 obj_arg = optarg;
6668 break;
6669 case 'd':
6670 do_delete = 1;
6671 break;
6672 case 'l':
6673 do_list = 1;
6674 break;
6675 case 'r':
6676 repo_path = realpath(optarg, NULL);
6677 if (repo_path == NULL)
6678 return got_error_from_errno2("realpath",
6679 optarg);
6680 got_path_strip_trailing_slashes(repo_path);
6681 break;
6682 case 's':
6683 symref_target = optarg;
6684 break;
6685 case 't':
6686 sort_by_time = 1;
6687 break;
6688 default:
6689 usage_ref();
6690 /* NOTREACHED */
6691 }
6692 }
6693
6694 if (obj_arg && do_list)
6695 option_conflict('c', 'l');
6696 if (obj_arg && do_delete)
6697 option_conflict('c', 'd');
6698 if (obj_arg && symref_target)
6699 option_conflict('c', 's');
6700 if (symref_target && do_delete)
6701 option_conflict('s', 'd');
6702 if (symref_target && do_list)
6703 option_conflict('s', 'l');
6704 if (do_delete && do_list)
6705 option_conflict('d', 'l');
6706 if (sort_by_time && !do_list)
6707 errx(1, "-t option requires -l option");
6708
6709 argc -= optind;
6710 argv += optind;
6711
6712 if (do_list) {
6713 if (argc != 0 && argc != 1)
6714 usage_ref();
6715 if (argc == 1) {
6716 refname = strdup(argv[0]);
6717 if (refname == NULL) {
6718 error = got_error_from_errno("strdup");
6719 goto done;
6720 }
6721 }
6722 } else {
6723 if (argc != 1)
6724 usage_ref();
6725 refname = strdup(argv[0]);
6726 if (refname == NULL) {
6727 error = got_error_from_errno("strdup");
6728 goto done;
6729 }
6730 }
6731
6732 if (refname)
6733 got_path_strip_trailing_slashes(refname);
6734
6735 cwd = getcwd(NULL, 0);
6736 if (cwd == NULL) {
6737 error = got_error_from_errno("getcwd");
6738 goto done;
6739 }
6740
6741 error = got_repo_pack_fds_open(&pack_fds);
6742 if (error != NULL)
6743 goto done;
6744
6745 if (repo_path == NULL) {
6746 error = got_worktree_open(&worktree, cwd,
6747 GOT_WORKTREE_GOT_DIR);
6748 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6749 goto done;
6750 else
6751 error = NULL;
6752 if (worktree) {
6753 repo_path =
6754 strdup(got_worktree_get_repo_path(worktree));
6755 if (repo_path == NULL)
6756 error = got_error_from_errno("strdup");
6757 if (error)
6758 goto done;
6759 } else {
6760 repo_path = strdup(cwd);
6761 if (repo_path == NULL) {
6762 error = got_error_from_errno("strdup");
6763 goto done;
6764 }
6765 }
6766 }
6767
6768 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6769 if (error != NULL)
6770 goto done;
6771
6772 #ifndef PROFILE
6773 if (do_list) {
6774 /* Remove "cpath" promise. */
6775 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6776 NULL) == -1)
6777 err(1, "pledge");
6778 }
6779 #endif
6780
6781 error = apply_unveil(got_repo_get_path(repo), do_list,
6782 worktree ? got_worktree_get_root_path(worktree) : NULL);
6783 if (error)
6784 goto done;
6785
6786 if (do_list)
6787 error = list_refs(repo, refname, sort_by_time);
6788 else if (do_delete)
6789 error = delete_ref_by_name(repo, refname);
6790 else if (symref_target)
6791 error = add_symref(repo, refname, symref_target);
6792 else {
6793 if (obj_arg == NULL)
6794 usage_ref();
6795
6796 error = got_keyword_to_idstr(&keyword_idstr, obj_arg,
6797 repo, worktree);
6798 if (error != NULL)
6799 goto done;
6800 if (keyword_idstr != NULL)
6801 obj_arg = keyword_idstr;
6802
6803 error = add_ref(repo, refname, obj_arg);
6804 }
6805 done:
6806 free(refname);
6807 if (repo) {
6808 const struct got_error *close_err = got_repo_close(repo);
6809 if (error == NULL)
6810 error = close_err;
6811 }
6812 if (worktree)
6813 got_worktree_close(worktree);
6814 if (pack_fds) {
6815 const struct got_error *pack_err =
6816 got_repo_pack_fds_close(pack_fds);
6817 if (error == NULL)
6818 error = pack_err;
6819 }
6820 free(cwd);
6821 free(repo_path);
6822 free(keyword_idstr);
6823 return error;
6824 }
6825
6826 __dead static void
6827 usage_branch(void)
6828 {
6829 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6830 "[-r repository-path] [name]\n", getprogname());
6831 exit(1);
6832 }
6833
6834 static const struct got_error *
6835 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6836 struct got_reference *ref)
6837 {
6838 const struct got_error *err = NULL;
6839 const char *refname;
6840 char *refstr;
6841 char marker = ' ';
6842
6843 refname = got_ref_get_name(ref);
6844 if (worktree && strcmp(refname,
6845 got_worktree_get_head_ref_name(worktree)) == 0) {
6846 err = got_worktree_get_state(&marker, repo, worktree,
6847 check_cancelled, NULL);
6848 if (err != NULL)
6849 return err;
6850 }
6851
6852 if (strncmp(refname, "refs/heads/", 11) == 0)
6853 refname += 11;
6854 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6855 refname += 18;
6856 if (strncmp(refname, "refs/remotes/", 13) == 0)
6857 refname += 13;
6858
6859 refstr = got_ref_to_str(ref);
6860 if (refstr == NULL)
6861 return got_error_from_errno("got_ref_to_str");
6862
6863 printf("%c %s: %s\n", marker, refname, refstr);
6864 free(refstr);
6865 return NULL;
6866 }
6867
6868 static const struct got_error *
6869 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6870 {
6871 const char *refname;
6872
6873 if (worktree == NULL)
6874 return got_error(GOT_ERR_NOT_WORKTREE);
6875
6876 refname = got_worktree_get_head_ref_name(worktree);
6877
6878 if (strncmp(refname, "refs/heads/", 11) == 0)
6879 refname += 11;
6880 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6881 refname += 18;
6882
6883 printf("%s\n", refname);
6884
6885 return NULL;
6886 }
6887
6888 static const struct got_error *
6889 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6890 int sort_by_time)
6891 {
6892 static const struct got_error *err = NULL;
6893 struct got_reflist_head refs;
6894 struct got_reflist_entry *re;
6895 struct got_reference *temp_ref = NULL;
6896 int rebase_in_progress, histedit_in_progress;
6897
6898 TAILQ_INIT(&refs);
6899
6900 if (worktree) {
6901 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6902 worktree);
6903 if (err)
6904 return err;
6905
6906 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6907 worktree);
6908 if (err)
6909 return err;
6910
6911 if (rebase_in_progress || histedit_in_progress) {
6912 err = got_ref_open(&temp_ref, repo,
6913 got_worktree_get_head_ref_name(worktree), 0);
6914 if (err)
6915 return err;
6916 list_branch(repo, worktree, temp_ref);
6917 got_ref_close(temp_ref);
6918 }
6919 }
6920
6921 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6922 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6923 repo);
6924 if (err)
6925 return err;
6926
6927 TAILQ_FOREACH(re, &refs, entry)
6928 list_branch(repo, worktree, re->ref);
6929
6930 got_ref_list_free(&refs);
6931
6932 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6933 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6934 repo);
6935 if (err)
6936 return err;
6937
6938 TAILQ_FOREACH(re, &refs, entry)
6939 list_branch(repo, worktree, re->ref);
6940
6941 got_ref_list_free(&refs);
6942
6943 return NULL;
6944 }
6945
6946 static const struct got_error *
6947 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6948 const char *branch_name)
6949 {
6950 const struct got_error *err = NULL;
6951 struct got_reference *ref = NULL;
6952 char *refname, *remote_refname = NULL;
6953
6954 if (strncmp(branch_name, "refs/", 5) == 0)
6955 branch_name += 5;
6956 if (strncmp(branch_name, "heads/", 6) == 0)
6957 branch_name += 6;
6958 else if (strncmp(branch_name, "remotes/", 8) == 0)
6959 branch_name += 8;
6960
6961 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6962 return got_error_from_errno("asprintf");
6963
6964 if (asprintf(&remote_refname, "refs/remotes/%s",
6965 branch_name) == -1) {
6966 err = got_error_from_errno("asprintf");
6967 goto done;
6968 }
6969
6970 err = got_ref_open(&ref, repo, refname, 0);
6971 if (err) {
6972 const struct got_error *err2;
6973 if (err->code != GOT_ERR_NOT_REF)
6974 goto done;
6975 /*
6976 * Keep 'err' intact such that if neither branch exists
6977 * we report "refs/heads" rather than "refs/remotes" in
6978 * our error message.
6979 */
6980 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6981 if (err2)
6982 goto done;
6983 err = NULL;
6984 }
6985
6986 if (worktree &&
6987 strcmp(got_worktree_get_head_ref_name(worktree),
6988 got_ref_get_name(ref)) == 0) {
6989 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6990 "will not delete this work tree's current branch");
6991 goto done;
6992 }
6993
6994 err = delete_ref(repo, ref);
6995 done:
6996 if (ref)
6997 got_ref_close(ref);
6998 free(refname);
6999 free(remote_refname);
7000 return err;
7001 }
7002
7003 static const struct got_error *
7004 add_branch(struct got_repository *repo, const char *branch_name,
7005 struct got_object_id *base_commit_id)
7006 {
7007 const struct got_error *err = NULL;
7008 struct got_reference *ref = NULL;
7009 char *refname = NULL;
7010
7011 /*
7012 * Don't let the user create a branch name with a leading '-'.
7013 * While technically a valid reference name, this case is usually
7014 * an unintended typo.
7015 */
7016 if (branch_name[0] == '-')
7017 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
7018
7019 if (strncmp(branch_name, "refs/heads/", 11) == 0)
7020 branch_name += 11;
7021
7022 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
7023 err = got_error_from_errno("asprintf");
7024 goto done;
7025 }
7026
7027 err = got_ref_open(&ref, repo, refname, 0);
7028 if (err == NULL) {
7029 err = got_error(GOT_ERR_BRANCH_EXISTS);
7030 goto done;
7031 } else if (err->code != GOT_ERR_NOT_REF)
7032 goto done;
7033
7034 err = got_ref_alloc(&ref, refname, base_commit_id);
7035 if (err)
7036 goto done;
7037
7038 err = got_ref_write(ref, repo);
7039 done:
7040 if (ref)
7041 got_ref_close(ref);
7042 free(refname);
7043 return err;
7044 }
7045
7046 static const struct got_error *
7047 cmd_branch(int argc, char *argv[])
7048 {
7049 const struct got_error *error = NULL;
7050 struct got_repository *repo = NULL;
7051 struct got_worktree *worktree = NULL;
7052 char *cwd = NULL, *repo_path = NULL;
7053 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
7054 const char *delref = NULL, *commit_id_arg = NULL;
7055 struct got_reference *ref = NULL;
7056 struct got_pathlist_head paths;
7057 struct got_object_id *commit_id = NULL;
7058 char *commit_id_str = NULL, *keyword_idstr = NULL;;
7059 int *pack_fds = NULL;
7060
7061 TAILQ_INIT(&paths);
7062
7063 #ifndef PROFILE
7064 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7065 "sendfd unveil", NULL) == -1)
7066 err(1, "pledge");
7067 #endif
7068
7069 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
7070 switch (ch) {
7071 case 'c':
7072 commit_id_arg = optarg;
7073 break;
7074 case 'd':
7075 delref = optarg;
7076 break;
7077 case 'l':
7078 do_list = 1;
7079 break;
7080 case 'n':
7081 do_update = 0;
7082 break;
7083 case 'r':
7084 repo_path = realpath(optarg, NULL);
7085 if (repo_path == NULL)
7086 return got_error_from_errno2("realpath",
7087 optarg);
7088 got_path_strip_trailing_slashes(repo_path);
7089 break;
7090 case 't':
7091 sort_by_time = 1;
7092 break;
7093 default:
7094 usage_branch();
7095 /* NOTREACHED */
7096 }
7097 }
7098
7099 if (do_list && delref)
7100 option_conflict('l', 'd');
7101 if (sort_by_time && !do_list)
7102 errx(1, "-t option requires -l option");
7103
7104 argc -= optind;
7105 argv += optind;
7106
7107 if (!do_list && !delref && argc == 0)
7108 do_show = 1;
7109
7110 if ((do_list || delref || do_show) && commit_id_arg != NULL)
7111 errx(1, "-c option can only be used when creating a branch");
7112
7113 if (do_list || delref) {
7114 if (argc > 0)
7115 usage_branch();
7116 } else if (!do_show && argc != 1)
7117 usage_branch();
7118
7119 cwd = getcwd(NULL, 0);
7120 if (cwd == NULL) {
7121 error = got_error_from_errno("getcwd");
7122 goto done;
7123 }
7124
7125 error = got_repo_pack_fds_open(&pack_fds);
7126 if (error != NULL)
7127 goto done;
7128
7129 if (repo_path == NULL) {
7130 error = got_worktree_open(&worktree, cwd,
7131 GOT_WORKTREE_GOT_DIR);
7132 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7133 goto done;
7134 else
7135 error = NULL;
7136 if (worktree) {
7137 repo_path =
7138 strdup(got_worktree_get_repo_path(worktree));
7139 if (repo_path == NULL)
7140 error = got_error_from_errno("strdup");
7141 if (error)
7142 goto done;
7143 } else {
7144 repo_path = strdup(cwd);
7145 if (repo_path == NULL) {
7146 error = got_error_from_errno("strdup");
7147 goto done;
7148 }
7149 }
7150 }
7151
7152 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7153 if (error != NULL)
7154 goto done;
7155
7156 #ifndef PROFILE
7157 if (do_list || do_show) {
7158 /* Remove "cpath" promise. */
7159 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7160 NULL) == -1)
7161 err(1, "pledge");
7162 }
7163 #endif
7164
7165 error = apply_unveil(got_repo_get_path(repo), do_list,
7166 worktree ? got_worktree_get_root_path(worktree) : NULL);
7167 if (error)
7168 goto done;
7169
7170 if (do_show)
7171 error = show_current_branch(repo, worktree);
7172 else if (do_list)
7173 error = list_branches(repo, worktree, sort_by_time);
7174 else if (delref)
7175 error = delete_branch(repo, worktree, delref);
7176 else {
7177 struct got_reflist_head refs;
7178 TAILQ_INIT(&refs);
7179 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
7180 NULL);
7181 if (error)
7182 goto done;
7183 if (commit_id_arg == NULL)
7184 commit_id_arg = worktree ?
7185 got_worktree_get_head_ref_name(worktree) :
7186 GOT_REF_HEAD;
7187 else {
7188 error = got_keyword_to_idstr(&keyword_idstr,
7189 commit_id_arg, repo, worktree);
7190 if (error != NULL)
7191 goto done;
7192 if (keyword_idstr != NULL)
7193 commit_id_arg = keyword_idstr;
7194 }
7195 error = got_repo_match_object_id(&commit_id, NULL,
7196 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7197 got_ref_list_free(&refs);
7198 if (error)
7199 goto done;
7200 error = add_branch(repo, argv[0], commit_id);
7201 if (error)
7202 goto done;
7203 if (worktree && do_update) {
7204 struct got_update_progress_arg upa;
7205 char *branch_refname = NULL;
7206
7207 error = got_object_id_str(&commit_id_str, commit_id);
7208 if (error)
7209 goto done;
7210 error = get_worktree_paths_from_argv(&paths, 0, NULL,
7211 worktree);
7212 if (error)
7213 goto done;
7214 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7215 == -1) {
7216 error = got_error_from_errno("asprintf");
7217 goto done;
7218 }
7219 error = got_ref_open(&ref, repo, branch_refname, 0);
7220 free(branch_refname);
7221 if (error)
7222 goto done;
7223 error = switch_head_ref(ref, commit_id, worktree,
7224 repo);
7225 if (error)
7226 goto done;
7227 error = got_worktree_set_base_commit_id(worktree, repo,
7228 commit_id);
7229 if (error)
7230 goto done;
7231 memset(&upa, 0, sizeof(upa));
7232 error = got_worktree_checkout_files(worktree, &paths,
7233 repo, update_progress, &upa, check_cancelled,
7234 NULL);
7235 if (error)
7236 goto done;
7237 if (upa.did_something) {
7238 printf("Updated to %s: %s\n",
7239 got_worktree_get_head_ref_name(worktree),
7240 commit_id_str);
7241 }
7242 print_update_progress_stats(&upa);
7243 }
7244 }
7245 done:
7246 free(keyword_idstr);
7247 if (ref)
7248 got_ref_close(ref);
7249 if (repo) {
7250 const struct got_error *close_err = got_repo_close(repo);
7251 if (error == NULL)
7252 error = close_err;
7253 }
7254 if (worktree)
7255 got_worktree_close(worktree);
7256 if (pack_fds) {
7257 const struct got_error *pack_err =
7258 got_repo_pack_fds_close(pack_fds);
7259 if (error == NULL)
7260 error = pack_err;
7261 }
7262 free(cwd);
7263 free(repo_path);
7264 free(commit_id);
7265 free(commit_id_str);
7266 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7267 return error;
7268 }
7269
7270
7271 __dead static void
7272 usage_tag(void)
7273 {
7274 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7275 "[-r repository-path] [-s signer-id] name\n", getprogname());
7276 exit(1);
7277 }
7278
7279 #if 0
7280 static const struct got_error *
7281 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7282 {
7283 const struct got_error *err = NULL;
7284 struct got_reflist_entry *re, *se, *new;
7285 struct got_object_id *re_id, *se_id;
7286 struct got_tag_object *re_tag, *se_tag;
7287 time_t re_time, se_time;
7288
7289 STAILQ_FOREACH(re, tags, entry) {
7290 se = STAILQ_FIRST(sorted);
7291 if (se == NULL) {
7292 err = got_reflist_entry_dup(&new, re);
7293 if (err)
7294 return err;
7295 STAILQ_INSERT_HEAD(sorted, new, entry);
7296 continue;
7297 } else {
7298 err = got_ref_resolve(&re_id, repo, re->ref);
7299 if (err)
7300 break;
7301 err = got_object_open_as_tag(&re_tag, repo, re_id);
7302 free(re_id);
7303 if (err)
7304 break;
7305 re_time = got_object_tag_get_tagger_time(re_tag);
7306 got_object_tag_close(re_tag);
7307 }
7308
7309 while (se) {
7310 err = got_ref_resolve(&se_id, repo, re->ref);
7311 if (err)
7312 break;
7313 err = got_object_open_as_tag(&se_tag, repo, se_id);
7314 free(se_id);
7315 if (err)
7316 break;
7317 se_time = got_object_tag_get_tagger_time(se_tag);
7318 got_object_tag_close(se_tag);
7319
7320 if (se_time > re_time) {
7321 err = got_reflist_entry_dup(&new, re);
7322 if (err)
7323 return err;
7324 STAILQ_INSERT_AFTER(sorted, se, new, entry);
7325 break;
7326 }
7327 se = STAILQ_NEXT(se, entry);
7328 continue;
7329 }
7330 }
7331 done:
7332 return err;
7333 }
7334 #endif
7335
7336 static const struct got_error *
7337 get_tag_refname(char **refname, const char *tag_name)
7338 {
7339 const struct got_error *err;
7340
7341 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7342 *refname = strdup(tag_name);
7343 if (*refname == NULL)
7344 return got_error_from_errno("strdup");
7345 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7346 err = got_error_from_errno("asprintf");
7347 *refname = NULL;
7348 return err;
7349 }
7350
7351 return NULL;
7352 }
7353
7354 static const struct got_error *
7355 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7356 const char *allowed_signers, const char *revoked_signers, int verbosity)
7357 {
7358 static const struct got_error *err = NULL;
7359 struct got_reflist_head refs;
7360 struct got_reflist_entry *re;
7361 char *wanted_refname = NULL;
7362 int bad_sigs = 0;
7363
7364 TAILQ_INIT(&refs);
7365
7366 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7367 if (err)
7368 return err;
7369
7370 if (tag_name) {
7371 struct got_reference *ref;
7372 err = get_tag_refname(&wanted_refname, tag_name);
7373 if (err)
7374 goto done;
7375 /* Wanted tag reference should exist. */
7376 err = got_ref_open(&ref, repo, wanted_refname, 0);
7377 if (err)
7378 goto done;
7379 got_ref_close(ref);
7380 }
7381
7382 TAILQ_FOREACH(re, &refs, entry) {
7383 const char *refname;
7384 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7385 char datebuf[26];
7386 const char *tagger, *ssh_sig = NULL;
7387 char *sig_msg = NULL;
7388 time_t tagger_time;
7389 struct got_object_id *id;
7390 struct got_tag_object *tag;
7391 struct got_commit_object *commit = NULL;
7392
7393 refname = got_ref_get_name(re->ref);
7394 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7395 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7396 continue;
7397 refname += 10;
7398 refstr = got_ref_to_str(re->ref);
7399 if (refstr == NULL) {
7400 err = got_error_from_errno("got_ref_to_str");
7401 break;
7402 }
7403
7404 err = got_ref_resolve(&id, repo, re->ref);
7405 if (err)
7406 break;
7407 err = got_object_open_as_tag(&tag, repo, id);
7408 if (err) {
7409 if (err->code != GOT_ERR_OBJ_TYPE) {
7410 free(id);
7411 break;
7412 }
7413 /* "lightweight" tag */
7414 err = got_object_open_as_commit(&commit, repo, id);
7415 if (err) {
7416 free(id);
7417 break;
7418 }
7419 tagger = got_object_commit_get_committer(commit);
7420 tagger_time =
7421 got_object_commit_get_committer_time(commit);
7422 err = got_object_id_str(&id_str, id);
7423 free(id);
7424 if (err)
7425 break;
7426 } else {
7427 free(id);
7428 tagger = got_object_tag_get_tagger(tag);
7429 tagger_time = got_object_tag_get_tagger_time(tag);
7430 err = got_object_id_str(&id_str,
7431 got_object_tag_get_object_id(tag));
7432 if (err)
7433 break;
7434 }
7435
7436 if (tag && verify_tags) {
7437 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7438 got_object_tag_get_message(tag));
7439 if (ssh_sig && allowed_signers == NULL) {
7440 err = got_error_msg(
7441 GOT_ERR_VERIFY_TAG_SIGNATURE,
7442 "SSH signature verification requires "
7443 "setting allowed_signers in "
7444 "got.conf(5)");
7445 break;
7446 }
7447 }
7448
7449 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7450 free(refstr);
7451 printf("from: %s\n", tagger);
7452 datestr = get_datestr(&tagger_time, datebuf);
7453 if (datestr)
7454 printf("date: %s UTC\n", datestr);
7455 if (commit)
7456 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7457 else {
7458 switch (got_object_tag_get_object_type(tag)) {
7459 case GOT_OBJ_TYPE_BLOB:
7460 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7461 id_str);
7462 break;
7463 case GOT_OBJ_TYPE_TREE:
7464 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7465 id_str);
7466 break;
7467 case GOT_OBJ_TYPE_COMMIT:
7468 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7469 id_str);
7470 break;
7471 case GOT_OBJ_TYPE_TAG:
7472 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7473 id_str);
7474 break;
7475 default:
7476 break;
7477 }
7478 }
7479 free(id_str);
7480
7481 if (ssh_sig) {
7482 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7483 allowed_signers, revoked_signers, verbosity);
7484 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7485 bad_sigs = 1;
7486 else if (err)
7487 break;
7488 printf("signature: %s", sig_msg);
7489 free(sig_msg);
7490 sig_msg = NULL;
7491 }
7492
7493 if (commit) {
7494 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7495 if (err)
7496 break;
7497 got_object_commit_close(commit);
7498 } else {
7499 tagmsg0 = strdup(got_object_tag_get_message(tag));
7500 got_object_tag_close(tag);
7501 if (tagmsg0 == NULL) {
7502 err = got_error_from_errno("strdup");
7503 break;
7504 }
7505 }
7506
7507 tagmsg = tagmsg0;
7508 do {
7509 line = strsep(&tagmsg, "\n");
7510 if (line)
7511 printf(" %s\n", line);
7512 } while (line);
7513 free(tagmsg0);
7514 }
7515 done:
7516 got_ref_list_free(&refs);
7517 free(wanted_refname);
7518
7519 if (err == NULL && bad_sigs)
7520 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7521 return err;
7522 }
7523
7524 static const struct got_error *
7525 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7526 const char *tag_name, const char *repo_path)
7527 {
7528 const struct got_error *err = NULL;
7529 char *template = NULL, *initial_content = NULL;
7530 char *editor = NULL;
7531 int initial_content_len;
7532 int fd = -1;
7533
7534 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7535 err = got_error_from_errno("asprintf");
7536 goto done;
7537 }
7538
7539 initial_content_len = asprintf(&initial_content,
7540 "\n# tagging commit %s as %s\n",
7541 commit_id_str, tag_name);
7542 if (initial_content_len == -1) {
7543 err = got_error_from_errno("asprintf");
7544 goto done;
7545 }
7546
7547 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7548 if (err)
7549 goto done;
7550
7551 if (write(fd, initial_content, initial_content_len) == -1) {
7552 err = got_error_from_errno2("write", *tagmsg_path);
7553 goto done;
7554 }
7555 if (close(fd) == -1) {
7556 err = got_error_from_errno2("close", *tagmsg_path);
7557 goto done;
7558 }
7559 fd = -1;
7560
7561 err = get_editor(&editor);
7562 if (err)
7563 goto done;
7564 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7565 initial_content_len, 1);
7566 done:
7567 free(initial_content);
7568 free(template);
7569 free(editor);
7570
7571 if (fd != -1 && close(fd) == -1 && err == NULL)
7572 err = got_error_from_errno2("close", *tagmsg_path);
7573
7574 if (err) {
7575 free(*tagmsg);
7576 *tagmsg = NULL;
7577 }
7578 return err;
7579 }
7580
7581 static const struct got_error *
7582 add_tag(struct got_repository *repo, const char *tagger,
7583 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7584 const char *signer_id, int verbosity)
7585 {
7586 const struct got_error *err = NULL;
7587 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7588 char *label = NULL, *commit_id_str = NULL;
7589 struct got_reference *ref = NULL;
7590 char *refname = NULL, *tagmsg = NULL;
7591 char *tagmsg_path = NULL, *tag_id_str = NULL;
7592 int preserve_tagmsg = 0;
7593 struct got_reflist_head refs;
7594
7595 TAILQ_INIT(&refs);
7596
7597 /*
7598 * Don't let the user create a tag name with a leading '-'.
7599 * While technically a valid reference name, this case is usually
7600 * an unintended typo.
7601 */
7602 if (tag_name[0] == '-')
7603 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7604
7605 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7606 if (err)
7607 goto done;
7608
7609 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7610 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7611 if (err)
7612 goto done;
7613
7614 err = got_object_id_str(&commit_id_str, commit_id);
7615 if (err)
7616 goto done;
7617
7618 err = get_tag_refname(&refname, tag_name);
7619 if (err)
7620 goto done;
7621 if (strncmp("refs/tags/", tag_name, 10) == 0)
7622 tag_name += 10;
7623
7624 err = got_ref_open(&ref, repo, refname, 0);
7625 if (err == NULL) {
7626 err = got_error(GOT_ERR_TAG_EXISTS);
7627 goto done;
7628 } else if (err->code != GOT_ERR_NOT_REF)
7629 goto done;
7630
7631 if (tagmsg_arg == NULL) {
7632 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7633 tag_name, got_repo_get_path(repo));
7634 if (err) {
7635 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7636 tagmsg_path != NULL)
7637 preserve_tagmsg = 1;
7638 goto done;
7639 }
7640 /* Editor is done; we can now apply unveil(2) */
7641 err = got_sigs_apply_unveil();
7642 if (err)
7643 goto done;
7644 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7645 if (err)
7646 goto done;
7647 }
7648
7649 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7650 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7651 verbosity);
7652 if (err) {
7653 if (tagmsg_path)
7654 preserve_tagmsg = 1;
7655 goto done;
7656 }
7657
7658 err = got_ref_alloc(&ref, refname, tag_id);
7659 if (err) {
7660 if (tagmsg_path)
7661 preserve_tagmsg = 1;
7662 goto done;
7663 }
7664
7665 err = got_ref_write(ref, repo);
7666 if (err) {
7667 if (tagmsg_path)
7668 preserve_tagmsg = 1;
7669 goto done;
7670 }
7671
7672 err = got_object_id_str(&tag_id_str, tag_id);
7673 if (err) {
7674 if (tagmsg_path)
7675 preserve_tagmsg = 1;
7676 goto done;
7677 }
7678 printf("Created tag %s\n", tag_id_str);
7679 done:
7680 if (preserve_tagmsg) {
7681 fprintf(stderr, "%s: tag message preserved in %s\n",
7682 getprogname(), tagmsg_path);
7683 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7684 err = got_error_from_errno2("unlink", tagmsg_path);
7685 free(tag_id_str);
7686 if (ref)
7687 got_ref_close(ref);
7688 free(commit_id);
7689 free(commit_id_str);
7690 free(refname);
7691 free(tagmsg);
7692 free(tagmsg_path);
7693 got_ref_list_free(&refs);
7694 return err;
7695 }
7696
7697 static const struct got_error *
7698 cmd_tag(int argc, char *argv[])
7699 {
7700 const struct got_error *error = NULL;
7701 struct got_repository *repo = NULL;
7702 struct got_worktree *worktree = NULL;
7703 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7704 char *gitconfig_path = NULL, *tagger = NULL, *keyword_idstr = NULL;
7705 char *allowed_signers = NULL, *revoked_signers = NULL;
7706 const char *signer_id = NULL;
7707 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7708 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7709 int *pack_fds = NULL;
7710
7711 #ifndef PROFILE
7712 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7713 "sendfd unveil", NULL) == -1)
7714 err(1, "pledge");
7715 #endif
7716
7717 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7718 switch (ch) {
7719 case 'c':
7720 commit_id_arg = optarg;
7721 break;
7722 case 'l':
7723 do_list = 1;
7724 break;
7725 case 'm':
7726 tagmsg = optarg;
7727 break;
7728 case 'r':
7729 repo_path = realpath(optarg, NULL);
7730 if (repo_path == NULL) {
7731 error = got_error_from_errno2("realpath",
7732 optarg);
7733 goto done;
7734 }
7735 got_path_strip_trailing_slashes(repo_path);
7736 break;
7737 case 's':
7738 signer_id = optarg;
7739 break;
7740 case 'V':
7741 verify_tags = 1;
7742 break;
7743 case 'v':
7744 if (verbosity < 0)
7745 verbosity = 0;
7746 else if (verbosity < 3)
7747 verbosity++;
7748 break;
7749 default:
7750 usage_tag();
7751 /* NOTREACHED */
7752 }
7753 }
7754
7755 argc -= optind;
7756 argv += optind;
7757
7758 if (do_list || verify_tags) {
7759 if (commit_id_arg != NULL)
7760 errx(1,
7761 "-c option can only be used when creating a tag");
7762 if (tagmsg) {
7763 if (do_list)
7764 option_conflict('l', 'm');
7765 else
7766 option_conflict('V', 'm');
7767 }
7768 if (signer_id) {
7769 if (do_list)
7770 option_conflict('l', 's');
7771 else
7772 option_conflict('V', 's');
7773 }
7774 if (argc > 1)
7775 usage_tag();
7776 } else if (argc != 1)
7777 usage_tag();
7778
7779 if (argc == 1)
7780 tag_name = argv[0];
7781
7782 cwd = getcwd(NULL, 0);
7783 if (cwd == NULL) {
7784 error = got_error_from_errno("getcwd");
7785 goto done;
7786 }
7787
7788 error = got_repo_pack_fds_open(&pack_fds);
7789 if (error != NULL)
7790 goto done;
7791
7792 if (repo_path == NULL) {
7793 error = got_worktree_open(&worktree, cwd,
7794 GOT_WORKTREE_GOT_DIR);
7795 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7796 goto done;
7797 else
7798 error = NULL;
7799 if (worktree) {
7800 repo_path =
7801 strdup(got_worktree_get_repo_path(worktree));
7802 if (repo_path == NULL)
7803 error = got_error_from_errno("strdup");
7804 if (error)
7805 goto done;
7806 } else {
7807 repo_path = strdup(cwd);
7808 if (repo_path == NULL) {
7809 error = got_error_from_errno("strdup");
7810 goto done;
7811 }
7812 }
7813 }
7814
7815 if (do_list || verify_tags) {
7816 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7817 if (error != NULL)
7818 goto done;
7819 error = get_allowed_signers(&allowed_signers, repo, worktree);
7820 if (error)
7821 goto done;
7822 error = get_revoked_signers(&revoked_signers, repo, worktree);
7823 if (error)
7824 goto done;
7825 if (worktree) {
7826 /* Release work tree lock. */
7827 got_worktree_close(worktree);
7828 worktree = NULL;
7829 }
7830
7831 /*
7832 * Remove "cpath" promise unless needed for signature tmpfile
7833 * creation.
7834 */
7835 if (verify_tags)
7836 got_sigs_apply_unveil();
7837 else {
7838 #ifndef PROFILE
7839 if (pledge("stdio rpath wpath flock proc exec sendfd "
7840 "unveil", NULL) == -1)
7841 err(1, "pledge");
7842 #endif
7843 }
7844 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7845 if (error)
7846 goto done;
7847 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7848 revoked_signers, verbosity);
7849 } else {
7850 error = get_gitconfig_path(&gitconfig_path);
7851 if (error)
7852 goto done;
7853 error = got_repo_open(&repo, repo_path, gitconfig_path,
7854 pack_fds);
7855 if (error != NULL)
7856 goto done;
7857
7858 error = get_author(&tagger, repo, worktree);
7859 if (error)
7860 goto done;
7861 if (signer_id == NULL)
7862 signer_id = get_signer_id(repo, worktree);
7863
7864 if (tagmsg) {
7865 if (signer_id) {
7866 error = got_sigs_apply_unveil();
7867 if (error)
7868 goto done;
7869 }
7870 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7871 if (error)
7872 goto done;
7873 }
7874
7875 if (commit_id_arg == NULL) {
7876 struct got_reference *head_ref;
7877 struct got_object_id *commit_id;
7878 error = got_ref_open(&head_ref, repo,
7879 worktree ? got_worktree_get_head_ref_name(worktree)
7880 : GOT_REF_HEAD, 0);
7881 if (error)
7882 goto done;
7883 error = got_ref_resolve(&commit_id, repo, head_ref);
7884 got_ref_close(head_ref);
7885 if (error)
7886 goto done;
7887 error = got_object_id_str(&commit_id_str, commit_id);
7888 free(commit_id);
7889 if (error)
7890 goto done;
7891 } else {
7892 error = got_keyword_to_idstr(&keyword_idstr,
7893 commit_id_arg, repo, worktree);
7894 if (error != NULL)
7895 goto done;
7896 commit_id_str = keyword_idstr;
7897 }
7898
7899 if (worktree) {
7900 /* Release work tree lock. */
7901 got_worktree_close(worktree);
7902 worktree = NULL;
7903 }
7904
7905 error = add_tag(repo, tagger, tag_name,
7906 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7907 signer_id, verbosity);
7908 }
7909 done:
7910 if (repo) {
7911 const struct got_error *close_err = got_repo_close(repo);
7912 if (error == NULL)
7913 error = close_err;
7914 }
7915 if (worktree)
7916 got_worktree_close(worktree);
7917 if (pack_fds) {
7918 const struct got_error *pack_err =
7919 got_repo_pack_fds_close(pack_fds);
7920 if (error == NULL)
7921 error = pack_err;
7922 }
7923 free(cwd);
7924 free(repo_path);
7925 free(gitconfig_path);
7926 free(commit_id_str);
7927 free(tagger);
7928 free(allowed_signers);
7929 free(revoked_signers);
7930 return error;
7931 }
7932
7933 __dead static void
7934 usage_add(void)
7935 {
7936 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7937 exit(1);
7938 }
7939
7940 static const struct got_error *
7941 add_progress(void *arg, unsigned char status, const char *path)
7942 {
7943 while (path[0] == '/')
7944 path++;
7945 printf("%c %s\n", status, path);
7946 return NULL;
7947 }
7948
7949 static const struct got_error *
7950 cmd_add(int argc, char *argv[])
7951 {
7952 const struct got_error *error = NULL;
7953 struct got_repository *repo = NULL;
7954 struct got_worktree *worktree = NULL;
7955 char *cwd = NULL;
7956 struct got_pathlist_head paths;
7957 struct got_pathlist_entry *pe;
7958 int ch, can_recurse = 0, no_ignores = 0;
7959 int *pack_fds = NULL;
7960
7961 TAILQ_INIT(&paths);
7962
7963 #ifndef PROFILE
7964 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7965 NULL) == -1)
7966 err(1, "pledge");
7967 #endif
7968
7969 while ((ch = getopt(argc, argv, "IR")) != -1) {
7970 switch (ch) {
7971 case 'I':
7972 no_ignores = 1;
7973 break;
7974 case 'R':
7975 can_recurse = 1;
7976 break;
7977 default:
7978 usage_add();
7979 /* NOTREACHED */
7980 }
7981 }
7982
7983 argc -= optind;
7984 argv += optind;
7985
7986 if (argc < 1)
7987 usage_add();
7988
7989 cwd = getcwd(NULL, 0);
7990 if (cwd == NULL) {
7991 error = got_error_from_errno("getcwd");
7992 goto done;
7993 }
7994
7995 error = got_repo_pack_fds_open(&pack_fds);
7996 if (error != NULL)
7997 goto done;
7998
7999 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8000 if (error) {
8001 if (error->code == GOT_ERR_NOT_WORKTREE)
8002 error = wrap_not_worktree_error(error, "add", cwd);
8003 goto done;
8004 }
8005
8006 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8007 NULL, pack_fds);
8008 if (error != NULL)
8009 goto done;
8010
8011 error = apply_unveil(got_repo_get_path(repo), 1,
8012 got_worktree_get_root_path(worktree));
8013 if (error)
8014 goto done;
8015
8016 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8017 if (error)
8018 goto done;
8019
8020 if (!can_recurse) {
8021 char *ondisk_path;
8022 struct stat sb;
8023 TAILQ_FOREACH(pe, &paths, entry) {
8024 if (asprintf(&ondisk_path, "%s/%s",
8025 got_worktree_get_root_path(worktree),
8026 pe->path) == -1) {
8027 error = got_error_from_errno("asprintf");
8028 goto done;
8029 }
8030 if (lstat(ondisk_path, &sb) == -1) {
8031 if (errno == ENOENT) {
8032 free(ondisk_path);
8033 continue;
8034 }
8035 error = got_error_from_errno2("lstat",
8036 ondisk_path);
8037 free(ondisk_path);
8038 goto done;
8039 }
8040 free(ondisk_path);
8041 if (S_ISDIR(sb.st_mode)) {
8042 error = got_error_msg(GOT_ERR_BAD_PATH,
8043 "adding directories requires -R option");
8044 goto done;
8045 }
8046 }
8047 }
8048
8049 error = got_worktree_schedule_add(worktree, &paths, add_progress,
8050 NULL, repo, no_ignores);
8051 done:
8052 if (repo) {
8053 const struct got_error *close_err = got_repo_close(repo);
8054 if (error == NULL)
8055 error = close_err;
8056 }
8057 if (worktree)
8058 got_worktree_close(worktree);
8059 if (pack_fds) {
8060 const struct got_error *pack_err =
8061 got_repo_pack_fds_close(pack_fds);
8062 if (error == NULL)
8063 error = pack_err;
8064 }
8065 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8066 free(cwd);
8067 return error;
8068 }
8069
8070 __dead static void
8071 usage_remove(void)
8072 {
8073 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
8074 getprogname());
8075 exit(1);
8076 }
8077
8078 static const struct got_error *
8079 print_remove_status(void *arg, unsigned char status,
8080 unsigned char staged_status, const char *path)
8081 {
8082 while (path[0] == '/')
8083 path++;
8084 if (status == GOT_STATUS_NONEXISTENT)
8085 return NULL;
8086 if (status == staged_status && (status == GOT_STATUS_DELETE))
8087 status = GOT_STATUS_NO_CHANGE;
8088 printf("%c%c %s\n", status, staged_status, path);
8089 return NULL;
8090 }
8091
8092 static const struct got_error *
8093 cmd_remove(int argc, char *argv[])
8094 {
8095 const struct got_error *error = NULL;
8096 struct got_worktree *worktree = NULL;
8097 struct got_repository *repo = NULL;
8098 const char *status_codes = NULL;
8099 char *cwd = NULL;
8100 struct got_pathlist_head paths;
8101 struct got_pathlist_entry *pe;
8102 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
8103 int ignore_missing_paths = 0;
8104 int *pack_fds = NULL;
8105
8106 TAILQ_INIT(&paths);
8107
8108 #ifndef PROFILE
8109 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8110 NULL) == -1)
8111 err(1, "pledge");
8112 #endif
8113
8114 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
8115 switch (ch) {
8116 case 'f':
8117 delete_local_mods = 1;
8118 ignore_missing_paths = 1;
8119 break;
8120 case 'k':
8121 keep_on_disk = 1;
8122 break;
8123 case 'R':
8124 can_recurse = 1;
8125 break;
8126 case 's':
8127 for (i = 0; optarg[i] != '\0'; i++) {
8128 switch (optarg[i]) {
8129 case GOT_STATUS_MODIFY:
8130 delete_local_mods = 1;
8131 break;
8132 case GOT_STATUS_MISSING:
8133 ignore_missing_paths = 1;
8134 break;
8135 default:
8136 errx(1, "invalid status code '%c'",
8137 optarg[i]);
8138 }
8139 }
8140 status_codes = optarg;
8141 break;
8142 default:
8143 usage_remove();
8144 /* NOTREACHED */
8145 }
8146 }
8147
8148 argc -= optind;
8149 argv += optind;
8150
8151 if (argc < 1)
8152 usage_remove();
8153
8154 cwd = getcwd(NULL, 0);
8155 if (cwd == NULL) {
8156 error = got_error_from_errno("getcwd");
8157 goto done;
8158 }
8159
8160 error = got_repo_pack_fds_open(&pack_fds);
8161 if (error != NULL)
8162 goto done;
8163
8164 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8165 if (error) {
8166 if (error->code == GOT_ERR_NOT_WORKTREE)
8167 error = wrap_not_worktree_error(error, "remove", cwd);
8168 goto done;
8169 }
8170
8171 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8172 NULL, pack_fds);
8173 if (error)
8174 goto done;
8175
8176 error = apply_unveil(got_repo_get_path(repo), 1,
8177 got_worktree_get_root_path(worktree));
8178 if (error)
8179 goto done;
8180
8181 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8182 if (error)
8183 goto done;
8184
8185 if (!can_recurse) {
8186 char *ondisk_path;
8187 struct stat sb;
8188 TAILQ_FOREACH(pe, &paths, entry) {
8189 if (asprintf(&ondisk_path, "%s/%s",
8190 got_worktree_get_root_path(worktree),
8191 pe->path) == -1) {
8192 error = got_error_from_errno("asprintf");
8193 goto done;
8194 }
8195 if (lstat(ondisk_path, &sb) == -1) {
8196 if (errno == ENOENT) {
8197 free(ondisk_path);
8198 continue;
8199 }
8200 error = got_error_from_errno2("lstat",
8201 ondisk_path);
8202 free(ondisk_path);
8203 goto done;
8204 }
8205 free(ondisk_path);
8206 if (S_ISDIR(sb.st_mode)) {
8207 error = got_error_msg(GOT_ERR_BAD_PATH,
8208 "removing directories requires -R option");
8209 goto done;
8210 }
8211 }
8212 }
8213
8214 error = got_worktree_schedule_delete(worktree, &paths,
8215 delete_local_mods, status_codes, print_remove_status, NULL,
8216 repo, keep_on_disk, ignore_missing_paths);
8217 done:
8218 if (repo) {
8219 const struct got_error *close_err = got_repo_close(repo);
8220 if (error == NULL)
8221 error = close_err;
8222 }
8223 if (worktree)
8224 got_worktree_close(worktree);
8225 if (pack_fds) {
8226 const struct got_error *pack_err =
8227 got_repo_pack_fds_close(pack_fds);
8228 if (error == NULL)
8229 error = pack_err;
8230 }
8231 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8232 free(cwd);
8233 return error;
8234 }
8235
8236 __dead static void
8237 usage_patch(void)
8238 {
8239 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8240 "[patchfile]\n", getprogname());
8241 exit(1);
8242 }
8243
8244 static const struct got_error *
8245 patch_from_stdin(int *patchfd)
8246 {
8247 const struct got_error *err = NULL;
8248 ssize_t r;
8249 char buf[BUFSIZ];
8250 sig_t sighup, sigint, sigquit;
8251
8252 *patchfd = got_opentempfd();
8253 if (*patchfd == -1)
8254 return got_error_from_errno("got_opentempfd");
8255
8256 sighup = signal(SIGHUP, SIG_DFL);
8257 sigint = signal(SIGINT, SIG_DFL);
8258 sigquit = signal(SIGQUIT, SIG_DFL);
8259
8260 for (;;) {
8261 r = read(0, buf, sizeof(buf));
8262 if (r == -1) {
8263 err = got_error_from_errno("read");
8264 break;
8265 }
8266 if (r == 0)
8267 break;
8268 if (write(*patchfd, buf, r) == -1) {
8269 err = got_error_from_errno("write");
8270 break;
8271 }
8272 }
8273
8274 signal(SIGHUP, sighup);
8275 signal(SIGINT, sigint);
8276 signal(SIGQUIT, sigquit);
8277
8278 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8279 err = got_error_from_errno("lseek");
8280
8281 if (err != NULL) {
8282 close(*patchfd);
8283 *patchfd = -1;
8284 }
8285
8286 return err;
8287 }
8288
8289 struct got_patch_progress_arg {
8290 int did_something;
8291 int conflicts;
8292 int rejects;
8293 };
8294
8295 static const struct got_error *
8296 patch_progress(void *arg, const char *old, const char *new,
8297 unsigned char status, const struct got_error *error, int old_from,
8298 int old_lines, int new_from, int new_lines, int offset,
8299 int ws_mangled, const struct got_error *hunk_err)
8300 {
8301 const char *path = new == NULL ? old : new;
8302 struct got_patch_progress_arg *a = arg;
8303
8304 while (*path == '/')
8305 path++;
8306
8307 if (status != GOT_STATUS_NO_CHANGE &&
8308 status != 0 /* per-hunk progress */) {
8309 printf("%c %s\n", status, path);
8310 a->did_something = 1;
8311 }
8312
8313 if (hunk_err == NULL) {
8314 if (status == GOT_STATUS_CANNOT_UPDATE)
8315 a->rejects++;
8316 else if (status == GOT_STATUS_CONFLICT)
8317 a->conflicts++;
8318 }
8319
8320 if (error != NULL)
8321 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8322
8323 if (offset != 0 || hunk_err != NULL || ws_mangled) {
8324 printf("@@ -%d,%d +%d,%d @@ ", old_from,
8325 old_lines, new_from, new_lines);
8326 if (hunk_err != NULL)
8327 printf("%s\n", hunk_err->msg);
8328 else if (offset != 0)
8329 printf("applied with offset %d\n", offset);
8330 else
8331 printf("hunk contains mangled whitespace\n");
8332 }
8333
8334 return NULL;
8335 }
8336
8337 static void
8338 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
8339 {
8340 if (!ppa->did_something)
8341 return;
8342
8343 if (ppa->conflicts > 0)
8344 printf("Files with merge conflicts: %d\n", ppa->conflicts);
8345
8346 if (ppa->rejects > 0) {
8347 printf("Files where patch failed to apply: %d\n",
8348 ppa->rejects);
8349 }
8350 }
8351
8352 static const struct got_error *
8353 cmd_patch(int argc, char *argv[])
8354 {
8355 const struct got_error *error = NULL, *close_error = NULL;
8356 struct got_worktree *worktree = NULL;
8357 struct got_repository *repo = NULL;
8358 struct got_reflist_head refs;
8359 struct got_object_id *commit_id = NULL;
8360 const char *commit_id_str = NULL;
8361 struct stat sb;
8362 const char *errstr;
8363 char *cwd = NULL, *keyword_idstr = NULL;
8364 int ch, nop = 0, strip = -1, reverse = 0;
8365 int patchfd;
8366 int *pack_fds = NULL;
8367 struct got_patch_progress_arg ppa;
8368
8369 TAILQ_INIT(&refs);
8370
8371 #ifndef PROFILE
8372 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8373 "unveil", NULL) == -1)
8374 err(1, "pledge");
8375 #endif
8376
8377 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8378 switch (ch) {
8379 case 'c':
8380 commit_id_str = optarg;
8381 break;
8382 case 'n':
8383 nop = 1;
8384 break;
8385 case 'p':
8386 strip = strtonum(optarg, 0, INT_MAX, &errstr);
8387 if (errstr != NULL)
8388 errx(1, "pathname strip count is %s: %s",
8389 errstr, optarg);
8390 break;
8391 case 'R':
8392 reverse = 1;
8393 break;
8394 default:
8395 usage_patch();
8396 /* NOTREACHED */
8397 }
8398 }
8399
8400 argc -= optind;
8401 argv += optind;
8402
8403 if (argc == 0) {
8404 error = patch_from_stdin(&patchfd);
8405 if (error)
8406 return error;
8407 } else if (argc == 1) {
8408 patchfd = open(argv[0], O_RDONLY);
8409 if (patchfd == -1) {
8410 error = got_error_from_errno2("open", argv[0]);
8411 return error;
8412 }
8413 if (fstat(patchfd, &sb) == -1) {
8414 error = got_error_from_errno2("fstat", argv[0]);
8415 goto done;
8416 }
8417 if (!S_ISREG(sb.st_mode)) {
8418 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8419 goto done;
8420 }
8421 } else
8422 usage_patch();
8423
8424 if ((cwd = getcwd(NULL, 0)) == NULL) {
8425 error = got_error_from_errno("getcwd");
8426 goto done;
8427 }
8428
8429 error = got_repo_pack_fds_open(&pack_fds);
8430 if (error != NULL)
8431 goto done;
8432
8433 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8434 if (error != NULL)
8435 goto done;
8436
8437 const char *repo_path = got_worktree_get_repo_path(worktree);
8438 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8439 if (error != NULL)
8440 goto done;
8441
8442 error = apply_unveil(got_repo_get_path(repo), 0,
8443 got_worktree_get_root_path(worktree));
8444 if (error != NULL)
8445 goto done;
8446
8447 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8448 if (error)
8449 goto done;
8450
8451 if (commit_id_str != NULL) {
8452 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
8453 repo, worktree);
8454 if (error != NULL)
8455 goto done;
8456
8457 error = got_repo_match_object_id(&commit_id, NULL,
8458 keyword_idstr != NULL ? keyword_idstr : commit_id_str,
8459 GOT_OBJ_TYPE_COMMIT, &refs, repo);
8460 if (error)
8461 goto done;
8462 }
8463
8464 memset(&ppa, 0, sizeof(ppa));
8465 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8466 commit_id, patch_progress, &ppa, check_cancelled, NULL);
8467 print_patch_progress_stats(&ppa);
8468 done:
8469 got_ref_list_free(&refs);
8470 free(keyword_idstr);
8471 free(commit_id);
8472 if (repo) {
8473 close_error = got_repo_close(repo);
8474 if (error == NULL)
8475 error = close_error;
8476 }
8477 if (worktree != NULL) {
8478 close_error = got_worktree_close(worktree);
8479 if (error == NULL)
8480 error = close_error;
8481 }
8482 if (pack_fds) {
8483 const struct got_error *pack_err =
8484 got_repo_pack_fds_close(pack_fds);
8485 if (error == NULL)
8486 error = pack_err;
8487 }
8488 free(cwd);
8489 return error;
8490 }
8491
8492 __dead static void
8493 usage_revert(void)
8494 {
8495 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8496 getprogname());
8497 exit(1);
8498 }
8499
8500 static const struct got_error *
8501 revert_progress(void *arg, unsigned char status, const char *path)
8502 {
8503 if (status == GOT_STATUS_UNVERSIONED)
8504 return NULL;
8505
8506 while (path[0] == '/')
8507 path++;
8508 printf("%c %s\n", status, path);
8509 return NULL;
8510 }
8511
8512 struct choose_patch_arg {
8513 FILE *patch_script_file;
8514 const char *action;
8515 };
8516
8517 static const struct got_error *
8518 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8519 int nchanges, const char *action)
8520 {
8521 const struct got_error *err;
8522 char *line = NULL;
8523 size_t linesize = 0;
8524 ssize_t linelen;
8525
8526 switch (status) {
8527 case GOT_STATUS_ADD:
8528 printf("A %s\n%s this addition? [y/n] ", path, action);
8529 break;
8530 case GOT_STATUS_DELETE:
8531 printf("D %s\n%s this deletion? [y/n] ", path, action);
8532 break;
8533 case GOT_STATUS_MODIFY:
8534 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8535 return got_error_from_errno("fseek");
8536 printf(GOT_COMMIT_SEP_STR);
8537 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8538 printf("%s", line);
8539 if (linelen == -1 && ferror(patch_file)) {
8540 err = got_error_from_errno("getline");
8541 free(line);
8542 return err;
8543 }
8544 free(line);
8545 printf(GOT_COMMIT_SEP_STR);
8546 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8547 path, n, nchanges, action);
8548 break;
8549 default:
8550 return got_error_path(path, GOT_ERR_FILE_STATUS);
8551 }
8552
8553 fflush(stdout);
8554 return NULL;
8555 }
8556
8557 static const struct got_error *
8558 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8559 FILE *patch_file, int n, int nchanges)
8560 {
8561 const struct got_error *err = NULL;
8562 char *line = NULL;
8563 size_t linesize = 0;
8564 ssize_t linelen;
8565 int resp = ' ';
8566 struct choose_patch_arg *a = arg;
8567
8568 *choice = GOT_PATCH_CHOICE_NONE;
8569
8570 if (a->patch_script_file) {
8571 char *nl;
8572 err = show_change(status, path, patch_file, n, nchanges,
8573 a->action);
8574 if (err)
8575 return err;
8576 linelen = getline(&line, &linesize, a->patch_script_file);
8577 if (linelen == -1) {
8578 if (ferror(a->patch_script_file))
8579 return got_error_from_errno("getline");
8580 return NULL;
8581 }
8582 nl = strchr(line, '\n');
8583 if (nl)
8584 *nl = '\0';
8585 if (strcmp(line, "y") == 0) {
8586 *choice = GOT_PATCH_CHOICE_YES;
8587 printf("y\n");
8588 } else if (strcmp(line, "n") == 0) {
8589 *choice = GOT_PATCH_CHOICE_NO;
8590 printf("n\n");
8591 } else if (strcmp(line, "q") == 0 &&
8592 status == GOT_STATUS_MODIFY) {
8593 *choice = GOT_PATCH_CHOICE_QUIT;
8594 printf("q\n");
8595 } else
8596 printf("invalid response '%s'\n", line);
8597 free(line);
8598 return NULL;
8599 }
8600
8601 while (resp != 'y' && resp != 'n' && resp != 'q') {
8602 err = show_change(status, path, patch_file, n, nchanges,
8603 a->action);
8604 if (err)
8605 return err;
8606 resp = getchar();
8607 if (resp == '\n')
8608 resp = getchar();
8609 if (status == GOT_STATUS_MODIFY) {
8610 if (resp != 'y' && resp != 'n' && resp != 'q') {
8611 printf("invalid response '%c'\n", resp);
8612 resp = ' ';
8613 }
8614 } else if (resp != 'y' && resp != 'n') {
8615 printf("invalid response '%c'\n", resp);
8616 resp = ' ';
8617 }
8618 }
8619
8620 if (resp == 'y')
8621 *choice = GOT_PATCH_CHOICE_YES;
8622 else if (resp == 'n')
8623 *choice = GOT_PATCH_CHOICE_NO;
8624 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8625 *choice = GOT_PATCH_CHOICE_QUIT;
8626
8627 return NULL;
8628 }
8629
8630 struct wt_commitable_path_arg {
8631 struct got_pathlist_head *commit_paths;
8632 int *has_changes;
8633 };
8634
8635 /*
8636 * Shortcut work tree status callback to determine if the set of paths scanned
8637 * has at least one versioned path that is being modified and, if not NULL, is
8638 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
8639 * soon as a path is passed with a status that satisfies this criteria.
8640 */
8641 static const struct got_error *
8642 worktree_has_commitable_path(void *arg, unsigned char status,
8643 unsigned char staged_status, const char *path,
8644 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8645 struct got_object_id *commit_id, int dirfd, const char *de_name)
8646 {
8647 struct wt_commitable_path_arg *a = arg;
8648
8649 if (status == staged_status && (status == GOT_STATUS_DELETE))
8650 status = GOT_STATUS_NO_CHANGE;
8651
8652 if (!(status == GOT_STATUS_NO_CHANGE ||
8653 status == GOT_STATUS_UNVERSIONED) ||
8654 staged_status != GOT_STATUS_NO_CHANGE) {
8655 if (a->commit_paths != NULL) {
8656 struct got_pathlist_entry *pe;
8657
8658 TAILQ_FOREACH(pe, a->commit_paths, entry) {
8659 if (strncmp(path, pe->path,
8660 pe->path_len) == 0) {
8661 *a->has_changes = 1;
8662 break;
8663 }
8664 }
8665 } else
8666 *a->has_changes = 1;
8667
8668 if (*a->has_changes)
8669 return got_error(GOT_ERR_FILE_MODIFIED);
8670 }
8671
8672 return NULL;
8673 }
8674
8675 /*
8676 * Check that the changeset of the commit identified by id is
8677 * comprised of at least one modified path that is being committed.
8678 */
8679 static const struct got_error *
8680 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
8681 struct got_object_id *id, struct got_worktree *worktree,
8682 struct got_repository *repo)
8683 {
8684 const struct got_error *err;
8685 struct got_pathlist_head paths;
8686 struct got_commit_object *commit = NULL, *pcommit = NULL;
8687 struct got_tree_object *tree = NULL, *ptree = NULL;
8688 struct got_object_qid *pid;
8689
8690 TAILQ_INIT(&paths);
8691
8692 err = got_object_open_as_commit(&commit, repo, id);
8693 if (err)
8694 goto done;
8695
8696 err = got_object_open_as_tree(&tree, repo,
8697 got_object_commit_get_tree_id(commit));
8698 if (err)
8699 goto done;
8700
8701 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8702 if (pid != NULL) {
8703 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
8704 if (err)
8705 goto done;
8706
8707 err = got_object_open_as_tree(&ptree, repo,
8708 got_object_commit_get_tree_id(pcommit));
8709 if (err)
8710 goto done;
8711 }
8712
8713 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
8714 got_diff_tree_collect_changed_paths, &paths, 0);
8715 if (err)
8716 goto done;
8717
8718 err = got_worktree_status(worktree, &paths, repo, 0,
8719 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
8720 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
8721 /*
8722 * At least one changed path in the referenced commit is
8723 * modified in the work tree, that's all we need to know!
8724 */
8725 err = NULL;
8726 }
8727
8728 done:
8729 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8730 if (commit)
8731 got_object_commit_close(commit);
8732 if (pcommit)
8733 got_object_commit_close(pcommit);
8734 if (tree)
8735 got_object_tree_close(tree);
8736 if (ptree)
8737 got_object_tree_close(ptree);
8738 return err;
8739 }
8740
8741 /*
8742 * Remove any "logmsg" reference comprised entirely of paths that have
8743 * been reverted in this work tree. If any path in the logmsg ref changeset
8744 * remains in a changed state in the worktree, do not remove the reference.
8745 */
8746 static const struct got_error *
8747 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
8748 {
8749 const struct got_error *err;
8750 struct got_reflist_head refs;
8751 struct got_reflist_entry *re;
8752 struct got_commit_object *commit = NULL;
8753 struct got_object_id *commit_id = NULL;
8754 struct wt_commitable_path_arg wcpa;
8755 char *uuidstr = NULL;
8756
8757 TAILQ_INIT(&refs);
8758
8759 err = got_worktree_get_uuid(&uuidstr, worktree);
8760 if (err)
8761 goto done;
8762
8763 err = got_ref_list(&refs, repo, "refs/got/worktree",
8764 got_ref_cmp_by_name, repo);
8765 if (err)
8766 goto done;
8767
8768 TAILQ_FOREACH(re, &refs, entry) {
8769 const char *refname;
8770 int has_changes = 0;
8771
8772 refname = got_ref_get_name(re->ref);
8773
8774 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8775 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
8776 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8777 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8778 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
8779 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8780 else
8781 continue;
8782
8783 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8784 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8785 else
8786 continue;
8787
8788 err = got_repo_match_object_id(&commit_id, NULL, refname,
8789 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8790 if (err)
8791 goto done;
8792
8793 err = got_object_open_as_commit(&commit, repo, commit_id);
8794 if (err)
8795 goto done;
8796
8797 wcpa.commit_paths = NULL;
8798 wcpa.has_changes = &has_changes;
8799
8800 err = commit_path_changed_in_worktree(&wcpa, commit_id,
8801 worktree, repo);
8802 if (err)
8803 goto done;
8804
8805 if (!has_changes) {
8806 err = got_ref_delete(re->ref, repo);
8807 if (err)
8808 goto done;
8809 }
8810
8811 got_object_commit_close(commit);
8812 commit = NULL;
8813 free(commit_id);
8814 commit_id = NULL;
8815 }
8816
8817 done:
8818 free(uuidstr);
8819 free(commit_id);
8820 got_ref_list_free(&refs);
8821 if (commit)
8822 got_object_commit_close(commit);
8823 return err;
8824 }
8825
8826 static const struct got_error *
8827 cmd_revert(int argc, char *argv[])
8828 {
8829 const struct got_error *error = NULL;
8830 struct got_worktree *worktree = NULL;
8831 struct got_repository *repo = NULL;
8832 char *cwd = NULL, *path = NULL;
8833 struct got_pathlist_head paths;
8834 struct got_pathlist_entry *pe;
8835 int ch, can_recurse = 0, pflag = 0;
8836 FILE *patch_script_file = NULL;
8837 const char *patch_script_path = NULL;
8838 struct choose_patch_arg cpa;
8839 int *pack_fds = NULL;
8840
8841 TAILQ_INIT(&paths);
8842
8843 #ifndef PROFILE
8844 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8845 "unveil", NULL) == -1)
8846 err(1, "pledge");
8847 #endif
8848
8849 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8850 switch (ch) {
8851 case 'F':
8852 patch_script_path = optarg;
8853 break;
8854 case 'p':
8855 pflag = 1;
8856 break;
8857 case 'R':
8858 can_recurse = 1;
8859 break;
8860 default:
8861 usage_revert();
8862 /* NOTREACHED */
8863 }
8864 }
8865
8866 argc -= optind;
8867 argv += optind;
8868
8869 if (argc < 1)
8870 usage_revert();
8871 if (patch_script_path && !pflag)
8872 errx(1, "-F option can only be used together with -p option");
8873
8874 cwd = getcwd(NULL, 0);
8875 if (cwd == NULL) {
8876 error = got_error_from_errno("getcwd");
8877 goto done;
8878 }
8879
8880 error = got_repo_pack_fds_open(&pack_fds);
8881 if (error != NULL)
8882 goto done;
8883
8884 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8885 if (error) {
8886 if (error->code == GOT_ERR_NOT_WORKTREE)
8887 error = wrap_not_worktree_error(error, "revert", cwd);
8888 goto done;
8889 }
8890
8891 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8892 NULL, pack_fds);
8893 if (error != NULL)
8894 goto done;
8895
8896 if (patch_script_path) {
8897 patch_script_file = fopen(patch_script_path, "re");
8898 if (patch_script_file == NULL) {
8899 error = got_error_from_errno2("fopen",
8900 patch_script_path);
8901 goto done;
8902 }
8903 }
8904
8905 /*
8906 * XXX "c" perm needed on repo dir to delete merge references.
8907 */
8908 error = apply_unveil(got_repo_get_path(repo), 0,
8909 got_worktree_get_root_path(worktree));
8910 if (error)
8911 goto done;
8912
8913 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8914 if (error)
8915 goto done;
8916
8917 if (!can_recurse) {
8918 char *ondisk_path;
8919 struct stat sb;
8920 TAILQ_FOREACH(pe, &paths, entry) {
8921 if (asprintf(&ondisk_path, "%s/%s",
8922 got_worktree_get_root_path(worktree),
8923 pe->path) == -1) {
8924 error = got_error_from_errno("asprintf");
8925 goto done;
8926 }
8927 if (lstat(ondisk_path, &sb) == -1) {
8928 if (errno == ENOENT) {
8929 free(ondisk_path);
8930 continue;
8931 }
8932 error = got_error_from_errno2("lstat",
8933 ondisk_path);
8934 free(ondisk_path);
8935 goto done;
8936 }
8937 free(ondisk_path);
8938 if (S_ISDIR(sb.st_mode)) {
8939 error = got_error_msg(GOT_ERR_BAD_PATH,
8940 "reverting directories requires -R option");
8941 goto done;
8942 }
8943 }
8944 }
8945
8946 cpa.patch_script_file = patch_script_file;
8947 cpa.action = "revert";
8948 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8949 pflag ? choose_patch : NULL, &cpa, repo);
8950
8951 error = rm_logmsg_ref(worktree, repo);
8952 done:
8953 if (patch_script_file && fclose(patch_script_file) == EOF &&
8954 error == NULL)
8955 error = got_error_from_errno2("fclose", patch_script_path);
8956 if (repo) {
8957 const struct got_error *close_err = got_repo_close(repo);
8958 if (error == NULL)
8959 error = close_err;
8960 }
8961 if (worktree)
8962 got_worktree_close(worktree);
8963 if (pack_fds) {
8964 const struct got_error *pack_err =
8965 got_repo_pack_fds_close(pack_fds);
8966 if (error == NULL)
8967 error = pack_err;
8968 }
8969 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8970 free(path);
8971 free(cwd);
8972 return error;
8973 }
8974
8975 __dead static void
8976 usage_commit(void)
8977 {
8978 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
8979 "[-m message] [path ...]\n", getprogname());
8980 exit(1);
8981 }
8982
8983 struct collect_commit_logmsg_arg {
8984 const char *cmdline_log;
8985 const char *prepared_log;
8986 const char *merged_log;
8987 int non_interactive;
8988 const char *editor;
8989 const char *worktree_path;
8990 const char *branch_name;
8991 const char *repo_path;
8992 char *logmsg_path;
8993
8994 };
8995
8996 static const struct got_error *
8997 read_prepared_logmsg(char **logmsg, const char *path)
8998 {
8999 const struct got_error *err = NULL;
9000 FILE *f = NULL;
9001 struct stat sb;
9002 size_t r;
9003
9004 *logmsg = NULL;
9005 memset(&sb, 0, sizeof(sb));
9006
9007 f = fopen(path, "re");
9008 if (f == NULL)
9009 return got_error_from_errno2("fopen", path);
9010
9011 if (fstat(fileno(f), &sb) == -1) {
9012 err = got_error_from_errno2("fstat", path);
9013 goto done;
9014 }
9015 if (sb.st_size == 0) {
9016 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
9017 goto done;
9018 }
9019
9020 *logmsg = malloc(sb.st_size + 1);
9021 if (*logmsg == NULL) {
9022 err = got_error_from_errno("malloc");
9023 goto done;
9024 }
9025
9026 r = fread(*logmsg, 1, sb.st_size, f);
9027 if (r != sb.st_size) {
9028 if (ferror(f))
9029 err = got_error_from_errno2("fread", path);
9030 else
9031 err = got_error(GOT_ERR_IO);
9032 goto done;
9033 }
9034 (*logmsg)[sb.st_size] = '\0';
9035 done:
9036 if (fclose(f) == EOF && err == NULL)
9037 err = got_error_from_errno2("fclose", path);
9038 if (err) {
9039 free(*logmsg);
9040 *logmsg = NULL;
9041 }
9042 return err;
9043 }
9044
9045 static const struct got_error *
9046 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
9047 const char *diff_path, char **logmsg, void *arg)
9048 {
9049 char *initial_content = NULL;
9050 struct got_pathlist_entry *pe;
9051 const struct got_error *err = NULL;
9052 char *template = NULL;
9053 char *prepared_msg = NULL, *merged_msg = NULL;
9054 struct collect_commit_logmsg_arg *a = arg;
9055 int initial_content_len;
9056 int fd = -1;
9057 size_t len;
9058
9059 /* if a message was specified on the command line, just use it */
9060 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
9061 len = strlen(a->cmdline_log) + 1;
9062 *logmsg = malloc(len + 1);
9063 if (*logmsg == NULL)
9064 return got_error_from_errno("malloc");
9065 strlcpy(*logmsg, a->cmdline_log, len);
9066 return NULL;
9067 } else if (a->prepared_log != NULL && a->non_interactive)
9068 return read_prepared_logmsg(logmsg, a->prepared_log);
9069
9070 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
9071 return got_error_from_errno("asprintf");
9072
9073 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
9074 if (err)
9075 goto done;
9076
9077 if (a->prepared_log) {
9078 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
9079 if (err)
9080 goto done;
9081 } else if (a->merged_log) {
9082 err = read_prepared_logmsg(&merged_msg, a->merged_log);
9083 if (err)
9084 goto done;
9085 }
9086
9087 initial_content_len = asprintf(&initial_content,
9088 "%s%s\n# changes to be committed on branch %s:\n",
9089 prepared_msg ? prepared_msg : "",
9090 merged_msg ? merged_msg : "", a->branch_name);
9091 if (initial_content_len == -1) {
9092 err = got_error_from_errno("asprintf");
9093 goto done;
9094 }
9095
9096 if (write(fd, initial_content, initial_content_len) == -1) {
9097 err = got_error_from_errno2("write", a->logmsg_path);
9098 goto done;
9099 }
9100
9101 TAILQ_FOREACH(pe, commitable_paths, entry) {
9102 struct got_commitable *ct = pe->data;
9103 dprintf(fd, "# %c %s\n",
9104 got_commitable_get_status(ct),
9105 got_commitable_get_path(ct));
9106 }
9107
9108 if (diff_path) {
9109 dprintf(fd, "# detailed changes can be viewed in %s\n",
9110 diff_path);
9111 }
9112
9113 if (close(fd) == -1) {
9114 err = got_error_from_errno2("close", a->logmsg_path);
9115 goto done;
9116 }
9117 fd = -1;
9118
9119 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
9120 initial_content_len, a->prepared_log ? 0 : 1);
9121 done:
9122 free(initial_content);
9123 free(template);
9124 free(prepared_msg);
9125 free(merged_msg);
9126
9127 if (fd != -1 && close(fd) == -1 && err == NULL)
9128 err = got_error_from_errno2("close", a->logmsg_path);
9129
9130 /* Editor is done; we can now apply unveil(2) */
9131 if (err == NULL)
9132 err = apply_unveil(a->repo_path, 0, a->worktree_path);
9133 if (err) {
9134 free(*logmsg);
9135 *logmsg = NULL;
9136 }
9137 return err;
9138 }
9139
9140 static const struct got_error *
9141 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
9142 const char *type, int has_content)
9143 {
9144 const struct got_error *err = NULL;
9145 char *logmsg = NULL;
9146
9147 err = got_object_commit_get_logmsg(&logmsg, commit);
9148 if (err)
9149 return err;
9150
9151 if (fprintf(f, "%s# log message of %s commit %s:%s",
9152 has_content ? "\n" : "", type, idstr, logmsg) < 0)
9153 err = got_ferror(f, GOT_ERR_IO);
9154
9155 free(logmsg);
9156 return err;
9157 }
9158
9159 /*
9160 * Lookup "logmsg" references of backed-out and cherrypicked commits
9161 * belonging to the current work tree. If found, and the worktree has
9162 * at least one modified file that was changed in the referenced commit,
9163 * add its log message to a new temporary file at *logmsg_path.
9164 * Add all refs found to matched_refs to be scheduled for removal on
9165 * successful commit.
9166 */
9167 static const struct got_error *
9168 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
9169 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
9170 struct got_repository *repo)
9171 {
9172 const struct got_error *err;
9173 struct got_commit_object *commit = NULL;
9174 struct got_object_id *id = NULL;
9175 struct got_reflist_head refs;
9176 struct got_reflist_entry *re, *re_match;
9177 FILE *f = NULL;
9178 char *uuidstr = NULL;
9179 int added_logmsg = 0;
9180
9181 TAILQ_INIT(&refs);
9182
9183 *logmsg_path = NULL;
9184
9185 err = got_worktree_get_uuid(&uuidstr, worktree);
9186 if (err)
9187 goto done;
9188
9189 err = got_ref_list(&refs, repo, "refs/got/worktree",
9190 got_ref_cmp_by_name, repo);
9191 if (err)
9192 goto done;
9193
9194 TAILQ_FOREACH(re, &refs, entry) {
9195 const char *refname, *type;
9196 struct wt_commitable_path_arg wcpa;
9197 int add_logmsg = 0;
9198
9199 refname = got_ref_get_name(re->ref);
9200
9201 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
9202 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
9203 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
9204 type = "cherrypicked";
9205 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
9206 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
9207 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
9208 type = "backed-out";
9209 } else
9210 continue;
9211
9212 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
9213 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
9214 else
9215 continue;
9216
9217 err = got_repo_match_object_id(&id, NULL, refname,
9218 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9219 if (err)
9220 goto done;
9221
9222 err = got_object_open_as_commit(&commit, repo, id);
9223 if (err)
9224 goto done;
9225
9226 wcpa.commit_paths = paths;
9227 wcpa.has_changes = &add_logmsg;
9228
9229 err = commit_path_changed_in_worktree(&wcpa, id,
9230 worktree, repo);
9231 if (err)
9232 goto done;
9233
9234 if (add_logmsg) {
9235 if (f == NULL) {
9236 err = got_opentemp_named(logmsg_path, &f,
9237 "got-commit-logmsg", "");
9238 if (err)
9239 goto done;
9240 }
9241 err = cat_logmsg(f, commit, refname, type,
9242 added_logmsg);
9243 if (err)
9244 goto done;
9245 if (!added_logmsg)
9246 ++added_logmsg;
9247
9248 err = got_reflist_entry_dup(&re_match, re);
9249 if (err)
9250 goto done;
9251 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
9252 }
9253
9254 got_object_commit_close(commit);
9255 commit = NULL;
9256 free(id);
9257 id = NULL;
9258 }
9259
9260 done:
9261 free(id);
9262 free(uuidstr);
9263 got_ref_list_free(&refs);
9264 if (commit)
9265 got_object_commit_close(commit);
9266 if (f && fclose(f) == EOF && err == NULL)
9267 err = got_error_from_errno("fclose");
9268 if (!added_logmsg) {
9269 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
9270 err = got_error_from_errno2("unlink", *logmsg_path);
9271 *logmsg_path = NULL;
9272 }
9273 return err;
9274 }
9275
9276 static const struct got_error *
9277 cmd_commit(int argc, char *argv[])
9278 {
9279 const struct got_error *error = NULL;
9280 struct got_worktree *worktree = NULL;
9281 struct got_repository *repo = NULL;
9282 char *cwd = NULL, *id_str = NULL;
9283 struct got_object_id *id = NULL;
9284 const char *logmsg = NULL;
9285 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
9286 struct collect_commit_logmsg_arg cl_arg;
9287 const char *author = NULL;
9288 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
9289 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
9290 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
9291 int show_diff = 1, commit_conflicts = 0;
9292 struct got_pathlist_head paths;
9293 struct got_reflist_head refs;
9294 struct got_reflist_entry *re;
9295 int *pack_fds = NULL;
9296
9297 TAILQ_INIT(&refs);
9298 TAILQ_INIT(&paths);
9299 cl_arg.logmsg_path = NULL;
9300
9301 #ifndef PROFILE
9302 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9303 "unveil", NULL) == -1)
9304 err(1, "pledge");
9305 #endif
9306
9307 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
9308 switch (ch) {
9309 case 'A':
9310 author = optarg;
9311 error = valid_author(author);
9312 if (error)
9313 return error;
9314 break;
9315 case 'C':
9316 commit_conflicts = 1;
9317 break;
9318 case 'F':
9319 if (logmsg != NULL)
9320 option_conflict('F', 'm');
9321 prepared_logmsg = realpath(optarg, NULL);
9322 if (prepared_logmsg == NULL)
9323 return got_error_from_errno2("realpath",
9324 optarg);
9325 break;
9326 case 'm':
9327 if (prepared_logmsg)
9328 option_conflict('m', 'F');
9329 logmsg = optarg;
9330 break;
9331 case 'N':
9332 non_interactive = 1;
9333 break;
9334 case 'n':
9335 show_diff = 0;
9336 break;
9337 case 'S':
9338 allow_bad_symlinks = 1;
9339 break;
9340 default:
9341 usage_commit();
9342 /* NOTREACHED */
9343 }
9344 }
9345
9346 argc -= optind;
9347 argv += optind;
9348
9349 cwd = getcwd(NULL, 0);
9350 if (cwd == NULL) {
9351 error = got_error_from_errno("getcwd");
9352 goto done;
9353 }
9354
9355 error = got_repo_pack_fds_open(&pack_fds);
9356 if (error != NULL)
9357 goto done;
9358
9359 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9360 if (error) {
9361 if (error->code == GOT_ERR_NOT_WORKTREE)
9362 error = wrap_not_worktree_error(error, "commit", cwd);
9363 goto done;
9364 }
9365
9366 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9367 if (error)
9368 goto done;
9369 if (rebase_in_progress) {
9370 error = got_error(GOT_ERR_REBASING);
9371 goto done;
9372 }
9373
9374 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9375 worktree);
9376 if (error)
9377 goto done;
9378
9379 error = get_gitconfig_path(&gitconfig_path);
9380 if (error)
9381 goto done;
9382 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9383 gitconfig_path, pack_fds);
9384 if (error != NULL)
9385 goto done;
9386
9387 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
9388 if (error)
9389 goto done;
9390 if (merge_in_progress) {
9391 error = got_error(GOT_ERR_MERGE_BUSY);
9392 goto done;
9393 }
9394
9395 error = get_author(&committer, repo, worktree);
9396 if (error)
9397 goto done;
9398
9399 if (author == NULL)
9400 author = committer;
9401
9402 /*
9403 * unveil(2) traverses exec(2); if an editor is used we have
9404 * to apply unveil after the log message has been written.
9405 */
9406 if (logmsg == NULL || strlen(logmsg) == 0)
9407 error = get_editor(&editor);
9408 else
9409 error = apply_unveil(got_repo_get_path(repo), 0,
9410 got_worktree_get_root_path(worktree));
9411 if (error)
9412 goto done;
9413
9414 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9415 if (error)
9416 goto done;
9417
9418 if (prepared_logmsg == NULL) {
9419 error = lookup_logmsg_ref(&merged_logmsg,
9420 argc > 0 ? &paths : NULL, &refs, worktree, repo);
9421 if (error)
9422 goto done;
9423 }
9424
9425 cl_arg.editor = editor;
9426 cl_arg.cmdline_log = logmsg;
9427 cl_arg.prepared_log = prepared_logmsg;
9428 cl_arg.merged_log = merged_logmsg;
9429 cl_arg.non_interactive = non_interactive;
9430 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
9431 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
9432 if (!histedit_in_progress) {
9433 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
9434 error = got_error(GOT_ERR_COMMIT_BRANCH);
9435 goto done;
9436 }
9437 cl_arg.branch_name += 11;
9438 }
9439 cl_arg.repo_path = got_repo_get_path(repo);
9440 error = got_worktree_commit(&id, worktree, &paths, author, committer,
9441 allow_bad_symlinks, show_diff, commit_conflicts,
9442 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
9443 if (error) {
9444 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
9445 cl_arg.logmsg_path != NULL)
9446 preserve_logmsg = 1;
9447 goto done;
9448 }
9449
9450 error = got_object_id_str(&id_str, id);
9451 if (error)
9452 goto done;
9453 printf("Created commit %s\n", id_str);
9454
9455 TAILQ_FOREACH(re, &refs, entry) {
9456 error = got_ref_delete(re->ref, repo);
9457 if (error)
9458 goto done;
9459 }
9460
9461 done:
9462 if (preserve_logmsg) {
9463 fprintf(stderr, "%s: log message preserved in %s\n",
9464 getprogname(), cl_arg.logmsg_path);
9465 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
9466 error == NULL)
9467 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
9468 free(cl_arg.logmsg_path);
9469 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
9470 error = got_error_from_errno2("unlink", merged_logmsg);
9471 free(merged_logmsg);
9472 if (repo) {
9473 const struct got_error *close_err = got_repo_close(repo);
9474 if (error == NULL)
9475 error = close_err;
9476 }
9477 if (worktree)
9478 got_worktree_close(worktree);
9479 if (pack_fds) {
9480 const struct got_error *pack_err =
9481 got_repo_pack_fds_close(pack_fds);
9482 if (error == NULL)
9483 error = pack_err;
9484 }
9485 got_ref_list_free(&refs);
9486 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9487 free(cwd);
9488 free(id_str);
9489 free(gitconfig_path);
9490 free(editor);
9491 free(committer);
9492 free(prepared_logmsg);
9493 return error;
9494 }
9495
9496 __dead static void
9497 usage_send(void)
9498 {
9499 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
9500 "[-r repository-path] [-t tag] [remote-repository]\n",
9501 getprogname());
9502 exit(1);
9503 }
9504
9505 static void
9506 print_load_info(int print_colored, int print_found, int print_trees,
9507 int ncolored, int nfound, int ntrees)
9508 {
9509 if (print_colored) {
9510 printf("%d commit%s colored", ncolored,
9511 ncolored == 1 ? "" : "s");
9512 }
9513 if (print_found) {
9514 printf("%s%d object%s found",
9515 ncolored > 0 ? "; " : "",
9516 nfound, nfound == 1 ? "" : "s");
9517 }
9518 if (print_trees) {
9519 printf("; %d tree%s scanned", ntrees,
9520 ntrees == 1 ? "" : "s");
9521 }
9522 }
9523
9524 struct got_send_progress_arg {
9525 char last_scaled_packsize[FMT_SCALED_STRSIZE];
9526 int verbosity;
9527 int last_ncolored;
9528 int last_nfound;
9529 int last_ntrees;
9530 int loading_done;
9531 int last_ncommits;
9532 int last_nobj_total;
9533 int last_p_deltify;
9534 int last_p_written;
9535 int last_p_sent;
9536 int printed_something;
9537 int sent_something;
9538 struct got_pathlist_head *delete_branches;
9539 };
9540
9541 static const struct got_error *
9542 send_progress(void *arg, int ncolored, int nfound, int ntrees,
9543 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
9544 int nobj_written, off_t bytes_sent, const char *refname,
9545 const char *errmsg, int success)
9546 {
9547 struct got_send_progress_arg *a = arg;
9548 char scaled_packsize[FMT_SCALED_STRSIZE];
9549 char scaled_sent[FMT_SCALED_STRSIZE];
9550 int p_deltify = 0, p_written = 0, p_sent = 0;
9551 int print_colored = 0, print_found = 0, print_trees = 0;
9552 int print_searching = 0, print_total = 0;
9553 int print_deltify = 0, print_written = 0, print_sent = 0;
9554
9555 if (a->verbosity < 0)
9556 return NULL;
9557
9558 if (refname) {
9559 const char *status = success ? "accepted" : "rejected";
9560
9561 if (success) {
9562 struct got_pathlist_entry *pe;
9563 TAILQ_FOREACH(pe, a->delete_branches, entry) {
9564 const char *branchname = pe->path;
9565 if (got_path_cmp(branchname, refname,
9566 strlen(branchname), strlen(refname)) == 0) {
9567 status = "deleted";
9568 a->sent_something = 1;
9569 break;
9570 }
9571 }
9572 }
9573
9574 if (a->printed_something)
9575 putchar('\n');
9576 printf("Server has %s %s", status, refname);
9577 if (errmsg)
9578 printf(": %s", errmsg);
9579 a->printed_something = 1;
9580 return NULL;
9581 }
9582
9583 if (a->last_ncolored != ncolored) {
9584 print_colored = 1;
9585 a->last_ncolored = ncolored;
9586 }
9587
9588 if (a->last_nfound != nfound) {
9589 print_colored = 1;
9590 print_found = 1;
9591 a->last_nfound = nfound;
9592 }
9593
9594 if (a->last_ntrees != ntrees) {
9595 print_colored = 1;
9596 print_found = 1;
9597 print_trees = 1;
9598 a->last_ntrees = ntrees;
9599 }
9600
9601 if ((print_colored || print_found || print_trees) &&
9602 !a->loading_done) {
9603 printf("\r");
9604 print_load_info(print_colored, print_found, print_trees,
9605 ncolored, nfound, ntrees);
9606 a->printed_something = 1;
9607 fflush(stdout);
9608 return NULL;
9609 } else if (!a->loading_done) {
9610 printf("\r");
9611 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
9612 printf("\n");
9613 a->loading_done = 1;
9614 }
9615
9616 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
9617 return got_error_from_errno("fmt_scaled");
9618 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
9619 return got_error_from_errno("fmt_scaled");
9620
9621 if (a->last_ncommits != ncommits) {
9622 print_searching = 1;
9623 a->last_ncommits = ncommits;
9624 }
9625
9626 if (a->last_nobj_total != nobj_total) {
9627 print_searching = 1;
9628 print_total = 1;
9629 a->last_nobj_total = nobj_total;
9630 }
9631
9632 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9633 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9634 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9635 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9636 return got_error(GOT_ERR_NO_SPACE);
9637 }
9638
9639 if (nobj_deltify > 0 || nobj_written > 0) {
9640 if (nobj_deltify > 0) {
9641 p_deltify = (nobj_deltify * 100) / nobj_total;
9642 if (p_deltify != a->last_p_deltify) {
9643 a->last_p_deltify = p_deltify;
9644 print_searching = 1;
9645 print_total = 1;
9646 print_deltify = 1;
9647 }
9648 }
9649 if (nobj_written > 0) {
9650 p_written = (nobj_written * 100) / nobj_total;
9651 if (p_written != a->last_p_written) {
9652 a->last_p_written = p_written;
9653 print_searching = 1;
9654 print_total = 1;
9655 print_deltify = 1;
9656 print_written = 1;
9657 }
9658 }
9659 }
9660
9661 if (bytes_sent > 0) {
9662 p_sent = (bytes_sent * 100) / packfile_size;
9663 if (p_sent != a->last_p_sent) {
9664 a->last_p_sent = p_sent;
9665 print_searching = 1;
9666 print_total = 1;
9667 print_deltify = 1;
9668 print_written = 1;
9669 print_sent = 1;
9670 }
9671 a->sent_something = 1;
9672 }
9673
9674 if (print_searching || print_total || print_deltify || print_written ||
9675 print_sent)
9676 printf("\r");
9677 if (print_searching)
9678 printf("packing %d reference%s", ncommits,
9679 ncommits == 1 ? "" : "s");
9680 if (print_total)
9681 printf("; %d object%s", nobj_total,
9682 nobj_total == 1 ? "" : "s");
9683 if (print_deltify)
9684 printf("; deltify: %d%%", p_deltify);
9685 if (print_sent)
9686 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9687 scaled_packsize, p_sent);
9688 else if (print_written)
9689 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9690 scaled_packsize, p_written);
9691 if (print_searching || print_total || print_deltify ||
9692 print_written || print_sent) {
9693 a->printed_something = 1;
9694 fflush(stdout);
9695 }
9696 return NULL;
9697 }
9698
9699 static const struct got_error *
9700 cmd_send(int argc, char *argv[])
9701 {
9702 const struct got_error *error = NULL;
9703 char *cwd = NULL, *repo_path = NULL;
9704 const char *remote_name;
9705 char *proto = NULL, *host = NULL, *port = NULL;
9706 char *repo_name = NULL, *server_path = NULL;
9707 const struct got_remote_repo *remotes;
9708 struct got_remote_repo *remote = NULL;
9709 int nremotes, nbranches = 0, ndelete_branches = 0;
9710 struct got_repository *repo = NULL;
9711 struct got_worktree *worktree = NULL;
9712 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9713 struct got_pathlist_head branches;
9714 struct got_pathlist_head tags;
9715 struct got_reflist_head all_branches;
9716 struct got_reflist_head all_tags;
9717 struct got_pathlist_head delete_args;
9718 struct got_pathlist_head delete_branches;
9719 struct got_reflist_entry *re;
9720 struct got_pathlist_entry *pe;
9721 int i, ch, sendfd = -1, sendstatus;
9722 pid_t sendpid = -1;
9723 struct got_send_progress_arg spa;
9724 int verbosity = 0, overwrite_refs = 0;
9725 int send_all_branches = 0, send_all_tags = 0;
9726 struct got_reference *ref = NULL;
9727 int *pack_fds = NULL;
9728
9729 TAILQ_INIT(&branches);
9730 TAILQ_INIT(&tags);
9731 TAILQ_INIT(&all_branches);
9732 TAILQ_INIT(&all_tags);
9733 TAILQ_INIT(&delete_args);
9734 TAILQ_INIT(&delete_branches);
9735
9736 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9737 switch (ch) {
9738 case 'a':
9739 send_all_branches = 1;
9740 break;
9741 case 'b':
9742 error = got_pathlist_append(&branches, optarg, NULL);
9743 if (error)
9744 return error;
9745 nbranches++;
9746 break;
9747 case 'd':
9748 error = got_pathlist_append(&delete_args, optarg, NULL);
9749 if (error)
9750 return error;
9751 break;
9752 case 'f':
9753 overwrite_refs = 1;
9754 break;
9755 case 'q':
9756 verbosity = -1;
9757 break;
9758 case 'r':
9759 repo_path = realpath(optarg, NULL);
9760 if (repo_path == NULL)
9761 return got_error_from_errno2("realpath",
9762 optarg);
9763 got_path_strip_trailing_slashes(repo_path);
9764 break;
9765 case 'T':
9766 send_all_tags = 1;
9767 break;
9768 case 't':
9769 error = got_pathlist_append(&tags, optarg, NULL);
9770 if (error)
9771 return error;
9772 break;
9773 case 'v':
9774 if (verbosity < 0)
9775 verbosity = 0;
9776 else if (verbosity < 3)
9777 verbosity++;
9778 break;
9779 default:
9780 usage_send();
9781 /* NOTREACHED */
9782 }
9783 }
9784 argc -= optind;
9785 argv += optind;
9786
9787 if (send_all_branches && !TAILQ_EMPTY(&branches))
9788 option_conflict('a', 'b');
9789 if (send_all_tags && !TAILQ_EMPTY(&tags))
9790 option_conflict('T', 't');
9791
9792
9793 if (argc == 0)
9794 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9795 else if (argc == 1)
9796 remote_name = argv[0];
9797 else
9798 usage_send();
9799
9800 cwd = getcwd(NULL, 0);
9801 if (cwd == NULL) {
9802 error = got_error_from_errno("getcwd");
9803 goto done;
9804 }
9805
9806 error = got_repo_pack_fds_open(&pack_fds);
9807 if (error != NULL)
9808 goto done;
9809
9810 if (repo_path == NULL) {
9811 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9812 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9813 goto done;
9814 else
9815 error = NULL;
9816 if (worktree) {
9817 repo_path =
9818 strdup(got_worktree_get_repo_path(worktree));
9819 if (repo_path == NULL)
9820 error = got_error_from_errno("strdup");
9821 if (error)
9822 goto done;
9823 } else {
9824 repo_path = strdup(cwd);
9825 if (repo_path == NULL) {
9826 error = got_error_from_errno("strdup");
9827 goto done;
9828 }
9829 }
9830 }
9831
9832 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9833 if (error)
9834 goto done;
9835
9836 if (worktree) {
9837 worktree_conf = got_worktree_get_gotconfig(worktree);
9838 if (worktree_conf) {
9839 got_gotconfig_get_remotes(&nremotes, &remotes,
9840 worktree_conf);
9841 for (i = 0; i < nremotes; i++) {
9842 if (strcmp(remotes[i].name, remote_name) == 0) {
9843 error = got_repo_remote_repo_dup(&remote,
9844 &remotes[i]);
9845 if (error)
9846 goto done;
9847 break;
9848 }
9849 }
9850 }
9851 }
9852 if (remote == NULL) {
9853 repo_conf = got_repo_get_gotconfig(repo);
9854 if (repo_conf) {
9855 got_gotconfig_get_remotes(&nremotes, &remotes,
9856 repo_conf);
9857 for (i = 0; i < nremotes; i++) {
9858 if (strcmp(remotes[i].name, remote_name) == 0) {
9859 error = got_repo_remote_repo_dup(&remote,
9860 &remotes[i]);
9861 if (error)
9862 goto done;
9863 break;
9864 }
9865 }
9866 }
9867 }
9868 if (remote == NULL) {
9869 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9870 for (i = 0; i < nremotes; i++) {
9871 if (strcmp(remotes[i].name, remote_name) == 0) {
9872 error = got_repo_remote_repo_dup(&remote,
9873 &remotes[i]);
9874 if (error)
9875 goto done;
9876 break;
9877 }
9878 }
9879 }
9880 if (remote == NULL) {
9881 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9882 goto done;
9883 }
9884
9885 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9886 &repo_name, remote->send_url);
9887 if (error)
9888 goto done;
9889
9890 if (strcmp(proto, "git") == 0) {
9891 #ifndef PROFILE
9892 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9893 "sendfd dns inet unveil", NULL) == -1)
9894 err(1, "pledge");
9895 #endif
9896 } else if (strcmp(proto, "git+ssh") == 0 ||
9897 strcmp(proto, "ssh") == 0) {
9898 #ifndef PROFILE
9899 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9900 "sendfd unveil", NULL) == -1)
9901 err(1, "pledge");
9902 #endif
9903 } else if (strcmp(proto, "http") == 0 ||
9904 strcmp(proto, "git+http") == 0) {
9905 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9906 goto done;
9907 } else {
9908 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9909 goto done;
9910 }
9911
9912 error = got_dial_apply_unveil(proto);
9913 if (error)
9914 goto done;
9915
9916 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9917 if (error)
9918 goto done;
9919
9920 if (send_all_branches) {
9921 error = got_ref_list(&all_branches, repo, "refs/heads",
9922 got_ref_cmp_by_name, NULL);
9923 if (error)
9924 goto done;
9925 TAILQ_FOREACH(re, &all_branches, entry) {
9926 const char *branchname = got_ref_get_name(re->ref);
9927 error = got_pathlist_append(&branches,
9928 branchname, NULL);
9929 if (error)
9930 goto done;
9931 nbranches++;
9932 }
9933 } else if (nbranches == 0) {
9934 for (i = 0; i < remote->nsend_branches; i++) {
9935 error = got_pathlist_append(&branches,
9936 remote->send_branches[i], NULL);
9937 if (error)
9938 goto done;
9939 }
9940 }
9941
9942 if (send_all_tags) {
9943 error = got_ref_list(&all_tags, repo, "refs/tags",
9944 got_ref_cmp_by_name, NULL);
9945 if (error)
9946 goto done;
9947 TAILQ_FOREACH(re, &all_tags, entry) {
9948 const char *tagname = got_ref_get_name(re->ref);
9949 error = got_pathlist_append(&tags,
9950 tagname, NULL);
9951 if (error)
9952 goto done;
9953 }
9954 }
9955
9956 /*
9957 * To prevent accidents only branches in refs/heads/ can be deleted
9958 * with 'got send -d'.
9959 * Deleting anything else requires local repository access or Git.
9960 */
9961 TAILQ_FOREACH(pe, &delete_args, entry) {
9962 const char *branchname = pe->path;
9963 char *s;
9964 struct got_pathlist_entry *new;
9965 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9966 s = strdup(branchname);
9967 if (s == NULL) {
9968 error = got_error_from_errno("strdup");
9969 goto done;
9970 }
9971 } else {
9972 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9973 error = got_error_from_errno("asprintf");
9974 goto done;
9975 }
9976 }
9977 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9978 if (error || new == NULL /* duplicate */)
9979 free(s);
9980 if (error)
9981 goto done;
9982 ndelete_branches++;
9983 }
9984
9985 if (nbranches == 0 && ndelete_branches == 0) {
9986 struct got_reference *head_ref;
9987 if (worktree)
9988 error = got_ref_open(&head_ref, repo,
9989 got_worktree_get_head_ref_name(worktree), 0);
9990 else
9991 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9992 if (error)
9993 goto done;
9994 if (got_ref_is_symbolic(head_ref)) {
9995 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9996 got_ref_close(head_ref);
9997 if (error)
9998 goto done;
9999 } else
10000 ref = head_ref;
10001 error = got_pathlist_append(&branches, got_ref_get_name(ref),
10002 NULL);
10003 if (error)
10004 goto done;
10005 nbranches++;
10006 }
10007
10008 if (worktree) {
10009 /* Release work tree lock. */
10010 got_worktree_close(worktree);
10011 worktree = NULL;
10012 }
10013
10014 if (verbosity >= 0) {
10015 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
10016 remote->name, proto, host,
10017 port ? ":" : "", port ? port : "",
10018 *server_path == '/' ? "" : "/", server_path);
10019 }
10020
10021 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
10022 server_path, verbosity);
10023 if (error)
10024 goto done;
10025
10026 memset(&spa, 0, sizeof(spa));
10027 spa.last_scaled_packsize[0] = '\0';
10028 spa.last_p_deltify = -1;
10029 spa.last_p_written = -1;
10030 spa.verbosity = verbosity;
10031 spa.delete_branches = &delete_branches;
10032 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
10033 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
10034 check_cancelled, NULL);
10035 if (spa.printed_something)
10036 putchar('\n');
10037 if (error)
10038 goto done;
10039 if (!spa.sent_something && verbosity >= 0)
10040 printf("Already up-to-date\n");
10041 done:
10042 if (sendpid > 0) {
10043 if (kill(sendpid, SIGTERM) == -1)
10044 error = got_error_from_errno("kill");
10045 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
10046 error = got_error_from_errno("waitpid");
10047 }
10048 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
10049 error = got_error_from_errno("close");
10050 if (repo) {
10051 const struct got_error *close_err = got_repo_close(repo);
10052 if (error == NULL)
10053 error = close_err;
10054 }
10055 if (worktree)
10056 got_worktree_close(worktree);
10057 if (pack_fds) {
10058 const struct got_error *pack_err =
10059 got_repo_pack_fds_close(pack_fds);
10060 if (error == NULL)
10061 error = pack_err;
10062 }
10063 if (ref)
10064 got_ref_close(ref);
10065 got_repo_free_remote_repo_data(remote);
10066 free(remote);
10067 got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
10068 got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
10069 got_ref_list_free(&all_branches);
10070 got_ref_list_free(&all_tags);
10071 got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
10072 got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
10073 free(cwd);
10074 free(repo_path);
10075 free(proto);
10076 free(host);
10077 free(port);
10078 free(server_path);
10079 free(repo_name);
10080 return error;
10081 }
10082
10083 /*
10084 * Print and if delete is set delete all ref_prefix references.
10085 * If wanted_ref is not NULL, only print or delete this reference.
10086 */
10087 static const struct got_error *
10088 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
10089 const char *wanted_ref, int delete, struct got_worktree *worktree,
10090 struct got_repository *repo)
10091 {
10092 const struct got_error *err;
10093 struct got_pathlist_head paths;
10094 struct got_reflist_head refs;
10095 struct got_reflist_entry *re;
10096 struct got_reflist_object_id_map *refs_idmap = NULL;
10097 struct got_commit_object *commit = NULL;
10098 struct got_object_id *id = NULL;
10099 const char *header_prefix;
10100 char *uuidstr = NULL;
10101 int found = 0;
10102
10103 TAILQ_INIT(&refs);
10104 TAILQ_INIT(&paths);
10105
10106 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
10107 if (err)
10108 goto done;
10109
10110 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10111 if (err)
10112 goto done;
10113
10114 if (worktree != NULL) {
10115 err = got_worktree_get_uuid(&uuidstr, worktree);
10116 if (err)
10117 goto done;
10118 }
10119
10120 if (wanted_ref) {
10121 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
10122 wanted_ref += 11;
10123 }
10124
10125 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
10126 header_prefix = "backout";
10127 else
10128 header_prefix = "cherrypick";
10129
10130 TAILQ_FOREACH(re, &refs, entry) {
10131 const char *refname, *wt;
10132
10133 refname = got_ref_get_name(re->ref);
10134
10135 err = check_cancelled(NULL);
10136 if (err)
10137 goto done;
10138
10139 if (strncmp(refname, ref_prefix, prefix_len) == 0)
10140 refname += prefix_len + 1; /* skip '-' delimiter */
10141 else
10142 continue;
10143
10144 wt = refname;
10145
10146 if (worktree == NULL || strncmp(refname, uuidstr,
10147 GOT_WORKTREE_UUID_STRLEN) == 0)
10148 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
10149 else
10150 continue;
10151
10152 err = got_repo_match_object_id(&id, NULL, refname,
10153 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10154 if (err)
10155 goto done;
10156
10157 err = got_object_open_as_commit(&commit, repo, id);
10158 if (err)
10159 goto done;
10160
10161 if (wanted_ref)
10162 found = strncmp(wanted_ref, refname,
10163 strlen(wanted_ref)) == 0;
10164 if (wanted_ref && !found) {
10165 struct got_reflist_head *ci_refs;
10166
10167 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
10168 id);
10169
10170 if (ci_refs) {
10171 char *refs_str = NULL;
10172 char const *r = NULL;
10173
10174 err = build_refs_str(&refs_str, ci_refs, id,
10175 repo, 1);
10176 if (err)
10177 goto done;
10178
10179 r = refs_str;
10180 while (r) {
10181 if (strncmp(r, wanted_ref,
10182 strlen(wanted_ref)) == 0) {
10183 found = 1;
10184 break;
10185 }
10186 r = strchr(r, ' ');
10187 if (r)
10188 ++r;
10189 }
10190 free(refs_str);
10191 }
10192 }
10193
10194 if (wanted_ref == NULL || found) {
10195 if (delete) {
10196 err = got_ref_delete(re->ref, repo);
10197 if (err)
10198 goto done;
10199 printf("Deleted: ");
10200 err = print_commit_oneline(commit, id, repo,
10201 refs_idmap);
10202 } else {
10203 /*
10204 * Print paths modified by commit to help
10205 * associate commits with worktree changes.
10206 */
10207 err = get_changed_paths(&paths, commit,
10208 repo, NULL);
10209 if (err)
10210 goto done;
10211
10212 err = print_commit(commit, id, repo, NULL,
10213 &paths, NULL, 0, 0, refs_idmap, NULL,
10214 header_prefix);
10215 got_pathlist_free(&paths,
10216 GOT_PATHLIST_FREE_ALL);
10217
10218 if (worktree == NULL)
10219 printf("work tree: %.*s\n\n",
10220 GOT_WORKTREE_UUID_STRLEN, wt);
10221 }
10222 if (err || found)
10223 goto done;
10224 }
10225
10226 got_object_commit_close(commit);
10227 commit = NULL;
10228 free(id);
10229 id = NULL;
10230 }
10231
10232 if (wanted_ref != NULL && !found)
10233 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
10234
10235 done:
10236 free(id);
10237 free(uuidstr);
10238 got_ref_list_free(&refs);
10239 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
10240 if (refs_idmap)
10241 got_reflist_object_id_map_free(refs_idmap);
10242 if (commit)
10243 got_object_commit_close(commit);
10244 return err;
10245 }
10246
10247 /*
10248 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
10249 * identified by id for log messages to prepopulate the editor on commit.
10250 */
10251 static const struct got_error *
10252 logmsg_ref(struct got_object_id *id, const char *prefix,
10253 struct got_worktree *worktree, struct got_repository *repo)
10254 {
10255 const struct got_error *err = NULL;
10256 char *idstr, *ref = NULL, *refname = NULL;
10257 int histedit_in_progress;
10258 int rebase_in_progress, merge_in_progress;
10259
10260 /*
10261 * Silenty refuse to create merge reference if any histedit, merge,
10262 * or rebase operation is in progress.
10263 */
10264 err = got_worktree_histedit_in_progress(&histedit_in_progress,
10265 worktree);
10266 if (err)
10267 return err;
10268 if (histedit_in_progress)
10269 return NULL;
10270
10271 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10272 if (err)
10273 return err;
10274 if (rebase_in_progress)
10275 return NULL;
10276
10277 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10278 repo);
10279 if (err)
10280 return err;
10281 if (merge_in_progress)
10282 return NULL;
10283
10284 err = got_object_id_str(&idstr, id);
10285 if (err)
10286 return err;
10287
10288 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
10289 if (err)
10290 goto done;
10291
10292 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
10293 err = got_error_from_errno("asprintf");
10294 goto done;
10295 }
10296
10297 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
10298 -1, repo);
10299 done:
10300 free(ref);
10301 free(idstr);
10302 free(refname);
10303 return err;
10304 }
10305
10306 __dead static void
10307 usage_cherrypick(void)
10308 {
10309 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
10310 getprogname());
10311 exit(1);
10312 }
10313
10314 static const struct got_error *
10315 cmd_cherrypick(int argc, char *argv[])
10316 {
10317 const struct got_error *error = NULL;
10318 struct got_worktree *worktree = NULL;
10319 struct got_repository *repo = NULL;
10320 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10321 struct got_object_id *commit_id = NULL;
10322 struct got_commit_object *commit = NULL;
10323 struct got_object_qid *pid;
10324 int ch, list_refs = 0, remove_refs = 0;
10325 struct got_update_progress_arg upa;
10326 int *pack_fds = NULL;
10327
10328 #ifndef PROFILE
10329 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10330 "unveil", NULL) == -1)
10331 err(1, "pledge");
10332 #endif
10333
10334 while ((ch = getopt(argc, argv, "lX")) != -1) {
10335 switch (ch) {
10336 case 'l':
10337 list_refs = 1;
10338 break;
10339 case 'X':
10340 remove_refs = 1;
10341 break;
10342 default:
10343 usage_cherrypick();
10344 /* NOTREACHED */
10345 }
10346 }
10347
10348 argc -= optind;
10349 argv += optind;
10350
10351 if (list_refs || remove_refs) {
10352 if (argc != 0 && argc != 1)
10353 usage_cherrypick();
10354 } else if (argc != 1)
10355 usage_cherrypick();
10356 if (list_refs && remove_refs)
10357 option_conflict('l', 'X');
10358
10359 cwd = getcwd(NULL, 0);
10360 if (cwd == NULL) {
10361 error = got_error_from_errno("getcwd");
10362 goto done;
10363 }
10364
10365 error = got_repo_pack_fds_open(&pack_fds);
10366 if (error != NULL)
10367 goto done;
10368
10369 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10370 if (error) {
10371 if (list_refs || remove_refs) {
10372 if (error->code != GOT_ERR_NOT_WORKTREE)
10373 goto done;
10374 } else {
10375 if (error->code == GOT_ERR_NOT_WORKTREE)
10376 error = wrap_not_worktree_error(error,
10377 "cherrypick", cwd);
10378 goto done;
10379 }
10380 }
10381
10382 error = got_repo_open(&repo,
10383 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10384 NULL, pack_fds);
10385 if (error != NULL)
10386 goto done;
10387
10388 error = apply_unveil(got_repo_get_path(repo), 0,
10389 worktree ? got_worktree_get_root_path(worktree) : NULL);
10390 if (error)
10391 goto done;
10392
10393 if (list_refs || remove_refs) {
10394 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
10395 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
10396 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10397 goto done;
10398 }
10399
10400 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10401 if (error != NULL)
10402 goto done;
10403
10404 error = got_repo_match_object_id(&commit_id, NULL,
10405 keyword_idstr != NULL ? keyword_idstr : argv[0],
10406 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10407 if (error)
10408 goto done;
10409 error = got_object_id_str(&commit_id_str, commit_id);
10410 if (error)
10411 goto done;
10412
10413 error = got_object_open_as_commit(&commit, repo, commit_id);
10414 if (error)
10415 goto done;
10416 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10417 memset(&upa, 0, sizeof(upa));
10418 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
10419 commit_id, repo, update_progress, &upa, check_cancelled,
10420 NULL);
10421 if (error != NULL)
10422 goto done;
10423
10424 if (upa.did_something) {
10425 error = logmsg_ref(commit_id,
10426 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
10427 if (error)
10428 goto done;
10429 printf("Merged commit %s\n", commit_id_str);
10430 }
10431 print_merge_progress_stats(&upa);
10432 done:
10433 free(cwd);
10434 free(keyword_idstr);
10435 if (commit)
10436 got_object_commit_close(commit);
10437 free(commit_id_str);
10438 if (worktree)
10439 got_worktree_close(worktree);
10440 if (repo) {
10441 const struct got_error *close_err = got_repo_close(repo);
10442 if (error == NULL)
10443 error = close_err;
10444 }
10445 if (pack_fds) {
10446 const struct got_error *pack_err =
10447 got_repo_pack_fds_close(pack_fds);
10448 if (error == NULL)
10449 error = pack_err;
10450 }
10451
10452 return error;
10453 }
10454
10455 __dead static void
10456 usage_backout(void)
10457 {
10458 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
10459 exit(1);
10460 }
10461
10462 static const struct got_error *
10463 cmd_backout(int argc, char *argv[])
10464 {
10465 const struct got_error *error = NULL;
10466 struct got_worktree *worktree = NULL;
10467 struct got_repository *repo = NULL;
10468 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10469 struct got_object_id *commit_id = NULL;
10470 struct got_commit_object *commit = NULL;
10471 struct got_object_qid *pid;
10472 int ch, list_refs = 0, remove_refs = 0;
10473 struct got_update_progress_arg upa;
10474 int *pack_fds = NULL;
10475
10476 #ifndef PROFILE
10477 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10478 "unveil", NULL) == -1)
10479 err(1, "pledge");
10480 #endif
10481
10482 while ((ch = getopt(argc, argv, "lX")) != -1) {
10483 switch (ch) {
10484 case 'l':
10485 list_refs = 1;
10486 break;
10487 case 'X':
10488 remove_refs = 1;
10489 break;
10490 default:
10491 usage_backout();
10492 /* NOTREACHED */
10493 }
10494 }
10495
10496 argc -= optind;
10497 argv += optind;
10498
10499 if (list_refs || remove_refs) {
10500 if (argc != 0 && argc != 1)
10501 usage_backout();
10502 } else if (argc != 1)
10503 usage_backout();
10504 if (list_refs && remove_refs)
10505 option_conflict('l', 'X');
10506
10507 cwd = getcwd(NULL, 0);
10508 if (cwd == NULL) {
10509 error = got_error_from_errno("getcwd");
10510 goto done;
10511 }
10512
10513 error = got_repo_pack_fds_open(&pack_fds);
10514 if (error != NULL)
10515 goto done;
10516
10517 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10518 if (error) {
10519 if (list_refs || remove_refs) {
10520 if (error->code != GOT_ERR_NOT_WORKTREE)
10521 goto done;
10522 } else {
10523 if (error->code == GOT_ERR_NOT_WORKTREE)
10524 error = wrap_not_worktree_error(error,
10525 "backout", cwd);
10526 goto done;
10527 }
10528 }
10529
10530 error = got_repo_open(&repo,
10531 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10532 NULL, pack_fds);
10533 if (error != NULL)
10534 goto done;
10535
10536 error = apply_unveil(got_repo_get_path(repo), 0,
10537 worktree ? got_worktree_get_root_path(worktree) : NULL);
10538 if (error)
10539 goto done;
10540
10541 if (list_refs || remove_refs) {
10542 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
10543 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
10544 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10545 goto done;
10546 }
10547
10548 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10549 if (error != NULL)
10550 goto done;
10551
10552 error = got_repo_match_object_id(&commit_id, NULL,
10553 keyword_idstr != NULL ? keyword_idstr : argv[0],
10554 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10555 if (error)
10556 goto done;
10557 error = got_object_id_str(&commit_id_str, commit_id);
10558 if (error)
10559 goto done;
10560
10561 error = got_object_open_as_commit(&commit, repo, commit_id);
10562 if (error)
10563 goto done;
10564 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10565 if (pid == NULL) {
10566 error = got_error(GOT_ERR_ROOT_COMMIT);
10567 goto done;
10568 }
10569
10570 memset(&upa, 0, sizeof(upa));
10571 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
10572 repo, update_progress, &upa, check_cancelled, NULL);
10573 if (error != NULL)
10574 goto done;
10575
10576 if (upa.did_something) {
10577 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
10578 worktree, repo);
10579 if (error)
10580 goto done;
10581 printf("Backed out commit %s\n", commit_id_str);
10582 }
10583 print_merge_progress_stats(&upa);
10584 done:
10585 free(cwd);
10586 free(keyword_idstr);
10587 if (commit)
10588 got_object_commit_close(commit);
10589 free(commit_id_str);
10590 if (worktree)
10591 got_worktree_close(worktree);
10592 if (repo) {
10593 const struct got_error *close_err = got_repo_close(repo);
10594 if (error == NULL)
10595 error = close_err;
10596 }
10597 if (pack_fds) {
10598 const struct got_error *pack_err =
10599 got_repo_pack_fds_close(pack_fds);
10600 if (error == NULL)
10601 error = pack_err;
10602 }
10603 return error;
10604 }
10605
10606 __dead static void
10607 usage_rebase(void)
10608 {
10609 fprintf(stderr, "usage: %s rebase [-aCclX] [branch]\n", getprogname());
10610 exit(1);
10611 }
10612
10613 static void
10614 trim_logmsg(char *logmsg, int limit)
10615 {
10616 char *nl;
10617 size_t len;
10618
10619 len = strlen(logmsg);
10620 if (len > limit)
10621 len = limit;
10622 logmsg[len] = '\0';
10623 nl = strchr(logmsg, '\n');
10624 if (nl)
10625 *nl = '\0';
10626 }
10627
10628 static const struct got_error *
10629 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
10630 {
10631 const struct got_error *err;
10632 char *logmsg0 = NULL;
10633 const char *s;
10634
10635 err = got_object_commit_get_logmsg(&logmsg0, commit);
10636 if (err)
10637 return err;
10638
10639 s = logmsg0;
10640 while (isspace((unsigned char)s[0]))
10641 s++;
10642
10643 *logmsg = strdup(s);
10644 if (*logmsg == NULL) {
10645 err = got_error_from_errno("strdup");
10646 goto done;
10647 }
10648
10649 trim_logmsg(*logmsg, limit);
10650 done:
10651 free(logmsg0);
10652 return err;
10653 }
10654
10655 static const struct got_error *
10656 show_rebase_merge_conflict(struct got_object_id *id,
10657 struct got_repository *repo)
10658 {
10659 const struct got_error *err;
10660 struct got_commit_object *commit = NULL;
10661 char *id_str = NULL, *logmsg = NULL;
10662
10663 err = got_object_open_as_commit(&commit, repo, id);
10664 if (err)
10665 return err;
10666
10667 err = got_object_id_str(&id_str, id);
10668 if (err)
10669 goto done;
10670
10671 id_str[12] = '\0';
10672
10673 err = get_short_logmsg(&logmsg, 42, commit);
10674 if (err)
10675 goto done;
10676
10677 printf("%s -> merge conflict: %s\n", id_str, logmsg);
10678 done:
10679 free(id_str);
10680 got_object_commit_close(commit);
10681 free(logmsg);
10682 return err;
10683 }
10684
10685 static const struct got_error *
10686 show_rebase_progress(struct got_commit_object *commit,
10687 struct got_object_id *old_id, struct got_object_id *new_id)
10688 {
10689 const struct got_error *err;
10690 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10691
10692 err = got_object_id_str(&old_id_str, old_id);
10693 if (err)
10694 goto done;
10695
10696 if (new_id) {
10697 err = got_object_id_str(&new_id_str, new_id);
10698 if (err)
10699 goto done;
10700 }
10701
10702 old_id_str[12] = '\0';
10703 if (new_id_str)
10704 new_id_str[12] = '\0';
10705
10706 err = get_short_logmsg(&logmsg, 42, commit);
10707 if (err)
10708 goto done;
10709
10710 printf("%s -> %s: %s\n", old_id_str,
10711 new_id_str ? new_id_str : "no-op change", logmsg);
10712 done:
10713 free(old_id_str);
10714 free(new_id_str);
10715 free(logmsg);
10716 return err;
10717 }
10718
10719 static const struct got_error *
10720 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
10721 struct got_reference *branch, struct got_reference *tmp_branch,
10722 struct got_repository *repo, int create_backup)
10723 {
10724 printf("Switching work tree to %s\n", got_ref_get_name(branch));
10725 return got_worktree_rebase_complete(worktree, fileindex,
10726 tmp_branch, branch, repo, create_backup);
10727 }
10728
10729 static const struct got_error *
10730 rebase_commit(struct got_pathlist_head *merged_paths,
10731 struct got_worktree *worktree, struct got_fileindex *fileindex,
10732 struct got_reference *tmp_branch, const char *committer,
10733 struct got_object_id *commit_id, int allow_conflict,
10734 struct got_repository *repo)
10735 {
10736 const struct got_error *error;
10737 struct got_commit_object *commit;
10738 struct got_object_id *new_commit_id;
10739
10740 error = got_object_open_as_commit(&commit, repo, commit_id);
10741 if (error)
10742 return error;
10743
10744 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
10745 worktree, fileindex, tmp_branch, committer, commit, commit_id,
10746 allow_conflict, repo);
10747 if (error) {
10748 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
10749 goto done;
10750 error = show_rebase_progress(commit, commit_id, NULL);
10751 } else {
10752 error = show_rebase_progress(commit, commit_id, new_commit_id);
10753 free(new_commit_id);
10754 }
10755 done:
10756 got_object_commit_close(commit);
10757 return error;
10758 }
10759
10760 struct check_path_prefix_arg {
10761 const char *path_prefix;
10762 size_t len;
10763 int errcode;
10764 };
10765
10766 static const struct got_error *
10767 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
10768 struct got_blob_object *blob2, FILE *f1, FILE *f2,
10769 struct got_object_id *id1, struct got_object_id *id2,
10770 const char *path1, const char *path2,
10771 mode_t mode1, mode_t mode2, struct got_repository *repo)
10772 {
10773 struct check_path_prefix_arg *a = arg;
10774
10775 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
10776 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
10777 return got_error(a->errcode);
10778
10779 return NULL;
10780 }
10781
10782 static const struct got_error *
10783 check_path_prefix(struct got_object_id *parent_id,
10784 struct got_object_id *commit_id, const char *path_prefix,
10785 int errcode, struct got_repository *repo)
10786 {
10787 const struct got_error *err;
10788 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
10789 struct got_commit_object *commit = NULL, *parent_commit = NULL;
10790 struct check_path_prefix_arg cpp_arg;
10791
10792 if (got_path_is_root_dir(path_prefix))
10793 return NULL;
10794
10795 err = got_object_open_as_commit(&commit, repo, commit_id);
10796 if (err)
10797 goto done;
10798
10799 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
10800 if (err)
10801 goto done;
10802
10803 err = got_object_open_as_tree(&tree1, repo,
10804 got_object_commit_get_tree_id(parent_commit));
10805 if (err)
10806 goto done;
10807
10808 err = got_object_open_as_tree(&tree2, repo,
10809 got_object_commit_get_tree_id(commit));
10810 if (err)
10811 goto done;
10812
10813 cpp_arg.path_prefix = path_prefix;
10814 while (cpp_arg.path_prefix[0] == '/')
10815 cpp_arg.path_prefix++;
10816 cpp_arg.len = strlen(cpp_arg.path_prefix);
10817 cpp_arg.errcode = errcode;
10818 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
10819 check_path_prefix_in_diff, &cpp_arg, 0);
10820 done:
10821 if (tree1)
10822 got_object_tree_close(tree1);
10823 if (tree2)
10824 got_object_tree_close(tree2);
10825 if (commit)
10826 got_object_commit_close(commit);
10827 if (parent_commit)
10828 got_object_commit_close(parent_commit);
10829 return err;
10830 }
10831
10832 static const struct got_error *
10833 collect_commits(struct got_object_id_queue *commits,
10834 struct got_object_id *initial_commit_id,
10835 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
10836 const char *path_prefix, int path_prefix_errcode,
10837 struct got_repository *repo)
10838 {
10839 const struct got_error *err = NULL;
10840 struct got_commit_graph *graph = NULL;
10841 struct got_object_id parent_id, commit_id;
10842 struct got_object_qid *qid;
10843
10844 err = got_commit_graph_open(&graph, "/", 1);
10845 if (err)
10846 return err;
10847
10848 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
10849 check_cancelled, NULL);
10850 if (err)
10851 goto done;
10852
10853 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
10854 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
10855 err = got_commit_graph_iter_next(&parent_id, graph, repo,
10856 check_cancelled, NULL);
10857 if (err) {
10858 if (err->code == GOT_ERR_ITER_COMPLETED) {
10859 err = got_error_msg(GOT_ERR_ANCESTRY,
10860 "ran out of commits to rebase before "
10861 "youngest common ancestor commit has "
10862 "been reached?!?");
10863 }
10864 goto done;
10865 } else {
10866 err = check_path_prefix(&parent_id, &commit_id,
10867 path_prefix, path_prefix_errcode, repo);
10868 if (err)
10869 goto done;
10870
10871 err = got_object_qid_alloc(&qid, &commit_id);
10872 if (err)
10873 goto done;
10874 STAILQ_INSERT_HEAD(commits, qid, entry);
10875
10876 memcpy(&commit_id, &parent_id, sizeof(commit_id));
10877 }
10878 }
10879 done:
10880 got_commit_graph_close(graph);
10881 return err;
10882 }
10883
10884 static const struct got_error *
10885 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
10886 {
10887 const struct got_error *err = NULL;
10888 time_t committer_time;
10889 struct tm tm;
10890 char datebuf[11]; /* YYYY-MM-DD + NUL */
10891 char *author0 = NULL, *author, *smallerthan;
10892 char *logmsg0 = NULL, *logmsg, *newline;
10893
10894 committer_time = got_object_commit_get_committer_time(commit);
10895 if (gmtime_r(&committer_time, &tm) == NULL)
10896 return got_error_from_errno("gmtime_r");
10897 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
10898 return got_error(GOT_ERR_NO_SPACE);
10899
10900 author0 = strdup(got_object_commit_get_author(commit));
10901 if (author0 == NULL)
10902 return got_error_from_errno("strdup");
10903 author = author0;
10904 smallerthan = strchr(author, '<');
10905 if (smallerthan && smallerthan[1] != '\0')
10906 author = smallerthan + 1;
10907 author[strcspn(author, "@>")] = '\0';
10908
10909 err = got_object_commit_get_logmsg(&logmsg0, commit);
10910 if (err)
10911 goto done;
10912 logmsg = logmsg0;
10913 while (*logmsg == '\n')
10914 logmsg++;
10915 newline = strchr(logmsg, '\n');
10916 if (newline)
10917 *newline = '\0';
10918
10919 if (asprintf(brief_str, "%s %s %s",
10920 datebuf, author, logmsg) == -1)
10921 err = got_error_from_errno("asprintf");
10922 done:
10923 free(author0);
10924 free(logmsg0);
10925 return err;
10926 }
10927
10928 static const struct got_error *
10929 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
10930 struct got_repository *repo)
10931 {
10932 const struct got_error *err;
10933 char *id_str;
10934
10935 err = got_object_id_str(&id_str, id);
10936 if (err)
10937 return err;
10938
10939 err = got_ref_delete(ref, repo);
10940 if (err)
10941 goto done;
10942
10943 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
10944 done:
10945 free(id_str);
10946 return err;
10947 }
10948
10949 static const struct got_error *
10950 print_backup_ref(const char *branch_name, const char *new_id_str,
10951 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
10952 struct got_reflist_object_id_map *refs_idmap,
10953 struct got_repository *repo)
10954 {
10955 const struct got_error *err = NULL;
10956 struct got_reflist_head *refs;
10957 char *refs_str = NULL;
10958 struct got_object_id *new_commit_id = NULL;
10959 struct got_commit_object *new_commit = NULL;
10960 char *new_commit_brief_str = NULL;
10961 struct got_object_id *yca_id = NULL;
10962 struct got_commit_object *yca_commit = NULL;
10963 char *yca_id_str = NULL, *yca_brief_str = NULL;
10964 char *custom_refs_str;
10965
10966 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
10967 return got_error_from_errno("asprintf");
10968
10969 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
10970 0, 0, refs_idmap, custom_refs_str, NULL);
10971 if (err)
10972 goto done;
10973
10974 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
10975 if (err)
10976 goto done;
10977
10978 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
10979 if (refs) {
10980 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
10981 if (err)
10982 goto done;
10983 }
10984
10985 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
10986 if (err)
10987 goto done;
10988
10989 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
10990 if (err)
10991 goto done;
10992
10993 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10994 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
10995 if (err)
10996 goto done;
10997
10998 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
10999 refs_str ? " (" : "", refs_str ? refs_str : "",
11000 refs_str ? ")" : "", new_commit_brief_str);
11001 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
11002 got_object_id_cmp(yca_id, old_commit_id) != 0) {
11003 free(refs_str);
11004 refs_str = NULL;
11005
11006 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
11007 if (err)
11008 goto done;
11009
11010 err = get_commit_brief_str(&yca_brief_str, yca_commit);
11011 if (err)
11012 goto done;
11013
11014 err = got_object_id_str(&yca_id_str, yca_id);
11015 if (err)
11016 goto done;
11017
11018 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
11019 if (refs) {
11020 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
11021 if (err)
11022 goto done;
11023 }
11024 printf("history forked at %s%s%s%s\n %s\n",
11025 yca_id_str,
11026 refs_str ? " (" : "", refs_str ? refs_str : "",
11027 refs_str ? ")" : "", yca_brief_str);
11028 }
11029 done:
11030 free(custom_refs_str);
11031 free(new_commit_id);
11032 free(refs_str);
11033 free(yca_id);
11034 free(yca_id_str);
11035 free(yca_brief_str);
11036 if (new_commit)
11037 got_object_commit_close(new_commit);
11038 if (yca_commit)
11039 got_object_commit_close(yca_commit);
11040
11041 return err;
11042 }
11043
11044 static const struct got_error *
11045 worktree_has_logmsg_ref(const char *caller, struct got_worktree *worktree,
11046 struct got_repository *repo)
11047 {
11048 const struct got_error *err;
11049 struct got_reflist_head refs;
11050 struct got_reflist_entry *re;
11051 char *uuidstr = NULL;
11052 static char msg[160];
11053
11054 TAILQ_INIT(&refs);
11055
11056 err = got_worktree_get_uuid(&uuidstr, worktree);
11057 if (err)
11058 goto done;
11059
11060 err = got_ref_list(&refs, repo, "refs/got/worktree",
11061 got_ref_cmp_by_name, repo);
11062 if (err)
11063 goto done;
11064
11065 TAILQ_FOREACH(re, &refs, entry) {
11066 const char *cmd, *refname, *type;
11067
11068 refname = got_ref_get_name(re->ref);
11069
11070 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
11071 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
11072 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
11073 cmd = "cherrypick";
11074 type = "cherrypicked";
11075 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
11076 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
11077 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
11078 cmd = "backout";
11079 type = "backed-out";
11080 } else
11081 continue;
11082
11083 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) != 0)
11084 continue;
11085
11086 snprintf(msg, sizeof(msg),
11087 "work tree has references created by %s commits which "
11088 "must be removed with 'got %s -X' before running the %s "
11089 "command", type, cmd, caller);
11090 err = got_error_msg(GOT_ERR_WORKTREE_META, msg);
11091 goto done;
11092 }
11093
11094 done:
11095 free(uuidstr);
11096 got_ref_list_free(&refs);
11097 return err;
11098 }
11099
11100 static const struct got_error *
11101 process_backup_refs(const char *backup_ref_prefix,
11102 const char *wanted_branch_name,
11103 int delete, struct got_repository *repo)
11104 {
11105 const struct got_error *err;
11106 struct got_reflist_head refs, backup_refs;
11107 struct got_reflist_entry *re;
11108 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
11109 struct got_object_id *old_commit_id = NULL;
11110 char *branch_name = NULL;
11111 struct got_commit_object *old_commit = NULL;
11112 struct got_reflist_object_id_map *refs_idmap = NULL;
11113 int wanted_branch_found = 0;
11114
11115 TAILQ_INIT(&refs);
11116 TAILQ_INIT(&backup_refs);
11117
11118 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11119 if (err)
11120 return err;
11121
11122 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
11123 if (err)
11124 goto done;
11125
11126 if (wanted_branch_name) {
11127 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
11128 wanted_branch_name += 11;
11129 }
11130
11131 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
11132 got_ref_cmp_by_commit_timestamp_descending, repo);
11133 if (err)
11134 goto done;
11135
11136 TAILQ_FOREACH(re, &backup_refs, entry) {
11137 const char *refname = got_ref_get_name(re->ref);
11138 char *slash;
11139
11140 err = check_cancelled(NULL);
11141 if (err)
11142 break;
11143
11144 err = got_ref_resolve(&old_commit_id, repo, re->ref);
11145 if (err)
11146 break;
11147
11148 err = got_object_open_as_commit(&old_commit, repo,
11149 old_commit_id);
11150 if (err)
11151 break;
11152
11153 if (strncmp(backup_ref_prefix, refname,
11154 backup_ref_prefix_len) == 0)
11155 refname += backup_ref_prefix_len;
11156
11157 while (refname[0] == '/')
11158 refname++;
11159
11160 branch_name = strdup(refname);
11161 if (branch_name == NULL) {
11162 err = got_error_from_errno("strdup");
11163 break;
11164 }
11165 slash = strrchr(branch_name, '/');
11166 if (slash) {
11167 *slash = '\0';
11168 refname += strlen(branch_name) + 1;
11169 }
11170
11171 if (wanted_branch_name == NULL ||
11172 strcmp(wanted_branch_name, branch_name) == 0) {
11173 wanted_branch_found = 1;
11174 if (delete) {
11175 err = delete_backup_ref(re->ref,
11176 old_commit_id, repo);
11177 } else {
11178 err = print_backup_ref(branch_name, refname,
11179 old_commit_id, old_commit, refs_idmap,
11180 repo);
11181 }
11182 if (err)
11183 break;
11184 }
11185
11186 free(old_commit_id);
11187 old_commit_id = NULL;
11188 free(branch_name);
11189 branch_name = NULL;
11190 got_object_commit_close(old_commit);
11191 old_commit = NULL;
11192 }
11193
11194 if (wanted_branch_name && !wanted_branch_found) {
11195 err = got_error_fmt(GOT_ERR_NOT_REF,
11196 "%s/%s/", backup_ref_prefix, wanted_branch_name);
11197 }
11198 done:
11199 if (refs_idmap)
11200 got_reflist_object_id_map_free(refs_idmap);
11201 got_ref_list_free(&refs);
11202 got_ref_list_free(&backup_refs);
11203 free(old_commit_id);
11204 free(branch_name);
11205 if (old_commit)
11206 got_object_commit_close(old_commit);
11207 return err;
11208 }
11209
11210 static const struct got_error *
11211 abort_progress(void *arg, unsigned char status, const char *path)
11212 {
11213 /*
11214 * Unversioned files should not clutter progress output when
11215 * an operation is aborted.
11216 */
11217 if (status == GOT_STATUS_UNVERSIONED)
11218 return NULL;
11219
11220 return update_progress(arg, status, path);
11221 }
11222
11223 static const struct got_error *
11224 cmd_rebase(int argc, char *argv[])
11225 {
11226 const struct got_error *error = NULL;
11227 struct got_worktree *worktree = NULL;
11228 struct got_repository *repo = NULL;
11229 struct got_fileindex *fileindex = NULL;
11230 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11231 struct got_reference *branch = NULL;
11232 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
11233 struct got_object_id *commit_id = NULL, *parent_id = NULL;
11234 struct got_object_id *resume_commit_id = NULL;
11235 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
11236 struct got_object_id *head_commit_id = NULL;
11237 struct got_reference *head_ref = NULL;
11238 struct got_commit_object *commit = NULL;
11239 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
11240 int histedit_in_progress = 0, merge_in_progress = 0;
11241 int create_backup = 1, list_backups = 0, delete_backups = 0;
11242 int allow_conflict = 0;
11243 struct got_object_id_queue commits;
11244 struct got_pathlist_head merged_paths;
11245 const struct got_object_id_queue *parent_ids;
11246 struct got_object_qid *qid, *pid;
11247 struct got_update_progress_arg upa;
11248 int *pack_fds = NULL;
11249
11250 STAILQ_INIT(&commits);
11251 TAILQ_INIT(&merged_paths);
11252 memset(&upa, 0, sizeof(upa));
11253
11254 #ifndef PROFILE
11255 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11256 "unveil", NULL) == -1)
11257 err(1, "pledge");
11258 #endif
11259
11260 while ((ch = getopt(argc, argv, "aCclX")) != -1) {
11261 switch (ch) {
11262 case 'a':
11263 abort_rebase = 1;
11264 break;
11265 case 'C':
11266 allow_conflict = 1;
11267 break;
11268 case 'c':
11269 continue_rebase = 1;
11270 break;
11271 case 'l':
11272 list_backups = 1;
11273 break;
11274 case 'X':
11275 delete_backups = 1;
11276 break;
11277 default:
11278 usage_rebase();
11279 /* NOTREACHED */
11280 }
11281 }
11282
11283 argc -= optind;
11284 argv += optind;
11285
11286 if (list_backups) {
11287 if (abort_rebase)
11288 option_conflict('l', 'a');
11289 if (allow_conflict)
11290 option_conflict('l', 'C');
11291 if (continue_rebase)
11292 option_conflict('l', 'c');
11293 if (delete_backups)
11294 option_conflict('l', 'X');
11295 if (argc != 0 && argc != 1)
11296 usage_rebase();
11297 } else if (delete_backups) {
11298 if (abort_rebase)
11299 option_conflict('X', 'a');
11300 if (allow_conflict)
11301 option_conflict('X', 'C');
11302 if (continue_rebase)
11303 option_conflict('X', 'c');
11304 if (list_backups)
11305 option_conflict('l', 'X');
11306 if (argc != 0 && argc != 1)
11307 usage_rebase();
11308 } else if (allow_conflict) {
11309 if (abort_rebase)
11310 option_conflict('C', 'a');
11311 if (!continue_rebase)
11312 errx(1, "-C option requires -c");
11313 } else {
11314 if (abort_rebase && continue_rebase)
11315 usage_rebase();
11316 else if (abort_rebase || continue_rebase) {
11317 if (argc != 0)
11318 usage_rebase();
11319 } else if (argc != 1)
11320 usage_rebase();
11321 }
11322
11323 cwd = getcwd(NULL, 0);
11324 if (cwd == NULL) {
11325 error = got_error_from_errno("getcwd");
11326 goto done;
11327 }
11328
11329 error = got_repo_pack_fds_open(&pack_fds);
11330 if (error != NULL)
11331 goto done;
11332
11333 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
11334 if (error) {
11335 if (list_backups || delete_backups) {
11336 if (error->code != GOT_ERR_NOT_WORKTREE)
11337 goto done;
11338 } else {
11339 if (error->code == GOT_ERR_NOT_WORKTREE)
11340 error = wrap_not_worktree_error(error,
11341 "rebase", cwd);
11342 goto done;
11343 }
11344 }
11345
11346 error = get_gitconfig_path(&gitconfig_path);
11347 if (error)
11348 goto done;
11349 error = got_repo_open(&repo,
11350 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11351 gitconfig_path, pack_fds);
11352 if (error != NULL)
11353 goto done;
11354
11355 if (worktree != NULL && !list_backups && !delete_backups) {
11356 error = worktree_has_logmsg_ref("rebase", worktree, repo);
11357 if (error)
11358 goto done;
11359 }
11360
11361 error = get_author(&committer, repo, worktree);
11362 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
11363 goto done;
11364
11365 error = apply_unveil(got_repo_get_path(repo), 0,
11366 worktree ? got_worktree_get_root_path(worktree) : NULL);
11367 if (error)
11368 goto done;
11369
11370 if (list_backups || delete_backups) {
11371 error = process_backup_refs(
11372 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
11373 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11374 goto done; /* nothing else to do */
11375 }
11376
11377 error = got_worktree_histedit_in_progress(&histedit_in_progress,
11378 worktree);
11379 if (error)
11380 goto done;
11381 if (histedit_in_progress) {
11382 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11383 goto done;
11384 }
11385
11386 error = got_worktree_merge_in_progress(&merge_in_progress,
11387 worktree, repo);
11388 if (error)
11389 goto done;
11390 if (merge_in_progress) {
11391 error = got_error(GOT_ERR_MERGE_BUSY);
11392 goto done;
11393 }
11394
11395 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11396 if (error)
11397 goto done;
11398
11399 if (abort_rebase) {
11400 if (!rebase_in_progress) {
11401 error = got_error(GOT_ERR_NOT_REBASING);
11402 goto done;
11403 }
11404 error = got_worktree_rebase_continue(&resume_commit_id,
11405 &new_base_branch, &tmp_branch, &branch, &fileindex,
11406 worktree, repo);
11407 if (error)
11408 goto done;
11409 printf("Switching work tree to %s\n",
11410 got_ref_get_symref_target(new_base_branch));
11411 error = got_worktree_rebase_abort(worktree, fileindex, repo,
11412 new_base_branch, abort_progress, &upa);
11413 if (error)
11414 goto done;
11415 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
11416 print_merge_progress_stats(&upa);
11417 goto done; /* nothing else to do */
11418 }
11419
11420 if (continue_rebase) {
11421 if (!rebase_in_progress) {
11422 error = got_error(GOT_ERR_NOT_REBASING);
11423 goto done;
11424 }
11425 error = got_worktree_rebase_continue(&resume_commit_id,
11426 &new_base_branch, &tmp_branch, &branch, &fileindex,
11427 worktree, repo);
11428 if (error)
11429 goto done;
11430
11431 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
11432 committer, resume_commit_id, allow_conflict, repo);
11433 if (error)
11434 goto done;
11435
11436 yca_id = got_object_id_dup(resume_commit_id);
11437 if (yca_id == NULL) {
11438 error = got_error_from_errno("got_object_id_dup");
11439 goto done;
11440 }
11441 } else {
11442 error = got_ref_open(&branch, repo, argv[0], 0);
11443 if (error != NULL)
11444 goto done;
11445 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11446 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11447 "will not rebase a branch which lives outside "
11448 "the \"refs/heads/\" reference namespace");
11449 goto done;
11450 }
11451 }
11452
11453 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
11454 if (error)
11455 goto done;
11456
11457 if (!continue_rebase) {
11458 struct got_object_id *base_commit_id;
11459
11460 error = got_ref_open(&head_ref, repo,
11461 got_worktree_get_head_ref_name(worktree), 0);
11462 if (error)
11463 goto done;
11464 error = got_ref_resolve(&head_commit_id, repo, head_ref);
11465 if (error)
11466 goto done;
11467 base_commit_id = got_worktree_get_base_commit_id(worktree);
11468 if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
11469 error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
11470 goto done;
11471 }
11472
11473 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11474 base_commit_id, branch_head_commit_id, 1, repo,
11475 check_cancelled, NULL);
11476 if (error) {
11477 if (error->code == GOT_ERR_ANCESTRY) {
11478 error = got_error_msg(GOT_ERR_ANCESTRY,
11479 "specified branch shares no common "
11480 "ancestry with work tree's branch");
11481 }
11482 goto done;
11483 }
11484
11485 if (got_object_id_cmp(base_commit_id, yca_id) == 0) {
11486 struct got_pathlist_head paths;
11487 printf("%s is already based on %s\n",
11488 got_ref_get_name(branch),
11489 got_worktree_get_head_ref_name(worktree));
11490 error = switch_head_ref(branch, branch_head_commit_id,
11491 worktree, repo);
11492 if (error)
11493 goto done;
11494 error = got_worktree_set_base_commit_id(worktree, repo,
11495 branch_head_commit_id);
11496 if (error)
11497 goto done;
11498 TAILQ_INIT(&paths);
11499 error = got_pathlist_append(&paths, "", NULL);
11500 if (error)
11501 goto done;
11502 error = got_worktree_checkout_files(worktree,
11503 &paths, repo, update_progress, &upa,
11504 check_cancelled, NULL);
11505 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
11506 if (error)
11507 goto done;
11508 if (upa.did_something) {
11509 char *id_str;
11510 error = got_object_id_str(&id_str,
11511 branch_head_commit_id);
11512 if (error)
11513 goto done;
11514 printf("Updated to %s: %s\n",
11515 got_worktree_get_head_ref_name(worktree),
11516 id_str);
11517 free(id_str);
11518 } else
11519 printf("Already up-to-date\n");
11520 print_update_progress_stats(&upa);
11521 goto done;
11522 }
11523 }
11524
11525 commit_id = branch_head_commit_id;
11526 error = got_object_open_as_commit(&commit, repo, commit_id);
11527 if (error)
11528 goto done;
11529
11530 parent_ids = got_object_commit_get_parent_ids(commit);
11531 pid = STAILQ_FIRST(parent_ids);
11532 if (pid) {
11533 error = collect_commits(&commits, commit_id, &pid->id,
11534 yca_id, got_worktree_get_path_prefix(worktree),
11535 GOT_ERR_REBASE_PATH, repo);
11536 if (error)
11537 goto done;
11538 }
11539
11540 got_object_commit_close(commit);
11541 commit = NULL;
11542
11543 if (!continue_rebase) {
11544 error = got_worktree_rebase_prepare(&new_base_branch,
11545 &tmp_branch, &fileindex, worktree, branch, repo);
11546 if (error)
11547 goto done;
11548 }
11549
11550 if (STAILQ_EMPTY(&commits)) {
11551 if (continue_rebase) {
11552 error = rebase_complete(worktree, fileindex,
11553 branch, tmp_branch, repo, create_backup);
11554 goto done;
11555 } else {
11556 /* Fast-forward the reference of the branch. */
11557 struct got_object_id *new_head_commit_id;
11558 char *id_str;
11559 error = got_ref_resolve(&new_head_commit_id, repo,
11560 new_base_branch);
11561 if (error)
11562 goto done;
11563 error = got_object_id_str(&id_str, new_head_commit_id);
11564 if (error)
11565 goto done;
11566 printf("Forwarding %s to commit %s\n",
11567 got_ref_get_name(branch), id_str);
11568 free(id_str);
11569 error = got_ref_change_ref(branch,
11570 new_head_commit_id);
11571 if (error)
11572 goto done;
11573 /* No backup needed since objects did not change. */
11574 create_backup = 0;
11575 }
11576 }
11577
11578 pid = NULL;
11579 STAILQ_FOREACH(qid, &commits, entry) {
11580
11581 commit_id = &qid->id;
11582 parent_id = pid ? &pid->id : yca_id;
11583 pid = qid;
11584
11585 memset(&upa, 0, sizeof(upa));
11586 error = got_worktree_rebase_merge_files(&merged_paths,
11587 worktree, fileindex, parent_id, commit_id, repo,
11588 update_progress, &upa, check_cancelled, NULL);
11589 if (error)
11590 goto done;
11591
11592 print_merge_progress_stats(&upa);
11593 if (upa.conflicts > 0 || upa.missing > 0 ||
11594 upa.not_deleted > 0 || upa.unversioned > 0) {
11595 if (upa.conflicts > 0) {
11596 error = show_rebase_merge_conflict(&qid->id,
11597 repo);
11598 if (error)
11599 goto done;
11600 }
11601 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11602 break;
11603 }
11604
11605 error = rebase_commit(&merged_paths, worktree, fileindex,
11606 tmp_branch, committer, commit_id, 0, repo);
11607 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11608 if (error)
11609 goto done;
11610 }
11611
11612 if (upa.conflicts > 0 || upa.missing > 0 ||
11613 upa.not_deleted > 0 || upa.unversioned > 0) {
11614 error = got_worktree_rebase_postpone(worktree, fileindex);
11615 if (error)
11616 goto done;
11617 if (upa.conflicts > 0 && upa.missing == 0 &&
11618 upa.not_deleted == 0 && upa.unversioned == 0) {
11619 error = got_error_msg(GOT_ERR_CONFLICTS,
11620 "conflicts must be resolved before rebasing "
11621 "can continue");
11622 } else if (upa.conflicts > 0) {
11623 error = got_error_msg(GOT_ERR_CONFLICTS,
11624 "conflicts must be resolved before rebasing "
11625 "can continue; changes destined for some "
11626 "files were not yet merged and should be "
11627 "merged manually if required before the "
11628 "rebase operation is continued");
11629 } else {
11630 error = got_error_msg(GOT_ERR_CONFLICTS,
11631 "changes destined for some files were not "
11632 "yet merged and should be merged manually "
11633 "if required before the rebase operation "
11634 "is continued");
11635 }
11636 } else
11637 error = rebase_complete(worktree, fileindex, branch,
11638 tmp_branch, repo, create_backup);
11639 done:
11640 free(cwd);
11641 free(committer);
11642 free(gitconfig_path);
11643 got_object_id_queue_free(&commits);
11644 free(branch_head_commit_id);
11645 free(resume_commit_id);
11646 free(head_commit_id);
11647 free(yca_id);
11648 if (commit)
11649 got_object_commit_close(commit);
11650 if (branch)
11651 got_ref_close(branch);
11652 if (new_base_branch)
11653 got_ref_close(new_base_branch);
11654 if (tmp_branch)
11655 got_ref_close(tmp_branch);
11656 if (head_ref)
11657 got_ref_close(head_ref);
11658 if (worktree)
11659 got_worktree_close(worktree);
11660 if (repo) {
11661 const struct got_error *close_err = got_repo_close(repo);
11662 if (error == NULL)
11663 error = close_err;
11664 }
11665 if (pack_fds) {
11666 const struct got_error *pack_err =
11667 got_repo_pack_fds_close(pack_fds);
11668 if (error == NULL)
11669 error = pack_err;
11670 }
11671 return error;
11672 }
11673
11674 __dead static void
11675 usage_histedit(void)
11676 {
11677 fprintf(stderr, "usage: %s histedit [-aCcdeflmX] [-F histedit-script] "
11678 "[branch]\n", getprogname());
11679 exit(1);
11680 }
11681
11682 #define GOT_HISTEDIT_PICK 'p'
11683 #define GOT_HISTEDIT_EDIT 'e'
11684 #define GOT_HISTEDIT_FOLD 'f'
11685 #define GOT_HISTEDIT_DROP 'd'
11686 #define GOT_HISTEDIT_MESG 'm'
11687
11688 static const struct got_histedit_cmd {
11689 unsigned char code;
11690 const char *name;
11691 const char *desc;
11692 } got_histedit_cmds[] = {
11693 { GOT_HISTEDIT_PICK, "pick", "use commit" },
11694 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
11695 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
11696 "be used" },
11697 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
11698 { GOT_HISTEDIT_MESG, "mesg", "open editor to edit the log message" },
11699 };
11700
11701 struct got_histedit_list_entry {
11702 TAILQ_ENTRY(got_histedit_list_entry) entry;
11703 struct got_object_id *commit_id;
11704 const struct got_histedit_cmd *cmd;
11705 char *logmsg;
11706 };
11707 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
11708
11709 static const struct got_error *
11710 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
11711 FILE *f, struct got_repository *repo)
11712 {
11713 const struct got_error *err = NULL;
11714 char *logmsg = NULL, *id_str = NULL;
11715 struct got_commit_object *commit = NULL;
11716 int n;
11717
11718 err = got_object_open_as_commit(&commit, repo, commit_id);
11719 if (err)
11720 goto done;
11721
11722 err = get_short_logmsg(&logmsg, 34, commit);
11723 if (err)
11724 goto done;
11725
11726 err = got_object_id_str(&id_str, commit_id);
11727 if (err)
11728 goto done;
11729
11730 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
11731 if (n < 0)
11732 err = got_ferror(f, GOT_ERR_IO);
11733 done:
11734 if (commit)
11735 got_object_commit_close(commit);
11736 free(id_str);
11737 free(logmsg);
11738 return err;
11739 }
11740
11741 static const struct got_error *
11742 histedit_write_commit_list(struct got_object_id_queue *commits,
11743 FILE *f, int edit_logmsg_only, int fold_only, int drop_only,
11744 int edit_only, struct got_repository *repo)
11745 {
11746 const struct got_error *err = NULL;
11747 struct got_object_qid *qid;
11748 const char *histedit_cmd = NULL;
11749
11750 if (STAILQ_EMPTY(commits))
11751 return got_error(GOT_ERR_EMPTY_HISTEDIT);
11752
11753 STAILQ_FOREACH(qid, commits, entry) {
11754 histedit_cmd = got_histedit_cmds[0].name;
11755 if (drop_only)
11756 histedit_cmd = "drop";
11757 else if (edit_only)
11758 histedit_cmd = "edit";
11759 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
11760 histedit_cmd = "fold";
11761 else if (edit_logmsg_only)
11762 histedit_cmd = "mesg";
11763 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
11764 if (err)
11765 break;
11766 }
11767
11768 return err;
11769 }
11770
11771 static const struct got_error *
11772 write_cmd_list(FILE *f, const char *branch_name,
11773 struct got_object_id_queue *commits)
11774 {
11775 const struct got_error *err = NULL;
11776 size_t i;
11777 int n;
11778 char *id_str;
11779 struct got_object_qid *qid;
11780
11781 qid = STAILQ_FIRST(commits);
11782 err = got_object_id_str(&id_str, &qid->id);
11783 if (err)
11784 return err;
11785
11786 n = fprintf(f,
11787 "# Editing the history of branch '%s' starting at\n"
11788 "# commit %s\n"
11789 "# Commits will be processed in order from top to "
11790 "bottom of this file.\n", branch_name, id_str);
11791 if (n < 0) {
11792 err = got_ferror(f, GOT_ERR_IO);
11793 goto done;
11794 }
11795
11796 n = fprintf(f, "# Available histedit commands:\n");
11797 if (n < 0) {
11798 err = got_ferror(f, GOT_ERR_IO);
11799 goto done;
11800 }
11801
11802 for (i = 0; i < nitems(got_histedit_cmds); i++) {
11803 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
11804 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
11805 cmd->desc);
11806 if (n < 0) {
11807 err = got_ferror(f, GOT_ERR_IO);
11808 break;
11809 }
11810 }
11811 done:
11812 free(id_str);
11813 return err;
11814 }
11815
11816 static const struct got_error *
11817 histedit_syntax_error(int lineno)
11818 {
11819 static char msg[42];
11820 int ret;
11821
11822 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
11823 lineno);
11824 if (ret < 0 || (size_t)ret >= sizeof(msg))
11825 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
11826
11827 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
11828 }
11829
11830 static const struct got_error *
11831 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
11832 char *logmsg, struct got_repository *repo)
11833 {
11834 const struct got_error *err;
11835 struct got_commit_object *folded_commit = NULL;
11836 char *id_str, *folded_logmsg = NULL;
11837
11838 err = got_object_id_str(&id_str, hle->commit_id);
11839 if (err)
11840 return err;
11841
11842 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
11843 if (err)
11844 goto done;
11845
11846 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
11847 if (err)
11848 goto done;
11849 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
11850 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
11851 folded_logmsg) == -1) {
11852 err = got_error_from_errno("asprintf");
11853 }
11854 done:
11855 if (folded_commit)
11856 got_object_commit_close(folded_commit);
11857 free(id_str);
11858 free(folded_logmsg);
11859 return err;
11860 }
11861
11862 static struct got_histedit_list_entry *
11863 get_folded_commits(struct got_histedit_list_entry *hle)
11864 {
11865 struct got_histedit_list_entry *prev, *folded = NULL;
11866
11867 prev = TAILQ_PREV(hle, got_histedit_list, entry);
11868 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
11869 prev->cmd->code == GOT_HISTEDIT_DROP)) {
11870 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
11871 folded = prev;
11872 prev = TAILQ_PREV(prev, got_histedit_list, entry);
11873 }
11874
11875 return folded;
11876 }
11877
11878 static const struct got_error *
11879 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
11880 struct got_repository *repo)
11881 {
11882 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
11883 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
11884 const struct got_error *err = NULL;
11885 struct got_commit_object *commit = NULL;
11886 int logmsg_len;
11887 int fd = -1;
11888 struct got_histedit_list_entry *folded = NULL;
11889
11890 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11891 if (err)
11892 return err;
11893
11894 folded = get_folded_commits(hle);
11895 if (folded) {
11896 while (folded != hle) {
11897 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
11898 folded = TAILQ_NEXT(folded, entry);
11899 continue;
11900 }
11901 err = append_folded_commit_msg(&new_msg, folded,
11902 logmsg, repo);
11903 if (err)
11904 goto done;
11905 free(logmsg);
11906 logmsg = new_msg;
11907 folded = TAILQ_NEXT(folded, entry);
11908 }
11909 }
11910
11911 err = got_object_id_str(&id_str, hle->commit_id);
11912 if (err)
11913 goto done;
11914 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
11915 if (err)
11916 goto done;
11917 logmsg_len = asprintf(&new_msg,
11918 "%s\n# original log message of commit %s: %s",
11919 logmsg ? logmsg : "", id_str, orig_logmsg);
11920 if (logmsg_len == -1) {
11921 err = got_error_from_errno("asprintf");
11922 goto done;
11923 }
11924 free(logmsg);
11925 logmsg = new_msg;
11926
11927 err = got_object_id_str(&id_str, hle->commit_id);
11928 if (err)
11929 goto done;
11930
11931 err = got_opentemp_named_fd(&logmsg_path, &fd,
11932 GOT_TMPDIR_STR "/got-logmsg", "");
11933 if (err)
11934 goto done;
11935
11936 if (write(fd, logmsg, logmsg_len) == -1) {
11937 err = got_error_from_errno2("write", logmsg_path);
11938 goto done;
11939 }
11940 if (close(fd) == -1) {
11941 err = got_error_from_errno2("close", logmsg_path);
11942 goto done;
11943 }
11944 fd = -1;
11945
11946 err = get_editor(&editor);
11947 if (err)
11948 goto done;
11949
11950 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
11951 logmsg_len, 0);
11952 if (err) {
11953 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
11954 goto done;
11955 err = NULL;
11956 hle->logmsg = strdup(new_msg);
11957 if (hle->logmsg == NULL)
11958 err = got_error_from_errno("strdup");
11959 }
11960 done:
11961 if (fd != -1 && close(fd) == -1 && err == NULL)
11962 err = got_error_from_errno2("close", logmsg_path);
11963 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
11964 err = got_error_from_errno2("unlink", logmsg_path);
11965 free(logmsg_path);
11966 free(logmsg);
11967 free(orig_logmsg);
11968 free(editor);
11969 if (commit)
11970 got_object_commit_close(commit);
11971 return err;
11972 }
11973
11974 static const struct got_error *
11975 histedit_parse_list(struct got_histedit_list *histedit_cmds,
11976 FILE *f, struct got_repository *repo)
11977 {
11978 const struct got_error *err = NULL;
11979 char *line = NULL, *p, *end;
11980 size_t i, linesize = 0;
11981 ssize_t linelen;
11982 int lineno = 0;
11983 const struct got_histedit_cmd *cmd;
11984 struct got_object_id *commit_id = NULL;
11985 struct got_histedit_list_entry *hle = NULL;
11986
11987 for (;;) {
11988 linelen = getline(&line, &linesize, f);
11989 if (linelen == -1) {
11990 const struct got_error *getline_err;
11991 if (feof(f))
11992 break;
11993 getline_err = got_error_from_errno("getline");
11994 err = got_ferror(f, getline_err->code);
11995 break;
11996 }
11997 lineno++;
11998 p = line;
11999 while (isspace((unsigned char)p[0]))
12000 p++;
12001 if (p[0] == '#' || p[0] == '\0')
12002 continue;
12003 cmd = NULL;
12004 for (i = 0; i < nitems(got_histedit_cmds); i++) {
12005 cmd = &got_histedit_cmds[i];
12006 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
12007 isspace((unsigned char)p[strlen(cmd->name)])) {
12008 p += strlen(cmd->name);
12009 break;
12010 }
12011 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
12012 p++;
12013 break;
12014 }
12015 }
12016 if (i == nitems(got_histedit_cmds)) {
12017 err = histedit_syntax_error(lineno);
12018 break;
12019 }
12020 while (isspace((unsigned char)p[0]))
12021 p++;
12022 end = p;
12023 while (end[0] && !isspace((unsigned char)end[0]))
12024 end++;
12025 *end = '\0';
12026 err = got_object_resolve_id_str(&commit_id, repo, p);
12027 if (err) {
12028 /* override error code */
12029 err = histedit_syntax_error(lineno);
12030 break;
12031 }
12032 hle = malloc(sizeof(*hle));
12033 if (hle == NULL) {
12034 err = got_error_from_errno("malloc");
12035 break;
12036 }
12037 hle->cmd = cmd;
12038 hle->commit_id = commit_id;
12039 hle->logmsg = NULL;
12040 commit_id = NULL;
12041 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
12042 }
12043
12044 free(line);
12045 free(commit_id);
12046 return err;
12047 }
12048
12049 static const struct got_error *
12050 histedit_check_script(struct got_histedit_list *histedit_cmds,
12051 struct got_object_id_queue *commits, struct got_repository *repo)
12052 {
12053 const struct got_error *err = NULL;
12054 struct got_object_qid *qid;
12055 struct got_histedit_list_entry *hle;
12056 static char msg[92];
12057 char *id_str;
12058
12059 if (TAILQ_EMPTY(histedit_cmds))
12060 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12061 "histedit script contains no commands");
12062 if (STAILQ_EMPTY(commits))
12063 return got_error(GOT_ERR_EMPTY_HISTEDIT);
12064
12065 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12066 struct got_histedit_list_entry *hle2;
12067 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
12068 if (hle == hle2)
12069 continue;
12070 if (got_object_id_cmp(hle->commit_id,
12071 hle2->commit_id) != 0)
12072 continue;
12073 err = got_object_id_str(&id_str, hle->commit_id);
12074 if (err)
12075 return err;
12076 snprintf(msg, sizeof(msg), "commit %s is listed "
12077 "more than once in histedit script", id_str);
12078 free(id_str);
12079 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12080 }
12081 }
12082
12083 STAILQ_FOREACH(qid, commits, entry) {
12084 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12085 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
12086 break;
12087 }
12088 if (hle == NULL) {
12089 err = got_object_id_str(&id_str, &qid->id);
12090 if (err)
12091 return err;
12092 snprintf(msg, sizeof(msg),
12093 "commit %s missing from histedit script", id_str);
12094 free(id_str);
12095 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12096 }
12097 }
12098
12099 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
12100 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
12101 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
12102 "last commit in histedit script cannot be folded");
12103
12104 return NULL;
12105 }
12106
12107 static const struct got_error *
12108 histedit_run_editor(struct got_histedit_list *histedit_cmds,
12109 const char *path, struct got_object_id_queue *commits,
12110 struct got_repository *repo)
12111 {
12112 const struct got_error *err = NULL;
12113 struct stat st, st2;
12114 struct timespec timeout;
12115 char *editor;
12116 FILE *f = NULL;
12117
12118 err = get_editor(&editor);
12119 if (err)
12120 return err;
12121
12122 if (stat(path, &st) == -1) {
12123 err = got_error_from_errno2("stat", path);
12124 goto done;
12125 }
12126
12127 if (spawn_editor(editor, path) == -1) {
12128 err = got_error_from_errno("failed spawning editor");
12129 goto done;
12130 }
12131
12132 timeout.tv_sec = 0;
12133 timeout.tv_nsec = 1;
12134 nanosleep(&timeout, NULL);
12135
12136 if (stat(path, &st2) == -1) {
12137 err = got_error_from_errno2("stat", path);
12138 goto done;
12139 }
12140
12141 if (st.st_size == st2.st_size &&
12142 timespeccmp(&st.st_mtim, &st2.st_mtim, ==)) {
12143 err = got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12144 "no changes made to histedit script, aborting");
12145 goto done;
12146 }
12147
12148 f = fopen(path, "re");
12149 if (f == NULL) {
12150 err = got_error_from_errno("fopen");
12151 goto done;
12152 }
12153 err = histedit_parse_list(histedit_cmds, f, repo);
12154 if (err)
12155 goto done;
12156
12157 err = histedit_check_script(histedit_cmds, commits, repo);
12158 done:
12159 if (f && fclose(f) == EOF && err == NULL)
12160 err = got_error_from_errno("fclose");
12161 free(editor);
12162 return err;
12163 }
12164
12165 static const struct got_error *
12166 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
12167 struct got_object_id_queue *, const char *, const char *,
12168 struct got_repository *);
12169
12170 static const struct got_error *
12171 histedit_edit_script(struct got_histedit_list *histedit_cmds,
12172 struct got_object_id_queue *commits, const char *branch_name,
12173 int edit_logmsg_only, int fold_only, int drop_only, int edit_only,
12174 struct got_repository *repo)
12175 {
12176 const struct got_error *err;
12177 FILE *f = NULL;
12178 char *path = NULL;
12179
12180 err = got_opentemp_named(&path, &f, "got-histedit", "");
12181 if (err)
12182 return err;
12183
12184 err = write_cmd_list(f, branch_name, commits);
12185 if (err)
12186 goto done;
12187
12188 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
12189 fold_only, drop_only, edit_only, repo);
12190 if (err)
12191 goto done;
12192
12193 if (drop_only || edit_logmsg_only || fold_only || edit_only) {
12194 rewind(f);
12195 err = histedit_parse_list(histedit_cmds, f, repo);
12196 } else {
12197 if (fclose(f) == EOF) {
12198 err = got_error_from_errno("fclose");
12199 goto done;
12200 }
12201 f = NULL;
12202 err = histedit_run_editor(histedit_cmds, path, commits, repo);
12203 if (err) {
12204 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12205 err->code != GOT_ERR_HISTEDIT_CMD)
12206 goto done;
12207 err = histedit_edit_list_retry(histedit_cmds, err,
12208 commits, path, branch_name, repo);
12209 }
12210 }
12211 done:
12212 if (f && fclose(f) == EOF && err == NULL)
12213 err = got_error_from_errno("fclose");
12214 if (path && unlink(path) != 0 && err == NULL)
12215 err = got_error_from_errno2("unlink", path);
12216 free(path);
12217 return err;
12218 }
12219
12220 static const struct got_error *
12221 histedit_save_list(struct got_histedit_list *histedit_cmds,
12222 struct got_worktree *worktree, struct got_repository *repo)
12223 {
12224 const struct got_error *err = NULL;
12225 char *path = NULL;
12226 FILE *f = NULL;
12227 struct got_histedit_list_entry *hle;
12228
12229 err = got_worktree_get_histedit_script_path(&path, worktree);
12230 if (err)
12231 return err;
12232
12233 f = fopen(path, "we");
12234 if (f == NULL) {
12235 err = got_error_from_errno2("fopen", path);
12236 goto done;
12237 }
12238 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12239 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
12240 repo);
12241 if (err)
12242 break;
12243 }
12244 done:
12245 if (f && fclose(f) == EOF && err == NULL)
12246 err = got_error_from_errno("fclose");
12247 free(path);
12248 return err;
12249 }
12250
12251 static void
12252 histedit_free_list(struct got_histedit_list *histedit_cmds)
12253 {
12254 struct got_histedit_list_entry *hle;
12255
12256 while ((hle = TAILQ_FIRST(histedit_cmds))) {
12257 TAILQ_REMOVE(histedit_cmds, hle, entry);
12258 free(hle);
12259 }
12260 }
12261
12262 static const struct got_error *
12263 histedit_load_list(struct got_histedit_list *histedit_cmds,
12264 const char *path, struct got_repository *repo)
12265 {
12266 const struct got_error *err = NULL;
12267 FILE *f = NULL;
12268
12269 f = fopen(path, "re");
12270 if (f == NULL) {
12271 err = got_error_from_errno2("fopen", path);
12272 goto done;
12273 }
12274
12275 err = histedit_parse_list(histedit_cmds, f, repo);
12276 done:
12277 if (f && fclose(f) == EOF && err == NULL)
12278 err = got_error_from_errno("fclose");
12279 return err;
12280 }
12281
12282 static const struct got_error *
12283 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
12284 const struct got_error *edit_err, struct got_object_id_queue *commits,
12285 const char *path, const char *branch_name, struct got_repository *repo)
12286 {
12287 const struct got_error *err = NULL, *prev_err = edit_err;
12288 int resp = ' ';
12289
12290 while (resp != 'c' && resp != 'r' && resp != 'a') {
12291 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
12292 "or (a)bort: ", getprogname(), prev_err->msg);
12293 resp = getchar();
12294 if (resp == '\n')
12295 resp = getchar();
12296 if (resp == 'c') {
12297 histedit_free_list(histedit_cmds);
12298 err = histedit_run_editor(histedit_cmds, path, commits,
12299 repo);
12300 if (err) {
12301 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12302 err->code != GOT_ERR_HISTEDIT_CMD)
12303 break;
12304 prev_err = err;
12305 resp = ' ';
12306 continue;
12307 }
12308 break;
12309 } else if (resp == 'r') {
12310 histedit_free_list(histedit_cmds);
12311 err = histedit_edit_script(histedit_cmds,
12312 commits, branch_name, 0, 0, 0, 0, repo);
12313 if (err) {
12314 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12315 err->code != GOT_ERR_HISTEDIT_CMD)
12316 break;
12317 prev_err = err;
12318 resp = ' ';
12319 continue;
12320 }
12321 break;
12322 } else if (resp == 'a') {
12323 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
12324 break;
12325 } else
12326 printf("invalid response '%c'\n", resp);
12327 }
12328
12329 return err;
12330 }
12331
12332 static const struct got_error *
12333 histedit_complete(struct got_worktree *worktree,
12334 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
12335 struct got_reference *branch, struct got_repository *repo)
12336 {
12337 printf("Switching work tree to %s\n",
12338 got_ref_get_symref_target(branch));
12339 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
12340 branch, repo);
12341 }
12342
12343 static const struct got_error *
12344 show_histedit_progress(struct got_commit_object *commit,
12345 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
12346 {
12347 const struct got_error *err;
12348 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
12349
12350 err = got_object_id_str(&old_id_str, hle->commit_id);
12351 if (err)
12352 goto done;
12353
12354 if (new_id) {
12355 err = got_object_id_str(&new_id_str, new_id);
12356 if (err)
12357 goto done;
12358 }
12359
12360 old_id_str[12] = '\0';
12361 if (new_id_str)
12362 new_id_str[12] = '\0';
12363
12364 if (hle->logmsg) {
12365 logmsg = strdup(hle->logmsg);
12366 if (logmsg == NULL) {
12367 err = got_error_from_errno("strdup");
12368 goto done;
12369 }
12370 trim_logmsg(logmsg, 42);
12371 } else {
12372 err = get_short_logmsg(&logmsg, 42, commit);
12373 if (err)
12374 goto done;
12375 }
12376
12377 switch (hle->cmd->code) {
12378 case GOT_HISTEDIT_PICK:
12379 case GOT_HISTEDIT_EDIT:
12380 case GOT_HISTEDIT_MESG:
12381 printf("%s -> %s: %s\n", old_id_str,
12382 new_id_str ? new_id_str : "no-op change", logmsg);
12383 break;
12384 case GOT_HISTEDIT_DROP:
12385 case GOT_HISTEDIT_FOLD:
12386 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
12387 logmsg);
12388 break;
12389 default:
12390 break;
12391 }
12392 done:
12393 free(old_id_str);
12394 free(new_id_str);
12395 return err;
12396 }
12397
12398 static const struct got_error *
12399 histedit_commit(struct got_pathlist_head *merged_paths,
12400 struct got_worktree *worktree, struct got_fileindex *fileindex,
12401 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
12402 const char *committer, int allow_conflict, struct got_repository *repo)
12403 {
12404 const struct got_error *err;
12405 struct got_commit_object *commit;
12406 struct got_object_id *new_commit_id;
12407
12408 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
12409 && hle->logmsg == NULL) {
12410 err = histedit_edit_logmsg(hle, repo);
12411 if (err)
12412 return err;
12413 }
12414
12415 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12416 if (err)
12417 return err;
12418
12419 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
12420 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
12421 hle->logmsg, allow_conflict, repo);
12422 if (err) {
12423 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
12424 goto done;
12425 err = show_histedit_progress(commit, hle, NULL);
12426 } else {
12427 err = show_histedit_progress(commit, hle, new_commit_id);
12428 free(new_commit_id);
12429 }
12430 done:
12431 got_object_commit_close(commit);
12432 return err;
12433 }
12434
12435 static const struct got_error *
12436 histedit_skip_commit(struct got_histedit_list_entry *hle,
12437 struct got_worktree *worktree, struct got_repository *repo)
12438 {
12439 const struct got_error *error;
12440 struct got_commit_object *commit;
12441
12442 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
12443 repo);
12444 if (error)
12445 return error;
12446
12447 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
12448 if (error)
12449 return error;
12450
12451 error = show_histedit_progress(commit, hle, NULL);
12452 got_object_commit_close(commit);
12453 return error;
12454 }
12455
12456 static const struct got_error *
12457 check_local_changes(void *arg, unsigned char status,
12458 unsigned char staged_status, const char *path,
12459 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12460 struct got_object_id *commit_id, int dirfd, const char *de_name)
12461 {
12462 int *have_local_changes = arg;
12463
12464 switch (status) {
12465 case GOT_STATUS_ADD:
12466 case GOT_STATUS_DELETE:
12467 case GOT_STATUS_MODIFY:
12468 case GOT_STATUS_CONFLICT:
12469 *have_local_changes = 1;
12470 return got_error(GOT_ERR_CANCELLED);
12471 default:
12472 break;
12473 }
12474
12475 switch (staged_status) {
12476 case GOT_STATUS_ADD:
12477 case GOT_STATUS_DELETE:
12478 case GOT_STATUS_MODIFY:
12479 *have_local_changes = 1;
12480 return got_error(GOT_ERR_CANCELLED);
12481 default:
12482 break;
12483 }
12484
12485 return NULL;
12486 }
12487
12488 static const struct got_error *
12489 cmd_histedit(int argc, char *argv[])
12490 {
12491 const struct got_error *error = NULL;
12492 struct got_worktree *worktree = NULL;
12493 struct got_fileindex *fileindex = NULL;
12494 struct got_repository *repo = NULL;
12495 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
12496 struct got_reference *branch = NULL;
12497 struct got_reference *tmp_branch = NULL;
12498 struct got_object_id *resume_commit_id = NULL;
12499 struct got_object_id *base_commit_id = NULL;
12500 struct got_object_id *head_commit_id = NULL;
12501 struct got_commit_object *commit = NULL;
12502 int ch, rebase_in_progress = 0, merge_in_progress = 0;
12503 struct got_update_progress_arg upa;
12504 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
12505 int drop_only = 0, edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
12506 int allow_conflict = 0, list_backups = 0, delete_backups = 0;
12507 const char *edit_script_path = NULL;
12508 struct got_object_id_queue commits;
12509 struct got_pathlist_head merged_paths;
12510 const struct got_object_id_queue *parent_ids;
12511 struct got_object_qid *pid;
12512 struct got_histedit_list histedit_cmds;
12513 struct got_histedit_list_entry *hle;
12514 int *pack_fds = NULL;
12515
12516 STAILQ_INIT(&commits);
12517 TAILQ_INIT(&histedit_cmds);
12518 TAILQ_INIT(&merged_paths);
12519 memset(&upa, 0, sizeof(upa));
12520
12521 #ifndef PROFILE
12522 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12523 "unveil", NULL) == -1)
12524 err(1, "pledge");
12525 #endif
12526
12527 while ((ch = getopt(argc, argv, "aCcdeF:flmX")) != -1) {
12528 switch (ch) {
12529 case 'a':
12530 abort_edit = 1;
12531 break;
12532 case 'C':
12533 allow_conflict = 1;
12534 break;
12535 case 'c':
12536 continue_edit = 1;
12537 break;
12538 case 'd':
12539 drop_only = 1;
12540 break;
12541 case 'e':
12542 edit_only = 1;
12543 break;
12544 case 'F':
12545 edit_script_path = optarg;
12546 break;
12547 case 'f':
12548 fold_only = 1;
12549 break;
12550 case 'l':
12551 list_backups = 1;
12552 break;
12553 case 'm':
12554 edit_logmsg_only = 1;
12555 break;
12556 case 'X':
12557 delete_backups = 1;
12558 break;
12559 default:
12560 usage_histedit();
12561 /* NOTREACHED */
12562 }
12563 }
12564
12565 argc -= optind;
12566 argv += optind;
12567
12568 if (abort_edit && allow_conflict)
12569 option_conflict('a', 'C');
12570 if (abort_edit && continue_edit)
12571 option_conflict('a', 'c');
12572 if (edit_script_path && allow_conflict)
12573 option_conflict('F', 'C');
12574 if (edit_script_path && edit_logmsg_only)
12575 option_conflict('F', 'm');
12576 if (abort_edit && edit_logmsg_only)
12577 option_conflict('a', 'm');
12578 if (edit_logmsg_only && allow_conflict)
12579 option_conflict('m', 'C');
12580 if (continue_edit && edit_logmsg_only)
12581 option_conflict('c', 'm');
12582 if (abort_edit && fold_only)
12583 option_conflict('a', 'f');
12584 if (fold_only && allow_conflict)
12585 option_conflict('f', 'C');
12586 if (continue_edit && fold_only)
12587 option_conflict('c', 'f');
12588 if (fold_only && edit_logmsg_only)
12589 option_conflict('f', 'm');
12590 if (edit_script_path && fold_only)
12591 option_conflict('F', 'f');
12592 if (abort_edit && edit_only)
12593 option_conflict('a', 'e');
12594 if (continue_edit && edit_only)
12595 option_conflict('c', 'e');
12596 if (edit_only && edit_logmsg_only)
12597 option_conflict('e', 'm');
12598 if (edit_script_path && edit_only)
12599 option_conflict('F', 'e');
12600 if (fold_only && edit_only)
12601 option_conflict('f', 'e');
12602 if (drop_only && abort_edit)
12603 option_conflict('d', 'a');
12604 if (drop_only && allow_conflict)
12605 option_conflict('d', 'C');
12606 if (drop_only && continue_edit)
12607 option_conflict('d', 'c');
12608 if (drop_only && edit_logmsg_only)
12609 option_conflict('d', 'm');
12610 if (drop_only && edit_only)
12611 option_conflict('d', 'e');
12612 if (drop_only && edit_script_path)
12613 option_conflict('d', 'F');
12614 if (drop_only && fold_only)
12615 option_conflict('d', 'f');
12616 if (list_backups) {
12617 if (abort_edit)
12618 option_conflict('l', 'a');
12619 if (allow_conflict)
12620 option_conflict('l', 'C');
12621 if (continue_edit)
12622 option_conflict('l', 'c');
12623 if (edit_script_path)
12624 option_conflict('l', 'F');
12625 if (edit_logmsg_only)
12626 option_conflict('l', 'm');
12627 if (drop_only)
12628 option_conflict('l', 'd');
12629 if (fold_only)
12630 option_conflict('l', 'f');
12631 if (edit_only)
12632 option_conflict('l', 'e');
12633 if (delete_backups)
12634 option_conflict('l', 'X');
12635 if (argc != 0 && argc != 1)
12636 usage_histedit();
12637 } else if (delete_backups) {
12638 if (abort_edit)
12639 option_conflict('X', 'a');
12640 if (allow_conflict)
12641 option_conflict('X', 'C');
12642 if (continue_edit)
12643 option_conflict('X', 'c');
12644 if (drop_only)
12645 option_conflict('X', 'd');
12646 if (edit_script_path)
12647 option_conflict('X', 'F');
12648 if (edit_logmsg_only)
12649 option_conflict('X', 'm');
12650 if (fold_only)
12651 option_conflict('X', 'f');
12652 if (edit_only)
12653 option_conflict('X', 'e');
12654 if (list_backups)
12655 option_conflict('X', 'l');
12656 if (argc != 0 && argc != 1)
12657 usage_histedit();
12658 } else if (allow_conflict && !continue_edit)
12659 errx(1, "-C option requires -c");
12660 else if (argc != 0)
12661 usage_histedit();
12662
12663 /*
12664 * This command cannot apply unveil(2) in all cases because the
12665 * user may choose to run an editor to edit the histedit script
12666 * and to edit individual commit log messages.
12667 * unveil(2) traverses exec(2); if an editor is used we have to
12668 * apply unveil after edit script and log messages have been written.
12669 * XXX TODO: Make use of unveil(2) where possible.
12670 */
12671
12672 cwd = getcwd(NULL, 0);
12673 if (cwd == NULL) {
12674 error = got_error_from_errno("getcwd");
12675 goto done;
12676 }
12677
12678 error = got_repo_pack_fds_open(&pack_fds);
12679 if (error != NULL)
12680 goto done;
12681
12682 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
12683 if (error) {
12684 if (list_backups || delete_backups) {
12685 if (error->code != GOT_ERR_NOT_WORKTREE)
12686 goto done;
12687 } else {
12688 if (error->code == GOT_ERR_NOT_WORKTREE)
12689 error = wrap_not_worktree_error(error,
12690 "histedit", cwd);
12691 goto done;
12692 }
12693 }
12694
12695 if (list_backups || delete_backups) {
12696 error = got_repo_open(&repo,
12697 worktree ? got_worktree_get_repo_path(worktree) : cwd,
12698 NULL, pack_fds);
12699 if (error != NULL)
12700 goto done;
12701 error = apply_unveil(got_repo_get_path(repo), 0,
12702 worktree ? got_worktree_get_root_path(worktree) : NULL);
12703 if (error)
12704 goto done;
12705 error = process_backup_refs(
12706 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
12707 argc == 1 ? argv[0] : NULL, delete_backups, repo);
12708 goto done; /* nothing else to do */
12709 }
12710
12711 error = get_gitconfig_path(&gitconfig_path);
12712 if (error)
12713 goto done;
12714 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12715 gitconfig_path, pack_fds);
12716 if (error != NULL)
12717 goto done;
12718
12719 if (worktree != NULL && !list_backups && !delete_backups) {
12720 error = worktree_has_logmsg_ref("histedit", worktree, repo);
12721 if (error)
12722 goto done;
12723 }
12724
12725 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
12726 if (error)
12727 goto done;
12728 if (rebase_in_progress) {
12729 error = got_error(GOT_ERR_REBASING);
12730 goto done;
12731 }
12732
12733 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12734 repo);
12735 if (error)
12736 goto done;
12737 if (merge_in_progress) {
12738 error = got_error(GOT_ERR_MERGE_BUSY);
12739 goto done;
12740 }
12741
12742 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
12743 if (error)
12744 goto done;
12745
12746 if (edit_in_progress && edit_logmsg_only) {
12747 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12748 "histedit operation is in progress in this "
12749 "work tree and must be continued or aborted "
12750 "before the -m option can be used");
12751 goto done;
12752 }
12753 if (edit_in_progress && drop_only) {
12754 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12755 "histedit operation is in progress in this "
12756 "work tree and must be continued or aborted "
12757 "before the -d option can be used");
12758 goto done;
12759 }
12760 if (edit_in_progress && fold_only) {
12761 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12762 "histedit operation is in progress in this "
12763 "work tree and must be continued or aborted "
12764 "before the -f option can be used");
12765 goto done;
12766 }
12767 if (edit_in_progress && edit_only) {
12768 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12769 "histedit operation is in progress in this "
12770 "work tree and must be continued or aborted "
12771 "before the -e option can be used");
12772 goto done;
12773 }
12774
12775 if (edit_in_progress && abort_edit) {
12776 error = got_worktree_histedit_continue(&resume_commit_id,
12777 &tmp_branch, &branch, &base_commit_id, &fileindex,
12778 worktree, repo);
12779 if (error)
12780 goto done;
12781 printf("Switching work tree to %s\n",
12782 got_ref_get_symref_target(branch));
12783 error = got_worktree_histedit_abort(worktree, fileindex, repo,
12784 branch, base_commit_id, abort_progress, &upa);
12785 if (error)
12786 goto done;
12787 printf("Histedit of %s aborted\n",
12788 got_ref_get_symref_target(branch));
12789 print_merge_progress_stats(&upa);
12790 goto done; /* nothing else to do */
12791 } else if (abort_edit) {
12792 error = got_error(GOT_ERR_NOT_HISTEDIT);
12793 goto done;
12794 }
12795
12796 error = get_author(&committer, repo, worktree);
12797 if (error)
12798 goto done;
12799
12800 if (continue_edit) {
12801 char *path;
12802
12803 if (!edit_in_progress) {
12804 error = got_error(GOT_ERR_NOT_HISTEDIT);
12805 goto done;
12806 }
12807
12808 error = got_worktree_get_histedit_script_path(&path, worktree);
12809 if (error)
12810 goto done;
12811
12812 error = histedit_load_list(&histedit_cmds, path, repo);
12813 free(path);
12814 if (error)
12815 goto done;
12816
12817 error = got_worktree_histedit_continue(&resume_commit_id,
12818 &tmp_branch, &branch, &base_commit_id, &fileindex,
12819 worktree, repo);
12820 if (error)
12821 goto done;
12822
12823 error = got_ref_resolve(&head_commit_id, repo, branch);
12824 if (error)
12825 goto done;
12826
12827 error = got_object_open_as_commit(&commit, repo,
12828 head_commit_id);
12829 if (error)
12830 goto done;
12831 parent_ids = got_object_commit_get_parent_ids(commit);
12832 pid = STAILQ_FIRST(parent_ids);
12833 if (pid == NULL) {
12834 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12835 goto done;
12836 }
12837 error = collect_commits(&commits, head_commit_id, &pid->id,
12838 base_commit_id, got_worktree_get_path_prefix(worktree),
12839 GOT_ERR_HISTEDIT_PATH, repo);
12840 got_object_commit_close(commit);
12841 commit = NULL;
12842 if (error)
12843 goto done;
12844 } else {
12845 if (edit_in_progress) {
12846 error = got_error(GOT_ERR_HISTEDIT_BUSY);
12847 goto done;
12848 }
12849
12850 error = got_ref_open(&branch, repo,
12851 got_worktree_get_head_ref_name(worktree), 0);
12852 if (error != NULL)
12853 goto done;
12854
12855 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
12856 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
12857 "will not edit commit history of a branch outside "
12858 "the \"refs/heads/\" reference namespace");
12859 goto done;
12860 }
12861
12862 error = got_ref_resolve(&head_commit_id, repo, branch);
12863 got_ref_close(branch);
12864 branch = NULL;
12865 if (error)
12866 goto done;
12867
12868 error = got_object_open_as_commit(&commit, repo,
12869 head_commit_id);
12870 if (error)
12871 goto done;
12872 parent_ids = got_object_commit_get_parent_ids(commit);
12873 pid = STAILQ_FIRST(parent_ids);
12874 if (pid == NULL) {
12875 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12876 goto done;
12877 }
12878 error = collect_commits(&commits, head_commit_id, &pid->id,
12879 got_worktree_get_base_commit_id(worktree),
12880 got_worktree_get_path_prefix(worktree),
12881 GOT_ERR_HISTEDIT_PATH, repo);
12882 got_object_commit_close(commit);
12883 commit = NULL;
12884 if (error)
12885 goto done;
12886
12887 if (STAILQ_EMPTY(&commits)) {
12888 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12889 goto done;
12890 }
12891
12892 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
12893 &base_commit_id, &fileindex, worktree, repo);
12894 if (error)
12895 goto done;
12896
12897 if (edit_script_path) {
12898 error = histedit_load_list(&histedit_cmds,
12899 edit_script_path, repo);
12900 if (error) {
12901 got_worktree_histedit_abort(worktree, fileindex,
12902 repo, branch, base_commit_id,
12903 abort_progress, &upa);
12904 print_merge_progress_stats(&upa);
12905 goto done;
12906 }
12907 } else {
12908 const char *branch_name;
12909 branch_name = got_ref_get_symref_target(branch);
12910 if (strncmp(branch_name, "refs/heads/", 11) == 0)
12911 branch_name += 11;
12912 error = histedit_edit_script(&histedit_cmds, &commits,
12913 branch_name, edit_logmsg_only, fold_only,
12914 drop_only, edit_only, repo);
12915 if (error) {
12916 got_worktree_histedit_abort(worktree, fileindex,
12917 repo, branch, base_commit_id,
12918 abort_progress, &upa);
12919 print_merge_progress_stats(&upa);
12920 goto done;
12921 }
12922
12923 }
12924
12925 error = histedit_save_list(&histedit_cmds, worktree,
12926 repo);
12927 if (error) {
12928 got_worktree_histedit_abort(worktree, fileindex,
12929 repo, branch, base_commit_id,
12930 abort_progress, &upa);
12931 print_merge_progress_stats(&upa);
12932 goto done;
12933 }
12934
12935 }
12936
12937 error = histedit_check_script(&histedit_cmds, &commits, repo);
12938 if (error)
12939 goto done;
12940
12941 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
12942 if (resume_commit_id) {
12943 if (got_object_id_cmp(hle->commit_id,
12944 resume_commit_id) != 0)
12945 continue;
12946
12947 resume_commit_id = NULL;
12948 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
12949 hle->cmd->code == GOT_HISTEDIT_FOLD) {
12950 error = histedit_skip_commit(hle, worktree,
12951 repo);
12952 if (error)
12953 goto done;
12954 } else {
12955 struct got_pathlist_head paths;
12956 int have_changes = 0;
12957
12958 TAILQ_INIT(&paths);
12959 error = got_pathlist_append(&paths, "", NULL);
12960 if (error)
12961 goto done;
12962 error = got_worktree_status(worktree, &paths,
12963 repo, 0, check_local_changes, &have_changes,
12964 check_cancelled, NULL);
12965 got_pathlist_free(&paths,
12966 GOT_PATHLIST_FREE_NONE);
12967 if (error) {
12968 if (error->code != GOT_ERR_CANCELLED)
12969 goto done;
12970 if (sigint_received || sigpipe_received)
12971 goto done;
12972 }
12973 if (have_changes) {
12974 error = histedit_commit(NULL, worktree,
12975 fileindex, tmp_branch, hle,
12976 committer, allow_conflict, repo);
12977 if (error)
12978 goto done;
12979 } else {
12980 error = got_object_open_as_commit(
12981 &commit, repo, hle->commit_id);
12982 if (error)
12983 goto done;
12984 error = show_histedit_progress(commit,
12985 hle, NULL);
12986 got_object_commit_close(commit);
12987 commit = NULL;
12988 if (error)
12989 goto done;
12990 }
12991 }
12992 continue;
12993 }
12994
12995 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
12996 error = histedit_skip_commit(hle, worktree, repo);
12997 if (error)
12998 goto done;
12999 continue;
13000 }
13001 error = got_object_open_as_commit(&commit, repo,
13002 hle->commit_id);
13003 if (error)
13004 goto done;
13005 parent_ids = got_object_commit_get_parent_ids(commit);
13006 pid = STAILQ_FIRST(parent_ids);
13007
13008 error = got_worktree_histedit_merge_files(&merged_paths,
13009 worktree, fileindex, &pid->id, hle->commit_id, repo,
13010 update_progress, &upa, check_cancelled, NULL);
13011 if (error)
13012 goto done;
13013 got_object_commit_close(commit);
13014 commit = NULL;
13015
13016 print_merge_progress_stats(&upa);
13017 if (upa.conflicts > 0 || upa.missing > 0 ||
13018 upa.not_deleted > 0 || upa.unversioned > 0) {
13019 if (upa.conflicts > 0) {
13020 error = show_rebase_merge_conflict(
13021 hle->commit_id, repo);
13022 if (error)
13023 goto done;
13024 }
13025 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13026 break;
13027 }
13028
13029 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
13030 char *id_str;
13031 error = got_object_id_str(&id_str, hle->commit_id);
13032 if (error)
13033 goto done;
13034 printf("Stopping histedit for amending commit %s\n",
13035 id_str);
13036 free(id_str);
13037 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13038 error = got_worktree_histedit_postpone(worktree,
13039 fileindex);
13040 goto done;
13041 } else if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
13042 error = histedit_skip_commit(hle, worktree, repo);
13043 if (error)
13044 goto done;
13045 continue;
13046 } else if (hle->cmd->code == GOT_HISTEDIT_MESG) {
13047 error = histedit_edit_logmsg(hle, repo);
13048 if (error)
13049 goto done;
13050 }
13051
13052 error = histedit_commit(&merged_paths, worktree, fileindex,
13053 tmp_branch, hle, committer, allow_conflict, repo);
13054 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13055 if (error)
13056 goto done;
13057 }
13058
13059 if (upa.conflicts > 0 || upa.missing > 0 ||
13060 upa.not_deleted > 0 || upa.unversioned > 0) {
13061 error = got_worktree_histedit_postpone(worktree, fileindex);
13062 if (error)
13063 goto done;
13064 if (upa.conflicts > 0 && upa.missing == 0 &&
13065 upa.not_deleted == 0 && upa.unversioned == 0) {
13066 error = got_error_msg(GOT_ERR_CONFLICTS,
13067 "conflicts must be resolved before histedit "
13068 "can continue");
13069 } else if (upa.conflicts > 0) {
13070 error = got_error_msg(GOT_ERR_CONFLICTS,
13071 "conflicts must be resolved before histedit "
13072 "can continue; changes destined for some "
13073 "files were not yet merged and should be "
13074 "merged manually if required before the "
13075 "histedit operation is continued");
13076 } else {
13077 error = got_error_msg(GOT_ERR_CONFLICTS,
13078 "changes destined for some files were not "
13079 "yet merged and should be merged manually "
13080 "if required before the histedit operation "
13081 "is continued");
13082 }
13083 } else
13084 error = histedit_complete(worktree, fileindex, tmp_branch,
13085 branch, repo);
13086 done:
13087 free(cwd);
13088 free(committer);
13089 free(gitconfig_path);
13090 got_object_id_queue_free(&commits);
13091 histedit_free_list(&histedit_cmds);
13092 free(head_commit_id);
13093 free(base_commit_id);
13094 free(resume_commit_id);
13095 if (commit)
13096 got_object_commit_close(commit);
13097 if (branch)
13098 got_ref_close(branch);
13099 if (tmp_branch)
13100 got_ref_close(tmp_branch);
13101 if (worktree)
13102 got_worktree_close(worktree);
13103 if (repo) {
13104 const struct got_error *close_err = got_repo_close(repo);
13105 if (error == NULL)
13106 error = close_err;
13107 }
13108 if (pack_fds) {
13109 const struct got_error *pack_err =
13110 got_repo_pack_fds_close(pack_fds);
13111 if (error == NULL)
13112 error = pack_err;
13113 }
13114 return error;
13115 }
13116
13117 __dead static void
13118 usage_integrate(void)
13119 {
13120 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
13121 exit(1);
13122 }
13123
13124 static const struct got_error *
13125 cmd_integrate(int argc, char *argv[])
13126 {
13127 const struct got_error *error = NULL;
13128 struct got_repository *repo = NULL;
13129 struct got_worktree *worktree = NULL;
13130 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
13131 const char *branch_arg = NULL;
13132 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
13133 struct got_fileindex *fileindex = NULL;
13134 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
13135 int ch;
13136 struct got_update_progress_arg upa;
13137 int *pack_fds = NULL;
13138
13139 #ifndef PROFILE
13140 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13141 "unveil", NULL) == -1)
13142 err(1, "pledge");
13143 #endif
13144
13145 while ((ch = getopt(argc, argv, "")) != -1) {
13146 switch (ch) {
13147 default:
13148 usage_integrate();
13149 /* NOTREACHED */
13150 }
13151 }
13152
13153 argc -= optind;
13154 argv += optind;
13155
13156 if (argc != 1)
13157 usage_integrate();
13158 branch_arg = argv[0];
13159
13160 cwd = getcwd(NULL, 0);
13161 if (cwd == NULL) {
13162 error = got_error_from_errno("getcwd");
13163 goto done;
13164 }
13165
13166 error = got_repo_pack_fds_open(&pack_fds);
13167 if (error != NULL)
13168 goto done;
13169
13170 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13171 if (error) {
13172 if (error->code == GOT_ERR_NOT_WORKTREE)
13173 error = wrap_not_worktree_error(error, "integrate",
13174 cwd);
13175 goto done;
13176 }
13177
13178 error = check_rebase_or_histedit_in_progress(worktree);
13179 if (error)
13180 goto done;
13181
13182 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13183 NULL, pack_fds);
13184 if (error != NULL)
13185 goto done;
13186
13187 error = apply_unveil(got_repo_get_path(repo), 0,
13188 got_worktree_get_root_path(worktree));
13189 if (error)
13190 goto done;
13191
13192 error = check_merge_in_progress(worktree, repo);
13193 if (error)
13194 goto done;
13195
13196 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
13197 error = got_error_from_errno("asprintf");
13198 goto done;
13199 }
13200
13201 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
13202 &base_branch_ref, worktree, refname, repo);
13203 if (error)
13204 goto done;
13205
13206 refname = strdup(got_ref_get_name(branch_ref));
13207 if (refname == NULL) {
13208 error = got_error_from_errno("strdup");
13209 got_worktree_integrate_abort(worktree, fileindex, repo,
13210 branch_ref, base_branch_ref);
13211 goto done;
13212 }
13213 base_refname = strdup(got_ref_get_name(base_branch_ref));
13214 if (base_refname == NULL) {
13215 error = got_error_from_errno("strdup");
13216 got_worktree_integrate_abort(worktree, fileindex, repo,
13217 branch_ref, base_branch_ref);
13218 goto done;
13219 }
13220 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
13221 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
13222 got_worktree_integrate_abort(worktree, fileindex, repo,
13223 branch_ref, base_branch_ref);
13224 goto done;
13225 }
13226
13227 error = got_ref_resolve(&commit_id, repo, branch_ref);
13228 if (error)
13229 goto done;
13230
13231 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
13232 if (error)
13233 goto done;
13234
13235 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
13236 error = got_error_msg(GOT_ERR_SAME_BRANCH,
13237 "specified branch has already been integrated");
13238 got_worktree_integrate_abort(worktree, fileindex, repo,
13239 branch_ref, base_branch_ref);
13240 goto done;
13241 }
13242
13243 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
13244 if (error) {
13245 if (error->code == GOT_ERR_ANCESTRY)
13246 error = got_error(GOT_ERR_REBASE_REQUIRED);
13247 got_worktree_integrate_abort(worktree, fileindex, repo,
13248 branch_ref, base_branch_ref);
13249 goto done;
13250 }
13251
13252 memset(&upa, 0, sizeof(upa));
13253 error = got_worktree_integrate_continue(worktree, fileindex, repo,
13254 branch_ref, base_branch_ref, update_progress, &upa,
13255 check_cancelled, NULL);
13256 if (error)
13257 goto done;
13258
13259 printf("Integrated %s into %s\n", refname, base_refname);
13260 print_update_progress_stats(&upa);
13261 done:
13262 if (repo) {
13263 const struct got_error *close_err = got_repo_close(repo);
13264 if (error == NULL)
13265 error = close_err;
13266 }
13267 if (worktree)
13268 got_worktree_close(worktree);
13269 if (pack_fds) {
13270 const struct got_error *pack_err =
13271 got_repo_pack_fds_close(pack_fds);
13272 if (error == NULL)
13273 error = pack_err;
13274 }
13275 free(cwd);
13276 free(base_commit_id);
13277 free(commit_id);
13278 free(refname);
13279 free(base_refname);
13280 return error;
13281 }
13282
13283 __dead static void
13284 usage_merge(void)
13285 {
13286 fprintf(stderr, "usage: %s merge [-aCcn] [branch]\n", getprogname());
13287 exit(1);
13288 }
13289
13290 static const struct got_error *
13291 cmd_merge(int argc, char *argv[])
13292 {
13293 const struct got_error *error = NULL;
13294 struct got_worktree *worktree = NULL;
13295 struct got_repository *repo = NULL;
13296 struct got_fileindex *fileindex = NULL;
13297 char *cwd = NULL, *id_str = NULL, *author = NULL;
13298 char *gitconfig_path = NULL;
13299 struct got_reference *branch = NULL, *wt_branch = NULL;
13300 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
13301 struct got_object_id *wt_branch_tip = NULL;
13302 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
13303 int allow_conflict = 0, prefer_fast_forward = 1, interrupt_merge = 0;
13304 struct got_update_progress_arg upa;
13305 struct got_object_id *merge_commit_id = NULL;
13306 char *branch_name = NULL;
13307 int *pack_fds = NULL;
13308
13309 memset(&upa, 0, sizeof(upa));
13310
13311 #ifndef PROFILE
13312 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13313 "unveil", NULL) == -1)
13314 err(1, "pledge");
13315 #endif
13316
13317 while ((ch = getopt(argc, argv, "aCcMn")) != -1) {
13318 switch (ch) {
13319 case 'a':
13320 abort_merge = 1;
13321 break;
13322 case 'C':
13323 allow_conflict = 1;
13324 break;
13325 case 'c':
13326 continue_merge = 1;
13327 break;
13328 case 'M':
13329 prefer_fast_forward = 0;
13330 break;
13331 case 'n':
13332 interrupt_merge = 1;
13333 break;
13334 default:
13335 usage_merge();
13336 /* NOTREACHED */
13337 }
13338 }
13339
13340 argc -= optind;
13341 argv += optind;
13342
13343 if (abort_merge) {
13344 if (continue_merge)
13345 option_conflict('a', 'c');
13346 if (!prefer_fast_forward)
13347 option_conflict('a', 'M');
13348 if (interrupt_merge)
13349 option_conflict('a', 'n');
13350 } else if (continue_merge) {
13351 if (!prefer_fast_forward)
13352 option_conflict('c', 'M');
13353 if (interrupt_merge)
13354 option_conflict('c', 'n');
13355 }
13356 if (allow_conflict) {
13357 if (!continue_merge)
13358 errx(1, "-C option requires -c");
13359 }
13360 if (abort_merge || continue_merge) {
13361 if (argc != 0)
13362 usage_merge();
13363 } else if (argc != 1)
13364 usage_merge();
13365
13366 cwd = getcwd(NULL, 0);
13367 if (cwd == NULL) {
13368 error = got_error_from_errno("getcwd");
13369 goto done;
13370 }
13371
13372 error = got_repo_pack_fds_open(&pack_fds);
13373 if (error != NULL)
13374 goto done;
13375
13376 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13377 if (error) {
13378 if (error->code == GOT_ERR_NOT_WORKTREE)
13379 error = wrap_not_worktree_error(error,
13380 "merge", cwd);
13381 goto done;
13382 }
13383
13384 error = get_gitconfig_path(&gitconfig_path);
13385 if (error)
13386 goto done;
13387 error = got_repo_open(&repo,
13388 worktree ? got_worktree_get_repo_path(worktree) : cwd,
13389 gitconfig_path, pack_fds);
13390 if (error != NULL)
13391 goto done;
13392
13393 if (worktree != NULL) {
13394 error = worktree_has_logmsg_ref("merge", worktree, repo);
13395 if (error)
13396 goto done;
13397 }
13398
13399 error = apply_unveil(got_repo_get_path(repo), 0,
13400 worktree ? got_worktree_get_root_path(worktree) : NULL);
13401 if (error)
13402 goto done;
13403
13404 error = check_rebase_or_histedit_in_progress(worktree);
13405 if (error)
13406 goto done;
13407
13408 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
13409 repo);
13410 if (error)
13411 goto done;
13412
13413 if (merge_in_progress && !(abort_merge || continue_merge)) {
13414 error = got_error(GOT_ERR_MERGE_BUSY);
13415 goto done;
13416 }
13417
13418 if (!merge_in_progress && (abort_merge || continue_merge)) {
13419 error = got_error(GOT_ERR_NOT_MERGING);
13420 goto done;
13421 }
13422
13423 if (abort_merge) {
13424 error = got_worktree_merge_continue(&branch_name,
13425 &branch_tip, &fileindex, worktree, repo);
13426 if (error)
13427 goto done;
13428 error = got_worktree_merge_abort(worktree, fileindex, repo,
13429 abort_progress, &upa);
13430 if (error)
13431 goto done;
13432 printf("Merge of %s aborted\n", branch_name);
13433 goto done; /* nothing else to do */
13434 }
13435
13436 if (strncmp(got_worktree_get_head_ref_name(worktree),
13437 "refs/heads/", 11) != 0) {
13438 error = got_error_fmt(GOT_ERR_COMMIT_BRANCH,
13439 "work tree's current branch %s is outside the "
13440 "\"refs/heads/\" reference namespace; "
13441 "update -b required",
13442 got_worktree_get_head_ref_name(worktree));
13443 goto done;
13444 }
13445
13446 error = get_author(&author, repo, worktree);
13447 if (error)
13448 goto done;
13449
13450 error = got_ref_open(&wt_branch, repo,
13451 got_worktree_get_head_ref_name(worktree), 0);
13452 if (error)
13453 goto done;
13454 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
13455 if (error)
13456 goto done;
13457
13458 if (continue_merge) {
13459 struct got_object_id *base_commit_id;
13460 base_commit_id = got_worktree_get_base_commit_id(worktree);
13461 if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
13462 error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
13463 goto done;
13464 }
13465 error = got_worktree_merge_continue(&branch_name,
13466 &branch_tip, &fileindex, worktree, repo);
13467 if (error)
13468 goto done;
13469 } else {
13470 error = got_ref_open(&branch, repo, argv[0], 0);
13471 if (error != NULL)
13472 goto done;
13473 branch_name = strdup(got_ref_get_name(branch));
13474 if (branch_name == NULL) {
13475 error = got_error_from_errno("strdup");
13476 goto done;
13477 }
13478 error = got_ref_resolve(&branch_tip, repo, branch);
13479 if (error)
13480 goto done;
13481 }
13482
13483 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
13484 wt_branch_tip, branch_tip, 0, repo,
13485 check_cancelled, NULL);
13486 if (error && error->code != GOT_ERR_ANCESTRY)
13487 goto done;
13488
13489 if (!continue_merge) {
13490 error = check_path_prefix(wt_branch_tip, branch_tip,
13491 got_worktree_get_path_prefix(worktree),
13492 GOT_ERR_MERGE_PATH, repo);
13493 if (error)
13494 goto done;
13495 error = got_worktree_merge_prepare(&fileindex, worktree, repo);
13496 if (error)
13497 goto done;
13498 if (prefer_fast_forward && yca_id &&
13499 got_object_id_cmp(wt_branch_tip, yca_id) == 0) {
13500 struct got_pathlist_head paths;
13501 if (interrupt_merge) {
13502 error = got_error_fmt(GOT_ERR_BAD_OPTION,
13503 "there are no changes to merge since %s "
13504 "is already based on %s; merge cannot be "
13505 "interrupted for amending; -n",
13506 branch_name, got_ref_get_name(wt_branch));
13507 goto done;
13508 }
13509 printf("Forwarding %s to %s\n",
13510 got_ref_get_name(wt_branch), branch_name);
13511 error = got_ref_change_ref(wt_branch, branch_tip);
13512 if (error)
13513 goto done;
13514 error = got_ref_write(wt_branch, repo);
13515 if (error)
13516 goto done;
13517 error = got_worktree_set_base_commit_id(worktree, repo,
13518 branch_tip);
13519 if (error)
13520 goto done;
13521 TAILQ_INIT(&paths);
13522 error = got_pathlist_append(&paths, "", NULL);
13523 if (error)
13524 goto done;
13525 error = got_worktree_checkout_files(worktree,
13526 &paths, repo, update_progress, &upa,
13527 check_cancelled, NULL);
13528 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
13529 if (error)
13530 goto done;
13531 if (upa.did_something) {
13532 char *id_str;
13533 error = got_object_id_str(&id_str, branch_tip);
13534 if (error)
13535 goto done;
13536 printf("Updated to commit %s\n", id_str);
13537 free(id_str);
13538 } else
13539 printf("Already up-to-date\n");
13540 print_update_progress_stats(&upa);
13541 goto done;
13542 }
13543 error = got_worktree_merge_write_refs(worktree, branch, repo);
13544 if (error)
13545 goto done;
13546
13547 error = got_worktree_merge_branch(worktree, fileindex,
13548 yca_id, branch_tip, repo, update_progress, &upa,
13549 check_cancelled, NULL);
13550 if (error)
13551 goto done;
13552 print_merge_progress_stats(&upa);
13553 if (!upa.did_something) {
13554 error = got_worktree_merge_abort(worktree, fileindex,
13555 repo, abort_progress, &upa);
13556 if (error)
13557 goto done;
13558 printf("Already up-to-date\n");
13559 goto done;
13560 }
13561 }
13562
13563 if (interrupt_merge) {
13564 error = got_worktree_merge_postpone(worktree, fileindex);
13565 if (error)
13566 goto done;
13567 printf("Merge of %s interrupted on request\n", branch_name);
13568 } else if (upa.conflicts > 0 || upa.missing > 0 ||
13569 upa.not_deleted > 0 || upa.unversioned > 0) {
13570 error = got_worktree_merge_postpone(worktree, fileindex);
13571 if (error)
13572 goto done;
13573 if (upa.conflicts > 0 && upa.missing == 0 &&
13574 upa.not_deleted == 0 && upa.unversioned == 0) {
13575 error = got_error_msg(GOT_ERR_CONFLICTS,
13576 "conflicts must be resolved before merging "
13577 "can continue");
13578 } else if (upa.conflicts > 0) {
13579 error = got_error_msg(GOT_ERR_CONFLICTS,
13580 "conflicts must be resolved before merging "
13581 "can continue; changes destined for some "
13582 "files were not yet merged and "
13583 "should be merged manually if required before the "
13584 "merge operation is continued");
13585 } else {
13586 error = got_error_msg(GOT_ERR_CONFLICTS,
13587 "changes destined for some "
13588 "files were not yet merged and should be "
13589 "merged manually if required before the "
13590 "merge operation is continued");
13591 }
13592 goto done;
13593 } else {
13594 error = got_worktree_merge_commit(&merge_commit_id, worktree,
13595 fileindex, author, NULL, 1, branch_tip, branch_name,
13596 allow_conflict, repo, continue_merge ? print_status : NULL,
13597 NULL);
13598 if (error)
13599 goto done;
13600 error = got_worktree_merge_complete(worktree, fileindex, repo);
13601 if (error)
13602 goto done;
13603 error = got_object_id_str(&id_str, merge_commit_id);
13604 if (error)
13605 goto done;
13606 printf("Merged %s into %s: %s\n", branch_name,
13607 got_worktree_get_head_ref_name(worktree),
13608 id_str);
13609
13610 }
13611 done:
13612 free(gitconfig_path);
13613 free(id_str);
13614 free(merge_commit_id);
13615 free(author);
13616 free(branch_tip);
13617 free(branch_name);
13618 free(yca_id);
13619 if (branch)
13620 got_ref_close(branch);
13621 if (wt_branch)
13622 got_ref_close(wt_branch);
13623 if (worktree)
13624 got_worktree_close(worktree);
13625 if (repo) {
13626 const struct got_error *close_err = got_repo_close(repo);
13627 if (error == NULL)
13628 error = close_err;
13629 }
13630 if (pack_fds) {
13631 const struct got_error *pack_err =
13632 got_repo_pack_fds_close(pack_fds);
13633 if (error == NULL)
13634 error = pack_err;
13635 }
13636 return error;
13637 }
13638
13639 __dead static void
13640 usage_stage(void)
13641 {
13642 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
13643 "[path ...]\n", getprogname());
13644 exit(1);
13645 }
13646
13647 static const struct got_error *
13648 print_stage(void *arg, unsigned char status, unsigned char staged_status,
13649 const char *path, struct got_object_id *blob_id,
13650 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
13651 int dirfd, const char *de_name)
13652 {
13653 const struct got_error *err = NULL;
13654 char *id_str = NULL;
13655
13656 if (staged_status != GOT_STATUS_ADD &&
13657 staged_status != GOT_STATUS_MODIFY &&
13658 staged_status != GOT_STATUS_DELETE)
13659 return NULL;
13660
13661 if (staged_status == GOT_STATUS_ADD ||
13662 staged_status == GOT_STATUS_MODIFY)
13663 err = got_object_id_str(&id_str, staged_blob_id);
13664 else
13665 err = got_object_id_str(&id_str, blob_id);
13666 if (err)
13667 return err;
13668
13669 printf("%s %c %s\n", id_str, staged_status, path);
13670 free(id_str);
13671 return NULL;
13672 }
13673
13674 static const struct got_error *
13675 cmd_stage(int argc, char *argv[])
13676 {
13677 const struct got_error *error = NULL;
13678 struct got_repository *repo = NULL;
13679 struct got_worktree *worktree = NULL;
13680 char *cwd = NULL;
13681 struct got_pathlist_head paths;
13682 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
13683 FILE *patch_script_file = NULL;
13684 const char *patch_script_path = NULL;
13685 struct choose_patch_arg cpa;
13686 int *pack_fds = NULL;
13687
13688 TAILQ_INIT(&paths);
13689
13690 #ifndef PROFILE
13691 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13692 "unveil", NULL) == -1)
13693 err(1, "pledge");
13694 #endif
13695
13696 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
13697 switch (ch) {
13698 case 'F':
13699 patch_script_path = optarg;
13700 break;
13701 case 'l':
13702 list_stage = 1;
13703 break;
13704 case 'p':
13705 pflag = 1;
13706 break;
13707 case 'S':
13708 allow_bad_symlinks = 1;
13709 break;
13710 default:
13711 usage_stage();
13712 /* NOTREACHED */
13713 }
13714 }
13715
13716 argc -= optind;
13717 argv += optind;
13718
13719 if (list_stage && (pflag || patch_script_path))
13720 errx(1, "-l option cannot be used with other options");
13721 if (patch_script_path && !pflag)
13722 errx(1, "-F option can only be used together with -p option");
13723
13724 cwd = getcwd(NULL, 0);
13725 if (cwd == NULL) {
13726 error = got_error_from_errno("getcwd");
13727 goto done;
13728 }
13729
13730 error = got_repo_pack_fds_open(&pack_fds);
13731 if (error != NULL)
13732 goto done;
13733
13734 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13735 if (error) {
13736 if (error->code == GOT_ERR_NOT_WORKTREE)
13737 error = wrap_not_worktree_error(error, "stage", cwd);
13738 goto done;
13739 }
13740
13741 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13742 NULL, pack_fds);
13743 if (error != NULL)
13744 goto done;
13745
13746 if (patch_script_path) {
13747 patch_script_file = fopen(patch_script_path, "re");
13748 if (patch_script_file == NULL) {
13749 error = got_error_from_errno2("fopen",
13750 patch_script_path);
13751 goto done;
13752 }
13753 }
13754 error = apply_unveil(got_repo_get_path(repo), 0,
13755 got_worktree_get_root_path(worktree));
13756 if (error)
13757 goto done;
13758
13759 error = check_merge_in_progress(worktree, repo);
13760 if (error)
13761 goto done;
13762
13763 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13764 if (error)
13765 goto done;
13766
13767 if (list_stage)
13768 error = got_worktree_status(worktree, &paths, repo, 0,
13769 print_stage, NULL, check_cancelled, NULL);
13770 else {
13771 cpa.patch_script_file = patch_script_file;
13772 cpa.action = "stage";
13773 error = got_worktree_stage(worktree, &paths,
13774 pflag ? NULL : print_status, NULL,
13775 pflag ? choose_patch : NULL, &cpa,
13776 allow_bad_symlinks, repo);
13777 }
13778 done:
13779 if (patch_script_file && fclose(patch_script_file) == EOF &&
13780 error == NULL)
13781 error = got_error_from_errno2("fclose", patch_script_path);
13782 if (repo) {
13783 const struct got_error *close_err = got_repo_close(repo);
13784 if (error == NULL)
13785 error = close_err;
13786 }
13787 if (worktree)
13788 got_worktree_close(worktree);
13789 if (pack_fds) {
13790 const struct got_error *pack_err =
13791 got_repo_pack_fds_close(pack_fds);
13792 if (error == NULL)
13793 error = pack_err;
13794 }
13795 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13796 free(cwd);
13797 return error;
13798 }
13799
13800 __dead static void
13801 usage_unstage(void)
13802 {
13803 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
13804 "[path ...]\n", getprogname());
13805 exit(1);
13806 }
13807
13808
13809 static const struct got_error *
13810 cmd_unstage(int argc, char *argv[])
13811 {
13812 const struct got_error *error = NULL;
13813 struct got_repository *repo = NULL;
13814 struct got_worktree *worktree = NULL;
13815 char *cwd = NULL;
13816 struct got_pathlist_head paths;
13817 int ch, pflag = 0;
13818 struct got_update_progress_arg upa;
13819 FILE *patch_script_file = NULL;
13820 const char *patch_script_path = NULL;
13821 struct choose_patch_arg cpa;
13822 int *pack_fds = NULL;
13823
13824 TAILQ_INIT(&paths);
13825
13826 #ifndef PROFILE
13827 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13828 "unveil", NULL) == -1)
13829 err(1, "pledge");
13830 #endif
13831
13832 while ((ch = getopt(argc, argv, "F:p")) != -1) {
13833 switch (ch) {
13834 case 'F':
13835 patch_script_path = optarg;
13836 break;
13837 case 'p':
13838 pflag = 1;
13839 break;
13840 default:
13841 usage_unstage();
13842 /* NOTREACHED */
13843 }
13844 }
13845
13846 argc -= optind;
13847 argv += optind;
13848
13849 if (patch_script_path && !pflag)
13850 errx(1, "-F option can only be used together with -p option");
13851
13852 cwd = getcwd(NULL, 0);
13853 if (cwd == NULL) {
13854 error = got_error_from_errno("getcwd");
13855 goto done;
13856 }
13857
13858 error = got_repo_pack_fds_open(&pack_fds);
13859 if (error != NULL)
13860 goto done;
13861
13862 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13863 if (error) {
13864 if (error->code == GOT_ERR_NOT_WORKTREE)
13865 error = wrap_not_worktree_error(error, "unstage", cwd);
13866 goto done;
13867 }
13868
13869 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13870 NULL, pack_fds);
13871 if (error != NULL)
13872 goto done;
13873
13874 if (patch_script_path) {
13875 patch_script_file = fopen(patch_script_path, "re");
13876 if (patch_script_file == NULL) {
13877 error = got_error_from_errno2("fopen",
13878 patch_script_path);
13879 goto done;
13880 }
13881 }
13882
13883 error = apply_unveil(got_repo_get_path(repo), 0,
13884 got_worktree_get_root_path(worktree));
13885 if (error)
13886 goto done;
13887
13888 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13889 if (error)
13890 goto done;
13891
13892 cpa.patch_script_file = patch_script_file;
13893 cpa.action = "unstage";
13894 memset(&upa, 0, sizeof(upa));
13895 error = got_worktree_unstage(worktree, &paths, update_progress,
13896 &upa, pflag ? choose_patch : NULL, &cpa, repo);
13897 if (!error)
13898 print_merge_progress_stats(&upa);
13899 done:
13900 if (patch_script_file && fclose(patch_script_file) == EOF &&
13901 error == NULL)
13902 error = got_error_from_errno2("fclose", patch_script_path);
13903 if (repo) {
13904 const struct got_error *close_err = got_repo_close(repo);
13905 if (error == NULL)
13906 error = close_err;
13907 }
13908 if (worktree)
13909 got_worktree_close(worktree);
13910 if (pack_fds) {
13911 const struct got_error *pack_err =
13912 got_repo_pack_fds_close(pack_fds);
13913 if (error == NULL)
13914 error = pack_err;
13915 }
13916 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13917 free(cwd);
13918 return error;
13919 }
13920
13921 __dead static void
13922 usage_cat(void)
13923 {
13924 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
13925 "arg ...\n", getprogname());
13926 exit(1);
13927 }
13928
13929 static const struct got_error *
13930 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13931 {
13932 const struct got_error *err;
13933 struct got_blob_object *blob;
13934 int fd = -1;
13935
13936 fd = got_opentempfd();
13937 if (fd == -1)
13938 return got_error_from_errno("got_opentempfd");
13939
13940 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
13941 if (err)
13942 goto done;
13943
13944 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
13945 done:
13946 if (fd != -1 && close(fd) == -1 && err == NULL)
13947 err = got_error_from_errno("close");
13948 if (blob)
13949 got_object_blob_close(blob);
13950 return err;
13951 }
13952
13953 static const struct got_error *
13954 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13955 {
13956 const struct got_error *err;
13957 struct got_tree_object *tree;
13958 int nentries, i;
13959
13960 err = got_object_open_as_tree(&tree, repo, id);
13961 if (err)
13962 return err;
13963
13964 nentries = got_object_tree_get_nentries(tree);
13965 for (i = 0; i < nentries; i++) {
13966 struct got_tree_entry *te;
13967 char *id_str;
13968 if (sigint_received || sigpipe_received)
13969 break;
13970 te = got_object_tree_get_entry(tree, i);
13971 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
13972 if (err)
13973 break;
13974 fprintf(outfile, "%s %.7o %s\n", id_str,
13975 got_tree_entry_get_mode(te),
13976 got_tree_entry_get_name(te));
13977 free(id_str);
13978 }
13979
13980 got_object_tree_close(tree);
13981 return err;
13982 }
13983
13984 static const struct got_error *
13985 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13986 {
13987 const struct got_error *err;
13988 struct got_commit_object *commit;
13989 const struct got_object_id_queue *parent_ids;
13990 struct got_object_qid *pid;
13991 char *id_str = NULL;
13992 const char *logmsg = NULL;
13993 char gmtoff[6];
13994
13995 err = got_object_open_as_commit(&commit, repo, id);
13996 if (err)
13997 return err;
13998
13999 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
14000 if (err)
14001 goto done;
14002
14003 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
14004 parent_ids = got_object_commit_get_parent_ids(commit);
14005 fprintf(outfile, "numparents %d\n",
14006 got_object_commit_get_nparents(commit));
14007 STAILQ_FOREACH(pid, parent_ids, entry) {
14008 char *pid_str;
14009 err = got_object_id_str(&pid_str, &pid->id);
14010 if (err)
14011 goto done;
14012 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
14013 free(pid_str);
14014 }
14015 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14016 got_object_commit_get_author_gmtoff(commit));
14017 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
14018 got_object_commit_get_author(commit),
14019 (long long)got_object_commit_get_author_time(commit),
14020 gmtoff);
14021
14022 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14023 got_object_commit_get_committer_gmtoff(commit));
14024 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
14025 got_object_commit_get_committer(commit),
14026 (long long)got_object_commit_get_committer_time(commit),
14027 gmtoff);
14028
14029 logmsg = got_object_commit_get_logmsg_raw(commit);
14030 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
14031 fprintf(outfile, "%s", logmsg);
14032 done:
14033 free(id_str);
14034 got_object_commit_close(commit);
14035 return err;
14036 }
14037
14038 static const struct got_error *
14039 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14040 {
14041 const struct got_error *err;
14042 struct got_tag_object *tag;
14043 char *id_str = NULL;
14044 const char *tagmsg = NULL;
14045 char gmtoff[6];
14046
14047 err = got_object_open_as_tag(&tag, repo, id);
14048 if (err)
14049 return err;
14050
14051 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
14052 if (err)
14053 goto done;
14054
14055 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
14056
14057 switch (got_object_tag_get_object_type(tag)) {
14058 case GOT_OBJ_TYPE_BLOB:
14059 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14060 GOT_OBJ_LABEL_BLOB);
14061 break;
14062 case GOT_OBJ_TYPE_TREE:
14063 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14064 GOT_OBJ_LABEL_TREE);
14065 break;
14066 case GOT_OBJ_TYPE_COMMIT:
14067 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14068 GOT_OBJ_LABEL_COMMIT);
14069 break;
14070 case GOT_OBJ_TYPE_TAG:
14071 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14072 GOT_OBJ_LABEL_TAG);
14073 break;
14074 default:
14075 break;
14076 }
14077
14078 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
14079 got_object_tag_get_name(tag));
14080
14081 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14082 got_object_tag_get_tagger_gmtoff(tag));
14083 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
14084 got_object_tag_get_tagger(tag),
14085 (long long)got_object_tag_get_tagger_time(tag),
14086 gmtoff);
14087
14088 tagmsg = got_object_tag_get_message(tag);
14089 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
14090 fprintf(outfile, "%s", tagmsg);
14091 done:
14092 free(id_str);
14093 got_object_tag_close(tag);
14094 return err;
14095 }
14096
14097 static const struct got_error *
14098 cmd_cat(int argc, char *argv[])
14099 {
14100 const struct got_error *error;
14101 struct got_repository *repo = NULL;
14102 struct got_worktree *worktree = NULL;
14103 char *cwd = NULL, *repo_path = NULL, *label = NULL;
14104 char *keyword_idstr = NULL;
14105 const char *commit_id_str = NULL;
14106 struct got_object_id *id = NULL, *commit_id = NULL;
14107 struct got_commit_object *commit = NULL;
14108 int ch, obj_type, i, force_path = 0;
14109 struct got_reflist_head refs;
14110 int *pack_fds = NULL;
14111
14112 TAILQ_INIT(&refs);
14113
14114 #ifndef PROFILE
14115 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14116 NULL) == -1)
14117 err(1, "pledge");
14118 #endif
14119
14120 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
14121 switch (ch) {
14122 case 'c':
14123 commit_id_str = optarg;
14124 break;
14125 case 'P':
14126 force_path = 1;
14127 break;
14128 case 'r':
14129 repo_path = realpath(optarg, NULL);
14130 if (repo_path == NULL)
14131 return got_error_from_errno2("realpath",
14132 optarg);
14133 got_path_strip_trailing_slashes(repo_path);
14134 break;
14135 default:
14136 usage_cat();
14137 /* NOTREACHED */
14138 }
14139 }
14140
14141 argc -= optind;
14142 argv += optind;
14143
14144 cwd = getcwd(NULL, 0);
14145 if (cwd == NULL) {
14146 error = got_error_from_errno("getcwd");
14147 goto done;
14148 }
14149
14150 error = got_repo_pack_fds_open(&pack_fds);
14151 if (error != NULL)
14152 goto done;
14153
14154 if (repo_path == NULL) {
14155 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14156 if (error && error->code != GOT_ERR_NOT_WORKTREE)
14157 goto done;
14158 if (worktree) {
14159 repo_path = strdup(
14160 got_worktree_get_repo_path(worktree));
14161 if (repo_path == NULL) {
14162 error = got_error_from_errno("strdup");
14163 goto done;
14164 }
14165
14166 if (commit_id_str == NULL) {
14167 /* Release work tree lock. */
14168 got_worktree_close(worktree);
14169 worktree = NULL;
14170 }
14171 }
14172 }
14173
14174 if (repo_path == NULL) {
14175 repo_path = strdup(cwd);
14176 if (repo_path == NULL)
14177 return got_error_from_errno("strdup");
14178 }
14179
14180 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
14181 free(repo_path);
14182 if (error != NULL)
14183 goto done;
14184
14185 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
14186 if (error)
14187 goto done;
14188
14189 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
14190 if (error)
14191 goto done;
14192
14193 if (commit_id_str != NULL) {
14194 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
14195 repo, worktree);
14196 if (error != NULL)
14197 goto done;
14198 if (keyword_idstr != NULL)
14199 commit_id_str = keyword_idstr;
14200 if (worktree != NULL) {
14201 got_worktree_close(worktree);
14202 worktree = NULL;
14203 }
14204 } else
14205 commit_id_str = GOT_REF_HEAD;
14206 error = got_repo_match_object_id(&commit_id, NULL,
14207 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
14208 if (error)
14209 goto done;
14210
14211 error = got_object_open_as_commit(&commit, repo, commit_id);
14212 if (error)
14213 goto done;
14214
14215 for (i = 0; i < argc; i++) {
14216 if (force_path) {
14217 error = got_object_id_by_path(&id, repo, commit,
14218 argv[i]);
14219 if (error)
14220 break;
14221 } else {
14222 error = got_repo_match_object_id(&id, &label, argv[i],
14223 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
14224 repo);
14225 if (error) {
14226 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
14227 error->code != GOT_ERR_NOT_REF)
14228 break;
14229 error = got_object_id_by_path(&id, repo,
14230 commit, argv[i]);
14231 if (error)
14232 break;
14233 }
14234 }
14235
14236 error = got_object_get_type(&obj_type, repo, id);
14237 if (error)
14238 break;
14239
14240 switch (obj_type) {
14241 case GOT_OBJ_TYPE_BLOB:
14242 error = cat_blob(id, repo, stdout);
14243 break;
14244 case GOT_OBJ_TYPE_TREE:
14245 error = cat_tree(id, repo, stdout);
14246 break;
14247 case GOT_OBJ_TYPE_COMMIT:
14248 error = cat_commit(id, repo, stdout);
14249 break;
14250 case GOT_OBJ_TYPE_TAG:
14251 error = cat_tag(id, repo, stdout);
14252 break;
14253 default:
14254 error = got_error(GOT_ERR_OBJ_TYPE);
14255 break;
14256 }
14257 if (error)
14258 break;
14259 free(label);
14260 label = NULL;
14261 free(id);
14262 id = NULL;
14263 }
14264 done:
14265 free(label);
14266 free(id);
14267 free(commit_id);
14268 free(keyword_idstr);
14269 if (commit)
14270 got_object_commit_close(commit);
14271 if (worktree)
14272 got_worktree_close(worktree);
14273 if (repo) {
14274 const struct got_error *close_err = got_repo_close(repo);
14275 if (error == NULL)
14276 error = close_err;
14277 }
14278 if (pack_fds) {
14279 const struct got_error *pack_err =
14280 got_repo_pack_fds_close(pack_fds);
14281 if (error == NULL)
14282 error = pack_err;
14283 }
14284
14285 got_ref_list_free(&refs);
14286 return error;
14287 }
14288
14289 __dead static void
14290 usage_info(void)
14291 {
14292 fprintf(stderr, "usage: %s info [path ...]\n",
14293 getprogname());
14294 exit(1);
14295 }
14296
14297 static const struct got_error *
14298 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
14299 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
14300 struct got_object_id *commit_id)
14301 {
14302 const struct got_error *err = NULL;
14303 char *id_str = NULL;
14304 char datebuf[128];
14305 struct tm mytm, *tm;
14306 struct got_pathlist_head *paths = arg;
14307 struct got_pathlist_entry *pe;
14308
14309 /*
14310 * Clear error indication from any of the path arguments which
14311 * would cause this file index entry to be displayed.
14312 */
14313 TAILQ_FOREACH(pe, paths, entry) {
14314 if (got_path_cmp(path, pe->path, strlen(path),
14315 pe->path_len) == 0 ||
14316 got_path_is_child(path, pe->path, pe->path_len))
14317 pe->data = NULL; /* no error */
14318 }
14319
14320 printf(GOT_COMMIT_SEP_STR);
14321 if (S_ISLNK(mode))
14322 printf("symlink: %s\n", path);
14323 else if (S_ISREG(mode)) {
14324 printf("file: %s\n", path);
14325 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
14326 } else if (S_ISDIR(mode))
14327 printf("directory: %s\n", path);
14328 else
14329 printf("something: %s\n", path);
14330
14331 tm = localtime_r(&mtime, &mytm);
14332 if (tm == NULL)
14333 return NULL;
14334 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
14335 return got_error(GOT_ERR_NO_SPACE);
14336 printf("timestamp: %s\n", datebuf);
14337
14338 if (blob_id) {
14339 err = got_object_id_str(&id_str, blob_id);
14340 if (err)
14341 return err;
14342 printf("based on blob: %s\n", id_str);
14343 free(id_str);
14344 }
14345
14346 if (staged_blob_id) {
14347 err = got_object_id_str(&id_str, staged_blob_id);
14348 if (err)
14349 return err;
14350 printf("based on staged blob: %s\n", id_str);
14351 free(id_str);
14352 }
14353
14354 if (commit_id) {
14355 err = got_object_id_str(&id_str, commit_id);
14356 if (err)
14357 return err;
14358 printf("based on commit: %s\n", id_str);
14359 free(id_str);
14360 }
14361
14362 return NULL;
14363 }
14364
14365 static const struct got_error *
14366 cmd_info(int argc, char *argv[])
14367 {
14368 const struct got_error *error = NULL;
14369 struct got_worktree *worktree = NULL;
14370 char *cwd = NULL, *id_str = NULL;
14371 struct got_pathlist_head paths;
14372 char *uuidstr = NULL;
14373 int ch, show_files = 0;
14374
14375 TAILQ_INIT(&paths);
14376
14377 #ifndef PROFILE
14378 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14379 NULL) == -1)
14380 err(1, "pledge");
14381 #endif
14382
14383 while ((ch = getopt(argc, argv, "")) != -1) {
14384 switch (ch) {
14385 default:
14386 usage_info();
14387 /* NOTREACHED */
14388 }
14389 }
14390
14391 argc -= optind;
14392 argv += optind;
14393
14394 cwd = getcwd(NULL, 0);
14395 if (cwd == NULL) {
14396 error = got_error_from_errno("getcwd");
14397 goto done;
14398 }
14399
14400 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14401 if (error) {
14402 if (error->code == GOT_ERR_NOT_WORKTREE)
14403 error = wrap_not_worktree_error(error, "info", cwd);
14404 goto done;
14405 }
14406
14407 #ifndef PROFILE
14408 /* Remove "wpath cpath proc exec sendfd" promises. */
14409 if (pledge("stdio rpath flock unveil", NULL) == -1)
14410 err(1, "pledge");
14411 #endif
14412 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
14413 if (error)
14414 goto done;
14415
14416 if (argc >= 1) {
14417 error = get_worktree_paths_from_argv(&paths, argc, argv,
14418 worktree);
14419 if (error)
14420 goto done;
14421 show_files = 1;
14422 }
14423
14424 error = got_object_id_str(&id_str,
14425 got_worktree_get_base_commit_id(worktree));
14426 if (error)
14427 goto done;
14428
14429 error = got_worktree_get_uuid(&uuidstr, worktree);
14430 if (error)
14431 goto done;
14432
14433 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
14434 printf("work tree base commit: %s\n", id_str);
14435 printf("work tree path prefix: %s\n",
14436 got_worktree_get_path_prefix(worktree));
14437 printf("work tree branch reference: %s\n",
14438 got_worktree_get_head_ref_name(worktree));
14439 printf("work tree UUID: %s\n", uuidstr);
14440 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
14441
14442 if (show_files) {
14443 struct got_pathlist_entry *pe;
14444 TAILQ_FOREACH(pe, &paths, entry) {
14445 if (pe->path_len == 0)
14446 continue;
14447 /*
14448 * Assume this path will fail. This will be corrected
14449 * in print_path_info() in case the path does suceeed.
14450 */
14451 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
14452 }
14453 error = got_worktree_path_info(worktree, &paths,
14454 print_path_info, &paths, check_cancelled, NULL);
14455 if (error)
14456 goto done;
14457 TAILQ_FOREACH(pe, &paths, entry) {
14458 if (pe->data != NULL) {
14459 const struct got_error *perr;
14460
14461 perr = pe->data;
14462 error = got_error_fmt(perr->code, "%s",
14463 pe->path);
14464 break;
14465 }
14466 }
14467 }
14468 done:
14469 if (worktree)
14470 got_worktree_close(worktree);
14471 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
14472 free(cwd);
14473 free(id_str);
14474 free(uuidstr);
14475 return error;
14476 }
portable version of Game of Trees