?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
gotwebd: send a UNIQUE temp fd
[got-portable.git] / cvg / cvg.c
blob713ac6213adf64d341195a912b6044a3298a0c80
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 * Copyright (C) 2023 Josh Rickmar <jrick@zettaport.com>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */
19
20 #include "got_compat.h"
21
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_worktree_cvg.h"
53 #include "got_diff.h"
54 #include "got_commit_graph.h"
55 #include "got_fetch.h"
56 #include "got_send.h"
57 #include "got_blame.h"
58 #include "got_privsep.h"
59 #include "got_opentemp.h"
60 #include "got_gotconfig.h"
61 #include "got_dial.h"
62 #include "got_patch.h"
63 #include "got_sigs.h"
64 #include "got_date.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_checkout(void);
97 __dead static void usage_update(void);
98 __dead static void usage_log(void);
99 __dead static void usage_diff(void);
100 __dead static void usage_blame(void);
101 __dead static void usage_tree(void);
102 __dead static void usage_status(void);
103 __dead static void usage_tag(void);
104 __dead static void usage_add(void);
105 __dead static void usage_remove(void);
106 __dead static void usage_patch(void);
107 __dead static void usage_revert(void);
108 __dead static void usage_commit(void);
109 __dead static void usage_cherrypick(void);
110 __dead static void usage_backout(void);
111 __dead static void usage_cat(void);
112 __dead static void usage_info(void);
113
114 static const struct got_error* cmd_import(int, char *[]);
115 static const struct got_error* cmd_clone(int, char *[]);
116 static const struct got_error* cmd_checkout(int, char *[]);
117 static const struct got_error* cmd_update(int, char *[]);
118 static const struct got_error* cmd_log(int, char *[]);
119 static const struct got_error* cmd_diff(int, char *[]);
120 static const struct got_error* cmd_blame(int, char *[]);
121 static const struct got_error* cmd_tree(int, char *[]);
122 static const struct got_error* cmd_status(int, char *[]);
123 static const struct got_error* cmd_tag(int, char *[]);
124 static const struct got_error* cmd_add(int, char *[]);
125 static const struct got_error* cmd_remove(int, char *[]);
126 static const struct got_error* cmd_patch(int, char *[]);
127 static const struct got_error* cmd_revert(int, char *[]);
128 static const struct got_error* cmd_commit(int, char *[]);
129 static const struct got_error* cmd_cherrypick(int, char *[]);
130 static const struct got_error* cmd_backout(int, char *[]);
131 static const struct got_error* cmd_cat(int, char *[]);
132 static const struct got_error* cmd_info(int, char *[]);
133
134 static const struct got_cmd got_commands[] = {
135 { "import", cmd_import, usage_import, "im" },
136 { "clone", cmd_clone, usage_clone, "cl" },
137 { "checkout", cmd_checkout, usage_checkout, "co" },
138 { "update", cmd_update, usage_update, "up" },
139 { "log", cmd_log, usage_log, "" },
140 { "diff", cmd_diff, usage_diff, "di" },
141 { "blame", cmd_blame, usage_blame, "bl" },
142 { "tree", cmd_tree, usage_tree, "tr" },
143 { "status", cmd_status, usage_status, "st" },
144 { "tag", cmd_tag, usage_tag, "" },
145 { "add", cmd_add, usage_add, "" },
146 { "remove", cmd_remove, usage_remove, "rm" },
147 { "patch", cmd_patch, usage_patch, "pa" },
148 { "revert", cmd_revert, usage_revert, "rv" },
149 { "commit", cmd_commit, usage_commit, "ci" },
150 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
151 { "backout", cmd_backout, usage_backout, "bo" },
152 { "cat", cmd_cat, usage_cat, "" },
153 { "info", cmd_info, usage_info, "" },
154 };
155
156 static void
157 list_commands(FILE *fp)
158 {
159 size_t i;
160
161 fprintf(fp, "commands:");
162 for (i = 0; i < nitems(got_commands); i++) {
163 const struct got_cmd *cmd = &got_commands[i];
164 fprintf(fp, " %s", cmd->cmd_name);
165 }
166 fputc('\n', fp);
167 }
168
169 __dead static void
170 option_conflict(char a, char b)
171 {
172 errx(1, "-%c and -%c options are mutually exclusive", a, b);
173 }
174
175 int
176 main(int argc, char *argv[])
177 {
178 const struct got_cmd *cmd;
179 size_t i;
180 int ch;
181 int hflag = 0, Vflag = 0;
182 static const struct option longopts[] = {
183 { "version", no_argument, NULL, 'V' },
184 { NULL, 0, NULL, 0 }
185 };
186
187 setlocale(LC_CTYPE, "");
188
189 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
190 switch (ch) {
191 case 'h':
192 hflag = 1;
193 break;
194 case 'V':
195 Vflag = 1;
196 break;
197 default:
198 usage(hflag, 1);
199 /* NOTREACHED */
200 }
201 }
202
203 argc -= optind;
204 argv += optind;
205 optind = 1;
206 optreset = 1;
207
208 if (Vflag) {
209 got_version_print_str();
210 return 0;
211 }
212
213 if (argc <= 0)
214 usage(hflag, hflag ? 0 : 1);
215
216 signal(SIGINT, catch_sigint);
217 signal(SIGPIPE, catch_sigpipe);
218
219 for (i = 0; i < nitems(got_commands); i++) {
220 const struct got_error *error;
221
222 cmd = &got_commands[i];
223
224 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
225 strcmp(cmd->cmd_alias, argv[0]) != 0)
226 continue;
227
228 if (hflag)
229 cmd->cmd_usage();
230
231 error = cmd->cmd_main(argc, argv);
232 if (error && error->code != GOT_ERR_CANCELLED &&
233 error->code != GOT_ERR_PRIVSEP_EXIT &&
234 !(sigpipe_received &&
235 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
236 !(sigint_received &&
237 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
238 fflush(stdout);
239 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
240 return 1;
241 }
242
243 return 0;
244 }
245
246 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
247 list_commands(stderr);
248 return 1;
249 }
250
251 __dead static void
252 usage(int hflag, int status)
253 {
254 FILE *fp = (status == 0) ? stdout : stderr;
255
256 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
257 getprogname());
258 if (hflag)
259 list_commands(fp);
260 exit(status);
261 }
262
263 static const struct got_error *
264 get_editor(char **abspath)
265 {
266 const struct got_error *err = NULL;
267 const char *editor;
268
269 *abspath = NULL;
270
271 editor = getenv("VISUAL");
272 if (editor == NULL)
273 editor = getenv("EDITOR");
274
275 if (editor) {
276 err = got_path_find_prog(abspath, editor);
277 if (err)
278 return err;
279 }
280
281 if (*abspath == NULL) {
282 *abspath = strdup("/usr/bin/vi");
283 if (*abspath == NULL)
284 return got_error_from_errno("strdup");
285 }
286
287 return NULL;
288 }
289
290 static const struct got_error *
291 apply_unveil(const char *repo_path, int repo_read_only,
292 const char *worktree_path)
293 {
294 const struct got_error *err;
295
296 #ifdef PROFILE
297 if (unveil("gmon.out", "rwc") != 0)
298 return got_error_from_errno2("unveil", "gmon.out");
299 #endif
300 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
301 return got_error_from_errno2("unveil", repo_path);
302
303 if (worktree_path && unveil(worktree_path, "rwc") != 0)
304 return got_error_from_errno2("unveil", worktree_path);
305
306 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
307 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
308
309 err = got_privsep_unveil_exec_helpers();
310 if (err != NULL)
311 return err;
312
313 if (unveil(NULL, NULL) != 0)
314 return got_error_from_errno("unveil");
315
316 return NULL;
317 }
318
319 __dead static void
320 usage_import(void)
321 {
322 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
323 "[-r repository-path] directory\n", getprogname());
324 exit(1);
325 }
326
327 static int
328 spawn_editor(const char *editor, const char *file)
329 {
330 pid_t pid;
331 sig_t sighup, sigint, sigquit;
332 int st = -1;
333
334 sighup = signal(SIGHUP, SIG_IGN);
335 sigint = signal(SIGINT, SIG_IGN);
336 sigquit = signal(SIGQUIT, SIG_IGN);
337
338 switch (pid = fork()) {
339 case -1:
340 goto doneediting;
341 case 0:
342 execl(editor, editor, file, (char *)NULL);
343 _exit(127);
344 }
345
346 while (waitpid(pid, &st, 0) == -1)
347 if (errno != EINTR)
348 break;
349
350 doneediting:
351 (void)signal(SIGHUP, sighup);
352 (void)signal(SIGINT, sigint);
353 (void)signal(SIGQUIT, sigquit);
354
355 if (!WIFEXITED(st)) {
356 errno = EINTR;
357 return -1;
358 }
359
360 return WEXITSTATUS(st);
361 }
362
363 static const struct got_error *
364 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
365 {
366 const struct got_error *err = NULL;
367 char *line = NULL;
368 size_t linesize = 0;
369
370 *logmsg = NULL;
371 *len = 0;
372
373 if (fseeko(fp, 0L, SEEK_SET) == -1)
374 return got_error_from_errno("fseeko");
375
376 *logmsg = malloc(filesize + 1);
377 if (*logmsg == NULL)
378 return got_error_from_errno("malloc");
379 (*logmsg)[0] = '\0';
380
381 while (getline(&line, &linesize, fp) != -1) {
382 if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
383 continue; /* remove comments and leading empty lines */
384 *len = strlcat(*logmsg, line, filesize + 1);
385 if (*len >= filesize + 1) {
386 err = got_error(GOT_ERR_NO_SPACE);
387 goto done;
388 }
389 }
390 if (ferror(fp)) {
391 err = got_ferror(fp, GOT_ERR_IO);
392 goto done;
393 }
394
395 while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
396 (*logmsg)[*len - 1] = '\0';
397 (*len)--;
398 }
399 done:
400 free(line);
401 if (err) {
402 free(*logmsg);
403 *logmsg = NULL;
404 *len = 0;
405 }
406 return err;
407 }
408
409 static const struct got_error *
410 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
411 const char *initial_content, size_t initial_content_len,
412 int require_modification)
413 {
414 const struct got_error *err = NULL;
415 struct stat st, st2;
416 FILE *fp = NULL;
417 size_t logmsg_len;
418
419 *logmsg = NULL;
420
421 if (stat(logmsg_path, &st) == -1)
422 return got_error_from_errno2("stat", logmsg_path);
423
424 if (spawn_editor(editor, logmsg_path) == -1)
425 return got_error_from_errno("failed spawning editor");
426
427 if (require_modification) {
428 struct timespec timeout;
429
430 timeout.tv_sec = 0;
431 timeout.tv_nsec = 1;
432 nanosleep(&timeout, NULL);
433 }
434
435 if (stat(logmsg_path, &st2) == -1)
436 return got_error_from_errno2("stat", logmsg_path);
437
438 if (require_modification && st.st_size == st2.st_size &&
439 timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
440 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
441 "no changes made to commit message, aborting");
442
443 fp = fopen(logmsg_path, "re");
444 if (fp == NULL) {
445 err = got_error_from_errno("fopen");
446 goto done;
447 }
448
449 /* strip comments and leading/trailing newlines */
450 err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
451 if (err)
452 goto done;
453 if (logmsg_len == 0) {
454 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
455 "commit message cannot be empty, aborting");
456 goto done;
457 }
458 done:
459 if (fp && fclose(fp) == EOF && err == NULL)
460 err = got_error_from_errno("fclose");
461 if (err) {
462 free(*logmsg);
463 *logmsg = NULL;
464 }
465 return err;
466 }
467
468 static const struct got_error *
469 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
470 const char *path_dir, const char *branch_name)
471 {
472 char *initial_content = NULL;
473 const struct got_error *err = NULL;
474 int initial_content_len;
475 int fd = -1;
476
477 initial_content_len = asprintf(&initial_content,
478 "\n# %s to be imported to branch %s\n", path_dir,
479 branch_name);
480 if (initial_content_len == -1)
481 return got_error_from_errno("asprintf");
482
483 err = got_opentemp_named_fd(logmsg_path, &fd,
484 GOT_TMPDIR_STR "/got-importmsg", "");
485 if (err)
486 goto done;
487
488 if (write(fd, initial_content, initial_content_len) == -1) {
489 err = got_error_from_errno2("write", *logmsg_path);
490 goto done;
491 }
492 if (close(fd) == -1) {
493 err = got_error_from_errno2("close", *logmsg_path);
494 goto done;
495 }
496 fd = -1;
497
498 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
499 initial_content_len, 1);
500 done:
501 if (fd != -1 && close(fd) == -1 && err == NULL)
502 err = got_error_from_errno2("close", *logmsg_path);
503 free(initial_content);
504 if (err) {
505 free(*logmsg_path);
506 *logmsg_path = NULL;
507 }
508 return err;
509 }
510
511 static const struct got_error *
512 import_progress(void *arg, const char *path)
513 {
514 printf("A %s\n", path);
515 return NULL;
516 }
517
518 static const struct got_error *
519 valid_author(const char *author)
520 {
521 const char *email = author;
522
523 /*
524 * Git' expects the author (or committer) to be in the form
525 * "name <email>", which are mostly free form (see the
526 * "committer" description in git-fast-import(1)). We're only
527 * doing this to avoid git's object parser breaking on commits
528 * we create.
529 */
530
531 while (*author && *author != '\n' && *author != '<' && *author != '>')
532 author++;
533 if (author != email && *author == '<' && *(author - 1) != ' ')
534 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
535 "between author name and email required", email);
536 if (*author++ != '<')
537 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
538 while (*author && *author != '\n' && *author != '<' && *author != '>')
539 author++;
540 if (strcmp(author, ">") != 0)
541 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
542 return NULL;
543 }
544
545 static const struct got_error *
546 get_author(char **author, struct got_repository *repo,
547 struct got_worktree *worktree)
548 {
549 const struct got_error *err = NULL;
550 const char *got_author = NULL, *name, *email;
551 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
552
553 *author = NULL;
554
555 if (worktree)
556 worktree_conf = got_worktree_get_gotconfig(worktree);
557 repo_conf = got_repo_get_gotconfig(repo);
558
559 /*
560 * Priority of potential author information sources, from most
561 * significant to least significant:
562 * 1) work tree's .got/got.conf file
563 * 2) repository's got.conf file
564 * 3) repository's git config file
565 * 4) environment variables
566 * 5) global git config files (in user's home directory or /etc)
567 */
568
569 if (worktree_conf)
570 got_author = got_gotconfig_get_author(worktree_conf);
571 if (got_author == NULL)
572 got_author = got_gotconfig_get_author(repo_conf);
573 if (got_author == NULL) {
574 name = got_repo_get_gitconfig_author_name(repo);
575 email = got_repo_get_gitconfig_author_email(repo);
576 if (name && email) {
577 if (asprintf(author, "%s <%s>", name, email) == -1)
578 return got_error_from_errno("asprintf");
579 return NULL;
580 }
581
582 got_author = getenv("GOT_AUTHOR");
583 if (got_author == NULL) {
584 name = got_repo_get_global_gitconfig_author_name(repo);
585 email = got_repo_get_global_gitconfig_author_email(
586 repo);
587 if (name && email) {
588 if (asprintf(author, "%s <%s>", name, email)
589 == -1)
590 return got_error_from_errno("asprintf");
591 return NULL;
592 }
593 /* TODO: Look up user in password database? */
594 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
595 }
596 }
597
598 *author = strdup(got_author);
599 if (*author == NULL)
600 return got_error_from_errno("strdup");
601
602 err = valid_author(*author);
603 if (err) {
604 free(*author);
605 *author = NULL;
606 }
607 return err;
608 }
609
610 static const struct got_error *
611 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
612 struct got_worktree *worktree)
613 {
614 const char *got_allowed_signers = NULL;
615 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
616
617 *allowed_signers = NULL;
618
619 if (worktree)
620 worktree_conf = got_worktree_get_gotconfig(worktree);
621 repo_conf = got_repo_get_gotconfig(repo);
622
623 /*
624 * Priority of potential author information sources, from most
625 * significant to least significant:
626 * 1) work tree's .got/got.conf file
627 * 2) repository's got.conf file
628 */
629
630 if (worktree_conf)
631 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
632 worktree_conf);
633 if (got_allowed_signers == NULL)
634 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
635 repo_conf);
636
637 if (got_allowed_signers) {
638 *allowed_signers = strdup(got_allowed_signers);
639 if (*allowed_signers == NULL)
640 return got_error_from_errno("strdup");
641 }
642 return NULL;
643 }
644
645 static const struct got_error *
646 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
647 struct got_worktree *worktree)
648 {
649 const char *got_revoked_signers = NULL;
650 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
651
652 *revoked_signers = NULL;
653
654 if (worktree)
655 worktree_conf = got_worktree_get_gotconfig(worktree);
656 repo_conf = got_repo_get_gotconfig(repo);
657
658 /*
659 * Priority of potential author information sources, from most
660 * significant to least significant:
661 * 1) work tree's .got/got.conf file
662 * 2) repository's got.conf file
663 */
664
665 if (worktree_conf)
666 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
667 worktree_conf);
668 if (got_revoked_signers == NULL)
669 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
670 repo_conf);
671
672 if (got_revoked_signers) {
673 *revoked_signers = strdup(got_revoked_signers);
674 if (*revoked_signers == NULL)
675 return got_error_from_errno("strdup");
676 }
677 return NULL;
678 }
679
680 static const char *
681 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
682 {
683 const char *got_signer_id = NULL;
684 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
685
686 if (worktree)
687 worktree_conf = got_worktree_get_gotconfig(worktree);
688 repo_conf = got_repo_get_gotconfig(repo);
689
690 /*
691 * Priority of potential author information sources, from most
692 * significant to least significant:
693 * 1) work tree's .got/got.conf file
694 * 2) repository's got.conf file
695 */
696
697 if (worktree_conf)
698 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
699 if (got_signer_id == NULL)
700 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
701
702 return got_signer_id;
703 }
704
705 static const struct got_error *
706 get_gitconfig_path(char **gitconfig_path)
707 {
708 const char *homedir = getenv("HOME");
709
710 *gitconfig_path = NULL;
711 if (homedir) {
712 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
713 return got_error_from_errno("asprintf");
714
715 }
716 return NULL;
717 }
718
719 static const struct got_error *
720 cmd_import(int argc, char *argv[])
721 {
722 const struct got_error *error = NULL;
723 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
724 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
725 const char *branch_name = NULL;
726 char *id_str = NULL, *logmsg_path = NULL;
727 char refname[PATH_MAX] = "refs/heads/";
728 struct got_repository *repo = NULL;
729 struct got_reference *branch_ref = NULL, *head_ref = NULL;
730 struct got_object_id *new_commit_id = NULL;
731 int ch, n = 0;
732 struct got_pathlist_head ignores;
733 struct got_pathlist_entry *pe;
734 int preserve_logmsg = 0;
735 int *pack_fds = NULL;
736
737 TAILQ_INIT(&ignores);
738
739 #ifndef PROFILE
740 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
741 "unveil",
742 NULL) == -1)
743 err(1, "pledge");
744 #endif
745
746 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
747 switch (ch) {
748 case 'b':
749 branch_name = optarg;
750 break;
751 case 'I':
752 if (optarg[0] == '\0')
753 break;
754 error = got_pathlist_insert(&pe, &ignores, optarg,
755 NULL);
756 if (error)
757 goto done;
758 break;
759 case 'm':
760 logmsg = strdup(optarg);
761 if (logmsg == NULL) {
762 error = got_error_from_errno("strdup");
763 goto done;
764 }
765 break;
766 case 'r':
767 repo_path = realpath(optarg, NULL);
768 if (repo_path == NULL) {
769 error = got_error_from_errno2("realpath",
770 optarg);
771 goto done;
772 }
773 break;
774 default:
775 usage_import();
776 /* NOTREACHED */
777 }
778 }
779
780 argc -= optind;
781 argv += optind;
782
783 if (argc != 1)
784 usage_import();
785
786 if (repo_path == NULL) {
787 repo_path = getcwd(NULL, 0);
788 if (repo_path == NULL)
789 return got_error_from_errno("getcwd");
790 }
791 got_path_strip_trailing_slashes(repo_path);
792 error = get_gitconfig_path(&gitconfig_path);
793 if (error)
794 goto done;
795 error = got_repo_pack_fds_open(&pack_fds);
796 if (error != NULL)
797 goto done;
798 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
799 if (error)
800 goto done;
801
802 error = get_author(&author, repo, NULL);
803 if (error)
804 return error;
805
806 /*
807 * Don't let the user create a branch name with a leading '-'.
808 * While technically a valid reference name, this case is usually
809 * an unintended typo.
810 */
811 if (branch_name && branch_name[0] == '-')
812 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
813
814 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
815 if (error && error->code != GOT_ERR_NOT_REF)
816 goto done;
817
818 if (branch_name)
819 n = strlcat(refname, branch_name, sizeof(refname));
820 else if (head_ref && got_ref_is_symbolic(head_ref))
821 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
822 sizeof(refname));
823 else
824 n = strlcat(refname, "main", sizeof(refname));
825 if (n >= sizeof(refname)) {
826 error = got_error(GOT_ERR_NO_SPACE);
827 goto done;
828 }
829
830 error = got_ref_open(&branch_ref, repo, refname, 0);
831 if (error) {
832 if (error->code != GOT_ERR_NOT_REF)
833 goto done;
834 } else {
835 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
836 "import target branch already exists");
837 goto done;
838 }
839
840 path_dir = realpath(argv[0], NULL);
841 if (path_dir == NULL) {
842 error = got_error_from_errno2("realpath", argv[0]);
843 goto done;
844 }
845 got_path_strip_trailing_slashes(path_dir);
846
847 /*
848 * unveil(2) traverses exec(2); if an editor is used we have
849 * to apply unveil after the log message has been written.
850 */
851 if (logmsg == NULL || *logmsg == '\0') {
852 error = get_editor(&editor);
853 if (error)
854 goto done;
855 free(logmsg);
856 error = collect_import_msg(&logmsg, &logmsg_path, editor,
857 path_dir, refname);
858 if (error) {
859 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
860 logmsg_path != NULL)
861 preserve_logmsg = 1;
862 goto done;
863 }
864 }
865
866 if (unveil(path_dir, "r") != 0) {
867 error = got_error_from_errno2("unveil", path_dir);
868 if (logmsg_path)
869 preserve_logmsg = 1;
870 goto done;
871 }
872
873 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
874 if (error) {
875 if (logmsg_path)
876 preserve_logmsg = 1;
877 goto done;
878 }
879
880 error = got_repo_import(&new_commit_id, path_dir, logmsg,
881 author, &ignores, repo, import_progress, NULL);
882 if (error) {
883 if (logmsg_path)
884 preserve_logmsg = 1;
885 goto done;
886 }
887
888 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
889 if (error) {
890 if (logmsg_path)
891 preserve_logmsg = 1;
892 goto done;
893 }
894
895 error = got_ref_write(branch_ref, repo);
896 if (error) {
897 if (logmsg_path)
898 preserve_logmsg = 1;
899 goto done;
900 }
901
902 error = got_object_id_str(&id_str, new_commit_id);
903 if (error) {
904 if (logmsg_path)
905 preserve_logmsg = 1;
906 goto done;
907 }
908
909 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
910 if (error) {
911 if (error->code != GOT_ERR_NOT_REF) {
912 if (logmsg_path)
913 preserve_logmsg = 1;
914 goto done;
915 }
916
917 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
918 branch_ref);
919 if (error) {
920 if (logmsg_path)
921 preserve_logmsg = 1;
922 goto done;
923 }
924
925 error = got_ref_write(head_ref, repo);
926 if (error) {
927 if (logmsg_path)
928 preserve_logmsg = 1;
929 goto done;
930 }
931 }
932
933 printf("Created branch %s with commit %s\n",
934 got_ref_get_name(branch_ref), id_str);
935 done:
936 if (pack_fds) {
937 const struct got_error *pack_err =
938 got_repo_pack_fds_close(pack_fds);
939 if (error == NULL)
940 error = pack_err;
941 }
942 if (repo) {
943 const struct got_error *close_err = got_repo_close(repo);
944 if (error == NULL)
945 error = close_err;
946 }
947 if (preserve_logmsg) {
948 fprintf(stderr, "%s: log message preserved in %s\n",
949 getprogname(), logmsg_path);
950 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
951 error = got_error_from_errno2("unlink", logmsg_path);
952 free(logmsg);
953 free(logmsg_path);
954 free(repo_path);
955 free(editor);
956 free(new_commit_id);
957 free(id_str);
958 free(author);
959 free(gitconfig_path);
960 if (branch_ref)
961 got_ref_close(branch_ref);
962 if (head_ref)
963 got_ref_close(head_ref);
964 return error;
965 }
966
967 __dead static void
968 usage_clone(void)
969 {
970 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
971 "repository-URL [directory]\n", getprogname());
972 exit(1);
973 }
974
975 struct got_fetch_progress_arg {
976 char last_scaled_size[FMT_SCALED_STRSIZE];
977 int last_p_indexed;
978 int last_p_resolved;
979 int verbosity;
980
981 struct got_repository *repo;
982
983 int create_configs;
984 int configs_created;
985 struct {
986 struct got_pathlist_head *symrefs;
987 struct got_pathlist_head *wanted_branches;
988 struct got_pathlist_head *wanted_refs;
989 const char *proto;
990 const char *host;
991 const char *port;
992 const char *remote_repo_path;
993 const char *git_url;
994 int fetch_all_branches;
995 int mirror_references;
996 } config_info;
997 };
998
999 /* XXX forward declaration */
1000 static const struct got_error *
1001 create_config_files(const char *proto, const char *host, const char *port,
1002 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1003 int mirror_references, struct got_pathlist_head *symrefs,
1004 struct got_pathlist_head *wanted_branches,
1005 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1006
1007 static const struct got_error *
1008 fetch_progress(void *arg, const char *message, off_t packfile_size,
1009 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1010 {
1011 const struct got_error *err = NULL;
1012 struct got_fetch_progress_arg *a = arg;
1013 char scaled_size[FMT_SCALED_STRSIZE];
1014 int p_indexed, p_resolved;
1015 int print_size = 0, print_indexed = 0, print_resolved = 0;
1016
1017 /*
1018 * In order to allow a failed clone to be resumed with 'got fetch'
1019 * we try to create configuration files as soon as possible.
1020 * Once the server has sent information about its default branch
1021 * we have all required information.
1022 */
1023 if (a->create_configs && !a->configs_created &&
1024 !TAILQ_EMPTY(a->config_info.symrefs)) {
1025 err = create_config_files(a->config_info.proto,
1026 a->config_info.host, a->config_info.port,
1027 a->config_info.remote_repo_path,
1028 a->config_info.git_url,
1029 a->config_info.fetch_all_branches,
1030 a->config_info.mirror_references,
1031 a->config_info.symrefs,
1032 a->config_info.wanted_branches,
1033 a->config_info.wanted_refs, a->repo);
1034 if (err)
1035 return err;
1036 a->configs_created = 1;
1037 }
1038
1039 if (a->verbosity < 0)
1040 return NULL;
1041
1042 if (message && message[0] != '\0') {
1043 printf("\rserver: %s", message);
1044 fflush(stdout);
1045 return NULL;
1046 }
1047
1048 if (packfile_size > 0 || nobj_indexed > 0) {
1049 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1050 (a->last_scaled_size[0] == '\0' ||
1051 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1052 print_size = 1;
1053 if (strlcpy(a->last_scaled_size, scaled_size,
1054 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1055 return got_error(GOT_ERR_NO_SPACE);
1056 }
1057 if (nobj_indexed > 0) {
1058 p_indexed = (nobj_indexed * 100) / nobj_total;
1059 if (p_indexed != a->last_p_indexed) {
1060 a->last_p_indexed = p_indexed;
1061 print_indexed = 1;
1062 print_size = 1;
1063 }
1064 }
1065 if (nobj_resolved > 0) {
1066 p_resolved = (nobj_resolved * 100) /
1067 (nobj_total - nobj_loose);
1068 if (p_resolved != a->last_p_resolved) {
1069 a->last_p_resolved = p_resolved;
1070 print_resolved = 1;
1071 print_indexed = 1;
1072 print_size = 1;
1073 }
1074 }
1075
1076 }
1077 if (print_size || print_indexed || print_resolved)
1078 printf("\r");
1079 if (print_size)
1080 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1081 if (print_indexed)
1082 printf("; indexing %d%%", p_indexed);
1083 if (print_resolved)
1084 printf("; resolving deltas %d%%", p_resolved);
1085 if (print_size || print_indexed || print_resolved)
1086 fflush(stdout);
1087
1088 return NULL;
1089 }
1090
1091 static const struct got_error *
1092 create_symref(const char *refname, struct got_reference *target_ref,
1093 int verbosity, struct got_repository *repo)
1094 {
1095 const struct got_error *err;
1096 struct got_reference *head_symref;
1097
1098 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1099 if (err)
1100 return err;
1101
1102 err = got_ref_write(head_symref, repo);
1103 if (err == NULL && verbosity > 0) {
1104 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1105 got_ref_get_name(target_ref));
1106 }
1107 got_ref_close(head_symref);
1108 return err;
1109 }
1110
1111 static const struct got_error *
1112 list_remote_refs(struct got_pathlist_head *symrefs,
1113 struct got_pathlist_head *refs)
1114 {
1115 const struct got_error *err;
1116 struct got_pathlist_entry *pe;
1117
1118 TAILQ_FOREACH(pe, symrefs, entry) {
1119 const char *refname = pe->path;
1120 const char *targetref = pe->data;
1121
1122 printf("%s: %s\n", refname, targetref);
1123 }
1124
1125 TAILQ_FOREACH(pe, refs, entry) {
1126 const char *refname = pe->path;
1127 struct got_object_id *id = pe->data;
1128 char *id_str;
1129
1130 err = got_object_id_str(&id_str, id);
1131 if (err)
1132 return err;
1133 printf("%s: %s\n", refname, id_str);
1134 free(id_str);
1135 }
1136
1137 return NULL;
1138 }
1139
1140 static const struct got_error *
1141 create_ref(const char *refname, struct got_object_id *id,
1142 int verbosity, struct got_repository *repo)
1143 {
1144 const struct got_error *err = NULL;
1145 struct got_reference *ref;
1146 char *id_str;
1147
1148 err = got_object_id_str(&id_str, id);
1149 if (err)
1150 return err;
1151
1152 err = got_ref_alloc(&ref, refname, id);
1153 if (err)
1154 goto done;
1155
1156 err = got_ref_write(ref, repo);
1157 got_ref_close(ref);
1158
1159 if (err == NULL && verbosity >= 0)
1160 printf("Created reference %s: %s\n", refname, id_str);
1161 done:
1162 free(id_str);
1163 return err;
1164 }
1165
1166 static int
1167 match_wanted_ref(const char *refname, const char *wanted_ref)
1168 {
1169 if (strncmp(refname, "refs/", 5) != 0)
1170 return 0;
1171 refname += 5;
1172
1173 /*
1174 * Prevent fetching of references that won't make any
1175 * sense outside of the remote repository's context.
1176 */
1177 if (strncmp(refname, "got/", 4) == 0)
1178 return 0;
1179 if (strncmp(refname, "remotes/", 8) == 0)
1180 return 0;
1181
1182 if (strncmp(wanted_ref, "refs/", 5) == 0)
1183 wanted_ref += 5;
1184
1185 /* Allow prefix match. */
1186 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1187 return 1;
1188
1189 /* Allow exact match. */
1190 return (strcmp(refname, wanted_ref) == 0);
1191 }
1192
1193 static int
1194 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1195 {
1196 struct got_pathlist_entry *pe;
1197
1198 TAILQ_FOREACH(pe, wanted_refs, entry) {
1199 if (match_wanted_ref(refname, pe->path))
1200 return 1;
1201 }
1202
1203 return 0;
1204 }
1205
1206 static const struct got_error *
1207 create_wanted_ref(const char *refname, struct got_object_id *id,
1208 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1209 {
1210 const struct got_error *err;
1211 char *remote_refname;
1212
1213 if (strncmp("refs/", refname, 5) == 0)
1214 refname += 5;
1215
1216 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1217 remote_repo_name, refname) == -1)
1218 return got_error_from_errno("asprintf");
1219
1220 err = create_ref(remote_refname, id, verbosity, repo);
1221 free(remote_refname);
1222 return err;
1223 }
1224
1225 static const struct got_error *
1226 create_gotconfig(const char *proto, const char *host, const char *port,
1227 const char *remote_repo_path, const char *default_branch,
1228 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1229 struct got_pathlist_head *wanted_refs, int mirror_references,
1230 struct got_repository *repo)
1231 {
1232 const struct got_error *err = NULL;
1233 char *gotconfig_path = NULL;
1234 char *gotconfig = NULL;
1235 FILE *gotconfig_file = NULL;
1236 const char *branchname = NULL;
1237 char *branches = NULL, *refs = NULL;
1238 ssize_t n;
1239
1240 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1241 struct got_pathlist_entry *pe;
1242 TAILQ_FOREACH(pe, wanted_branches, entry) {
1243 char *s;
1244 branchname = pe->path;
1245 if (strncmp(branchname, "refs/heads/", 11) == 0)
1246 branchname += 11;
1247 if (asprintf(&s, "%s\"%s\" ",
1248 branches ? branches : "", branchname) == -1) {
1249 err = got_error_from_errno("asprintf");
1250 goto done;
1251 }
1252 free(branches);
1253 branches = s;
1254 }
1255 } else if (!fetch_all_branches && default_branch) {
1256 branchname = default_branch;
1257 if (strncmp(branchname, "refs/heads/", 11) == 0)
1258 branchname += 11;
1259 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1260 err = got_error_from_errno("asprintf");
1261 goto done;
1262 }
1263 }
1264 if (!TAILQ_EMPTY(wanted_refs)) {
1265 struct got_pathlist_entry *pe;
1266 TAILQ_FOREACH(pe, wanted_refs, entry) {
1267 char *s;
1268 const char *refname = pe->path;
1269 if (strncmp(refname, "refs/", 5) == 0)
1270 branchname += 5;
1271 if (asprintf(&s, "%s\"%s\" ",
1272 refs ? refs : "", refname) == -1) {
1273 err = got_error_from_errno("asprintf");
1274 goto done;
1275 }
1276 free(refs);
1277 refs = s;
1278 }
1279 }
1280
1281 /* Create got.conf(5). */
1282 gotconfig_path = got_repo_get_path_gotconfig(repo);
1283 if (gotconfig_path == NULL) {
1284 err = got_error_from_errno("got_repo_get_path_gotconfig");
1285 goto done;
1286 }
1287 gotconfig_file = fopen(gotconfig_path, "ae");
1288 if (gotconfig_file == NULL) {
1289 err = got_error_from_errno2("fopen", gotconfig_path);
1290 goto done;
1291 }
1292 if (asprintf(&gotconfig,
1293 "remote \"%s\" {\n"
1294 "\tserver %s\n"
1295 "\tprotocol %s\n"
1296 "%s%s%s"
1297 "\trepository \"%s\"\n"
1298 "%s%s%s"
1299 "%s%s%s"
1300 "%s"
1301 "%s"
1302 "}\n",
1303 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1304 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1305 remote_repo_path, branches ? "\tbranch { " : "",
1306 branches ? branches : "", branches ? "}\n" : "",
1307 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1308 mirror_references ? "\tmirror_references yes\n" : "",
1309 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1310 err = got_error_from_errno("asprintf");
1311 goto done;
1312 }
1313 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1314 if (n != strlen(gotconfig)) {
1315 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1316 goto done;
1317 }
1318
1319 done:
1320 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1321 err = got_error_from_errno2("fclose", gotconfig_path);
1322 free(gotconfig_path);
1323 free(branches);
1324 return err;
1325 }
1326
1327 static const struct got_error *
1328 create_gitconfig(const char *git_url, const char *default_branch,
1329 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1330 struct got_pathlist_head *wanted_refs, int mirror_references,
1331 struct got_repository *repo)
1332 {
1333 const struct got_error *err = NULL;
1334 char *gitconfig_path = NULL;
1335 char *gitconfig = NULL;
1336 FILE *gitconfig_file = NULL;
1337 char *branches = NULL, *refs = NULL;
1338 const char *branchname;
1339 ssize_t n;
1340
1341 /* Create a config file Git can understand. */
1342 gitconfig_path = got_repo_get_path_gitconfig(repo);
1343 if (gitconfig_path == NULL) {
1344 err = got_error_from_errno("got_repo_get_path_gitconfig");
1345 goto done;
1346 }
1347 gitconfig_file = fopen(gitconfig_path, "ae");
1348 if (gitconfig_file == NULL) {
1349 err = got_error_from_errno2("fopen", gitconfig_path);
1350 goto done;
1351 }
1352 if (fetch_all_branches) {
1353 if (mirror_references) {
1354 if (asprintf(&branches,
1355 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1356 err = got_error_from_errno("asprintf");
1357 goto done;
1358 }
1359 } else if (asprintf(&branches,
1360 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1361 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1362 err = got_error_from_errno("asprintf");
1363 goto done;
1364 }
1365 } else if (!TAILQ_EMPTY(wanted_branches)) {
1366 struct got_pathlist_entry *pe;
1367 TAILQ_FOREACH(pe, wanted_branches, entry) {
1368 char *s;
1369 branchname = pe->path;
1370 if (strncmp(branchname, "refs/heads/", 11) == 0)
1371 branchname += 11;
1372 if (mirror_references) {
1373 if (asprintf(&s,
1374 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1375 branches ? branches : "",
1376 branchname, branchname) == -1) {
1377 err = got_error_from_errno("asprintf");
1378 goto done;
1379 }
1380 } else if (asprintf(&s,
1381 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1382 branches ? branches : "",
1383 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1384 branchname) == -1) {
1385 err = got_error_from_errno("asprintf");
1386 goto done;
1387 }
1388 free(branches);
1389 branches = s;
1390 }
1391 } else {
1392 /*
1393 * If the server specified a default branch, use just that one.
1394 * Otherwise fall back to fetching all branches on next fetch.
1395 */
1396 if (default_branch) {
1397 branchname = default_branch;
1398 if (strncmp(branchname, "refs/heads/", 11) == 0)
1399 branchname += 11;
1400 } else
1401 branchname = "*"; /* fall back to all branches */
1402 if (mirror_references) {
1403 if (asprintf(&branches,
1404 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1405 branchname, branchname) == -1) {
1406 err = got_error_from_errno("asprintf");
1407 goto done;
1408 }
1409 } else if (asprintf(&branches,
1410 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1411 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1412 branchname) == -1) {
1413 err = got_error_from_errno("asprintf");
1414 goto done;
1415 }
1416 }
1417 if (!TAILQ_EMPTY(wanted_refs)) {
1418 struct got_pathlist_entry *pe;
1419 TAILQ_FOREACH(pe, wanted_refs, entry) {
1420 char *s;
1421 const char *refname = pe->path;
1422 if (strncmp(refname, "refs/", 5) == 0)
1423 refname += 5;
1424 if (mirror_references) {
1425 if (asprintf(&s,
1426 "%s\tfetch = refs/%s:refs/%s\n",
1427 refs ? refs : "", refname, refname) == -1) {
1428 err = got_error_from_errno("asprintf");
1429 goto done;
1430 }
1431 } else if (asprintf(&s,
1432 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1433 refs ? refs : "",
1434 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1435 refname) == -1) {
1436 err = got_error_from_errno("asprintf");
1437 goto done;
1438 }
1439 free(refs);
1440 refs = s;
1441 }
1442 }
1443
1444 if (asprintf(&gitconfig,
1445 "[remote \"%s\"]\n"
1446 "\turl = %s\n"
1447 "%s"
1448 "%s"
1449 "\tfetch = refs/tags/*:refs/tags/*\n",
1450 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1451 refs ? refs : "") == -1) {
1452 err = got_error_from_errno("asprintf");
1453 goto done;
1454 }
1455 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1456 if (n != strlen(gitconfig)) {
1457 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1458 goto done;
1459 }
1460 done:
1461 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1462 err = got_error_from_errno2("fclose", gitconfig_path);
1463 free(gitconfig_path);
1464 free(branches);
1465 return err;
1466 }
1467
1468 static const struct got_error *
1469 create_config_files(const char *proto, const char *host, const char *port,
1470 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1471 int mirror_references, struct got_pathlist_head *symrefs,
1472 struct got_pathlist_head *wanted_branches,
1473 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1474 {
1475 const struct got_error *err = NULL;
1476 const char *default_branch = NULL;
1477 struct got_pathlist_entry *pe;
1478
1479 /*
1480 * If we asked for a set of wanted branches then use the first
1481 * one of those.
1482 */
1483 if (!TAILQ_EMPTY(wanted_branches)) {
1484 pe = TAILQ_FIRST(wanted_branches);
1485 default_branch = pe->path;
1486 } else {
1487 /* First HEAD ref listed by server is the default branch. */
1488 TAILQ_FOREACH(pe, symrefs, entry) {
1489 const char *refname = pe->path;
1490 const char *target = pe->data;
1491
1492 if (strcmp(refname, GOT_REF_HEAD) != 0)
1493 continue;
1494
1495 default_branch = target;
1496 break;
1497 }
1498 }
1499
1500 /* Create got.conf(5). */
1501 err = create_gotconfig(proto, host, port, remote_repo_path,
1502 default_branch, fetch_all_branches, wanted_branches,
1503 wanted_refs, mirror_references, repo);
1504 if (err)
1505 return err;
1506
1507 /* Create a config file Git can understand. */
1508 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1509 wanted_branches, wanted_refs, mirror_references, repo);
1510 }
1511
1512 static const struct got_error *
1513 cmd_clone(int argc, char *argv[])
1514 {
1515 const struct got_error *error = NULL;
1516 const char *uri, *dirname;
1517 char *proto, *host, *port, *repo_name, *server_path;
1518 char *default_destdir = NULL, *id_str = NULL;
1519 const char *repo_path;
1520 struct got_repository *repo = NULL;
1521 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1522 struct got_pathlist_entry *pe;
1523 struct got_object_id *pack_hash = NULL;
1524 int ch, fetchfd = -1, fetchstatus;
1525 pid_t fetchpid = -1;
1526 struct got_fetch_progress_arg fpa;
1527 char *git_url = NULL;
1528 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1529 int bflag = 0, list_refs_only = 0;
1530 int *pack_fds = NULL;
1531
1532 TAILQ_INIT(&refs);
1533 TAILQ_INIT(&symrefs);
1534 TAILQ_INIT(&wanted_branches);
1535 TAILQ_INIT(&wanted_refs);
1536
1537 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1538 switch (ch) {
1539 case 'a':
1540 fetch_all_branches = 1;
1541 break;
1542 case 'b':
1543 error = got_pathlist_append(&wanted_branches,
1544 optarg, NULL);
1545 if (error)
1546 return error;
1547 bflag = 1;
1548 break;
1549 case 'l':
1550 list_refs_only = 1;
1551 break;
1552 case 'm':
1553 mirror_references = 1;
1554 break;
1555 case 'q':
1556 verbosity = -1;
1557 break;
1558 case 'R':
1559 error = got_pathlist_append(&wanted_refs,
1560 optarg, NULL);
1561 if (error)
1562 return error;
1563 break;
1564 case 'v':
1565 if (verbosity < 0)
1566 verbosity = 0;
1567 else if (verbosity < 3)
1568 verbosity++;
1569 break;
1570 default:
1571 usage_clone();
1572 break;
1573 }
1574 }
1575 argc -= optind;
1576 argv += optind;
1577
1578 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1579 option_conflict('a', 'b');
1580 if (list_refs_only) {
1581 if (!TAILQ_EMPTY(&wanted_branches))
1582 option_conflict('l', 'b');
1583 if (fetch_all_branches)
1584 option_conflict('l', 'a');
1585 if (mirror_references)
1586 option_conflict('l', 'm');
1587 if (!TAILQ_EMPTY(&wanted_refs))
1588 option_conflict('l', 'R');
1589 }
1590
1591 uri = argv[0];
1592
1593 if (argc == 1)
1594 dirname = NULL;
1595 else if (argc == 2)
1596 dirname = argv[1];
1597 else
1598 usage_clone();
1599
1600 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1601 &repo_name, uri);
1602 if (error)
1603 goto done;
1604
1605 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1606 host, port ? ":" : "", port ? port : "",
1607 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1608 error = got_error_from_errno("asprintf");
1609 goto done;
1610 }
1611
1612 if (strcmp(proto, "git") == 0) {
1613 #ifndef PROFILE
1614 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1615 "sendfd dns inet unveil", NULL) == -1)
1616 err(1, "pledge");
1617 #endif
1618 } else if (strcmp(proto, "git+ssh") == 0 ||
1619 strcmp(proto, "ssh") == 0) {
1620 #ifndef PROFILE
1621 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1622 "sendfd unveil", NULL) == -1)
1623 err(1, "pledge");
1624 #endif
1625 } else if (strcmp(proto, "http") == 0 ||
1626 strcmp(proto, "git+http") == 0) {
1627 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1628 goto done;
1629 } else {
1630 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1631 goto done;
1632 }
1633 if (dirname == NULL) {
1634 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1635 error = got_error_from_errno("asprintf");
1636 goto done;
1637 }
1638 repo_path = default_destdir;
1639 } else
1640 repo_path = dirname;
1641
1642 if (!list_refs_only) {
1643 error = got_path_mkdir(repo_path);
1644 if (error &&
1645 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1646 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1647 goto done;
1648 if (!got_path_dir_is_empty(repo_path)) {
1649 error = got_error_path(repo_path,
1650 GOT_ERR_DIR_NOT_EMPTY);
1651 goto done;
1652 }
1653 }
1654
1655 error = got_dial_apply_unveil(proto);
1656 if (error)
1657 goto done;
1658
1659 error = apply_unveil(repo_path, 0, NULL);
1660 if (error)
1661 goto done;
1662
1663 if (verbosity >= 0)
1664 printf("Connecting to %s\n", git_url);
1665
1666 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1667 server_path, verbosity);
1668 if (error)
1669 goto done;
1670
1671 if (!list_refs_only) {
1672 error = got_repo_init(repo_path, NULL);
1673 if (error)
1674 goto done;
1675 error = got_repo_pack_fds_open(&pack_fds);
1676 if (error != NULL)
1677 goto done;
1678 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1679 if (error)
1680 goto done;
1681 }
1682
1683 fpa.last_scaled_size[0] = '\0';
1684 fpa.last_p_indexed = -1;
1685 fpa.last_p_resolved = -1;
1686 fpa.verbosity = verbosity;
1687 fpa.create_configs = 1;
1688 fpa.configs_created = 0;
1689 fpa.repo = repo;
1690 fpa.config_info.symrefs = &symrefs;
1691 fpa.config_info.wanted_branches = &wanted_branches;
1692 fpa.config_info.wanted_refs = &wanted_refs;
1693 fpa.config_info.proto = proto;
1694 fpa.config_info.host = host;
1695 fpa.config_info.port = port;
1696 fpa.config_info.remote_repo_path = server_path;
1697 fpa.config_info.git_url = git_url;
1698 fpa.config_info.fetch_all_branches = fetch_all_branches;
1699 fpa.config_info.mirror_references = mirror_references;
1700 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1701 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1702 fetch_all_branches, &wanted_branches, &wanted_refs,
1703 list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1704 fetch_progress, &fpa);
1705 if (error)
1706 goto done;
1707
1708 if (list_refs_only) {
1709 error = list_remote_refs(&symrefs, &refs);
1710 goto done;
1711 }
1712
1713 if (pack_hash == NULL) {
1714 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1715 "server sent an empty pack file");
1716 goto done;
1717 }
1718 error = got_object_id_str(&id_str, pack_hash);
1719 if (error)
1720 goto done;
1721 if (verbosity >= 0)
1722 printf("\nFetched %s.pack\n", id_str);
1723 free(id_str);
1724
1725 /* Set up references provided with the pack file. */
1726 TAILQ_FOREACH(pe, &refs, entry) {
1727 const char *refname = pe->path;
1728 struct got_object_id *id = pe->data;
1729 char *remote_refname;
1730
1731 if (is_wanted_ref(&wanted_refs, refname) &&
1732 !mirror_references) {
1733 error = create_wanted_ref(refname, id,
1734 GOT_FETCH_DEFAULT_REMOTE_NAME,
1735 verbosity - 1, repo);
1736 if (error)
1737 goto done;
1738 continue;
1739 }
1740
1741 error = create_ref(refname, id, verbosity - 1, repo);
1742 if (error)
1743 goto done;
1744
1745 if (mirror_references)
1746 continue;
1747
1748 if (strncmp("refs/heads/", refname, 11) != 0)
1749 continue;
1750
1751 if (asprintf(&remote_refname,
1752 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1753 refname + 11) == -1) {
1754 error = got_error_from_errno("asprintf");
1755 goto done;
1756 }
1757 error = create_ref(remote_refname, id, verbosity - 1, repo);
1758 free(remote_refname);
1759 if (error)
1760 goto done;
1761 }
1762
1763 /* Set the HEAD reference if the server provided one. */
1764 TAILQ_FOREACH(pe, &symrefs, entry) {
1765 struct got_reference *target_ref;
1766 const char *refname = pe->path;
1767 const char *target = pe->data;
1768 char *remote_refname = NULL, *remote_target = NULL;
1769
1770 if (strcmp(refname, GOT_REF_HEAD) != 0)
1771 continue;
1772
1773 error = got_ref_open(&target_ref, repo, target, 0);
1774 if (error) {
1775 if (error->code == GOT_ERR_NOT_REF) {
1776 error = NULL;
1777 continue;
1778 }
1779 goto done;
1780 }
1781
1782 error = create_symref(refname, target_ref, verbosity, repo);
1783 got_ref_close(target_ref);
1784 if (error)
1785 goto done;
1786
1787 if (mirror_references)
1788 continue;
1789
1790 if (strncmp("refs/heads/", target, 11) != 0)
1791 continue;
1792
1793 if (asprintf(&remote_refname,
1794 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1795 refname) == -1) {
1796 error = got_error_from_errno("asprintf");
1797 goto done;
1798 }
1799 if (asprintf(&remote_target,
1800 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1801 target + 11) == -1) {
1802 error = got_error_from_errno("asprintf");
1803 free(remote_refname);
1804 goto done;
1805 }
1806 error = got_ref_open(&target_ref, repo, remote_target, 0);
1807 if (error) {
1808 free(remote_refname);
1809 free(remote_target);
1810 if (error->code == GOT_ERR_NOT_REF) {
1811 error = NULL;
1812 continue;
1813 }
1814 goto done;
1815 }
1816 error = create_symref(remote_refname, target_ref,
1817 verbosity - 1, repo);
1818 free(remote_refname);
1819 free(remote_target);
1820 got_ref_close(target_ref);
1821 if (error)
1822 goto done;
1823 }
1824 if (pe == NULL) {
1825 /*
1826 * We failed to set the HEAD reference. If we asked for
1827 * a set of wanted branches use the first of one of those
1828 * which could be fetched instead.
1829 */
1830 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1831 const char *target = pe->path;
1832 struct got_reference *target_ref;
1833
1834 error = got_ref_open(&target_ref, repo, target, 0);
1835 if (error) {
1836 if (error->code == GOT_ERR_NOT_REF) {
1837 error = NULL;
1838 continue;
1839 }
1840 goto done;
1841 }
1842
1843 error = create_symref(GOT_REF_HEAD, target_ref,
1844 verbosity, repo);
1845 got_ref_close(target_ref);
1846 if (error)
1847 goto done;
1848 break;
1849 }
1850
1851 if (!fpa.configs_created && pe != NULL) {
1852 error = create_config_files(fpa.config_info.proto,
1853 fpa.config_info.host, fpa.config_info.port,
1854 fpa.config_info.remote_repo_path,
1855 fpa.config_info.git_url,
1856 fpa.config_info.fetch_all_branches,
1857 fpa.config_info.mirror_references,
1858 fpa.config_info.symrefs,
1859 fpa.config_info.wanted_branches,
1860 fpa.config_info.wanted_refs, fpa.repo);
1861 if (error)
1862 goto done;
1863 }
1864 }
1865
1866 if (verbosity >= 0)
1867 printf("Created %s repository '%s'\n",
1868 mirror_references ? "mirrored" : "cloned", repo_path);
1869 done:
1870 if (pack_fds) {
1871 const struct got_error *pack_err =
1872 got_repo_pack_fds_close(pack_fds);
1873 if (error == NULL)
1874 error = pack_err;
1875 }
1876 if (fetchpid > 0) {
1877 if (kill(fetchpid, SIGTERM) == -1)
1878 error = got_error_from_errno("kill");
1879 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1880 error = got_error_from_errno("waitpid");
1881 }
1882 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1883 error = got_error_from_errno("close");
1884 if (repo) {
1885 const struct got_error *close_err = got_repo_close(repo);
1886 if (error == NULL)
1887 error = close_err;
1888 }
1889 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1890 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1891 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1892 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1893 free(pack_hash);
1894 free(proto);
1895 free(host);
1896 free(port);
1897 free(server_path);
1898 free(repo_name);
1899 free(default_destdir);
1900 free(git_url);
1901 return error;
1902 }
1903
1904 static const struct got_error *
1905 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1906 int replace_tags, int verbosity, struct got_repository *repo)
1907 {
1908 const struct got_error *err = NULL;
1909 char *new_id_str = NULL;
1910 struct got_object_id *old_id = NULL;
1911
1912 err = got_object_id_str(&new_id_str, new_id);
1913 if (err)
1914 goto done;
1915
1916 if (!replace_tags &&
1917 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1918 err = got_ref_resolve(&old_id, repo, ref);
1919 if (err)
1920 goto done;
1921 if (got_object_id_cmp(old_id, new_id) == 0)
1922 goto done;
1923 if (verbosity >= 0) {
1924 printf("Rejecting update of existing tag %s: %s\n",
1925 got_ref_get_name(ref), new_id_str);
1926 }
1927 goto done;
1928 }
1929
1930 if (got_ref_is_symbolic(ref)) {
1931 if (verbosity >= 0) {
1932 printf("Replacing reference %s: %s\n",
1933 got_ref_get_name(ref),
1934 got_ref_get_symref_target(ref));
1935 }
1936 err = got_ref_change_symref_to_ref(ref, new_id);
1937 if (err)
1938 goto done;
1939 err = got_ref_write(ref, repo);
1940 if (err)
1941 goto done;
1942 } else {
1943 err = got_ref_resolve(&old_id, repo, ref);
1944 if (err)
1945 goto done;
1946 if (got_object_id_cmp(old_id, new_id) == 0)
1947 goto done;
1948
1949 err = got_ref_change_ref(ref, new_id);
1950 if (err)
1951 goto done;
1952 err = got_ref_write(ref, repo);
1953 if (err)
1954 goto done;
1955 }
1956
1957 if (verbosity >= 0)
1958 printf("Updated %s: %s\n", got_ref_get_name(ref),
1959 new_id_str);
1960 done:
1961 free(old_id);
1962 free(new_id_str);
1963 return err;
1964 }
1965
1966 static const struct got_error *
1967 update_wanted_ref(const char *refname, struct got_object_id *id,
1968 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1969 {
1970 const struct got_error *err, *unlock_err;
1971 char *remote_refname;
1972 struct got_reference *ref;
1973
1974 if (strncmp("refs/", refname, 5) == 0)
1975 refname += 5;
1976
1977 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1978 remote_repo_name, refname) == -1)
1979 return got_error_from_errno("asprintf");
1980
1981 err = got_ref_open(&ref, repo, remote_refname, 1);
1982 if (err) {
1983 if (err->code != GOT_ERR_NOT_REF)
1984 goto done;
1985 err = create_ref(remote_refname, id, verbosity, repo);
1986 } else {
1987 err = update_ref(ref, id, 0, verbosity, repo);
1988 unlock_err = got_ref_unlock(ref);
1989 if (unlock_err && err == NULL)
1990 err = unlock_err;
1991 got_ref_close(ref);
1992 }
1993 done:
1994 free(remote_refname);
1995 return err;
1996 }
1997
1998 __dead static void
1999 usage_checkout(void)
2000 {
2001 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2002 "[-p path-prefix] repository-path [work-tree-path]\n",
2003 getprogname());
2004 exit(1);
2005 }
2006
2007 static void
2008 show_worktree_base_ref_warning(void)
2009 {
2010 fprintf(stderr, "%s: warning: could not create a reference "
2011 "to the work tree's base commit; the commit could be "
2012 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2013 "repository writable and running 'got update' will prevent this\n",
2014 getprogname());
2015 }
2016
2017 struct got_checkout_progress_arg {
2018 const char *worktree_path;
2019 int had_base_commit_ref_error;
2020 int verbosity;
2021 };
2022
2023 static const struct got_error *
2024 checkout_progress(void *arg, unsigned char status, const char *path)
2025 {
2026 struct got_checkout_progress_arg *a = arg;
2027
2028 /* Base commit bump happens silently. */
2029 if (status == GOT_STATUS_BUMP_BASE)
2030 return NULL;
2031
2032 if (status == GOT_STATUS_BASE_REF_ERR) {
2033 a->had_base_commit_ref_error = 1;
2034 return NULL;
2035 }
2036
2037 while (path[0] == '/')
2038 path++;
2039
2040 if (a->verbosity >= 0)
2041 printf("%c %s/%s\n", status, a->worktree_path, path);
2042
2043 return NULL;
2044 }
2045
2046 static const struct got_error *
2047 check_cancelled(void *arg)
2048 {
2049 if (sigint_received || sigpipe_received)
2050 return got_error(GOT_ERR_CANCELLED);
2051 return NULL;
2052 }
2053
2054 static const struct got_error *
2055 check_linear_ancestry(struct got_object_id *commit_id,
2056 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2057 struct got_repository *repo)
2058 {
2059 const struct got_error *err = NULL;
2060 struct got_object_id *yca_id;
2061
2062 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2063 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2064 if (err)
2065 return err;
2066
2067 if (yca_id == NULL)
2068 return got_error(GOT_ERR_ANCESTRY);
2069
2070 /*
2071 * Require a straight line of history between the target commit
2072 * and the work tree's base commit.
2073 *
2074 * Non-linear situations such as this require a rebase:
2075 *
2076 * (commit) D F (base_commit)
2077 * \ /
2078 * C E
2079 * \ /
2080 * B (yca)
2081 * |
2082 * A
2083 *
2084 * 'got update' only handles linear cases:
2085 * Update forwards in time: A (base/yca) - B - C - D (commit)
2086 * Update backwards in time: D (base) - C - B - A (commit/yca)
2087 */
2088 if (allow_forwards_in_time_only) {
2089 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2090 return got_error(GOT_ERR_ANCESTRY);
2091 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2092 got_object_id_cmp(base_commit_id, yca_id) != 0)
2093 return got_error(GOT_ERR_ANCESTRY);
2094
2095 free(yca_id);
2096 return NULL;
2097 }
2098
2099 static const struct got_error *
2100 check_same_branch(struct got_object_id *commit_id,
2101 struct got_reference *head_ref, struct got_repository *repo)
2102 {
2103 const struct got_error *err = NULL;
2104 struct got_commit_graph *graph = NULL;
2105 struct got_object_id *head_commit_id = NULL;
2106
2107 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2108 if (err)
2109 goto done;
2110
2111 if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2112 goto done;
2113
2114 err = got_commit_graph_open(&graph, "/", 1);
2115 if (err)
2116 goto done;
2117
2118 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2119 check_cancelled, NULL);
2120 if (err)
2121 goto done;
2122
2123 for (;;) {
2124 struct got_object_id id;
2125
2126 err = got_commit_graph_iter_next(&id, graph, repo,
2127 check_cancelled, NULL);
2128 if (err) {
2129 if (err->code == GOT_ERR_ITER_COMPLETED)
2130 err = got_error(GOT_ERR_ANCESTRY);
2131 break;
2132 }
2133
2134 if (got_object_id_cmp(&id, commit_id) == 0)
2135 break;
2136 }
2137 done:
2138 if (graph)
2139 got_commit_graph_close(graph);
2140 free(head_commit_id);
2141 return err;
2142 }
2143
2144 static const struct got_error *
2145 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2146 {
2147 static char msg[512];
2148 const char *branch_name;
2149
2150 if (got_ref_is_symbolic(ref))
2151 branch_name = got_ref_get_symref_target(ref);
2152 else
2153 branch_name = got_ref_get_name(ref);
2154
2155 if (strncmp("refs/heads/", branch_name, 11) == 0)
2156 branch_name += 11;
2157
2158 snprintf(msg, sizeof(msg),
2159 "target commit is not contained in branch '%s'; "
2160 "the branch to use must be specified with -b; "
2161 "if necessary a new branch can be created for "
2162 "this commit with 'got branch -c %s BRANCH_NAME'",
2163 branch_name, commit_id_str);
2164
2165 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2166 }
2167
2168 static const struct got_error *
2169 cmd_checkout(int argc, char *argv[])
2170 {
2171 const struct got_error *error = NULL;
2172 struct got_repository *repo = NULL;
2173 struct got_reference *head_ref = NULL, *ref = NULL;
2174 struct got_worktree *worktree = NULL;
2175 char *repo_path = NULL;
2176 char *worktree_path = NULL;
2177 const char *path_prefix = "";
2178 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2179 char *commit_id_str = NULL;
2180 struct got_object_id *commit_id = NULL;
2181 char *cwd = NULL;
2182 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2183 struct got_pathlist_head paths;
2184 struct got_checkout_progress_arg cpa;
2185 int *pack_fds = NULL;
2186
2187 TAILQ_INIT(&paths);
2188
2189 #ifndef PROFILE
2190 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2191 "unveil", NULL) == -1)
2192 err(1, "pledge");
2193 #endif
2194
2195 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2196 switch (ch) {
2197 case 'b':
2198 branch_name = optarg;
2199 break;
2200 case 'c':
2201 commit_id_str = strdup(optarg);
2202 if (commit_id_str == NULL)
2203 return got_error_from_errno("strdup");
2204 break;
2205 case 'E':
2206 allow_nonempty = 1;
2207 break;
2208 case 'p':
2209 path_prefix = optarg;
2210 break;
2211 case 'q':
2212 verbosity = -1;
2213 break;
2214 default:
2215 usage_checkout();
2216 /* NOTREACHED */
2217 }
2218 }
2219
2220 argc -= optind;
2221 argv += optind;
2222
2223 if (argc == 1) {
2224 char *base, *dotgit;
2225 const char *path;
2226 repo_path = realpath(argv[0], NULL);
2227 if (repo_path == NULL)
2228 return got_error_from_errno2("realpath", argv[0]);
2229 cwd = getcwd(NULL, 0);
2230 if (cwd == NULL) {
2231 error = got_error_from_errno("getcwd");
2232 goto done;
2233 }
2234 if (path_prefix[0])
2235 path = path_prefix;
2236 else
2237 path = repo_path;
2238 error = got_path_basename(&base, path);
2239 if (error)
2240 goto done;
2241 dotgit = strstr(base, ".git");
2242 if (dotgit)
2243 *dotgit = '\0';
2244 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2245 error = got_error_from_errno("asprintf");
2246 free(base);
2247 goto done;
2248 }
2249 free(base);
2250 } else if (argc == 2) {
2251 repo_path = realpath(argv[0], NULL);
2252 if (repo_path == NULL) {
2253 error = got_error_from_errno2("realpath", argv[0]);
2254 goto done;
2255 }
2256 worktree_path = realpath(argv[1], NULL);
2257 if (worktree_path == NULL) {
2258 if (errno != ENOENT) {
2259 error = got_error_from_errno2("realpath",
2260 argv[1]);
2261 goto done;
2262 }
2263 worktree_path = strdup(argv[1]);
2264 if (worktree_path == NULL) {
2265 error = got_error_from_errno("strdup");
2266 goto done;
2267 }
2268 }
2269 } else
2270 usage_checkout();
2271
2272 got_path_strip_trailing_slashes(repo_path);
2273 got_path_strip_trailing_slashes(worktree_path);
2274
2275 error = got_repo_pack_fds_open(&pack_fds);
2276 if (error != NULL)
2277 goto done;
2278
2279 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2280 if (error != NULL)
2281 goto done;
2282
2283 /* Pre-create work tree path for unveil(2) */
2284 error = got_path_mkdir(worktree_path);
2285 if (error) {
2286 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2287 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2288 goto done;
2289 if (!allow_nonempty &&
2290 !got_path_dir_is_empty(worktree_path)) {
2291 error = got_error_path(worktree_path,
2292 GOT_ERR_DIR_NOT_EMPTY);
2293 goto done;
2294 }
2295 }
2296
2297 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2298 if (error)
2299 goto done;
2300
2301 error = got_ref_open(&head_ref, repo, branch_name, 0);
2302 if (error != NULL)
2303 goto done;
2304
2305 error = got_worktree_init(worktree_path, head_ref, path_prefix,
2306 GOT_WORKTREE_CVG_DIR, repo);
2307 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2308 goto done;
2309
2310 error = got_worktree_open(&worktree, worktree_path, GOT_WORKTREE_CVG_DIR);
2311 if (error != NULL)
2312 goto done;
2313
2314 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2315 path_prefix);
2316 if (error != NULL)
2317 goto done;
2318 if (!same_path_prefix) {
2319 error = got_error(GOT_ERR_PATH_PREFIX);
2320 goto done;
2321 }
2322
2323 if (commit_id_str) {
2324 struct got_reflist_head refs;
2325 TAILQ_INIT(&refs);
2326 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2327 NULL);
2328 if (error)
2329 goto done;
2330 error = got_repo_match_object_id(&commit_id, NULL,
2331 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2332 got_ref_list_free(&refs);
2333 if (error)
2334 goto done;
2335 error = check_linear_ancestry(commit_id,
2336 got_worktree_get_base_commit_id(worktree), 0, repo);
2337 if (error != NULL) {
2338 if (error->code == GOT_ERR_ANCESTRY) {
2339 error = checkout_ancestry_error(
2340 head_ref, commit_id_str);
2341 }
2342 goto done;
2343 }
2344 error = check_same_branch(commit_id, head_ref, repo);
2345 if (error) {
2346 if (error->code == GOT_ERR_ANCESTRY) {
2347 error = checkout_ancestry_error(
2348 head_ref, commit_id_str);
2349 }
2350 goto done;
2351 }
2352 error = got_worktree_set_base_commit_id(worktree, repo,
2353 commit_id);
2354 if (error)
2355 goto done;
2356 /* Expand potentially abbreviated commit ID string. */
2357 free(commit_id_str);
2358 error = got_object_id_str(&commit_id_str, commit_id);
2359 if (error)
2360 goto done;
2361 } else {
2362 commit_id = got_object_id_dup(
2363 got_worktree_get_base_commit_id(worktree));
2364 if (commit_id == NULL) {
2365 error = got_error_from_errno("got_object_id_dup");
2366 goto done;
2367 }
2368 error = got_object_id_str(&commit_id_str, commit_id);
2369 if (error)
2370 goto done;
2371 }
2372
2373 error = got_pathlist_append(&paths, "", NULL);
2374 if (error)
2375 goto done;
2376 cpa.worktree_path = worktree_path;
2377 cpa.had_base_commit_ref_error = 0;
2378 cpa.verbosity = verbosity;
2379 error = got_worktree_checkout_files(worktree, &paths, repo,
2380 checkout_progress, &cpa, check_cancelled, NULL);
2381 if (error != NULL)
2382 goto done;
2383
2384 if (got_ref_is_symbolic(head_ref)) {
2385 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2386 if (error)
2387 goto done;
2388 refname = got_ref_get_name(ref);
2389 } else
2390 refname = got_ref_get_name(head_ref);
2391 printf("Checked out %s: %s\n", refname, commit_id_str);
2392 printf("Now shut up and hack\n");
2393 if (cpa.had_base_commit_ref_error)
2394 show_worktree_base_ref_warning();
2395 done:
2396 if (pack_fds) {
2397 const struct got_error *pack_err =
2398 got_repo_pack_fds_close(pack_fds);
2399 if (error == NULL)
2400 error = pack_err;
2401 }
2402 if (head_ref)
2403 got_ref_close(head_ref);
2404 if (ref)
2405 got_ref_close(ref);
2406 if (repo) {
2407 const struct got_error *close_err = got_repo_close(repo);
2408 if (error == NULL)
2409 error = close_err;
2410 }
2411 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2412 free(commit_id_str);
2413 free(commit_id);
2414 free(repo_path);
2415 free(worktree_path);
2416 free(cwd);
2417 return error;
2418 }
2419
2420 struct got_update_progress_arg {
2421 int did_something;
2422 int conflicts;
2423 int obstructed;
2424 int not_updated;
2425 int missing;
2426 int not_deleted;
2427 int unversioned;
2428 int verbosity;
2429 };
2430
2431 static void
2432 print_update_progress_stats(struct got_update_progress_arg *upa)
2433 {
2434 if (!upa->did_something)
2435 return;
2436
2437 if (upa->conflicts > 0)
2438 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2439 if (upa->obstructed > 0)
2440 printf("File paths obstructed by a non-regular file: %d\n",
2441 upa->obstructed);
2442 if (upa->not_updated > 0)
2443 printf("Files not updated because of existing merge "
2444 "conflicts: %d\n", upa->not_updated);
2445 }
2446
2447 /*
2448 * The meaning of some status codes differs between merge-style operations and
2449 * update operations. For example, the ! status code means "file was missing"
2450 * if changes were merged into the work tree, and "missing file was restored"
2451 * if the work tree was updated. This function should be used by any operation
2452 * which merges changes into the work tree without updating the work tree.
2453 */
2454 static void
2455 print_merge_progress_stats(struct got_update_progress_arg *upa)
2456 {
2457 if (!upa->did_something)
2458 return;
2459
2460 if (upa->conflicts > 0)
2461 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2462 if (upa->obstructed > 0)
2463 printf("File paths obstructed by a non-regular file: %d\n",
2464 upa->obstructed);
2465 if (upa->missing > 0)
2466 printf("Files which had incoming changes but could not be "
2467 "found in the work tree: %d\n", upa->missing);
2468 if (upa->not_deleted > 0)
2469 printf("Files not deleted due to differences in deleted "
2470 "content: %d\n", upa->not_deleted);
2471 if (upa->unversioned > 0)
2472 printf("Files not merged because an unversioned file was "
2473 "found in the work tree: %d\n", upa->unversioned);
2474 }
2475
2476 __dead static void
2477 usage_update(void)
2478 {
2479 fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2480 "[path ...]\n", getprogname());
2481 exit(1);
2482 }
2483
2484 static const struct got_error *
2485 update_progress(void *arg, unsigned char status, const char *path)
2486 {
2487 struct got_update_progress_arg *upa = arg;
2488
2489 if (status == GOT_STATUS_EXISTS ||
2490 status == GOT_STATUS_BASE_REF_ERR)
2491 return NULL;
2492
2493 upa->did_something = 1;
2494
2495 /* Base commit bump happens silently. */
2496 if (status == GOT_STATUS_BUMP_BASE)
2497 return NULL;
2498
2499 if (status == GOT_STATUS_CONFLICT)
2500 upa->conflicts++;
2501 if (status == GOT_STATUS_OBSTRUCTED)
2502 upa->obstructed++;
2503 if (status == GOT_STATUS_CANNOT_UPDATE)
2504 upa->not_updated++;
2505 if (status == GOT_STATUS_MISSING)
2506 upa->missing++;
2507 if (status == GOT_STATUS_CANNOT_DELETE)
2508 upa->not_deleted++;
2509 if (status == GOT_STATUS_UNVERSIONED)
2510 upa->unversioned++;
2511
2512 while (path[0] == '/')
2513 path++;
2514 if (upa->verbosity >= 0)
2515 printf("%c %s\n", status, path);
2516
2517 return NULL;
2518 }
2519
2520 static const struct got_error *
2521 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2522 {
2523 const struct got_error *err;
2524 int in_progress;
2525
2526 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2527 if (err)
2528 return err;
2529 if (in_progress)
2530 return got_error(GOT_ERR_REBASING);
2531
2532 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2533 if (err)
2534 return err;
2535 if (in_progress)
2536 return got_error(GOT_ERR_HISTEDIT_BUSY);
2537
2538 return NULL;
2539 }
2540
2541 static const struct got_error *
2542 check_merge_in_progress(struct got_worktree *worktree,
2543 struct got_repository *repo)
2544 {
2545 const struct got_error *err;
2546 int in_progress;
2547
2548 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2549 if (err)
2550 return err;
2551 if (in_progress)
2552 return got_error(GOT_ERR_MERGE_BUSY);
2553
2554 return NULL;
2555 }
2556
2557 static const struct got_error *
2558 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2559 char *argv[], struct got_worktree *worktree)
2560 {
2561 const struct got_error *err = NULL;
2562 char *path;
2563 struct got_pathlist_entry *new;
2564 int i;
2565
2566 if (argc == 0) {
2567 path = strdup("");
2568 if (path == NULL)
2569 return got_error_from_errno("strdup");
2570 return got_pathlist_append(paths, path, NULL);
2571 }
2572
2573 for (i = 0; i < argc; i++) {
2574 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2575 if (err)
2576 break;
2577 err = got_pathlist_insert(&new, paths, path, NULL);
2578 if (err || new == NULL /* duplicate */) {
2579 free(path);
2580 if (err)
2581 break;
2582 }
2583 }
2584
2585 return err;
2586 }
2587
2588 static const struct got_error *
2589 wrap_not_worktree_error(const struct got_error *orig_err,
2590 const char *cmdname, const char *path)
2591 {
2592 const struct got_error *err;
2593 struct got_repository *repo;
2594 static char msg[512];
2595 int *pack_fds = NULL;
2596
2597 err = got_repo_pack_fds_open(&pack_fds);
2598 if (err)
2599 return err;
2600
2601 err = got_repo_open(&repo, path, NULL, pack_fds);
2602 if (err)
2603 return orig_err;
2604
2605 snprintf(msg, sizeof(msg),
2606 "'got %s' needs a work tree in addition to a git repository\n"
2607 "Work trees can be checked out from this Git repository with "
2608 "'got checkout'.\n"
2609 "The got(1) manual page contains more information.", cmdname);
2610 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2611 if (repo) {
2612 const struct got_error *close_err = got_repo_close(repo);
2613 if (err == NULL)
2614 err = close_err;
2615 }
2616 if (pack_fds) {
2617 const struct got_error *pack_err =
2618 got_repo_pack_fds_close(pack_fds);
2619 if (err == NULL)
2620 err = pack_err;
2621 }
2622 return err;
2623 }
2624
2625 static const struct got_error *
2626 cmd_update(int argc, char *argv[])
2627 {
2628 const struct got_error *error = NULL, *unlock_err;
2629 char *worktree_path = NULL;
2630 const char *repo_path = NULL;
2631 const char *remote_name = NULL;
2632 char *proto = NULL, *host = NULL, *port = NULL;
2633 char *repo_name = NULL, *server_path = NULL;
2634 const struct got_remote_repo *remotes, *remote = NULL;
2635 int nremotes;
2636 char *id_str = NULL;
2637 struct got_repository *repo = NULL;
2638 struct got_worktree *worktree = NULL;
2639 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2640 struct got_pathlist_head paths, refs, symrefs;
2641 struct got_pathlist_head wanted_branches, wanted_refs;
2642 struct got_pathlist_entry *pe;
2643 struct got_reflist_head remote_refs;
2644 struct got_reflist_entry *re;
2645 struct got_object_id *pack_hash = NULL;
2646 int i, ch, fetchfd = -1, fetchstatus;
2647 pid_t fetchpid = -1;
2648 struct got_fetch_progress_arg fpa;
2649 struct got_update_progress_arg upa;
2650 int verbosity = 0;
2651 int delete_remote = 0;
2652 int replace_tags = 0;
2653 int *pack_fds = NULL;
2654 const char *remote_head = NULL, *worktree_branch = NULL;
2655 struct got_object_id *commit_id = NULL;
2656 char *commit_id_str = NULL;
2657 const char *refname;
2658 struct got_reference *head_ref = NULL;
2659
2660 TAILQ_INIT(&paths);
2661 TAILQ_INIT(&refs);
2662 TAILQ_INIT(&symrefs);
2663 TAILQ_INIT(&remote_refs);
2664 TAILQ_INIT(&wanted_branches);
2665 TAILQ_INIT(&wanted_refs);
2666
2667 while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2668 switch (ch) {
2669 case 'c':
2670 commit_id_str = strdup(optarg);
2671 if (commit_id_str == NULL)
2672 return got_error_from_errno("strdup");
2673 break;
2674 case 't':
2675 replace_tags = 1;
2676 break;
2677 case 'q':
2678 verbosity = -1;
2679 break;
2680 case 'r':
2681 remote_name = optarg;
2682 break;
2683 case 'v':
2684 if (verbosity < 0)
2685 verbosity = 0;
2686 else if (verbosity < 3)
2687 verbosity++;
2688 break;
2689 case 'X':
2690 delete_remote = 1;
2691 break;
2692 default:
2693 usage_update();
2694 break;
2695 }
2696 }
2697 argc -= optind;
2698 argv += optind;
2699
2700 if (delete_remote) {
2701 if (replace_tags)
2702 option_conflict('X', 't');
2703 if (remote_name == NULL)
2704 errx(1, "-X option requires a remote name");
2705 }
2706 if (remote_name == NULL)
2707 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2708
2709 worktree_path = getcwd(NULL, 0);
2710 if (worktree_path == NULL) {
2711 error = got_error_from_errno("getcwd");
2712 goto done;
2713 }
2714 error = got_worktree_open(&worktree, worktree_path, GOT_WORKTREE_CVG_DIR);
2715 if (error) {
2716 if (error->code == GOT_ERR_NOT_WORKTREE)
2717 error = wrap_not_worktree_error(error, "update",
2718 worktree_path);
2719 goto done;
2720 }
2721 repo_path = got_worktree_get_repo_path(worktree);
2722
2723 error = got_repo_pack_fds_open(&pack_fds);
2724 if (error != NULL)
2725 goto done;
2726
2727 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2728 if (error)
2729 goto done;
2730
2731 error = check_rebase_or_histedit_in_progress(worktree);
2732 if (error)
2733 goto done;
2734 error = check_merge_in_progress(worktree, repo);
2735 if (error)
2736 goto done;
2737
2738 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2739 if (error)
2740 goto done;
2741
2742 worktree_conf = got_worktree_get_gotconfig(worktree);
2743 if (worktree_conf) {
2744 got_gotconfig_get_remotes(&nremotes, &remotes,
2745 worktree_conf);
2746 for (i = 0; i < nremotes; i++) {
2747 if (strcmp(remotes[i].name, remote_name) == 0) {
2748 remote = &remotes[i];
2749 break;
2750 }
2751 }
2752 }
2753
2754 if (remote == NULL) {
2755 repo_conf = got_repo_get_gotconfig(repo);
2756 if (repo_conf) {
2757 got_gotconfig_get_remotes(&nremotes, &remotes,
2758 repo_conf);
2759 for (i = 0; i < nremotes; i++) {
2760 if (strcmp(remotes[i].name, remote_name) == 0) {
2761 remote = &remotes[i];
2762 break;
2763 }
2764 }
2765 }
2766 }
2767 if (remote == NULL) {
2768 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2769 for (i = 0; i < nremotes; i++) {
2770 if (strcmp(remotes[i].name, remote_name) == 0) {
2771 remote = &remotes[i];
2772 break;
2773 }
2774 }
2775 }
2776 if (remote == NULL) {
2777 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2778 goto done;
2779 }
2780
2781 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2782 &repo_name, remote->fetch_url);
2783 if (error)
2784 goto done;
2785
2786 if (strcmp(proto, "git") == 0) {
2787 #ifndef PROFILE
2788 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2789 "sendfd dns inet unveil", NULL) == -1)
2790 err(1, "pledge");
2791 #endif
2792 } else if (strcmp(proto, "git+ssh") == 0 ||
2793 strcmp(proto, "ssh") == 0) {
2794 #ifndef PROFILE
2795 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2796 "sendfd unveil", NULL) == -1)
2797 err(1, "pledge");
2798 #endif
2799 } else if (strcmp(proto, "http") == 0 ||
2800 strcmp(proto, "git+http") == 0) {
2801 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2802 goto done;
2803 } else {
2804 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2805 goto done;
2806 }
2807
2808 error = got_dial_apply_unveil(proto);
2809 if (error)
2810 goto done;
2811
2812 error = apply_unveil(got_repo_get_path(repo), 0,
2813 got_worktree_get_root_path(worktree));
2814 if (error)
2815 goto done;
2816
2817 if (verbosity >= 0) {
2818 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2819 remote->name, proto, host,
2820 port ? ":" : "", port ? port : "",
2821 *server_path == '/' ? "" : "/", server_path);
2822 }
2823
2824 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2825 server_path, verbosity);
2826 if (error)
2827 goto done;
2828
2829 /*
2830 * If set, get this remote's HEAD ref target so
2831 * if it has changed on the server we can fetch it.
2832 */
2833 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2834 got_ref_cmp_by_name, repo);
2835 if (error)
2836 goto done;
2837
2838 TAILQ_FOREACH(re, &remote_refs, entry) {
2839 const char *remote_refname, *remote_target;
2840 size_t remote_name_len;
2841
2842 if (!got_ref_is_symbolic(re->ref))
2843 continue;
2844
2845 remote_name_len = strlen(remote->name);
2846 remote_refname = got_ref_get_name(re->ref);
2847
2848 /* we only want refs/remotes/$remote->name/HEAD */
2849 if (strncmp(remote_refname + 13, remote->name,
2850 remote_name_len) != 0)
2851 continue;
2852
2853 if (strcmp(remote_refname + remote_name_len + 14,
2854 GOT_REF_HEAD) != 0)
2855 continue;
2856
2857 /*
2858 * Take the name itself because we already
2859 * only match with refs/heads/ in fetch_pack().
2860 */
2861 remote_target = got_ref_get_symref_target(re->ref);
2862 remote_head = remote_target + remote_name_len + 14;
2863 break;
2864 }
2865
2866 refname = got_worktree_get_head_ref_name(worktree);
2867 if (strncmp(refname, "refs/heads/", 11) == 0)
2868 worktree_branch = refname;
2869
2870 fpa.last_scaled_size[0] = '\0';
2871 fpa.last_p_indexed = -1;
2872 fpa.last_p_resolved = -1;
2873 fpa.verbosity = verbosity;
2874 fpa.repo = repo;
2875 fpa.create_configs = 0;
2876 fpa.configs_created = 0;
2877 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2878
2879 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2880 remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2881 0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2882 0, fetch_progress, &fpa);
2883 if (error)
2884 goto done;
2885
2886 if (pack_hash != NULL && verbosity >= 0) {
2887 error = got_object_id_str(&id_str, pack_hash);
2888 if (error)
2889 goto done;
2890 printf("\nFetched %s.pack\n", id_str);
2891 free(id_str);
2892 id_str = NULL;
2893 }
2894
2895 /* Update references provided with the pack file. */
2896 TAILQ_FOREACH(pe, &refs, entry) {
2897 const char *refname = pe->path;
2898 struct got_object_id *id = pe->data;
2899 struct got_reference *ref;
2900
2901 if (is_wanted_ref(&wanted_refs, refname)) {
2902 error = update_wanted_ref(refname, id,
2903 remote->name, verbosity, repo);
2904 if (error)
2905 goto done;
2906 continue;
2907 }
2908
2909 error = got_ref_open(&ref, repo, refname, 1);
2910 if (error) {
2911 if (error->code != GOT_ERR_NOT_REF)
2912 goto done;
2913 error = create_ref(refname, id, verbosity,
2914 repo);
2915 if (error)
2916 goto done;
2917 } else {
2918 error = update_ref(ref, id, replace_tags,
2919 verbosity-1, repo);
2920 unlock_err = got_ref_unlock(ref);
2921 if (unlock_err && error == NULL)
2922 error = unlock_err;
2923 got_ref_close(ref);
2924 if (error)
2925 goto done;
2926 }
2927 }
2928
2929 /* Update worktree */
2930 error = got_ref_open(&head_ref, repo,
2931 got_worktree_get_head_ref_name(worktree), 0);
2932 if (error != NULL)
2933 goto done;
2934 if (commit_id_str == NULL) {
2935 error = got_ref_resolve(&commit_id, repo, head_ref);
2936 if (error != NULL)
2937 goto done;
2938 error = got_object_id_str(&commit_id_str, commit_id);
2939 if (error != NULL)
2940 goto done;
2941 } else {
2942 struct got_reflist_head refs;
2943 TAILQ_INIT(&refs);
2944 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2945 NULL);
2946 if (error)
2947 goto done;
2948 error = got_repo_match_object_id(&commit_id, NULL,
2949 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2950 got_ref_list_free(&refs);
2951 free(commit_id_str);
2952 commit_id_str = NULL;
2953 if (error)
2954 goto done;
2955 error = got_object_id_str(&commit_id_str, commit_id);
2956 if (error)
2957 goto done;
2958 }
2959
2960
2961 error = check_linear_ancestry(commit_id,
2962 got_worktree_get_base_commit_id(worktree), 0, repo);
2963 if (error != NULL) {
2964 if (error->code == GOT_ERR_ANCESTRY)
2965 error = got_error(GOT_ERR_BRANCH_MOVED);
2966 goto done;
2967 }
2968 error = check_same_branch(commit_id, head_ref, repo);
2969 if (error)
2970 goto done;
2971
2972 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2973 commit_id) != 0) {
2974 error = got_worktree_set_base_commit_id(worktree, repo,
2975 commit_id);
2976 if (error)
2977 goto done;
2978 }
2979
2980 memset(&upa, 0, sizeof(upa));
2981 upa.verbosity = verbosity;
2982 error = got_worktree_checkout_files(worktree, &paths, repo,
2983 update_progress, &upa, check_cancelled, NULL);
2984 if (error != NULL)
2985 goto done;
2986
2987 if (upa.did_something) {
2988 printf("Updated to %s: %s\n",
2989 got_worktree_get_head_ref_name(worktree), commit_id_str);
2990 } else
2991 printf("Already up-to-date\n");
2992
2993 print_update_progress_stats(&upa);
2994 done:
2995 if (fetchpid > 0) {
2996 if (kill(fetchpid, SIGTERM) == -1)
2997 error = got_error_from_errno("kill");
2998 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2999 error = got_error_from_errno("waitpid");
3000 }
3001 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3002 error = got_error_from_errno("close");
3003 if (repo) {
3004 const struct got_error *close_err = got_repo_close(repo);
3005 if (error == NULL)
3006 error = close_err;
3007 }
3008 if (worktree)
3009 got_worktree_close(worktree);
3010 if (pack_fds) {
3011 const struct got_error *pack_err =
3012 got_repo_pack_fds_close(pack_fds);
3013 if (error == NULL)
3014 error = pack_err;
3015 }
3016 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3017 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3018 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3019 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3020 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3021 got_ref_list_free(&remote_refs);
3022 free(id_str);
3023 free(worktree_path);
3024 free(pack_hash);
3025 free(proto);
3026 free(host);
3027 free(port);
3028 free(server_path);
3029 free(repo_name);
3030 free(commit_id);
3031 free(commit_id_str);
3032 return error;
3033 }
3034
3035 static const struct got_error *
3036 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3037 const char *path, int diff_context, int ignore_whitespace,
3038 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3039 struct got_repository *repo, FILE *outfile)
3040 {
3041 const struct got_error *err = NULL;
3042 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3043 FILE *f1 = NULL, *f2 = NULL;
3044 int fd1 = -1, fd2 = -1;
3045
3046 fd1 = got_opentempfd();
3047 if (fd1 == -1)
3048 return got_error_from_errno("got_opentempfd");
3049 fd2 = got_opentempfd();
3050 if (fd2 == -1) {
3051 err = got_error_from_errno("got_opentempfd");
3052 goto done;
3053 }
3054
3055 if (blob_id1) {
3056 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3057 fd1);
3058 if (err)
3059 goto done;
3060 }
3061
3062 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3063 if (err)
3064 goto done;
3065
3066 f1 = got_opentemp();
3067 if (f1 == NULL) {
3068 err = got_error_from_errno("got_opentemp");
3069 goto done;
3070 }
3071 f2 = got_opentemp();
3072 if (f2 == NULL) {
3073 err = got_error_from_errno("got_opentemp");
3074 goto done;
3075 }
3076
3077 while (path[0] == '/')
3078 path++;
3079 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3080 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3081 force_text_diff, dsa, outfile);
3082 done:
3083 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3084 err = got_error_from_errno("close");
3085 if (blob1)
3086 got_object_blob_close(blob1);
3087 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3088 err = got_error_from_errno("close");
3089 if (blob2)
3090 got_object_blob_close(blob2);
3091 if (f1 && fclose(f1) == EOF && err == NULL)
3092 err = got_error_from_errno("fclose");
3093 if (f2 && fclose(f2) == EOF && err == NULL)
3094 err = got_error_from_errno("fclose");
3095 return err;
3096 }
3097
3098 static const struct got_error *
3099 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3100 const char *path, int diff_context, int ignore_whitespace,
3101 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3102 struct got_repository *repo, FILE *outfile)
3103 {
3104 const struct got_error *err = NULL;
3105 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3106 struct got_diff_blob_output_unidiff_arg arg;
3107 FILE *f1 = NULL, *f2 = NULL;
3108 int fd1 = -1, fd2 = -1;
3109
3110 if (tree_id1) {
3111 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3112 if (err)
3113 goto done;
3114 fd1 = got_opentempfd();
3115 if (fd1 == -1) {
3116 err = got_error_from_errno("got_opentempfd");
3117 goto done;
3118 }
3119 }
3120
3121 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3122 if (err)
3123 goto done;
3124
3125 f1 = got_opentemp();
3126 if (f1 == NULL) {
3127 err = got_error_from_errno("got_opentemp");
3128 goto done;
3129 }
3130
3131 f2 = got_opentemp();
3132 if (f2 == NULL) {
3133 err = got_error_from_errno("got_opentemp");
3134 goto done;
3135 }
3136 fd2 = got_opentempfd();
3137 if (fd2 == -1) {
3138 err = got_error_from_errno("got_opentempfd");
3139 goto done;
3140 }
3141 arg.diff_context = diff_context;
3142 arg.ignore_whitespace = ignore_whitespace;
3143 arg.force_text_diff = force_text_diff;
3144 arg.diffstat = dsa;
3145 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3146 arg.outfile = outfile;
3147 arg.lines = NULL;
3148 arg.nlines = 0;
3149 while (path[0] == '/')
3150 path++;
3151 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3152 got_diff_blob_output_unidiff, &arg, 1);
3153 done:
3154 if (tree1)
3155 got_object_tree_close(tree1);
3156 if (tree2)
3157 got_object_tree_close(tree2);
3158 if (f1 && fclose(f1) == EOF && err == NULL)
3159 err = got_error_from_errno("fclose");
3160 if (f2 && fclose(f2) == EOF && err == NULL)
3161 err = got_error_from_errno("fclose");
3162 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3163 err = got_error_from_errno("close");
3164 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3165 err = got_error_from_errno("close");
3166 return err;
3167 }
3168
3169 static const struct got_error *
3170 get_changed_paths(struct got_pathlist_head *paths,
3171 struct got_commit_object *commit, struct got_repository *repo,
3172 struct got_diffstat_cb_arg *dsa)
3173 {
3174 const struct got_error *err = NULL;
3175 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3176 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3177 struct got_object_qid *qid;
3178 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3179 FILE *f1 = NULL, *f2 = NULL;
3180 int fd1 = -1, fd2 = -1;
3181
3182 if (dsa) {
3183 cb = got_diff_tree_compute_diffstat;
3184
3185 f1 = got_opentemp();
3186 if (f1 == NULL) {
3187 err = got_error_from_errno("got_opentemp");
3188 goto done;
3189 }
3190 f2 = got_opentemp();
3191 if (f2 == NULL) {
3192 err = got_error_from_errno("got_opentemp");
3193 goto done;
3194 }
3195 fd1 = got_opentempfd();
3196 if (fd1 == -1) {
3197 err = got_error_from_errno("got_opentempfd");
3198 goto done;
3199 }
3200 fd2 = got_opentempfd();
3201 if (fd2 == -1) {
3202 err = got_error_from_errno("got_opentempfd");
3203 goto done;
3204 }
3205 }
3206
3207 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3208 if (qid != NULL) {
3209 struct got_commit_object *pcommit;
3210 err = got_object_open_as_commit(&pcommit, repo,
3211 &qid->id);
3212 if (err)
3213 return err;
3214
3215 tree_id1 = got_object_id_dup(
3216 got_object_commit_get_tree_id(pcommit));
3217 if (tree_id1 == NULL) {
3218 got_object_commit_close(pcommit);
3219 return got_error_from_errno("got_object_id_dup");
3220 }
3221 got_object_commit_close(pcommit);
3222
3223 }
3224
3225 if (tree_id1) {
3226 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3227 if (err)
3228 goto done;
3229 }
3230
3231 tree_id2 = got_object_commit_get_tree_id(commit);
3232 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3233 if (err)
3234 goto done;
3235
3236 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3237 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3238 done:
3239 if (tree1)
3240 got_object_tree_close(tree1);
3241 if (tree2)
3242 got_object_tree_close(tree2);
3243 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3244 err = got_error_from_errno("close");
3245 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3246 err = got_error_from_errno("close");
3247 if (f1 && fclose(f1) == EOF && err == NULL)
3248 err = got_error_from_errno("fclose");
3249 if (f2 && fclose(f2) == EOF && err == NULL)
3250 err = got_error_from_errno("fclose");
3251 free(tree_id1);
3252 return err;
3253 }
3254
3255 static const struct got_error *
3256 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3257 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3258 struct got_repository *repo, FILE *outfile)
3259 {
3260 const struct got_error *err = NULL;
3261 struct got_commit_object *pcommit = NULL;
3262 char *id_str1 = NULL, *id_str2 = NULL;
3263 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3264 struct got_object_qid *qid;
3265
3266 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3267 if (qid != NULL) {
3268 err = got_object_open_as_commit(&pcommit, repo,
3269 &qid->id);
3270 if (err)
3271 return err;
3272 err = got_object_id_str(&id_str1, &qid->id);
3273 if (err)
3274 goto done;
3275 }
3276
3277 err = got_object_id_str(&id_str2, id);
3278 if (err)
3279 goto done;
3280
3281 if (path && path[0] != '\0') {
3282 int obj_type;
3283 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3284 if (err)
3285 goto done;
3286 if (pcommit) {
3287 err = got_object_id_by_path(&obj_id1, repo,
3288 pcommit, path);
3289 if (err) {
3290 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3291 free(obj_id2);
3292 goto done;
3293 }
3294 }
3295 }
3296 err = got_object_get_type(&obj_type, repo, obj_id2);
3297 if (err) {
3298 free(obj_id2);
3299 goto done;
3300 }
3301 fprintf(outfile,
3302 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3303 fprintf(outfile, "commit - %s\n",
3304 id_str1 ? id_str1 : "/dev/null");
3305 fprintf(outfile, "commit + %s\n", id_str2);
3306 switch (obj_type) {
3307 case GOT_OBJ_TYPE_BLOB:
3308 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3309 0, 0, dsa, repo, outfile);
3310 break;
3311 case GOT_OBJ_TYPE_TREE:
3312 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3313 0, 0, dsa, repo, outfile);
3314 break;
3315 default:
3316 err = got_error(GOT_ERR_OBJ_TYPE);
3317 break;
3318 }
3319 free(obj_id1);
3320 free(obj_id2);
3321 } else {
3322 obj_id2 = got_object_commit_get_tree_id(commit);
3323 if (pcommit)
3324 obj_id1 = got_object_commit_get_tree_id(pcommit);
3325 fprintf(outfile,
3326 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3327 fprintf(outfile, "commit - %s\n",
3328 id_str1 ? id_str1 : "/dev/null");
3329 fprintf(outfile, "commit + %s\n", id_str2);
3330 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3331 dsa, repo, outfile);
3332 }
3333 done:
3334 free(id_str1);
3335 free(id_str2);
3336 if (pcommit)
3337 got_object_commit_close(pcommit);
3338 return err;
3339 }
3340
3341 static char *
3342 get_datestr(time_t *time, char *datebuf)
3343 {
3344 struct tm mytm, *tm;
3345 char *p, *s;
3346
3347 tm = gmtime_r(time, &mytm);
3348 if (tm == NULL)
3349 return NULL;
3350 s = asctime_r(tm, datebuf);
3351 if (s == NULL)
3352 return NULL;
3353 p = strchr(s, '\n');
3354 if (p)
3355 *p = '\0';
3356 return s;
3357 }
3358
3359 static const struct got_error *
3360 match_commit(int *have_match, struct got_object_id *id,
3361 struct got_commit_object *commit, regex_t *regex)
3362 {
3363 const struct got_error *err = NULL;
3364 regmatch_t regmatch;
3365 char *id_str = NULL, *logmsg = NULL;
3366
3367 *have_match = 0;
3368
3369 err = got_object_id_str(&id_str, id);
3370 if (err)
3371 return err;
3372
3373 err = got_object_commit_get_logmsg(&logmsg, commit);
3374 if (err)
3375 goto done;
3376
3377 if (regexec(regex, got_object_commit_get_author(commit), 1,
3378 &regmatch, 0) == 0 ||
3379 regexec(regex, got_object_commit_get_committer(commit), 1,
3380 &regmatch, 0) == 0 ||
3381 regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
3382 regexec(regex, logmsg, 1, &regmatch, 0) == 0)
3383 *have_match = 1;
3384 done:
3385 free(id_str);
3386 free(logmsg);
3387 return err;
3388 }
3389
3390 static void
3391 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3392 regex_t *regex)
3393 {
3394 regmatch_t regmatch;
3395 struct got_pathlist_entry *pe;
3396
3397 *have_match = 0;
3398
3399 TAILQ_FOREACH(pe, changed_paths, entry) {
3400 if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
3401 *have_match = 1;
3402 break;
3403 }
3404 }
3405 }
3406
3407 static const struct got_error *
3408 match_patch(int *have_match, struct got_commit_object *commit,
3409 struct got_object_id *id, const char *path, int diff_context,
3410 struct got_repository *repo, regex_t *regex, FILE *f)
3411 {
3412 const struct got_error *err = NULL;
3413 char *line = NULL;
3414 size_t linesize = 0;
3415 regmatch_t regmatch;
3416
3417 *have_match = 0;
3418
3419 err = got_opentemp_truncate(f);
3420 if (err)
3421 return err;
3422
3423 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3424 if (err)
3425 goto done;
3426
3427 if (fseeko(f, 0L, SEEK_SET) == -1) {
3428 err = got_error_from_errno("fseeko");
3429 goto done;
3430 }
3431
3432 while (getline(&line, &linesize, f) != -1) {
3433 if (regexec(regex, line, 1, &regmatch, 0) == 0) {
3434 *have_match = 1;
3435 break;
3436 }
3437 }
3438 done:
3439 free(line);
3440 return err;
3441 }
3442
3443 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3444
3445 static const struct got_error*
3446 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3447 struct got_object_id *id, struct got_repository *repo,
3448 int local_only)
3449 {
3450 static const struct got_error *err = NULL;
3451 struct got_reflist_entry *re;
3452 char *s;
3453 const char *name;
3454
3455 *refs_str = NULL;
3456
3457 TAILQ_FOREACH(re, refs, entry) {
3458 struct got_tag_object *tag = NULL;
3459 struct got_object_id *ref_id;
3460 int cmp;
3461
3462 name = got_ref_get_name(re->ref);
3463 if (strcmp(name, GOT_REF_HEAD) == 0)
3464 continue;
3465 if (strncmp(name, "refs/", 5) == 0)
3466 name += 5;
3467 if (strncmp(name, "got/", 4) == 0)
3468 continue;
3469 if (strncmp(name, "heads/", 6) == 0)
3470 name += 6;
3471 if (strncmp(name, "remotes/", 8) == 0) {
3472 if (local_only)
3473 continue;
3474 name += 8;
3475 s = strstr(name, "/" GOT_REF_HEAD);
3476 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3477 continue;
3478 }
3479 err = got_ref_resolve(&ref_id, repo, re->ref);
3480 if (err)
3481 break;
3482 if (strncmp(name, "tags/", 5) == 0) {
3483 err = got_object_open_as_tag(&tag, repo, ref_id);
3484 if (err) {
3485 if (err->code != GOT_ERR_OBJ_TYPE) {
3486 free(ref_id);
3487 break;
3488 }
3489 /* Ref points at something other than a tag. */
3490 err = NULL;
3491 tag = NULL;
3492 }
3493 }
3494 cmp = got_object_id_cmp(tag ?
3495 got_object_tag_get_object_id(tag) : ref_id, id);
3496 free(ref_id);
3497 if (tag)
3498 got_object_tag_close(tag);
3499 if (cmp != 0)
3500 continue;
3501 s = *refs_str;
3502 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3503 s ? ", " : "", name) == -1) {
3504 err = got_error_from_errno("asprintf");
3505 free(s);
3506 *refs_str = NULL;
3507 break;
3508 }
3509 free(s);
3510 }
3511
3512 return err;
3513 }
3514
3515 static const struct got_error *
3516 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3517 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3518 {
3519 const struct got_error *err = NULL;
3520 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3521 char *comma, *s, *nl;
3522 struct got_reflist_head *refs;
3523 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3524 struct tm tm;
3525 time_t committer_time;
3526
3527 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3528 if (refs) {
3529 err = build_refs_str(&ref_str, refs, id, repo, 1);
3530 if (err)
3531 return err;
3532
3533 /* Display the first matching ref only. */
3534 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3535 *comma = '\0';
3536 }
3537
3538 if (ref_str == NULL) {
3539 err = got_object_id_str(&id_str, id);
3540 if (err)
3541 return err;
3542 }
3543
3544 committer_time = got_object_commit_get_committer_time(commit);
3545 if (gmtime_r(&committer_time, &tm) == NULL) {
3546 err = got_error_from_errno("gmtime_r");
3547 goto done;
3548 }
3549 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3550 err = got_error(GOT_ERR_NO_SPACE);
3551 goto done;
3552 }
3553
3554 err = got_object_commit_get_logmsg(&logmsg0, commit);
3555 if (err)
3556 goto done;
3557
3558 s = logmsg0;
3559 while (isspace((unsigned char)s[0]))
3560 s++;
3561
3562 nl = strchr(s, '\n');
3563 if (nl) {
3564 *nl = '\0';
3565 }
3566
3567 if (ref_str)
3568 printf("%s%-7s %s\n", datebuf, ref_str, s);
3569 else
3570 printf("%s%.7s %s\n", datebuf, id_str, s);
3571
3572 if (fflush(stdout) != 0 && err == NULL)
3573 err = got_error_from_errno("fflush");
3574 done:
3575 free(id_str);
3576 free(ref_str);
3577 free(logmsg0);
3578 return err;
3579 }
3580
3581 static const struct got_error *
3582 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3583 {
3584 struct got_pathlist_entry *pe;
3585
3586 if (header != NULL)
3587 printf("%s\n", header);
3588
3589 TAILQ_FOREACH(pe, dsa->paths, entry) {
3590 struct got_diff_changed_path *cp = pe->data;
3591 int pad = dsa->max_path_len - pe->path_len + 1;
3592
3593 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3594 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3595 }
3596 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3597 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3598 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3599
3600 if (fflush(stdout) != 0)
3601 return got_error_from_errno("fflush");
3602
3603 return NULL;
3604 }
3605
3606 static const struct got_error *
3607 printfile(FILE *f)
3608 {
3609 char buf[8192];
3610 size_t r;
3611
3612 if (fseeko(f, 0L, SEEK_SET) == -1)
3613 return got_error_from_errno("fseek");
3614
3615 for (;;) {
3616 r = fread(buf, 1, sizeof(buf), f);
3617 if (r == 0) {
3618 if (ferror(f))
3619 return got_error_from_errno("fread");
3620 if (feof(f))
3621 break;
3622 }
3623 if (fwrite(buf, 1, r, stdout) != r)
3624 return got_ferror(stdout, GOT_ERR_IO);
3625 }
3626
3627 return NULL;
3628 }
3629
3630 static const struct got_error *
3631 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3632 struct got_repository *repo, const char *path,
3633 struct got_pathlist_head *changed_paths,
3634 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3635 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3636 const char *prefix)
3637 {
3638 const struct got_error *err = NULL;
3639 FILE *f = NULL;
3640 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3641 char datebuf[26];
3642 time_t committer_time;
3643 const char *author, *committer;
3644 char *refs_str = NULL;
3645
3646 err = got_object_id_str(&id_str, id);
3647 if (err)
3648 return err;
3649
3650 if (custom_refs_str == NULL) {
3651 struct got_reflist_head *refs;
3652 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3653 if (refs) {
3654 err = build_refs_str(&refs_str, refs, id, repo, 0);
3655 if (err)
3656 goto done;
3657 }
3658 }
3659
3660 printf(GOT_COMMIT_SEP_STR);
3661 if (custom_refs_str)
3662 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3663 custom_refs_str);
3664 else
3665 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3666 refs_str ? " (" : "", refs_str ? refs_str : "",
3667 refs_str ? ")" : "");
3668 free(id_str);
3669 id_str = NULL;
3670 free(refs_str);
3671 refs_str = NULL;
3672 printf("from: %s\n", got_object_commit_get_author(commit));
3673 author = got_object_commit_get_author(commit);
3674 committer = got_object_commit_get_committer(commit);
3675 if (strcmp(author, committer) != 0)
3676 printf("via: %s\n", committer);
3677 committer_time = got_object_commit_get_committer_time(commit);
3678 datestr = get_datestr(&committer_time, datebuf);
3679 if (datestr)
3680 printf("date: %s UTC\n", datestr);
3681 if (got_object_commit_get_nparents(commit) > 1) {
3682 const struct got_object_id_queue *parent_ids;
3683 struct got_object_qid *qid;
3684 int n = 1;
3685 parent_ids = got_object_commit_get_parent_ids(commit);
3686 STAILQ_FOREACH(qid, parent_ids, entry) {
3687 err = got_object_id_str(&id_str, &qid->id);
3688 if (err)
3689 goto done;
3690 printf("parent %d: %s\n", n++, id_str);
3691 free(id_str);
3692 id_str = NULL;
3693 }
3694 }
3695
3696 err = got_object_commit_get_logmsg(&logmsg0, commit);
3697 if (err)
3698 goto done;
3699
3700 logmsg = logmsg0;
3701 do {
3702 line = strsep(&logmsg, "\n");
3703 if (line)
3704 printf(" %s\n", line);
3705 } while (line);
3706 free(logmsg0);
3707
3708 if (changed_paths && diffstat == NULL) {
3709 struct got_pathlist_entry *pe;
3710
3711 TAILQ_FOREACH(pe, changed_paths, entry) {
3712 struct got_diff_changed_path *cp = pe->data;
3713
3714 printf(" %c %s\n", cp->status, pe->path);
3715 }
3716 printf("\n");
3717 }
3718 if (show_patch) {
3719 if (diffstat) {
3720 f = got_opentemp();
3721 if (f == NULL) {
3722 err = got_error_from_errno("got_opentemp");
3723 goto done;
3724 }
3725 }
3726
3727 err = print_patch(commit, id, path, diff_context, diffstat,
3728 repo, diffstat == NULL ? stdout : f);
3729 if (err)
3730 goto done;
3731 }
3732 if (diffstat) {
3733 err = print_diffstat(diffstat, NULL);
3734 if (err)
3735 goto done;
3736 if (show_patch) {
3737 err = printfile(f);
3738 if (err)
3739 goto done;
3740 }
3741 }
3742 if (show_patch)
3743 printf("\n");
3744
3745 if (fflush(stdout) != 0 && err == NULL)
3746 err = got_error_from_errno("fflush");
3747 done:
3748 if (f && fclose(f) == EOF && err == NULL)
3749 err = got_error_from_errno("fclose");
3750 free(id_str);
3751 free(refs_str);
3752 return err;
3753 }
3754
3755 static const struct got_error *
3756 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3757 struct got_repository *repo, const char *path, int show_changed_paths,
3758 int show_diffstat, int show_patch, const char *search_pattern,
3759 int diff_context, int limit, int log_branches, int reverse_display_order,
3760 struct got_reflist_object_id_map *refs_idmap, int one_line,
3761 FILE *tmpfile)
3762 {
3763 const struct got_error *err;
3764 struct got_commit_graph *graph;
3765 regex_t regex;
3766 int have_match;
3767 struct got_object_id_queue reversed_commits;
3768 struct got_object_qid *qid;
3769 struct got_commit_object *commit;
3770 struct got_pathlist_head changed_paths;
3771
3772 STAILQ_INIT(&reversed_commits);
3773 TAILQ_INIT(&changed_paths);
3774
3775 if (search_pattern && regcomp(&regex, search_pattern,
3776 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3777 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3778
3779 err = got_commit_graph_open(&graph, path, !log_branches);
3780 if (err)
3781 return err;
3782 err = got_commit_graph_iter_start(graph, root_id, repo,
3783 check_cancelled, NULL);
3784 if (err)
3785 goto done;
3786 for (;;) {
3787 struct got_object_id id;
3788 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3789 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3790
3791 if (sigint_received || sigpipe_received)
3792 break;
3793
3794 err = got_commit_graph_iter_next(&id, graph, repo,
3795 check_cancelled, NULL);
3796 if (err) {
3797 if (err->code == GOT_ERR_ITER_COMPLETED)
3798 err = NULL;
3799 break;
3800 }
3801
3802 err = got_object_open_as_commit(&commit, repo, &id);
3803 if (err)
3804 break;
3805
3806 if ((show_changed_paths || (show_diffstat && !show_patch))
3807 && !reverse_display_order) {
3808 err = get_changed_paths(&changed_paths, commit, repo,
3809 show_diffstat ? &dsa : NULL);
3810 if (err)
3811 break;
3812 }
3813
3814 if (search_pattern) {
3815 err = match_commit(&have_match, &id, commit, &regex);
3816 if (err) {
3817 got_object_commit_close(commit);
3818 break;
3819 }
3820 if (have_match == 0 && show_changed_paths)
3821 match_changed_paths(&have_match,
3822 &changed_paths, &regex);
3823 if (have_match == 0 && show_patch) {
3824 err = match_patch(&have_match, commit, &id,
3825 path, diff_context, repo, &regex, tmpfile);
3826 if (err)
3827 break;
3828 }
3829 if (have_match == 0) {
3830 got_object_commit_close(commit);
3831 got_pathlist_free(&changed_paths,
3832 GOT_PATHLIST_FREE_ALL);
3833 continue;
3834 }
3835 }
3836
3837 if (reverse_display_order) {
3838 err = got_object_qid_alloc(&qid, &id);
3839 if (err)
3840 break;
3841 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3842 got_object_commit_close(commit);
3843 } else {
3844 if (one_line)
3845 err = print_commit_oneline(commit, &id,
3846 repo, refs_idmap);
3847 else
3848 err = print_commit(commit, &id, repo, path,
3849 (show_changed_paths || show_diffstat) ?
3850 &changed_paths : NULL,
3851 show_diffstat ? &dsa : NULL, show_patch,
3852 diff_context, refs_idmap, NULL, NULL);
3853 got_object_commit_close(commit);
3854 if (err)
3855 break;
3856 }
3857 if ((limit && --limit == 0) ||
3858 (end_id && got_object_id_cmp(&id, end_id) == 0))
3859 break;
3860
3861 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3862 }
3863 if (reverse_display_order) {
3864 STAILQ_FOREACH(qid, &reversed_commits, entry) {
3865 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3866 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3867
3868 err = got_object_open_as_commit(&commit, repo,
3869 &qid->id);
3870 if (err)
3871 break;
3872 if (show_changed_paths ||
3873 (show_diffstat && !show_patch)) {
3874 err = get_changed_paths(&changed_paths, commit,
3875 repo, show_diffstat ? &dsa : NULL);
3876 if (err)
3877 break;
3878 }
3879 if (one_line)
3880 err = print_commit_oneline(commit, &qid->id,
3881 repo, refs_idmap);
3882 else
3883 err = print_commit(commit, &qid->id, repo, path,
3884 (show_changed_paths || show_diffstat) ?
3885 &changed_paths : NULL,
3886 show_diffstat ? &dsa : NULL, show_patch,
3887 diff_context, refs_idmap, NULL, NULL);
3888 got_object_commit_close(commit);
3889 if (err)
3890 break;
3891 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3892 }
3893 }
3894 done:
3895 while (!STAILQ_EMPTY(&reversed_commits)) {
3896 qid = STAILQ_FIRST(&reversed_commits);
3897 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3898 got_object_qid_free(qid);
3899 }
3900 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3901 if (search_pattern)
3902 regfree(&regex);
3903 got_commit_graph_close(graph);
3904 return err;
3905 }
3906
3907 __dead static void
3908 usage_log(void)
3909 {
3910 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3911 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3912 "[path]\n", getprogname());
3913 exit(1);
3914 }
3915
3916 static int
3917 get_default_log_limit(void)
3918 {
3919 const char *got_default_log_limit;
3920 long long n;
3921 const char *errstr;
3922
3923 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3924 if (got_default_log_limit == NULL)
3925 return 0;
3926 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3927 if (errstr != NULL)
3928 return 0;
3929 return n;
3930 }
3931
3932 static const struct got_error *
3933 cmd_log(int argc, char *argv[])
3934 {
3935 const struct got_error *error;
3936 struct got_repository *repo = NULL;
3937 struct got_worktree *worktree = NULL;
3938 struct got_object_id *start_id = NULL, *end_id = NULL;
3939 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3940 const char *start_commit = NULL, *end_commit = NULL;
3941 const char *search_pattern = NULL;
3942 int diff_context = -1, ch;
3943 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3944 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3945 const char *errstr;
3946 struct got_reflist_head refs;
3947 struct got_reflist_object_id_map *refs_idmap = NULL;
3948 FILE *tmpfile = NULL;
3949 int *pack_fds = NULL;
3950
3951 TAILQ_INIT(&refs);
3952
3953 #ifndef PROFILE
3954 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3955 NULL)
3956 == -1)
3957 err(1, "pledge");
3958 #endif
3959
3960 limit = get_default_log_limit();
3961
3962 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3963 switch (ch) {
3964 case 'b':
3965 log_branches = 1;
3966 break;
3967 case 'C':
3968 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3969 &errstr);
3970 if (errstr != NULL)
3971 errx(1, "number of context lines is %s: %s",
3972 errstr, optarg);
3973 break;
3974 case 'c':
3975 start_commit = optarg;
3976 break;
3977 case 'd':
3978 show_diffstat = 1;
3979 break;
3980 case 'l':
3981 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3982 if (errstr != NULL)
3983 errx(1, "number of commits is %s: %s",
3984 errstr, optarg);
3985 break;
3986 case 'P':
3987 show_changed_paths = 1;
3988 break;
3989 case 'p':
3990 show_patch = 1;
3991 break;
3992 case 'R':
3993 reverse_display_order = 1;
3994 break;
3995 case 'r':
3996 repo_path = realpath(optarg, NULL);
3997 if (repo_path == NULL)
3998 return got_error_from_errno2("realpath",
3999 optarg);
4000 got_path_strip_trailing_slashes(repo_path);
4001 break;
4002 case 'S':
4003 search_pattern = optarg;
4004 break;
4005 case 's':
4006 one_line = 1;
4007 break;
4008 case 'x':
4009 end_commit = optarg;
4010 break;
4011 default:
4012 usage_log();
4013 /* NOTREACHED */
4014 }
4015 }
4016
4017 argc -= optind;
4018 argv += optind;
4019
4020 if (diff_context == -1)
4021 diff_context = 3;
4022 else if (!show_patch)
4023 errx(1, "-C requires -p");
4024
4025 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4026 errx(1, "cannot use -s with -d, -p or -P");
4027
4028 cwd = getcwd(NULL, 0);
4029 if (cwd == NULL) {
4030 error = got_error_from_errno("getcwd");
4031 goto done;
4032 }
4033
4034 error = got_repo_pack_fds_open(&pack_fds);
4035 if (error != NULL)
4036 goto done;
4037
4038 if (repo_path == NULL) {
4039 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
4040 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4041 goto done;
4042 error = NULL;
4043 }
4044
4045 if (argc == 1) {
4046 if (worktree) {
4047 error = got_worktree_resolve_path(&path, worktree,
4048 argv[0]);
4049 if (error)
4050 goto done;
4051 } else {
4052 path = strdup(argv[0]);
4053 if (path == NULL) {
4054 error = got_error_from_errno("strdup");
4055 goto done;
4056 }
4057 }
4058 } else if (argc != 0)
4059 usage_log();
4060
4061 if (repo_path == NULL) {
4062 repo_path = worktree ?
4063 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4064 }
4065 if (repo_path == NULL) {
4066 error = got_error_from_errno("strdup");
4067 goto done;
4068 }
4069
4070 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4071 if (error != NULL)
4072 goto done;
4073
4074 error = apply_unveil(got_repo_get_path(repo), 1,
4075 worktree ? got_worktree_get_root_path(worktree) : NULL);
4076 if (error)
4077 goto done;
4078
4079 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4080 if (error)
4081 goto done;
4082
4083 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4084 if (error)
4085 goto done;
4086
4087 if (start_commit == NULL) {
4088 struct got_reference *head_ref;
4089 struct got_commit_object *commit = NULL;
4090 error = got_ref_open(&head_ref, repo,
4091 worktree ? got_worktree_get_head_ref_name(worktree)
4092 : GOT_REF_HEAD, 0);
4093 if (error != NULL)
4094 goto done;
4095 error = got_ref_resolve(&start_id, repo, head_ref);
4096 got_ref_close(head_ref);
4097 if (error != NULL)
4098 goto done;
4099 error = got_object_open_as_commit(&commit, repo,
4100 start_id);
4101 if (error != NULL)
4102 goto done;
4103 got_object_commit_close(commit);
4104 } else {
4105 error = got_repo_match_object_id(&start_id, NULL,
4106 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4107 if (error != NULL)
4108 goto done;
4109 }
4110 if (end_commit != NULL) {
4111 error = got_repo_match_object_id(&end_id, NULL,
4112 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4113 if (error != NULL)
4114 goto done;
4115 }
4116
4117 if (worktree) {
4118 /*
4119 * If a path was specified on the command line it was resolved
4120 * to a path in the work tree above. Prepend the work tree's
4121 * path prefix to obtain the corresponding in-repository path.
4122 */
4123 if (path) {
4124 const char *prefix;
4125 prefix = got_worktree_get_path_prefix(worktree);
4126 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4127 (path[0] != '\0') ? "/" : "", path) == -1) {
4128 error = got_error_from_errno("asprintf");
4129 goto done;
4130 }
4131 }
4132 } else
4133 error = got_repo_map_path(&in_repo_path, repo,
4134 path ? path : "");
4135 if (error != NULL)
4136 goto done;
4137 if (in_repo_path) {
4138 free(path);
4139 path = in_repo_path;
4140 }
4141
4142 if (worktree) {
4143 /* Release work tree lock. */
4144 got_worktree_close(worktree);
4145 worktree = NULL;
4146 }
4147
4148 if (search_pattern && show_patch) {
4149 tmpfile = got_opentemp();
4150 if (tmpfile == NULL) {
4151 error = got_error_from_errno("got_opentemp");
4152 goto done;
4153 }
4154 }
4155
4156 error = print_commits(start_id, end_id, repo, path ? path : "",
4157 show_changed_paths, show_diffstat, show_patch, search_pattern,
4158 diff_context, limit, log_branches, reverse_display_order,
4159 refs_idmap, one_line, tmpfile);
4160 done:
4161 free(path);
4162 free(repo_path);
4163 free(cwd);
4164 free(start_id);
4165 free(end_id);
4166 if (worktree)
4167 got_worktree_close(worktree);
4168 if (repo) {
4169 const struct got_error *close_err = got_repo_close(repo);
4170 if (error == NULL)
4171 error = close_err;
4172 }
4173 if (pack_fds) {
4174 const struct got_error *pack_err =
4175 got_repo_pack_fds_close(pack_fds);
4176 if (error == NULL)
4177 error = pack_err;
4178 }
4179 if (refs_idmap)
4180 got_reflist_object_id_map_free(refs_idmap);
4181 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4182 error = got_error_from_errno("fclose");
4183 got_ref_list_free(&refs);
4184 return error;
4185 }
4186
4187 __dead static void
4188 usage_diff(void)
4189 {
4190 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4191 "[-r repository-path] [object1 object2 | path ...]\n",
4192 getprogname());
4193 exit(1);
4194 }
4195
4196 struct print_diff_arg {
4197 struct got_repository *repo;
4198 struct got_worktree *worktree;
4199 struct got_diffstat_cb_arg *diffstat;
4200 int diff_context;
4201 const char *id_str;
4202 int header_shown;
4203 int diff_staged;
4204 enum got_diff_algorithm diff_algo;
4205 int ignore_whitespace;
4206 int force_text_diff;
4207 FILE *f1;
4208 FILE *f2;
4209 FILE *outfile;
4210 };
4211
4212 /*
4213 * Create a file which contains the target path of a symlink so we can feed
4214 * it as content to the diff engine.
4215 */
4216 static const struct got_error *
4217 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4218 const char *abspath)
4219 {
4220 const struct got_error *err = NULL;
4221 char target_path[PATH_MAX];
4222 ssize_t target_len, outlen;
4223
4224 *fd = -1;
4225
4226 if (dirfd != -1) {
4227 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4228 if (target_len == -1)
4229 return got_error_from_errno2("readlinkat", abspath);
4230 } else {
4231 target_len = readlink(abspath, target_path, PATH_MAX);
4232 if (target_len == -1)
4233 return got_error_from_errno2("readlink", abspath);
4234 }
4235
4236 *fd = got_opentempfd();
4237 if (*fd == -1)
4238 return got_error_from_errno("got_opentempfd");
4239
4240 outlen = write(*fd, target_path, target_len);
4241 if (outlen == -1) {
4242 err = got_error_from_errno("got_opentempfd");
4243 goto done;
4244 }
4245
4246 if (lseek(*fd, 0, SEEK_SET) == -1) {
4247 err = got_error_from_errno2("lseek", abspath);
4248 goto done;
4249 }
4250 done:
4251 if (err) {
4252 close(*fd);
4253 *fd = -1;
4254 }
4255 return err;
4256 }
4257
4258 static const struct got_error *
4259 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4260 const char *path, struct got_object_id *blob_id,
4261 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4262 int dirfd, const char *de_name)
4263 {
4264 struct print_diff_arg *a = arg;
4265 const struct got_error *err = NULL;
4266 struct got_blob_object *blob1 = NULL;
4267 int fd = -1, fd1 = -1, fd2 = -1;
4268 FILE *f2 = NULL;
4269 char *abspath = NULL, *label1 = NULL;
4270 struct stat sb;
4271 off_t size1 = 0;
4272 int f2_exists = 0;
4273
4274 memset(&sb, 0, sizeof(sb));
4275
4276 if (a->diff_staged) {
4277 if (staged_status != GOT_STATUS_MODIFY &&
4278 staged_status != GOT_STATUS_ADD &&
4279 staged_status != GOT_STATUS_DELETE)
4280 return NULL;
4281 } else {
4282 if (staged_status == GOT_STATUS_DELETE)
4283 return NULL;
4284 if (status == GOT_STATUS_NONEXISTENT)
4285 return got_error_set_errno(ENOENT, path);
4286 if (status != GOT_STATUS_MODIFY &&
4287 status != GOT_STATUS_ADD &&
4288 status != GOT_STATUS_DELETE &&
4289 status != GOT_STATUS_CONFLICT)
4290 return NULL;
4291 }
4292
4293 err = got_opentemp_truncate(a->f1);
4294 if (err)
4295 return got_error_from_errno("got_opentemp_truncate");
4296 err = got_opentemp_truncate(a->f2);
4297 if (err)
4298 return got_error_from_errno("got_opentemp_truncate");
4299
4300 if (!a->header_shown) {
4301 if (fprintf(a->outfile, "diff %s%s\n",
4302 a->diff_staged ? "-s " : "",
4303 got_worktree_get_root_path(a->worktree)) < 0) {
4304 err = got_error_from_errno("fprintf");
4305 goto done;
4306 }
4307 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4308 err = got_error_from_errno("fprintf");
4309 goto done;
4310 }
4311 if (fprintf(a->outfile, "path + %s%s\n",
4312 got_worktree_get_root_path(a->worktree),
4313 a->diff_staged ? " (staged changes)" : "") < 0) {
4314 err = got_error_from_errno("fprintf");
4315 goto done;
4316 }
4317 a->header_shown = 1;
4318 }
4319
4320 if (a->diff_staged) {
4321 const char *label1 = NULL, *label2 = NULL;
4322 switch (staged_status) {
4323 case GOT_STATUS_MODIFY:
4324 label1 = path;
4325 label2 = path;
4326 break;
4327 case GOT_STATUS_ADD:
4328 label2 = path;
4329 break;
4330 case GOT_STATUS_DELETE:
4331 label1 = path;
4332 break;
4333 default:
4334 return got_error(GOT_ERR_FILE_STATUS);
4335 }
4336 fd1 = got_opentempfd();
4337 if (fd1 == -1) {
4338 err = got_error_from_errno("got_opentempfd");
4339 goto done;
4340 }
4341 fd2 = got_opentempfd();
4342 if (fd2 == -1) {
4343 err = got_error_from_errno("got_opentempfd");
4344 goto done;
4345 }
4346 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4347 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4348 a->diff_algo, a->diff_context, a->ignore_whitespace,
4349 a->force_text_diff, a->diffstat, a->repo, a->outfile);
4350 goto done;
4351 }
4352
4353 fd1 = got_opentempfd();
4354 if (fd1 == -1) {
4355 err = got_error_from_errno("got_opentempfd");
4356 goto done;
4357 }
4358
4359 if (staged_status == GOT_STATUS_ADD ||
4360 staged_status == GOT_STATUS_MODIFY) {
4361 char *id_str;
4362 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4363 8192, fd1);
4364 if (err)
4365 goto done;
4366 err = got_object_id_str(&id_str, staged_blob_id);
4367 if (err)
4368 goto done;
4369 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4370 err = got_error_from_errno("asprintf");
4371 free(id_str);
4372 goto done;
4373 }
4374 free(id_str);
4375 } else if (status != GOT_STATUS_ADD) {
4376 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4377 fd1);
4378 if (err)
4379 goto done;
4380 }
4381
4382 if (status != GOT_STATUS_DELETE) {
4383 if (asprintf(&abspath, "%s/%s",
4384 got_worktree_get_root_path(a->worktree), path) == -1) {
4385 err = got_error_from_errno("asprintf");
4386 goto done;
4387 }
4388
4389 if (dirfd != -1) {
4390 fd = openat(dirfd, de_name,
4391 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4392 if (fd == -1) {
4393 if (!got_err_open_nofollow_on_symlink()) {
4394 err = got_error_from_errno2("openat",
4395 abspath);
4396 goto done;
4397 }
4398 err = get_symlink_target_file(&fd, dirfd,
4399 de_name, abspath);
4400 if (err)
4401 goto done;
4402 }
4403 } else {
4404 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4405 if (fd == -1) {
4406 if (!got_err_open_nofollow_on_symlink()) {
4407 err = got_error_from_errno2("open",
4408 abspath);
4409 goto done;
4410 }
4411 err = get_symlink_target_file(&fd, dirfd,
4412 de_name, abspath);
4413 if (err)
4414 goto done;
4415 }
4416 }
4417 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4418 err = got_error_from_errno2("fstatat", abspath);
4419 goto done;
4420 }
4421 f2 = fdopen(fd, "r");
4422 if (f2 == NULL) {
4423 err = got_error_from_errno2("fdopen", abspath);
4424 goto done;
4425 }
4426 fd = -1;
4427 f2_exists = 1;
4428 }
4429
4430 if (blob1) {
4431 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4432 a->f1, blob1);
4433 if (err)
4434 goto done;
4435 }
4436
4437 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4438 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4439 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
4440 done:
4441 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4442 err = got_error_from_errno("close");
4443 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4444 err = got_error_from_errno("close");
4445 if (blob1)
4446 got_object_blob_close(blob1);
4447 if (fd != -1 && close(fd) == -1 && err == NULL)
4448 err = got_error_from_errno("close");
4449 if (f2 && fclose(f2) == EOF && err == NULL)
4450 err = got_error_from_errno("fclose");
4451 free(abspath);
4452 return err;
4453 }
4454
4455 static const struct got_error *
4456 cmd_diff(int argc, char *argv[])
4457 {
4458 const struct got_error *error;
4459 struct got_repository *repo = NULL;
4460 struct got_worktree *worktree = NULL;
4461 char *cwd = NULL, *repo_path = NULL;
4462 const char *commit_args[2] = { NULL, NULL };
4463 int ncommit_args = 0;
4464 struct got_object_id *ids[2] = { NULL, NULL };
4465 char *labels[2] = { NULL, NULL };
4466 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4467 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4468 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
4469 const char *errstr;
4470 struct got_reflist_head refs;
4471 struct got_pathlist_head diffstat_paths, paths;
4472 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4473 int fd1 = -1, fd2 = -1;
4474 int *pack_fds = NULL;
4475 struct got_diffstat_cb_arg dsa;
4476
4477 memset(&dsa, 0, sizeof(dsa));
4478
4479 TAILQ_INIT(&refs);
4480 TAILQ_INIT(&paths);
4481 TAILQ_INIT(&diffstat_paths);
4482
4483 #ifndef PROFILE
4484 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4485 NULL) == -1)
4486 err(1, "pledge");
4487 #endif
4488
4489 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
4490 switch (ch) {
4491 case 'a':
4492 force_text_diff = 1;
4493 break;
4494 case 'C':
4495 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4496 &errstr);
4497 if (errstr != NULL)
4498 errx(1, "number of context lines is %s: %s",
4499 errstr, optarg);
4500 break;
4501 case 'c':
4502 if (ncommit_args >= 2)
4503 errx(1, "too many -c options used");
4504 commit_args[ncommit_args++] = optarg;
4505 break;
4506 case 'd':
4507 show_diffstat = 1;
4508 break;
4509 case 'P':
4510 force_path = 1;
4511 break;
4512 case 'r':
4513 repo_path = realpath(optarg, NULL);
4514 if (repo_path == NULL)
4515 return got_error_from_errno2("realpath",
4516 optarg);
4517 got_path_strip_trailing_slashes(repo_path);
4518 rflag = 1;
4519 break;
4520 case 's':
4521 diff_staged = 1;
4522 break;
4523 case 'w':
4524 ignore_whitespace = 1;
4525 break;
4526 default:
4527 usage_diff();
4528 /* NOTREACHED */
4529 }
4530 }
4531
4532 argc -= optind;
4533 argv += optind;
4534
4535 cwd = getcwd(NULL, 0);
4536 if (cwd == NULL) {
4537 error = got_error_from_errno("getcwd");
4538 goto done;
4539 }
4540
4541 error = got_repo_pack_fds_open(&pack_fds);
4542 if (error != NULL)
4543 goto done;
4544
4545 if (repo_path == NULL) {
4546 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
4547 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4548 goto done;
4549 else
4550 error = NULL;
4551 if (worktree) {
4552 repo_path =
4553 strdup(got_worktree_get_repo_path(worktree));
4554 if (repo_path == NULL) {
4555 error = got_error_from_errno("strdup");
4556 goto done;
4557 }
4558 } else {
4559 repo_path = strdup(cwd);
4560 if (repo_path == NULL) {
4561 error = got_error_from_errno("strdup");
4562 goto done;
4563 }
4564 }
4565 }
4566
4567 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4568 free(repo_path);
4569 if (error != NULL)
4570 goto done;
4571
4572 if (show_diffstat) {
4573 dsa.paths = &diffstat_paths;
4574 dsa.force_text = force_text_diff;
4575 dsa.ignore_ws = ignore_whitespace;
4576 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4577 }
4578
4579 if (rflag || worktree == NULL || ncommit_args > 0) {
4580 if (force_path) {
4581 error = got_error_msg(GOT_ERR_NOT_IMPL,
4582 "-P option can only be used when diffing "
4583 "a work tree");
4584 goto done;
4585 }
4586 if (diff_staged) {
4587 error = got_error_msg(GOT_ERR_NOT_IMPL,
4588 "-s option can only be used when diffing "
4589 "a work tree");
4590 goto done;
4591 }
4592 }
4593
4594 error = apply_unveil(got_repo_get_path(repo), 1,
4595 worktree ? got_worktree_get_root_path(worktree) : NULL);
4596 if (error)
4597 goto done;
4598
4599 if ((!force_path && argc == 2) || ncommit_args > 0) {
4600 int obj_type = (ncommit_args > 0 ?
4601 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4602 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4603 NULL);
4604 if (error)
4605 goto done;
4606 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4607 const char *arg;
4608 if (ncommit_args > 0)
4609 arg = commit_args[i];
4610 else
4611 arg = argv[i];
4612 error = got_repo_match_object_id(&ids[i], &labels[i],
4613 arg, obj_type, &refs, repo);
4614 if (error) {
4615 if (error->code != GOT_ERR_NOT_REF &&
4616 error->code != GOT_ERR_NO_OBJ)
4617 goto done;
4618 if (ncommit_args > 0)
4619 goto done;
4620 error = NULL;
4621 break;
4622 }
4623 }
4624 }
4625
4626 f1 = got_opentemp();
4627 if (f1 == NULL) {
4628 error = got_error_from_errno("got_opentemp");
4629 goto done;
4630 }
4631
4632 f2 = got_opentemp();
4633 if (f2 == NULL) {
4634 error = got_error_from_errno("got_opentemp");
4635 goto done;
4636 }
4637
4638 outfile = got_opentemp();
4639 if (outfile == NULL) {
4640 error = got_error_from_errno("got_opentemp");
4641 goto done;
4642 }
4643
4644 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4645 struct print_diff_arg arg;
4646 char *id_str;
4647
4648 if (worktree == NULL) {
4649 if (argc == 2 && ids[0] == NULL) {
4650 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4651 goto done;
4652 } else if (argc == 2 && ids[1] == NULL) {
4653 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4654 goto done;
4655 } else if (argc > 0) {
4656 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4657 "%s", "specified paths cannot be resolved");
4658 goto done;
4659 } else {
4660 error = got_error(GOT_ERR_NOT_WORKTREE);
4661 goto done;
4662 }
4663 }
4664
4665 error = get_worktree_paths_from_argv(&paths, argc, argv,
4666 worktree);
4667 if (error)
4668 goto done;
4669
4670 error = got_object_id_str(&id_str,
4671 got_worktree_get_base_commit_id(worktree));
4672 if (error)
4673 goto done;
4674 arg.repo = repo;
4675 arg.worktree = worktree;
4676 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4677 arg.diff_context = diff_context;
4678 arg.id_str = id_str;
4679 arg.header_shown = 0;
4680 arg.diff_staged = diff_staged;
4681 arg.ignore_whitespace = ignore_whitespace;
4682 arg.force_text_diff = force_text_diff;
4683 arg.diffstat = show_diffstat ? &dsa : NULL;
4684 arg.f1 = f1;
4685 arg.f2 = f2;
4686 arg.outfile = outfile;
4687
4688 error = got_worktree_status(worktree, &paths, repo, 0,
4689 print_diff, &arg, check_cancelled, NULL);
4690 free(id_str);
4691 if (error)
4692 goto done;
4693
4694 if (show_diffstat && dsa.nfiles > 0) {
4695 char *header;
4696
4697 if (asprintf(&header, "diffstat %s%s",
4698 diff_staged ? "-s " : "",
4699 got_worktree_get_root_path(worktree)) == -1) {
4700 error = got_error_from_errno("asprintf");
4701 goto done;
4702 }
4703
4704 error = print_diffstat(&dsa, header);
4705 free(header);
4706 if (error)
4707 goto done;
4708 }
4709
4710 error = printfile(outfile);
4711 goto done;
4712 }
4713
4714 if (ncommit_args == 1) {
4715 struct got_commit_object *commit;
4716 error = got_object_open_as_commit(&commit, repo, ids[0]);
4717 if (error)
4718 goto done;
4719
4720 labels[1] = labels[0];
4721 ids[1] = ids[0];
4722 if (got_object_commit_get_nparents(commit) > 0) {
4723 const struct got_object_id_queue *pids;
4724 struct got_object_qid *pid;
4725 pids = got_object_commit_get_parent_ids(commit);
4726 pid = STAILQ_FIRST(pids);
4727 ids[0] = got_object_id_dup(&pid->id);
4728 if (ids[0] == NULL) {
4729 error = got_error_from_errno(
4730 "got_object_id_dup");
4731 got_object_commit_close(commit);
4732 goto done;
4733 }
4734 error = got_object_id_str(&labels[0], ids[0]);
4735 if (error) {
4736 got_object_commit_close(commit);
4737 goto done;
4738 }
4739 } else {
4740 ids[0] = NULL;
4741 labels[0] = strdup("/dev/null");
4742 if (labels[0] == NULL) {
4743 error = got_error_from_errno("strdup");
4744 got_object_commit_close(commit);
4745 goto done;
4746 }
4747 }
4748
4749 got_object_commit_close(commit);
4750 }
4751
4752 if (ncommit_args == 0 && argc > 2) {
4753 error = got_error_msg(GOT_ERR_BAD_PATH,
4754 "path arguments cannot be used when diffing two objects");
4755 goto done;
4756 }
4757
4758 if (ids[0]) {
4759 error = got_object_get_type(&type1, repo, ids[0]);
4760 if (error)
4761 goto done;
4762 }
4763
4764 error = got_object_get_type(&type2, repo, ids[1]);
4765 if (error)
4766 goto done;
4767 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4768 error = got_error(GOT_ERR_OBJ_TYPE);
4769 goto done;
4770 }
4771 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
4772 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4773 "path arguments cannot be used when diffing blobs");
4774 goto done;
4775 }
4776
4777 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4778 char *in_repo_path;
4779 struct got_pathlist_entry *new;
4780 if (worktree) {
4781 const char *prefix;
4782 char *p;
4783 error = got_worktree_resolve_path(&p, worktree,
4784 argv[i]);
4785 if (error)
4786 goto done;
4787 prefix = got_worktree_get_path_prefix(worktree);
4788 while (prefix[0] == '/')
4789 prefix++;
4790 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4791 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4792 p) == -1) {
4793 error = got_error_from_errno("asprintf");
4794 free(p);
4795 goto done;
4796 }
4797 free(p);
4798 } else {
4799 char *mapped_path, *s;
4800 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4801 if (error)
4802 goto done;
4803 s = mapped_path;
4804 while (s[0] == '/')
4805 s++;
4806 in_repo_path = strdup(s);
4807 if (in_repo_path == NULL) {
4808 error = got_error_from_errno("asprintf");
4809 free(mapped_path);
4810 goto done;
4811 }
4812 free(mapped_path);
4813
4814 }
4815 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4816 if (error || new == NULL /* duplicate */)
4817 free(in_repo_path);
4818 if (error)
4819 goto done;
4820 }
4821
4822 if (worktree) {
4823 /* Release work tree lock. */
4824 got_worktree_close(worktree);
4825 worktree = NULL;
4826 }
4827
4828 fd1 = got_opentempfd();
4829 if (fd1 == -1) {
4830 error = got_error_from_errno("got_opentempfd");
4831 goto done;
4832 }
4833
4834 fd2 = got_opentempfd();
4835 if (fd2 == -1) {
4836 error = got_error_from_errno("got_opentempfd");
4837 goto done;
4838 }
4839
4840 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4841 case GOT_OBJ_TYPE_BLOB:
4842 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4843 fd1, fd2, ids[0], ids[1], NULL, NULL,
4844 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4845 ignore_whitespace, force_text_diff,
4846 show_diffstat ? &dsa : NULL, repo, outfile);
4847 break;
4848 case GOT_OBJ_TYPE_TREE:
4849 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
4850 ids[0], ids[1], &paths, "", "",
4851 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4852 ignore_whitespace, force_text_diff,
4853 show_diffstat ? &dsa : NULL, repo, outfile);
4854 break;
4855 case GOT_OBJ_TYPE_COMMIT:
4856 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
4857 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4858 fd1, fd2, ids[0], ids[1], &paths,
4859 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4860 ignore_whitespace, force_text_diff,
4861 show_diffstat ? &dsa : NULL, repo, outfile);
4862 break;
4863 default:
4864 error = got_error(GOT_ERR_OBJ_TYPE);
4865 }
4866 if (error)
4867 goto done;
4868
4869 if (show_diffstat && dsa.nfiles > 0) {
4870 char *header = NULL;
4871
4872 if (asprintf(&header, "diffstat %s %s",
4873 labels[0], labels[1]) == -1) {
4874 error = got_error_from_errno("asprintf");
4875 goto done;
4876 }
4877
4878 error = print_diffstat(&dsa, header);
4879 free(header);
4880 if (error)
4881 goto done;
4882 }
4883
4884 error = printfile(outfile);
4885
4886 done:
4887 free(labels[0]);
4888 free(labels[1]);
4889 free(ids[0]);
4890 free(ids[1]);
4891 if (worktree)
4892 got_worktree_close(worktree);
4893 if (repo) {
4894 const struct got_error *close_err = got_repo_close(repo);
4895 if (error == NULL)
4896 error = close_err;
4897 }
4898 if (pack_fds) {
4899 const struct got_error *pack_err =
4900 got_repo_pack_fds_close(pack_fds);
4901 if (error == NULL)
4902 error = pack_err;
4903 }
4904 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
4905 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
4906 got_ref_list_free(&refs);
4907 if (outfile && fclose(outfile) == EOF && error == NULL)
4908 error = got_error_from_errno("fclose");
4909 if (f1 && fclose(f1) == EOF && error == NULL)
4910 error = got_error_from_errno("fclose");
4911 if (f2 && fclose(f2) == EOF && error == NULL)
4912 error = got_error_from_errno("fclose");
4913 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
4914 error = got_error_from_errno("close");
4915 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
4916 error = got_error_from_errno("close");
4917 return error;
4918 }
4919
4920 __dead static void
4921 usage_blame(void)
4922 {
4923 fprintf(stderr,
4924 "usage: %s blame [-c commit] [-r repository-path] path\n",
4925 getprogname());
4926 exit(1);
4927 }
4928
4929 struct blame_line {
4930 int annotated;
4931 char *id_str;
4932 char *committer;
4933 char datebuf[11]; /* YYYY-MM-DD + NUL */
4934 };
4935
4936 struct blame_cb_args {
4937 struct blame_line *lines;
4938 int nlines;
4939 int nlines_prec;
4940 int lineno_cur;
4941 off_t *line_offsets;
4942 FILE *f;
4943 struct got_repository *repo;
4944 };
4945
4946 static const struct got_error *
4947 blame_cb(void *arg, int nlines, int lineno,
4948 struct got_commit_object *commit, struct got_object_id *id)
4949 {
4950 const struct got_error *err = NULL;
4951 struct blame_cb_args *a = arg;
4952 struct blame_line *bline;
4953 char *line = NULL;
4954 size_t linesize = 0;
4955 off_t offset;
4956 struct tm tm;
4957 time_t committer_time;
4958
4959 if (nlines != a->nlines ||
4960 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4961 return got_error(GOT_ERR_RANGE);
4962
4963 if (sigint_received)
4964 return got_error(GOT_ERR_ITER_COMPLETED);
4965
4966 if (lineno == -1)
4967 return NULL; /* no change in this commit */
4968
4969 /* Annotate this line. */
4970 bline = &a->lines[lineno - 1];
4971 if (bline->annotated)
4972 return NULL;
4973 err = got_object_id_str(&bline->id_str, id);
4974 if (err)
4975 return err;
4976
4977 bline->committer = strdup(got_object_commit_get_committer(commit));
4978 if (bline->committer == NULL) {
4979 err = got_error_from_errno("strdup");
4980 goto done;
4981 }
4982
4983 committer_time = got_object_commit_get_committer_time(commit);
4984 if (gmtime_r(&committer_time, &tm) == NULL)
4985 return got_error_from_errno("gmtime_r");
4986 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4987 &tm) == 0) {
4988 err = got_error(GOT_ERR_NO_SPACE);
4989 goto done;
4990 }
4991 bline->annotated = 1;
4992
4993 /* Print lines annotated so far. */
4994 bline = &a->lines[a->lineno_cur - 1];
4995 if (!bline->annotated)
4996 goto done;
4997
4998 offset = a->line_offsets[a->lineno_cur - 1];
4999 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5000 err = got_error_from_errno("fseeko");
5001 goto done;
5002 }
5003
5004 while (a->lineno_cur <= a->nlines && bline->annotated) {
5005 char *smallerthan, *at, *nl, *committer;
5006 size_t len;
5007
5008 if (getline(&line, &linesize, a->f) == -1) {
5009 if (ferror(a->f))
5010 err = got_error_from_errno("getline");
5011 break;
5012 }
5013
5014 committer = bline->committer;
5015 smallerthan = strchr(committer, '<');
5016 if (smallerthan && smallerthan[1] != '\0')
5017 committer = smallerthan + 1;
5018 at = strchr(committer, '@');
5019 if (at)
5020 *at = '\0';
5021 len = strlen(committer);
5022 if (len >= 9)
5023 committer[8] = '\0';
5024
5025 nl = strchr(line, '\n');
5026 if (nl)
5027 *nl = '\0';
5028 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5029 bline->id_str, bline->datebuf, committer, line);
5030
5031 a->lineno_cur++;
5032 bline = &a->lines[a->lineno_cur - 1];
5033 }
5034 done:
5035 free(line);
5036 return err;
5037 }
5038
5039 static const struct got_error *
5040 cmd_blame(int argc, char *argv[])
5041 {
5042 const struct got_error *error;
5043 struct got_repository *repo = NULL;
5044 struct got_worktree *worktree = NULL;
5045 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5046 char *link_target = NULL;
5047 struct got_object_id *obj_id = NULL;
5048 struct got_object_id *commit_id = NULL;
5049 struct got_commit_object *commit = NULL;
5050 struct got_blob_object *blob = NULL;
5051 char *commit_id_str = NULL;
5052 struct blame_cb_args bca;
5053 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5054 off_t filesize;
5055 int *pack_fds = NULL;
5056 FILE *f1 = NULL, *f2 = NULL;
5057
5058 fd1 = got_opentempfd();
5059 if (fd1 == -1)
5060 return got_error_from_errno("got_opentempfd");
5061
5062 memset(&bca, 0, sizeof(bca));
5063
5064 #ifndef PROFILE
5065 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5066 NULL) == -1)
5067 err(1, "pledge");
5068 #endif
5069
5070 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5071 switch (ch) {
5072 case 'c':
5073 commit_id_str = optarg;
5074 break;
5075 case 'r':
5076 repo_path = realpath(optarg, NULL);
5077 if (repo_path == NULL)
5078 return got_error_from_errno2("realpath",
5079 optarg);
5080 got_path_strip_trailing_slashes(repo_path);
5081 break;
5082 default:
5083 usage_blame();
5084 /* NOTREACHED */
5085 }
5086 }
5087
5088 argc -= optind;
5089 argv += optind;
5090
5091 if (argc == 1)
5092 path = argv[0];
5093 else
5094 usage_blame();
5095
5096 cwd = getcwd(NULL, 0);
5097 if (cwd == NULL) {
5098 error = got_error_from_errno("getcwd");
5099 goto done;
5100 }
5101
5102 error = got_repo_pack_fds_open(&pack_fds);
5103 if (error != NULL)
5104 goto done;
5105
5106 if (repo_path == NULL) {
5107 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5108 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5109 goto done;
5110 else
5111 error = NULL;
5112 if (worktree) {
5113 repo_path =
5114 strdup(got_worktree_get_repo_path(worktree));
5115 if (repo_path == NULL) {
5116 error = got_error_from_errno("strdup");
5117 if (error)
5118 goto done;
5119 }
5120 } else {
5121 repo_path = strdup(cwd);
5122 if (repo_path == NULL) {
5123 error = got_error_from_errno("strdup");
5124 goto done;
5125 }
5126 }
5127 }
5128
5129 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5130 if (error != NULL)
5131 goto done;
5132
5133 if (worktree) {
5134 const char *prefix = got_worktree_get_path_prefix(worktree);
5135 char *p;
5136
5137 error = got_worktree_resolve_path(&p, worktree, path);
5138 if (error)
5139 goto done;
5140 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5141 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5142 p) == -1) {
5143 error = got_error_from_errno("asprintf");
5144 free(p);
5145 goto done;
5146 }
5147 free(p);
5148 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5149 } else {
5150 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5151 if (error)
5152 goto done;
5153 error = got_repo_map_path(&in_repo_path, repo, path);
5154 }
5155 if (error)
5156 goto done;
5157
5158 if (commit_id_str == NULL) {
5159 struct got_reference *head_ref;
5160 error = got_ref_open(&head_ref, repo, worktree ?
5161 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5162 if (error != NULL)
5163 goto done;
5164 error = got_ref_resolve(&commit_id, repo, head_ref);
5165 got_ref_close(head_ref);
5166 if (error != NULL)
5167 goto done;
5168 } else {
5169 struct got_reflist_head refs;
5170 TAILQ_INIT(&refs);
5171 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5172 NULL);
5173 if (error)
5174 goto done;
5175 error = got_repo_match_object_id(&commit_id, NULL,
5176 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5177 got_ref_list_free(&refs);
5178 if (error)
5179 goto done;
5180 }
5181
5182 if (worktree) {
5183 /* Release work tree lock. */
5184 got_worktree_close(worktree);
5185 worktree = NULL;
5186 }
5187
5188 error = got_object_open_as_commit(&commit, repo, commit_id);
5189 if (error)
5190 goto done;
5191
5192 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5193 commit, repo);
5194 if (error)
5195 goto done;
5196
5197 error = got_object_id_by_path(&obj_id, repo, commit,
5198 link_target ? link_target : in_repo_path);
5199 if (error)
5200 goto done;
5201
5202 error = got_object_get_type(&obj_type, repo, obj_id);
5203 if (error)
5204 goto done;
5205
5206 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5207 error = got_error_path(link_target ? link_target : in_repo_path,
5208 GOT_ERR_OBJ_TYPE);
5209 goto done;
5210 }
5211
5212 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5213 if (error)
5214 goto done;
5215 bca.f = got_opentemp();
5216 if (bca.f == NULL) {
5217 error = got_error_from_errno("got_opentemp");
5218 goto done;
5219 }
5220 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5221 &bca.line_offsets, bca.f, blob);
5222 if (error || bca.nlines == 0)
5223 goto done;
5224
5225 /* Don't include \n at EOF in the blame line count. */
5226 if (bca.line_offsets[bca.nlines - 1] == filesize)
5227 bca.nlines--;
5228
5229 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5230 if (bca.lines == NULL) {
5231 error = got_error_from_errno("calloc");
5232 goto done;
5233 }
5234 bca.lineno_cur = 1;
5235 bca.nlines_prec = 0;
5236 i = bca.nlines;
5237 while (i > 0) {
5238 i /= 10;
5239 bca.nlines_prec++;
5240 }
5241 bca.repo = repo;
5242
5243 fd2 = got_opentempfd();
5244 if (fd2 == -1) {
5245 error = got_error_from_errno("got_opentempfd");
5246 goto done;
5247 }
5248 fd3 = got_opentempfd();
5249 if (fd3 == -1) {
5250 error = got_error_from_errno("got_opentempfd");
5251 goto done;
5252 }
5253 f1 = got_opentemp();
5254 if (f1 == NULL) {
5255 error = got_error_from_errno("got_opentemp");
5256 goto done;
5257 }
5258 f2 = got_opentemp();
5259 if (f2 == NULL) {
5260 error = got_error_from_errno("got_opentemp");
5261 goto done;
5262 }
5263 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5264 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5265 check_cancelled, NULL, fd2, fd3, f1, f2);
5266 done:
5267 free(in_repo_path);
5268 free(link_target);
5269 free(repo_path);
5270 free(cwd);
5271 free(commit_id);
5272 free(obj_id);
5273 if (commit)
5274 got_object_commit_close(commit);
5275
5276 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5277 error = got_error_from_errno("close");
5278 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5279 error = got_error_from_errno("close");
5280 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5281 error = got_error_from_errno("close");
5282 if (f1 && fclose(f1) == EOF && error == NULL)
5283 error = got_error_from_errno("fclose");
5284 if (f2 && fclose(f2) == EOF && error == NULL)
5285 error = got_error_from_errno("fclose");
5286
5287 if (blob)
5288 got_object_blob_close(blob);
5289 if (worktree)
5290 got_worktree_close(worktree);
5291 if (repo) {
5292 const struct got_error *close_err = got_repo_close(repo);
5293 if (error == NULL)
5294 error = close_err;
5295 }
5296 if (pack_fds) {
5297 const struct got_error *pack_err =
5298 got_repo_pack_fds_close(pack_fds);
5299 if (error == NULL)
5300 error = pack_err;
5301 }
5302 if (bca.lines) {
5303 for (i = 0; i < bca.nlines; i++) {
5304 struct blame_line *bline = &bca.lines[i];
5305 free(bline->id_str);
5306 free(bline->committer);
5307 }
5308 free(bca.lines);
5309 }
5310 free(bca.line_offsets);
5311 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5312 error = got_error_from_errno("fclose");
5313 return error;
5314 }
5315
5316 __dead static void
5317 usage_tree(void)
5318 {
5319 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5320 "[path]\n", getprogname());
5321 exit(1);
5322 }
5323
5324 static const struct got_error *
5325 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5326 const char *root_path, struct got_repository *repo)
5327 {
5328 const struct got_error *err = NULL;
5329 int is_root_path = (strcmp(path, root_path) == 0);
5330 const char *modestr = "";
5331 mode_t mode = got_tree_entry_get_mode(te);
5332 char *link_target = NULL;
5333
5334 path += strlen(root_path);
5335 while (path[0] == '/')
5336 path++;
5337
5338 if (got_object_tree_entry_is_submodule(te))
5339 modestr = "$";
5340 else if (S_ISLNK(mode)) {
5341 int i;
5342
5343 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5344 if (err)
5345 return err;
5346 for (i = 0; link_target[i] != '\0'; i++) {
5347 if (!isprint((unsigned char)link_target[i]))
5348 link_target[i] = '?';
5349 }
5350
5351 modestr = "@";
5352 }
5353 else if (S_ISDIR(mode))
5354 modestr = "/";
5355 else if (mode & S_IXUSR)
5356 modestr = "*";
5357
5358 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5359 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5360 link_target ? " -> ": "", link_target ? link_target : "");
5361
5362 free(link_target);
5363 return NULL;
5364 }
5365
5366 static const struct got_error *
5367 print_tree(const char *path, struct got_commit_object *commit,
5368 int show_ids, int recurse, const char *root_path,
5369 struct got_repository *repo)
5370 {
5371 const struct got_error *err = NULL;
5372 struct got_object_id *tree_id = NULL;
5373 struct got_tree_object *tree = NULL;
5374 int nentries, i;
5375
5376 err = got_object_id_by_path(&tree_id, repo, commit, path);
5377 if (err)
5378 goto done;
5379
5380 err = got_object_open_as_tree(&tree, repo, tree_id);
5381 if (err)
5382 goto done;
5383 nentries = got_object_tree_get_nentries(tree);
5384 for (i = 0; i < nentries; i++) {
5385 struct got_tree_entry *te;
5386 char *id = NULL;
5387
5388 if (sigint_received || sigpipe_received)
5389 break;
5390
5391 te = got_object_tree_get_entry(tree, i);
5392 if (show_ids) {
5393 char *id_str;
5394 err = got_object_id_str(&id_str,
5395 got_tree_entry_get_id(te));
5396 if (err)
5397 goto done;
5398 if (asprintf(&id, "%s ", id_str) == -1) {
5399 err = got_error_from_errno("asprintf");
5400 free(id_str);
5401 goto done;
5402 }
5403 free(id_str);
5404 }
5405 err = print_entry(te, id, path, root_path, repo);
5406 free(id);
5407 if (err)
5408 goto done;
5409
5410 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5411 char *child_path;
5412 if (asprintf(&child_path, "%s%s%s", path,
5413 path[0] == '/' && path[1] == '\0' ? "" : "/",
5414 got_tree_entry_get_name(te)) == -1) {
5415 err = got_error_from_errno("asprintf");
5416 goto done;
5417 }
5418 err = print_tree(child_path, commit, show_ids, 1,
5419 root_path, repo);
5420 free(child_path);
5421 if (err)
5422 goto done;
5423 }
5424 }
5425 done:
5426 if (tree)
5427 got_object_tree_close(tree);
5428 free(tree_id);
5429 return err;
5430 }
5431
5432 static const struct got_error *
5433 cmd_tree(int argc, char *argv[])
5434 {
5435 const struct got_error *error;
5436 struct got_repository *repo = NULL;
5437 struct got_worktree *worktree = NULL;
5438 const char *path, *refname = NULL;
5439 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5440 struct got_object_id *commit_id = NULL;
5441 struct got_commit_object *commit = NULL;
5442 char *commit_id_str = NULL;
5443 int show_ids = 0, recurse = 0;
5444 int ch;
5445 int *pack_fds = NULL;
5446
5447 #ifndef PROFILE
5448 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5449 NULL) == -1)
5450 err(1, "pledge");
5451 #endif
5452
5453 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5454 switch (ch) {
5455 case 'c':
5456 commit_id_str = optarg;
5457 break;
5458 case 'i':
5459 show_ids = 1;
5460 break;
5461 case 'R':
5462 recurse = 1;
5463 break;
5464 case 'r':
5465 repo_path = realpath(optarg, NULL);
5466 if (repo_path == NULL)
5467 return got_error_from_errno2("realpath",
5468 optarg);
5469 got_path_strip_trailing_slashes(repo_path);
5470 break;
5471 default:
5472 usage_tree();
5473 /* NOTREACHED */
5474 }
5475 }
5476
5477 argc -= optind;
5478 argv += optind;
5479
5480 if (argc == 1)
5481 path = argv[0];
5482 else if (argc > 1)
5483 usage_tree();
5484 else
5485 path = NULL;
5486
5487 cwd = getcwd(NULL, 0);
5488 if (cwd == NULL) {
5489 error = got_error_from_errno("getcwd");
5490 goto done;
5491 }
5492
5493 error = got_repo_pack_fds_open(&pack_fds);
5494 if (error != NULL)
5495 goto done;
5496
5497 if (repo_path == NULL) {
5498 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5499 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5500 goto done;
5501 else
5502 error = NULL;
5503 if (worktree) {
5504 repo_path =
5505 strdup(got_worktree_get_repo_path(worktree));
5506 if (repo_path == NULL)
5507 error = got_error_from_errno("strdup");
5508 if (error)
5509 goto done;
5510 } else {
5511 repo_path = strdup(cwd);
5512 if (repo_path == NULL) {
5513 error = got_error_from_errno("strdup");
5514 goto done;
5515 }
5516 }
5517 }
5518
5519 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5520 if (error != NULL)
5521 goto done;
5522
5523 if (worktree) {
5524 const char *prefix = got_worktree_get_path_prefix(worktree);
5525 char *p;
5526
5527 if (path == NULL || got_path_is_root_dir(path))
5528 path = "";
5529 error = got_worktree_resolve_path(&p, worktree, path);
5530 if (error)
5531 goto done;
5532 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5533 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5534 p) == -1) {
5535 error = got_error_from_errno("asprintf");
5536 free(p);
5537 goto done;
5538 }
5539 free(p);
5540 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5541 if (error)
5542 goto done;
5543 } else {
5544 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5545 if (error)
5546 goto done;
5547 if (path == NULL)
5548 path = "/";
5549 error = got_repo_map_path(&in_repo_path, repo, path);
5550 if (error != NULL)
5551 goto done;
5552 }
5553
5554 if (commit_id_str == NULL) {
5555 struct got_reference *head_ref;
5556 if (worktree)
5557 refname = got_worktree_get_head_ref_name(worktree);
5558 else
5559 refname = GOT_REF_HEAD;
5560 error = got_ref_open(&head_ref, repo, refname, 0);
5561 if (error != NULL)
5562 goto done;
5563 error = got_ref_resolve(&commit_id, repo, head_ref);
5564 got_ref_close(head_ref);
5565 if (error != NULL)
5566 goto done;
5567 } else {
5568 struct got_reflist_head refs;
5569 TAILQ_INIT(&refs);
5570 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5571 NULL);
5572 if (error)
5573 goto done;
5574 error = got_repo_match_object_id(&commit_id, NULL,
5575 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5576 got_ref_list_free(&refs);
5577 if (error)
5578 goto done;
5579 }
5580
5581 if (worktree) {
5582 /* Release work tree lock. */
5583 got_worktree_close(worktree);
5584 worktree = NULL;
5585 }
5586
5587 error = got_object_open_as_commit(&commit, repo, commit_id);
5588 if (error)
5589 goto done;
5590
5591 error = print_tree(in_repo_path, commit, show_ids, recurse,
5592 in_repo_path, repo);
5593 done:
5594 free(in_repo_path);
5595 free(repo_path);
5596 free(cwd);
5597 free(commit_id);
5598 if (commit)
5599 got_object_commit_close(commit);
5600 if (worktree)
5601 got_worktree_close(worktree);
5602 if (repo) {
5603 const struct got_error *close_err = got_repo_close(repo);
5604 if (error == NULL)
5605 error = close_err;
5606 }
5607 if (pack_fds) {
5608 const struct got_error *pack_err =
5609 got_repo_pack_fds_close(pack_fds);
5610 if (error == NULL)
5611 error = pack_err;
5612 }
5613 return error;
5614 }
5615
5616 __dead static void
5617 usage_status(void)
5618 {
5619 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5620 "[-s status-codes] [path ...]\n", getprogname());
5621 exit(1);
5622 }
5623
5624 struct got_status_arg {
5625 char *status_codes;
5626 int suppress;
5627 };
5628
5629 static const struct got_error *
5630 print_status(void *arg, unsigned char status, unsigned char staged_status,
5631 const char *path, struct got_object_id *blob_id,
5632 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5633 int dirfd, const char *de_name)
5634 {
5635 struct got_status_arg *st = arg;
5636
5637 if (status == staged_status && (status == GOT_STATUS_DELETE))
5638 status = GOT_STATUS_NO_CHANGE;
5639 if (st != NULL && st->status_codes) {
5640 size_t ncodes = strlen(st->status_codes);
5641 int i, j = 0;
5642
5643 for (i = 0; i < ncodes ; i++) {
5644 if (st->suppress) {
5645 if (status == st->status_codes[i] ||
5646 staged_status == st->status_codes[i]) {
5647 j++;
5648 continue;
5649 }
5650 } else {
5651 if (status == st->status_codes[i] ||
5652 staged_status == st->status_codes[i])
5653 break;
5654 }
5655 }
5656
5657 if (st->suppress && j == 0)
5658 goto print;
5659
5660 if (i == ncodes)
5661 return NULL;
5662 }
5663 print:
5664 printf("%c%c %s\n", status, staged_status, path);
5665 return NULL;
5666 }
5667
5668 static const struct got_error *
5669 cmd_status(int argc, char *argv[])
5670 {
5671 const struct got_error *error = NULL;
5672 struct got_repository *repo = NULL;
5673 struct got_worktree *worktree = NULL;
5674 struct got_status_arg st;
5675 char *cwd = NULL;
5676 struct got_pathlist_head paths;
5677 int ch, i, no_ignores = 0;
5678 int *pack_fds = NULL;
5679
5680 TAILQ_INIT(&paths);
5681
5682 memset(&st, 0, sizeof(st));
5683 st.status_codes = NULL;
5684 st.suppress = 0;
5685
5686 #ifndef PROFILE
5687 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5688 NULL) == -1)
5689 err(1, "pledge");
5690 #endif
5691
5692 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
5693 switch (ch) {
5694 case 'I':
5695 no_ignores = 1;
5696 break;
5697 case 'S':
5698 if (st.status_codes != NULL && st.suppress == 0)
5699 option_conflict('S', 's');
5700 st.suppress = 1;
5701 /* fallthrough */
5702 case 's':
5703 for (i = 0; optarg[i] != '\0'; i++) {
5704 switch (optarg[i]) {
5705 case GOT_STATUS_MODIFY:
5706 case GOT_STATUS_ADD:
5707 case GOT_STATUS_DELETE:
5708 case GOT_STATUS_CONFLICT:
5709 case GOT_STATUS_MISSING:
5710 case GOT_STATUS_OBSTRUCTED:
5711 case GOT_STATUS_UNVERSIONED:
5712 case GOT_STATUS_MODE_CHANGE:
5713 case GOT_STATUS_NONEXISTENT:
5714 break;
5715 default:
5716 errx(1, "invalid status code '%c'",
5717 optarg[i]);
5718 }
5719 }
5720 if (ch == 's' && st.suppress)
5721 option_conflict('s', 'S');
5722 st.status_codes = optarg;
5723 break;
5724 default:
5725 usage_status();
5726 /* NOTREACHED */
5727 }
5728 }
5729
5730 argc -= optind;
5731 argv += optind;
5732
5733 cwd = getcwd(NULL, 0);
5734 if (cwd == NULL) {
5735 error = got_error_from_errno("getcwd");
5736 goto done;
5737 }
5738
5739 error = got_repo_pack_fds_open(&pack_fds);
5740 if (error != NULL)
5741 goto done;
5742
5743 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5744 if (error) {
5745 if (error->code == GOT_ERR_NOT_WORKTREE)
5746 error = wrap_not_worktree_error(error, "status", cwd);
5747 goto done;
5748 }
5749
5750 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5751 NULL, pack_fds);
5752 if (error != NULL)
5753 goto done;
5754
5755 error = apply_unveil(got_repo_get_path(repo), 1,
5756 got_worktree_get_root_path(worktree));
5757 if (error)
5758 goto done;
5759
5760 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5761 if (error)
5762 goto done;
5763
5764 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5765 print_status, &st, check_cancelled, NULL);
5766 done:
5767 if (pack_fds) {
5768 const struct got_error *pack_err =
5769 got_repo_pack_fds_close(pack_fds);
5770 if (error == NULL)
5771 error = pack_err;
5772 }
5773 if (repo) {
5774 const struct got_error *close_err = got_repo_close(repo);
5775 if (error == NULL)
5776 error = close_err;
5777 }
5778
5779 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5780 free(cwd);
5781 return error;
5782 }
5783
5784 __dead static void
5785 usage_tag(void)
5786 {
5787 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
5788 "[-r repository-path] [-s signer-id] name\n", getprogname());
5789 exit(1);
5790 }
5791
5792 #if 0
5793 static const struct got_error *
5794 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5795 {
5796 const struct got_error *err = NULL;
5797 struct got_reflist_entry *re, *se, *new;
5798 struct got_object_id *re_id, *se_id;
5799 struct got_tag_object *re_tag, *se_tag;
5800 time_t re_time, se_time;
5801
5802 STAILQ_FOREACH(re, tags, entry) {
5803 se = STAILQ_FIRST(sorted);
5804 if (se == NULL) {
5805 err = got_reflist_entry_dup(&new, re);
5806 if (err)
5807 return err;
5808 STAILQ_INSERT_HEAD(sorted, new, entry);
5809 continue;
5810 } else {
5811 err = got_ref_resolve(&re_id, repo, re->ref);
5812 if (err)
5813 break;
5814 err = got_object_open_as_tag(&re_tag, repo, re_id);
5815 free(re_id);
5816 if (err)
5817 break;
5818 re_time = got_object_tag_get_tagger_time(re_tag);
5819 got_object_tag_close(re_tag);
5820 }
5821
5822 while (se) {
5823 err = got_ref_resolve(&se_id, repo, re->ref);
5824 if (err)
5825 break;
5826 err = got_object_open_as_tag(&se_tag, repo, se_id);
5827 free(se_id);
5828 if (err)
5829 break;
5830 se_time = got_object_tag_get_tagger_time(se_tag);
5831 got_object_tag_close(se_tag);
5832
5833 if (se_time > re_time) {
5834 err = got_reflist_entry_dup(&new, re);
5835 if (err)
5836 return err;
5837 STAILQ_INSERT_AFTER(sorted, se, new, entry);
5838 break;
5839 }
5840 se = STAILQ_NEXT(se, entry);
5841 continue;
5842 }
5843 }
5844 done:
5845 return err;
5846 }
5847 #endif
5848
5849 static const struct got_error *
5850 get_tag_refname(char **refname, const char *tag_name)
5851 {
5852 const struct got_error *err;
5853
5854 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5855 *refname = strdup(tag_name);
5856 if (*refname == NULL)
5857 return got_error_from_errno("strdup");
5858 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
5859 err = got_error_from_errno("asprintf");
5860 *refname = NULL;
5861 return err;
5862 }
5863
5864 return NULL;
5865 }
5866
5867 static const struct got_error *
5868 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
5869 const char *allowed_signers, const char *revoked_signers, int verbosity)
5870 {
5871 static const struct got_error *err = NULL;
5872 struct got_reflist_head refs;
5873 struct got_reflist_entry *re;
5874 char *wanted_refname = NULL;
5875 int bad_sigs = 0;
5876
5877 TAILQ_INIT(&refs);
5878
5879 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5880 if (err)
5881 return err;
5882
5883 if (tag_name) {
5884 struct got_reference *ref;
5885 err = get_tag_refname(&wanted_refname, tag_name);
5886 if (err)
5887 goto done;
5888 /* Wanted tag reference should exist. */
5889 err = got_ref_open(&ref, repo, wanted_refname, 0);
5890 if (err)
5891 goto done;
5892 got_ref_close(ref);
5893 }
5894
5895 TAILQ_FOREACH(re, &refs, entry) {
5896 const char *refname;
5897 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5898 char datebuf[26];
5899 const char *tagger, *ssh_sig = NULL;
5900 char *sig_msg = NULL;
5901 time_t tagger_time;
5902 struct got_object_id *id;
5903 struct got_tag_object *tag;
5904 struct got_commit_object *commit = NULL;
5905
5906 refname = got_ref_get_name(re->ref);
5907 if (strncmp(refname, "refs/tags/", 10) != 0 ||
5908 (wanted_refname && strcmp(refname, wanted_refname) != 0))
5909 continue;
5910 refname += 10;
5911 refstr = got_ref_to_str(re->ref);
5912 if (refstr == NULL) {
5913 err = got_error_from_errno("got_ref_to_str");
5914 break;
5915 }
5916
5917 err = got_ref_resolve(&id, repo, re->ref);
5918 if (err)
5919 break;
5920 err = got_object_open_as_tag(&tag, repo, id);
5921 if (err) {
5922 if (err->code != GOT_ERR_OBJ_TYPE) {
5923 free(id);
5924 break;
5925 }
5926 /* "lightweight" tag */
5927 err = got_object_open_as_commit(&commit, repo, id);
5928 if (err) {
5929 free(id);
5930 break;
5931 }
5932 tagger = got_object_commit_get_committer(commit);
5933 tagger_time =
5934 got_object_commit_get_committer_time(commit);
5935 err = got_object_id_str(&id_str, id);
5936 free(id);
5937 if (err)
5938 break;
5939 } else {
5940 free(id);
5941 tagger = got_object_tag_get_tagger(tag);
5942 tagger_time = got_object_tag_get_tagger_time(tag);
5943 err = got_object_id_str(&id_str,
5944 got_object_tag_get_object_id(tag));
5945 if (err)
5946 break;
5947 }
5948
5949 if (tag && verify_tags) {
5950 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
5951 got_object_tag_get_message(tag));
5952 if (ssh_sig && allowed_signers == NULL) {
5953 err = got_error_msg(
5954 GOT_ERR_VERIFY_TAG_SIGNATURE,
5955 "SSH signature verification requires "
5956 "setting allowed_signers in "
5957 "got.conf(5)");
5958 break;
5959 }
5960 }
5961
5962 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5963 free(refstr);
5964 printf("from: %s\n", tagger);
5965 datestr = get_datestr(&tagger_time, datebuf);
5966 if (datestr)
5967 printf("date: %s UTC\n", datestr);
5968 if (commit)
5969 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5970 else {
5971 switch (got_object_tag_get_object_type(tag)) {
5972 case GOT_OBJ_TYPE_BLOB:
5973 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5974 id_str);
5975 break;
5976 case GOT_OBJ_TYPE_TREE:
5977 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5978 id_str);
5979 break;
5980 case GOT_OBJ_TYPE_COMMIT:
5981 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5982 id_str);
5983 break;
5984 case GOT_OBJ_TYPE_TAG:
5985 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5986 id_str);
5987 break;
5988 default:
5989 break;
5990 }
5991 }
5992 free(id_str);
5993
5994 if (ssh_sig) {
5995 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
5996 allowed_signers, revoked_signers, verbosity);
5997 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
5998 bad_sigs = 1;
5999 else if (err)
6000 break;
6001 printf("signature: %s", sig_msg);
6002 free(sig_msg);
6003 sig_msg = NULL;
6004 }
6005
6006 if (commit) {
6007 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6008 if (err)
6009 break;
6010 got_object_commit_close(commit);
6011 } else {
6012 tagmsg0 = strdup(got_object_tag_get_message(tag));
6013 got_object_tag_close(tag);
6014 if (tagmsg0 == NULL) {
6015 err = got_error_from_errno("strdup");
6016 break;
6017 }
6018 }
6019
6020 tagmsg = tagmsg0;
6021 do {
6022 line = strsep(&tagmsg, "\n");
6023 if (line)
6024 printf(" %s\n", line);
6025 } while (line);
6026 free(tagmsg0);
6027 }
6028 done:
6029 got_ref_list_free(&refs);
6030 free(wanted_refname);
6031
6032 if (err == NULL && bad_sigs)
6033 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
6034 return err;
6035 }
6036
6037 static const struct got_error *
6038 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6039 const char *tag_name, const char *repo_path)
6040 {
6041 const struct got_error *err = NULL;
6042 char *template = NULL, *initial_content = NULL;
6043 char *editor = NULL;
6044 int initial_content_len;
6045 int fd = -1;
6046
6047 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6048 err = got_error_from_errno("asprintf");
6049 goto done;
6050 }
6051
6052 initial_content_len = asprintf(&initial_content,
6053 "\n# tagging commit %s as %s\n",
6054 commit_id_str, tag_name);
6055 if (initial_content_len == -1) {
6056 err = got_error_from_errno("asprintf");
6057 goto done;
6058 }
6059
6060 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
6061 if (err)
6062 goto done;
6063
6064 if (write(fd, initial_content, initial_content_len) == -1) {
6065 err = got_error_from_errno2("write", *tagmsg_path);
6066 goto done;
6067 }
6068 if (close(fd) == -1) {
6069 err = got_error_from_errno2("close", *tagmsg_path);
6070 goto done;
6071 }
6072 fd = -1;
6073
6074 err = get_editor(&editor);
6075 if (err)
6076 goto done;
6077 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6078 initial_content_len, 1);
6079 done:
6080 free(initial_content);
6081 free(template);
6082 free(editor);
6083
6084 if (fd != -1 && close(fd) == -1 && err == NULL)
6085 err = got_error_from_errno2("close", *tagmsg_path);
6086
6087 if (err) {
6088 free(*tagmsg);
6089 *tagmsg = NULL;
6090 }
6091 return err;
6092 }
6093
6094 static const struct got_error *
6095 add_tag(struct got_repository *repo, const char *tagger,
6096 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
6097 const char *signer_id, int verbosity)
6098 {
6099 const struct got_error *err = NULL;
6100 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6101 char *label = NULL, *commit_id_str = NULL;
6102 struct got_reference *ref = NULL;
6103 char *refname = NULL, *tagmsg = NULL;
6104 char *tagmsg_path = NULL, *tag_id_str = NULL;
6105 int preserve_tagmsg = 0;
6106 struct got_reflist_head refs;
6107
6108 TAILQ_INIT(&refs);
6109
6110 /*
6111 * Don't let the user create a tag name with a leading '-'.
6112 * While technically a valid reference name, this case is usually
6113 * an unintended typo.
6114 */
6115 if (tag_name[0] == '-')
6116 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6117
6118 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6119 if (err)
6120 goto done;
6121
6122 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6123 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6124 if (err)
6125 goto done;
6126
6127 err = got_object_id_str(&commit_id_str, commit_id);
6128 if (err)
6129 goto done;
6130
6131 err = get_tag_refname(&refname, tag_name);
6132 if (err)
6133 goto done;
6134 if (strncmp("refs/tags/", tag_name, 10) == 0)
6135 tag_name += 10;
6136
6137 err = got_ref_open(&ref, repo, refname, 0);
6138 if (err == NULL) {
6139 err = got_error(GOT_ERR_TAG_EXISTS);
6140 goto done;
6141 } else if (err->code != GOT_ERR_NOT_REF)
6142 goto done;
6143
6144 if (tagmsg_arg == NULL) {
6145 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6146 tag_name, got_repo_get_path(repo));
6147 if (err) {
6148 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6149 tagmsg_path != NULL)
6150 preserve_tagmsg = 1;
6151 goto done;
6152 }
6153 /* Editor is done; we can now apply unveil(2) */
6154 err = got_sigs_apply_unveil();
6155 if (err)
6156 goto done;
6157 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
6158 if (err)
6159 goto done;
6160 }
6161
6162 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6163 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
6164 verbosity);
6165 if (err) {
6166 if (tagmsg_path)
6167 preserve_tagmsg = 1;
6168 goto done;
6169 }
6170
6171 err = got_ref_alloc(&ref, refname, tag_id);
6172 if (err) {
6173 if (tagmsg_path)
6174 preserve_tagmsg = 1;
6175 goto done;
6176 }
6177
6178 err = got_ref_write(ref, repo);
6179 if (err) {
6180 if (tagmsg_path)
6181 preserve_tagmsg = 1;
6182 goto done;
6183 }
6184
6185 err = got_object_id_str(&tag_id_str, tag_id);
6186 if (err) {
6187 if (tagmsg_path)
6188 preserve_tagmsg = 1;
6189 goto done;
6190 }
6191 printf("Created tag %s\n", tag_id_str);
6192 done:
6193 if (preserve_tagmsg) {
6194 fprintf(stderr, "%s: tag message preserved in %s\n",
6195 getprogname(), tagmsg_path);
6196 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6197 err = got_error_from_errno2("unlink", tagmsg_path);
6198 free(tag_id_str);
6199 if (ref)
6200 got_ref_close(ref);
6201 free(commit_id);
6202 free(commit_id_str);
6203 free(refname);
6204 free(tagmsg);
6205 free(tagmsg_path);
6206 got_ref_list_free(&refs);
6207 return err;
6208 }
6209
6210 static const struct got_error *
6211 cmd_tag(int argc, char *argv[])
6212 {
6213 const struct got_error *error = NULL;
6214 struct got_repository *repo = NULL;
6215 struct got_worktree *worktree = NULL;
6216 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6217 char *gitconfig_path = NULL, *tagger = NULL;
6218 char *allowed_signers = NULL, *revoked_signers = NULL;
6219 const char *signer_id = NULL;
6220 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
6221 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
6222 int *pack_fds = NULL;
6223
6224 #ifndef PROFILE
6225 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6226 "sendfd unveil", NULL) == -1)
6227 err(1, "pledge");
6228 #endif
6229
6230 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
6231 switch (ch) {
6232 case 'c':
6233 commit_id_arg = optarg;
6234 break;
6235 case 'l':
6236 do_list = 1;
6237 break;
6238 case 'm':
6239 tagmsg = optarg;
6240 break;
6241 case 'r':
6242 repo_path = realpath(optarg, NULL);
6243 if (repo_path == NULL) {
6244 error = got_error_from_errno2("realpath",
6245 optarg);
6246 goto done;
6247 }
6248 got_path_strip_trailing_slashes(repo_path);
6249 break;
6250 case 's':
6251 signer_id = optarg;
6252 break;
6253 case 'V':
6254 verify_tags = 1;
6255 break;
6256 case 'v':
6257 if (verbosity < 0)
6258 verbosity = 0;
6259 else if (verbosity < 3)
6260 verbosity++;
6261 break;
6262 default:
6263 usage_tag();
6264 /* NOTREACHED */
6265 }
6266 }
6267
6268 argc -= optind;
6269 argv += optind;
6270
6271 if (do_list || verify_tags) {
6272 if (commit_id_arg != NULL)
6273 errx(1,
6274 "-c option can only be used when creating a tag");
6275 if (tagmsg) {
6276 if (do_list)
6277 option_conflict('l', 'm');
6278 else
6279 option_conflict('V', 'm');
6280 }
6281 if (signer_id) {
6282 if (do_list)
6283 option_conflict('l', 's');
6284 else
6285 option_conflict('V', 's');
6286 }
6287 if (argc > 1)
6288 usage_tag();
6289 } else if (argc != 1)
6290 usage_tag();
6291
6292 if (argc == 1)
6293 tag_name = argv[0];
6294
6295 cwd = getcwd(NULL, 0);
6296 if (cwd == NULL) {
6297 error = got_error_from_errno("getcwd");
6298 goto done;
6299 }
6300
6301 error = got_repo_pack_fds_open(&pack_fds);
6302 if (error != NULL)
6303 goto done;
6304
6305 if (repo_path == NULL) {
6306 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6307 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6308 goto done;
6309 else
6310 error = NULL;
6311 if (worktree) {
6312 repo_path =
6313 strdup(got_worktree_get_repo_path(worktree));
6314 if (repo_path == NULL)
6315 error = got_error_from_errno("strdup");
6316 if (error)
6317 goto done;
6318 } else {
6319 repo_path = strdup(cwd);
6320 if (repo_path == NULL) {
6321 error = got_error_from_errno("strdup");
6322 goto done;
6323 }
6324 }
6325 }
6326
6327 if (do_list || verify_tags) {
6328 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6329 if (error != NULL)
6330 goto done;
6331 error = get_allowed_signers(&allowed_signers, repo, worktree);
6332 if (error)
6333 goto done;
6334 error = get_revoked_signers(&revoked_signers, repo, worktree);
6335 if (error)
6336 goto done;
6337 if (worktree) {
6338 /* Release work tree lock. */
6339 got_worktree_close(worktree);
6340 worktree = NULL;
6341 }
6342
6343 /*
6344 * Remove "cpath" promise unless needed for signature tmpfile
6345 * creation.
6346 */
6347 if (verify_tags)
6348 got_sigs_apply_unveil();
6349 else {
6350 #ifndef PROFILE
6351 if (pledge("stdio rpath wpath flock proc exec sendfd "
6352 "unveil", NULL) == -1)
6353 err(1, "pledge");
6354 #endif
6355 }
6356 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6357 if (error)
6358 goto done;
6359 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
6360 revoked_signers, verbosity);
6361 } else {
6362 error = get_gitconfig_path(&gitconfig_path);
6363 if (error)
6364 goto done;
6365 error = got_repo_open(&repo, repo_path, gitconfig_path,
6366 pack_fds);
6367 if (error != NULL)
6368 goto done;
6369
6370 error = get_author(&tagger, repo, worktree);
6371 if (error)
6372 goto done;
6373 if (signer_id == NULL)
6374 signer_id = get_signer_id(repo, worktree);
6375
6376 if (tagmsg) {
6377 if (signer_id) {
6378 error = got_sigs_apply_unveil();
6379 if (error)
6380 goto done;
6381 }
6382 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6383 if (error)
6384 goto done;
6385 }
6386
6387 if (commit_id_arg == NULL) {
6388 struct got_reference *head_ref;
6389 struct got_object_id *commit_id;
6390 error = got_ref_open(&head_ref, repo,
6391 worktree ? got_worktree_get_head_ref_name(worktree)
6392 : GOT_REF_HEAD, 0);
6393 if (error)
6394 goto done;
6395 error = got_ref_resolve(&commit_id, repo, head_ref);
6396 got_ref_close(head_ref);
6397 if (error)
6398 goto done;
6399 error = got_object_id_str(&commit_id_str, commit_id);
6400 free(commit_id);
6401 if (error)
6402 goto done;
6403 }
6404
6405 if (worktree) {
6406 /* Release work tree lock. */
6407 got_worktree_close(worktree);
6408 worktree = NULL;
6409 }
6410
6411 error = add_tag(repo, tagger, tag_name,
6412 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
6413 signer_id, verbosity);
6414 }
6415 done:
6416 if (repo) {
6417 const struct got_error *close_err = got_repo_close(repo);
6418 if (error == NULL)
6419 error = close_err;
6420 }
6421 if (worktree)
6422 got_worktree_close(worktree);
6423 if (pack_fds) {
6424 const struct got_error *pack_err =
6425 got_repo_pack_fds_close(pack_fds);
6426 if (error == NULL)
6427 error = pack_err;
6428 }
6429 free(cwd);
6430 free(repo_path);
6431 free(gitconfig_path);
6432 free(commit_id_str);
6433 free(tagger);
6434 free(allowed_signers);
6435 free(revoked_signers);
6436 return error;
6437 }
6438
6439 __dead static void
6440 usage_add(void)
6441 {
6442 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
6443 exit(1);
6444 }
6445
6446 static const struct got_error *
6447 add_progress(void *arg, unsigned char status, const char *path)
6448 {
6449 while (path[0] == '/')
6450 path++;
6451 printf("%c %s\n", status, path);
6452 return NULL;
6453 }
6454
6455 static const struct got_error *
6456 cmd_add(int argc, char *argv[])
6457 {
6458 const struct got_error *error = NULL;
6459 struct got_repository *repo = NULL;
6460 struct got_worktree *worktree = NULL;
6461 char *cwd = NULL;
6462 struct got_pathlist_head paths;
6463 struct got_pathlist_entry *pe;
6464 int ch, can_recurse = 0, no_ignores = 0;
6465 int *pack_fds = NULL;
6466
6467 TAILQ_INIT(&paths);
6468
6469 #ifndef PROFILE
6470 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6471 NULL) == -1)
6472 err(1, "pledge");
6473 #endif
6474
6475 while ((ch = getopt(argc, argv, "IR")) != -1) {
6476 switch (ch) {
6477 case 'I':
6478 no_ignores = 1;
6479 break;
6480 case 'R':
6481 can_recurse = 1;
6482 break;
6483 default:
6484 usage_add();
6485 /* NOTREACHED */
6486 }
6487 }
6488
6489 argc -= optind;
6490 argv += optind;
6491
6492 if (argc < 1)
6493 usage_add();
6494
6495 cwd = getcwd(NULL, 0);
6496 if (cwd == NULL) {
6497 error = got_error_from_errno("getcwd");
6498 goto done;
6499 }
6500
6501 error = got_repo_pack_fds_open(&pack_fds);
6502 if (error != NULL)
6503 goto done;
6504
6505 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6506 if (error) {
6507 if (error->code == GOT_ERR_NOT_WORKTREE)
6508 error = wrap_not_worktree_error(error, "add", cwd);
6509 goto done;
6510 }
6511
6512 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6513 NULL, pack_fds);
6514 if (error != NULL)
6515 goto done;
6516
6517 error = apply_unveil(got_repo_get_path(repo), 1,
6518 got_worktree_get_root_path(worktree));
6519 if (error)
6520 goto done;
6521
6522 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6523 if (error)
6524 goto done;
6525
6526 if (!can_recurse) {
6527 char *ondisk_path;
6528 struct stat sb;
6529 TAILQ_FOREACH(pe, &paths, entry) {
6530 if (asprintf(&ondisk_path, "%s/%s",
6531 got_worktree_get_root_path(worktree),
6532 pe->path) == -1) {
6533 error = got_error_from_errno("asprintf");
6534 goto done;
6535 }
6536 if (lstat(ondisk_path, &sb) == -1) {
6537 if (errno == ENOENT) {
6538 free(ondisk_path);
6539 continue;
6540 }
6541 error = got_error_from_errno2("lstat",
6542 ondisk_path);
6543 free(ondisk_path);
6544 goto done;
6545 }
6546 free(ondisk_path);
6547 if (S_ISDIR(sb.st_mode)) {
6548 error = got_error_msg(GOT_ERR_BAD_PATH,
6549 "adding directories requires -R option");
6550 goto done;
6551 }
6552 }
6553 }
6554
6555 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6556 NULL, repo, no_ignores);
6557 done:
6558 if (repo) {
6559 const struct got_error *close_err = got_repo_close(repo);
6560 if (error == NULL)
6561 error = close_err;
6562 }
6563 if (worktree)
6564 got_worktree_close(worktree);
6565 if (pack_fds) {
6566 const struct got_error *pack_err =
6567 got_repo_pack_fds_close(pack_fds);
6568 if (error == NULL)
6569 error = pack_err;
6570 }
6571 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6572 free(cwd);
6573 return error;
6574 }
6575
6576 __dead static void
6577 usage_remove(void)
6578 {
6579 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
6580 getprogname());
6581 exit(1);
6582 }
6583
6584 static const struct got_error *
6585 print_remove_status(void *arg, unsigned char status,
6586 unsigned char staged_status, const char *path)
6587 {
6588 while (path[0] == '/')
6589 path++;
6590 if (status == GOT_STATUS_NONEXISTENT)
6591 return NULL;
6592 if (status == staged_status && (status == GOT_STATUS_DELETE))
6593 status = GOT_STATUS_NO_CHANGE;
6594 printf("%c%c %s\n", status, staged_status, path);
6595 return NULL;
6596 }
6597
6598 static const struct got_error *
6599 cmd_remove(int argc, char *argv[])
6600 {
6601 const struct got_error *error = NULL;
6602 struct got_worktree *worktree = NULL;
6603 struct got_repository *repo = NULL;
6604 const char *status_codes = NULL;
6605 char *cwd = NULL;
6606 struct got_pathlist_head paths;
6607 struct got_pathlist_entry *pe;
6608 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6609 int ignore_missing_paths = 0;
6610 int *pack_fds = NULL;
6611
6612 TAILQ_INIT(&paths);
6613
6614 #ifndef PROFILE
6615 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6616 NULL) == -1)
6617 err(1, "pledge");
6618 #endif
6619
6620 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6621 switch (ch) {
6622 case 'f':
6623 delete_local_mods = 1;
6624 ignore_missing_paths = 1;
6625 break;
6626 case 'k':
6627 keep_on_disk = 1;
6628 break;
6629 case 'R':
6630 can_recurse = 1;
6631 break;
6632 case 's':
6633 for (i = 0; optarg[i] != '\0'; i++) {
6634 switch (optarg[i]) {
6635 case GOT_STATUS_MODIFY:
6636 delete_local_mods = 1;
6637 break;
6638 case GOT_STATUS_MISSING:
6639 ignore_missing_paths = 1;
6640 break;
6641 default:
6642 errx(1, "invalid status code '%c'",
6643 optarg[i]);
6644 }
6645 }
6646 status_codes = optarg;
6647 break;
6648 default:
6649 usage_remove();
6650 /* NOTREACHED */
6651 }
6652 }
6653
6654 argc -= optind;
6655 argv += optind;
6656
6657 if (argc < 1)
6658 usage_remove();
6659
6660 cwd = getcwd(NULL, 0);
6661 if (cwd == NULL) {
6662 error = got_error_from_errno("getcwd");
6663 goto done;
6664 }
6665
6666 error = got_repo_pack_fds_open(&pack_fds);
6667 if (error != NULL)
6668 goto done;
6669
6670 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6671 if (error) {
6672 if (error->code == GOT_ERR_NOT_WORKTREE)
6673 error = wrap_not_worktree_error(error, "remove", cwd);
6674 goto done;
6675 }
6676
6677 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6678 NULL, pack_fds);
6679 if (error)
6680 goto done;
6681
6682 error = apply_unveil(got_repo_get_path(repo), 1,
6683 got_worktree_get_root_path(worktree));
6684 if (error)
6685 goto done;
6686
6687 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6688 if (error)
6689 goto done;
6690
6691 if (!can_recurse) {
6692 char *ondisk_path;
6693 struct stat sb;
6694 TAILQ_FOREACH(pe, &paths, entry) {
6695 if (asprintf(&ondisk_path, "%s/%s",
6696 got_worktree_get_root_path(worktree),
6697 pe->path) == -1) {
6698 error = got_error_from_errno("asprintf");
6699 goto done;
6700 }
6701 if (lstat(ondisk_path, &sb) == -1) {
6702 if (errno == ENOENT) {
6703 free(ondisk_path);
6704 continue;
6705 }
6706 error = got_error_from_errno2("lstat",
6707 ondisk_path);
6708 free(ondisk_path);
6709 goto done;
6710 }
6711 free(ondisk_path);
6712 if (S_ISDIR(sb.st_mode)) {
6713 error = got_error_msg(GOT_ERR_BAD_PATH,
6714 "removing directories requires -R option");
6715 goto done;
6716 }
6717 }
6718 }
6719
6720 error = got_worktree_schedule_delete(worktree, &paths,
6721 delete_local_mods, status_codes, print_remove_status, NULL,
6722 repo, keep_on_disk, ignore_missing_paths);
6723 done:
6724 if (repo) {
6725 const struct got_error *close_err = got_repo_close(repo);
6726 if (error == NULL)
6727 error = close_err;
6728 }
6729 if (worktree)
6730 got_worktree_close(worktree);
6731 if (pack_fds) {
6732 const struct got_error *pack_err =
6733 got_repo_pack_fds_close(pack_fds);
6734 if (error == NULL)
6735 error = pack_err;
6736 }
6737 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6738 free(cwd);
6739 return error;
6740 }
6741
6742 __dead static void
6743 usage_patch(void)
6744 {
6745 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
6746 "[patchfile]\n", getprogname());
6747 exit(1);
6748 }
6749
6750 static const struct got_error *
6751 patch_from_stdin(int *patchfd)
6752 {
6753 const struct got_error *err = NULL;
6754 ssize_t r;
6755 char buf[BUFSIZ];
6756 sig_t sighup, sigint, sigquit;
6757
6758 *patchfd = got_opentempfd();
6759 if (*patchfd == -1)
6760 return got_error_from_errno("got_opentempfd");
6761
6762 sighup = signal(SIGHUP, SIG_DFL);
6763 sigint = signal(SIGINT, SIG_DFL);
6764 sigquit = signal(SIGQUIT, SIG_DFL);
6765
6766 for (;;) {
6767 r = read(0, buf, sizeof(buf));
6768 if (r == -1) {
6769 err = got_error_from_errno("read");
6770 break;
6771 }
6772 if (r == 0)
6773 break;
6774 if (write(*patchfd, buf, r) == -1) {
6775 err = got_error_from_errno("write");
6776 break;
6777 }
6778 }
6779
6780 signal(SIGHUP, sighup);
6781 signal(SIGINT, sigint);
6782 signal(SIGQUIT, sigquit);
6783
6784 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
6785 err = got_error_from_errno("lseek");
6786
6787 if (err != NULL) {
6788 close(*patchfd);
6789 *patchfd = -1;
6790 }
6791
6792 return err;
6793 }
6794
6795 struct got_patch_progress_arg {
6796 int did_something;
6797 int conflicts;
6798 int rejects;
6799 };
6800
6801 static const struct got_error *
6802 patch_progress(void *arg, const char *old, const char *new,
6803 unsigned char status, const struct got_error *error, int old_from,
6804 int old_lines, int new_from, int new_lines, int offset,
6805 int ws_mangled, const struct got_error *hunk_err)
6806 {
6807 const char *path = new == NULL ? old : new;
6808 struct got_patch_progress_arg *a = arg;
6809
6810 while (*path == '/')
6811 path++;
6812
6813 if (status != GOT_STATUS_NO_CHANGE &&
6814 status != 0 /* per-hunk progress */) {
6815 printf("%c %s\n", status, path);
6816 a->did_something = 1;
6817 }
6818
6819 if (hunk_err == NULL) {
6820 if (status == GOT_STATUS_CANNOT_UPDATE)
6821 a->rejects++;
6822 else if (status == GOT_STATUS_CONFLICT)
6823 a->conflicts++;
6824 }
6825
6826 if (error != NULL)
6827 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
6828
6829 if (offset != 0 || hunk_err != NULL || ws_mangled) {
6830 printf("@@ -%d,%d +%d,%d @@ ", old_from,
6831 old_lines, new_from, new_lines);
6832 if (hunk_err != NULL)
6833 printf("%s\n", hunk_err->msg);
6834 else if (offset != 0)
6835 printf("applied with offset %d\n", offset);
6836 else
6837 printf("hunk contains mangled whitespace\n");
6838 }
6839
6840 return NULL;
6841 }
6842
6843 static void
6844 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
6845 {
6846 if (!ppa->did_something)
6847 return;
6848
6849 if (ppa->conflicts > 0)
6850 printf("Files with merge conflicts: %d\n", ppa->conflicts);
6851
6852 if (ppa->rejects > 0) {
6853 printf("Files where patch failed to apply: %d\n",
6854 ppa->rejects);
6855 }
6856 }
6857
6858 static const struct got_error *
6859 cmd_patch(int argc, char *argv[])
6860 {
6861 const struct got_error *error = NULL, *close_error = NULL;
6862 struct got_worktree *worktree = NULL;
6863 struct got_repository *repo = NULL;
6864 struct got_reflist_head refs;
6865 struct got_object_id *commit_id = NULL;
6866 const char *commit_id_str = NULL;
6867 struct stat sb;
6868 const char *errstr;
6869 char *cwd = NULL;
6870 int ch, nop = 0, strip = -1, reverse = 0;
6871 int patchfd;
6872 int *pack_fds = NULL;
6873 struct got_patch_progress_arg ppa;
6874
6875 TAILQ_INIT(&refs);
6876
6877 #ifndef PROFILE
6878 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
6879 "unveil", NULL) == -1)
6880 err(1, "pledge");
6881 #endif
6882
6883 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
6884 switch (ch) {
6885 case 'c':
6886 commit_id_str = optarg;
6887 break;
6888 case 'n':
6889 nop = 1;
6890 break;
6891 case 'p':
6892 strip = strtonum(optarg, 0, INT_MAX, &errstr);
6893 if (errstr != NULL)
6894 errx(1, "pathname strip count is %s: %s",
6895 errstr, optarg);
6896 break;
6897 case 'R':
6898 reverse = 1;
6899 break;
6900 default:
6901 usage_patch();
6902 /* NOTREACHED */
6903 }
6904 }
6905
6906 argc -= optind;
6907 argv += optind;
6908
6909 if (argc == 0) {
6910 error = patch_from_stdin(&patchfd);
6911 if (error)
6912 return error;
6913 } else if (argc == 1) {
6914 patchfd = open(argv[0], O_RDONLY);
6915 if (patchfd == -1) {
6916 error = got_error_from_errno2("open", argv[0]);
6917 return error;
6918 }
6919 if (fstat(patchfd, &sb) == -1) {
6920 error = got_error_from_errno2("fstat", argv[0]);
6921 goto done;
6922 }
6923 if (!S_ISREG(sb.st_mode)) {
6924 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
6925 goto done;
6926 }
6927 } else
6928 usage_patch();
6929
6930 if ((cwd = getcwd(NULL, 0)) == NULL) {
6931 error = got_error_from_errno("getcwd");
6932 goto done;
6933 }
6934
6935 error = got_repo_pack_fds_open(&pack_fds);
6936 if (error != NULL)
6937 goto done;
6938
6939 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6940 if (error != NULL)
6941 goto done;
6942
6943 const char *repo_path = got_worktree_get_repo_path(worktree);
6944 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6945 if (error != NULL)
6946 goto done;
6947
6948 error = apply_unveil(got_repo_get_path(repo), 0,
6949 got_worktree_get_root_path(worktree));
6950 if (error != NULL)
6951 goto done;
6952
6953 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6954 if (error)
6955 goto done;
6956
6957 if (commit_id_str != NULL) {
6958 error = got_repo_match_object_id(&commit_id, NULL,
6959 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6960 if (error)
6961 goto done;
6962 }
6963
6964 memset(&ppa, 0, sizeof(ppa));
6965 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
6966 commit_id, patch_progress, &ppa, check_cancelled, NULL);
6967 print_patch_progress_stats(&ppa);
6968 done:
6969 got_ref_list_free(&refs);
6970 free(commit_id);
6971 if (repo) {
6972 close_error = got_repo_close(repo);
6973 if (error == NULL)
6974 error = close_error;
6975 }
6976 if (worktree != NULL) {
6977 close_error = got_worktree_close(worktree);
6978 if (error == NULL)
6979 error = close_error;
6980 }
6981 if (pack_fds) {
6982 const struct got_error *pack_err =
6983 got_repo_pack_fds_close(pack_fds);
6984 if (error == NULL)
6985 error = pack_err;
6986 }
6987 free(cwd);
6988 return error;
6989 }
6990
6991 __dead static void
6992 usage_revert(void)
6993 {
6994 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
6995 getprogname());
6996 exit(1);
6997 }
6998
6999 static const struct got_error *
7000 revert_progress(void *arg, unsigned char status, const char *path)
7001 {
7002 if (status == GOT_STATUS_UNVERSIONED)
7003 return NULL;
7004
7005 while (path[0] == '/')
7006 path++;
7007 printf("%c %s\n", status, path);
7008 return NULL;
7009 }
7010
7011 struct choose_patch_arg {
7012 FILE *patch_script_file;
7013 const char *action;
7014 };
7015
7016 static const struct got_error *
7017 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7018 int nchanges, const char *action)
7019 {
7020 const struct got_error *err;
7021 char *line = NULL;
7022 size_t linesize = 0;
7023 ssize_t linelen;
7024
7025 switch (status) {
7026 case GOT_STATUS_ADD:
7027 printf("A %s\n%s this addition? [y/n] ", path, action);
7028 break;
7029 case GOT_STATUS_DELETE:
7030 printf("D %s\n%s this deletion? [y/n] ", path, action);
7031 break;
7032 case GOT_STATUS_MODIFY:
7033 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7034 return got_error_from_errno("fseek");
7035 printf(GOT_COMMIT_SEP_STR);
7036 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7037 printf("%s", line);
7038 if (linelen == -1 && ferror(patch_file)) {
7039 err = got_error_from_errno("getline");
7040 free(line);
7041 return err;
7042 }
7043 free(line);
7044 printf(GOT_COMMIT_SEP_STR);
7045 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7046 path, n, nchanges, action);
7047 break;
7048 default:
7049 return got_error_path(path, GOT_ERR_FILE_STATUS);
7050 }
7051
7052 fflush(stdout);
7053 return NULL;
7054 }
7055
7056 static const struct got_error *
7057 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7058 FILE *patch_file, int n, int nchanges)
7059 {
7060 const struct got_error *err = NULL;
7061 char *line = NULL;
7062 size_t linesize = 0;
7063 ssize_t linelen;
7064 int resp = ' ';
7065 struct choose_patch_arg *a = arg;
7066
7067 *choice = GOT_PATCH_CHOICE_NONE;
7068
7069 if (a->patch_script_file) {
7070 char *nl;
7071 err = show_change(status, path, patch_file, n, nchanges,
7072 a->action);
7073 if (err)
7074 return err;
7075 linelen = getline(&line, &linesize, a->patch_script_file);
7076 if (linelen == -1) {
7077 if (ferror(a->patch_script_file))
7078 return got_error_from_errno("getline");
7079 return NULL;
7080 }
7081 nl = strchr(line, '\n');
7082 if (nl)
7083 *nl = '\0';
7084 if (strcmp(line, "y") == 0) {
7085 *choice = GOT_PATCH_CHOICE_YES;
7086 printf("y\n");
7087 } else if (strcmp(line, "n") == 0) {
7088 *choice = GOT_PATCH_CHOICE_NO;
7089 printf("n\n");
7090 } else if (strcmp(line, "q") == 0 &&
7091 status == GOT_STATUS_MODIFY) {
7092 *choice = GOT_PATCH_CHOICE_QUIT;
7093 printf("q\n");
7094 } else
7095 printf("invalid response '%s'\n", line);
7096 free(line);
7097 return NULL;
7098 }
7099
7100 while (resp != 'y' && resp != 'n' && resp != 'q') {
7101 err = show_change(status, path, patch_file, n, nchanges,
7102 a->action);
7103 if (err)
7104 return err;
7105 resp = getchar();
7106 if (resp == '\n')
7107 resp = getchar();
7108 if (status == GOT_STATUS_MODIFY) {
7109 if (resp != 'y' && resp != 'n' && resp != 'q') {
7110 printf("invalid response '%c'\n", resp);
7111 resp = ' ';
7112 }
7113 } else if (resp != 'y' && resp != 'n') {
7114 printf("invalid response '%c'\n", resp);
7115 resp = ' ';
7116 }
7117 }
7118
7119 if (resp == 'y')
7120 *choice = GOT_PATCH_CHOICE_YES;
7121 else if (resp == 'n')
7122 *choice = GOT_PATCH_CHOICE_NO;
7123 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7124 *choice = GOT_PATCH_CHOICE_QUIT;
7125
7126 return NULL;
7127 }
7128
7129 struct wt_commitable_path_arg {
7130 struct got_pathlist_head *commit_paths;
7131 int *has_changes;
7132 };
7133
7134 /*
7135 * Shortcut work tree status callback to determine if the set of paths scanned
7136 * has at least one versioned path that is being modified and, if not NULL, is
7137 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
7138 * soon as a path is passed with a status that satisfies this criteria.
7139 */
7140 static const struct got_error *
7141 worktree_has_commitable_path(void *arg, unsigned char status,
7142 unsigned char staged_status, const char *path,
7143 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7144 struct got_object_id *commit_id, int dirfd, const char *de_name)
7145 {
7146 struct wt_commitable_path_arg *a = arg;
7147
7148 if (status == staged_status && (status == GOT_STATUS_DELETE))
7149 status = GOT_STATUS_NO_CHANGE;
7150
7151 if (!(status == GOT_STATUS_NO_CHANGE ||
7152 status == GOT_STATUS_UNVERSIONED) ||
7153 staged_status != GOT_STATUS_NO_CHANGE) {
7154 if (a->commit_paths != NULL) {
7155 struct got_pathlist_entry *pe;
7156
7157 TAILQ_FOREACH(pe, a->commit_paths, entry) {
7158 if (strncmp(path, pe->path,
7159 pe->path_len) == 0) {
7160 *a->has_changes = 1;
7161 break;
7162 }
7163 }
7164 } else
7165 *a->has_changes = 1;
7166
7167 if (*a->has_changes)
7168 return got_error(GOT_ERR_FILE_MODIFIED);
7169 }
7170
7171 return NULL;
7172 }
7173
7174 /*
7175 * Check that the changeset of the commit identified by id is
7176 * comprised of at least one modified path that is being committed.
7177 */
7178 static const struct got_error *
7179 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
7180 struct got_object_id *id, struct got_worktree *worktree,
7181 struct got_repository *repo)
7182 {
7183 const struct got_error *err;
7184 struct got_pathlist_head paths;
7185 struct got_commit_object *commit = NULL, *pcommit = NULL;
7186 struct got_tree_object *tree = NULL, *ptree = NULL;
7187 struct got_object_qid *pid;
7188
7189 TAILQ_INIT(&paths);
7190
7191 err = got_object_open_as_commit(&commit, repo, id);
7192 if (err)
7193 goto done;
7194
7195 err = got_object_open_as_tree(&tree, repo,
7196 got_object_commit_get_tree_id(commit));
7197 if (err)
7198 goto done;
7199
7200 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7201 if (pid != NULL) {
7202 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
7203 if (err)
7204 goto done;
7205
7206 err = got_object_open_as_tree(&ptree, repo,
7207 got_object_commit_get_tree_id(pcommit));
7208 if (err)
7209 goto done;
7210 }
7211
7212 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
7213 got_diff_tree_collect_changed_paths, &paths, 0);
7214 if (err)
7215 goto done;
7216
7217 err = got_worktree_status(worktree, &paths, repo, 0,
7218 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
7219 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
7220 /*
7221 * At least one changed path in the referenced commit is
7222 * modified in the work tree, that's all we need to know!
7223 */
7224 err = NULL;
7225 }
7226
7227 done:
7228 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
7229 if (commit)
7230 got_object_commit_close(commit);
7231 if (pcommit)
7232 got_object_commit_close(pcommit);
7233 if (tree)
7234 got_object_tree_close(tree);
7235 if (ptree)
7236 got_object_tree_close(ptree);
7237 return err;
7238 }
7239
7240 /*
7241 * Remove any "logmsg" reference comprised entirely of paths that have
7242 * been reverted in this work tree. If any path in the logmsg ref changeset
7243 * remains in a changed state in the worktree, do not remove the reference.
7244 */
7245 static const struct got_error *
7246 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
7247 {
7248 const struct got_error *err;
7249 struct got_reflist_head refs;
7250 struct got_reflist_entry *re;
7251 struct got_commit_object *commit = NULL;
7252 struct got_object_id *commit_id = NULL;
7253 struct wt_commitable_path_arg wcpa;
7254 char *uuidstr = NULL;
7255
7256 TAILQ_INIT(&refs);
7257
7258 err = got_worktree_get_uuid(&uuidstr, worktree);
7259 if (err)
7260 goto done;
7261
7262 err = got_ref_list(&refs, repo, "refs/got/worktree",
7263 got_ref_cmp_by_name, repo);
7264 if (err)
7265 goto done;
7266
7267 TAILQ_FOREACH(re, &refs, entry) {
7268 const char *refname;
7269 int has_changes = 0;
7270
7271 refname = got_ref_get_name(re->ref);
7272
7273 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7274 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
7275 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7276 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7277 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
7278 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7279 else
7280 continue;
7281
7282 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7283 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7284 else
7285 continue;
7286
7287 err = got_repo_match_object_id(&commit_id, NULL, refname,
7288 GOT_OBJ_TYPE_COMMIT, NULL, repo);
7289 if (err)
7290 goto done;
7291
7292 err = got_object_open_as_commit(&commit, repo, commit_id);
7293 if (err)
7294 goto done;
7295
7296 wcpa.commit_paths = NULL;
7297 wcpa.has_changes = &has_changes;
7298
7299 err = commit_path_changed_in_worktree(&wcpa, commit_id,
7300 worktree, repo);
7301 if (err)
7302 goto done;
7303
7304 if (!has_changes) {
7305 err = got_ref_delete(re->ref, repo);
7306 if (err)
7307 goto done;
7308 }
7309
7310 got_object_commit_close(commit);
7311 commit = NULL;
7312 free(commit_id);
7313 commit_id = NULL;
7314 }
7315
7316 done:
7317 free(uuidstr);
7318 free(commit_id);
7319 got_ref_list_free(&refs);
7320 if (commit)
7321 got_object_commit_close(commit);
7322 return err;
7323 }
7324
7325 static const struct got_error *
7326 cmd_revert(int argc, char *argv[])
7327 {
7328 const struct got_error *error = NULL;
7329 struct got_worktree *worktree = NULL;
7330 struct got_repository *repo = NULL;
7331 char *cwd = NULL, *path = NULL;
7332 struct got_pathlist_head paths;
7333 struct got_pathlist_entry *pe;
7334 int ch, can_recurse = 0, pflag = 0;
7335 FILE *patch_script_file = NULL;
7336 const char *patch_script_path = NULL;
7337 struct choose_patch_arg cpa;
7338 int *pack_fds = NULL;
7339
7340 TAILQ_INIT(&paths);
7341
7342 #ifndef PROFILE
7343 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7344 "unveil", NULL) == -1)
7345 err(1, "pledge");
7346 #endif
7347
7348 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
7349 switch (ch) {
7350 case 'F':
7351 patch_script_path = optarg;
7352 break;
7353 case 'p':
7354 pflag = 1;
7355 break;
7356 case 'R':
7357 can_recurse = 1;
7358 break;
7359 default:
7360 usage_revert();
7361 /* NOTREACHED */
7362 }
7363 }
7364
7365 argc -= optind;
7366 argv += optind;
7367
7368 if (argc < 1)
7369 usage_revert();
7370 if (patch_script_path && !pflag)
7371 errx(1, "-F option can only be used together with -p option");
7372
7373 cwd = getcwd(NULL, 0);
7374 if (cwd == NULL) {
7375 error = got_error_from_errno("getcwd");
7376 goto done;
7377 }
7378
7379 error = got_repo_pack_fds_open(&pack_fds);
7380 if (error != NULL)
7381 goto done;
7382
7383 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
7384 if (error) {
7385 if (error->code == GOT_ERR_NOT_WORKTREE)
7386 error = wrap_not_worktree_error(error, "revert", cwd);
7387 goto done;
7388 }
7389
7390 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7391 NULL, pack_fds);
7392 if (error != NULL)
7393 goto done;
7394
7395 if (patch_script_path) {
7396 patch_script_file = fopen(patch_script_path, "re");
7397 if (patch_script_file == NULL) {
7398 error = got_error_from_errno2("fopen",
7399 patch_script_path);
7400 goto done;
7401 }
7402 }
7403
7404 /*
7405 * XXX "c" perm needed on repo dir to delete merge references.
7406 */
7407 error = apply_unveil(got_repo_get_path(repo), 0,
7408 got_worktree_get_root_path(worktree));
7409 if (error)
7410 goto done;
7411
7412 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7413 if (error)
7414 goto done;
7415
7416 if (!can_recurse) {
7417 char *ondisk_path;
7418 struct stat sb;
7419 TAILQ_FOREACH(pe, &paths, entry) {
7420 if (asprintf(&ondisk_path, "%s/%s",
7421 got_worktree_get_root_path(worktree),
7422 pe->path) == -1) {
7423 error = got_error_from_errno("asprintf");
7424 goto done;
7425 }
7426 if (lstat(ondisk_path, &sb) == -1) {
7427 if (errno == ENOENT) {
7428 free(ondisk_path);
7429 continue;
7430 }
7431 error = got_error_from_errno2("lstat",
7432 ondisk_path);
7433 free(ondisk_path);
7434 goto done;
7435 }
7436 free(ondisk_path);
7437 if (S_ISDIR(sb.st_mode)) {
7438 error = got_error_msg(GOT_ERR_BAD_PATH,
7439 "reverting directories requires -R option");
7440 goto done;
7441 }
7442 }
7443 }
7444
7445 cpa.patch_script_file = patch_script_file;
7446 cpa.action = "revert";
7447 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7448 pflag ? choose_patch : NULL, &cpa, repo);
7449
7450 error = rm_logmsg_ref(worktree, repo);
7451 done:
7452 if (patch_script_file && fclose(patch_script_file) == EOF &&
7453 error == NULL)
7454 error = got_error_from_errno2("fclose", patch_script_path);
7455 if (repo) {
7456 const struct got_error *close_err = got_repo_close(repo);
7457 if (error == NULL)
7458 error = close_err;
7459 }
7460 if (worktree)
7461 got_worktree_close(worktree);
7462 if (pack_fds) {
7463 const struct got_error *pack_err =
7464 got_repo_pack_fds_close(pack_fds);
7465 if (error == NULL)
7466 error = pack_err;
7467 }
7468 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7469 free(path);
7470 free(cwd);
7471 return error;
7472 }
7473
7474 __dead static void
7475 usage_commit(void)
7476 {
7477 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
7478 "[-m message] [path ...]\n", getprogname());
7479 exit(1);
7480 }
7481
7482 struct collect_commit_logmsg_arg {
7483 const char *cmdline_log;
7484 const char *prepared_log;
7485 const char *merged_log;
7486 int non_interactive;
7487 const char *editor;
7488 const char *worktree_path;
7489 const char *repo_path;
7490 const char *dial_proto;
7491 char *logmsg_path;
7492 };
7493
7494 static const struct got_error *
7495 read_prepared_logmsg(char **logmsg, const char *path)
7496 {
7497 const struct got_error *err = NULL;
7498 FILE *f = NULL;
7499 struct stat sb;
7500 size_t r;
7501
7502 *logmsg = NULL;
7503 memset(&sb, 0, sizeof(sb));
7504
7505 f = fopen(path, "re");
7506 if (f == NULL)
7507 return got_error_from_errno2("fopen", path);
7508
7509 if (fstat(fileno(f), &sb) == -1) {
7510 err = got_error_from_errno2("fstat", path);
7511 goto done;
7512 }
7513 if (sb.st_size == 0) {
7514 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7515 goto done;
7516 }
7517
7518 *logmsg = malloc(sb.st_size + 1);
7519 if (*logmsg == NULL) {
7520 err = got_error_from_errno("malloc");
7521 goto done;
7522 }
7523
7524 r = fread(*logmsg, 1, sb.st_size, f);
7525 if (r != sb.st_size) {
7526 if (ferror(f))
7527 err = got_error_from_errno2("fread", path);
7528 else
7529 err = got_error(GOT_ERR_IO);
7530 goto done;
7531 }
7532 (*logmsg)[sb.st_size] = '\0';
7533 done:
7534 if (fclose(f) == EOF && err == NULL)
7535 err = got_error_from_errno2("fclose", path);
7536 if (err) {
7537 free(*logmsg);
7538 *logmsg = NULL;
7539 }
7540 return err;
7541 }
7542
7543 static const struct got_error *
7544 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
7545 const char *diff_path, char **logmsg, void *arg)
7546 {
7547 char *initial_content = NULL;
7548 struct got_pathlist_entry *pe;
7549 const struct got_error *err = NULL;
7550 char *template = NULL;
7551 char *prepared_msg = NULL, *merged_msg = NULL;
7552 struct collect_commit_logmsg_arg *a = arg;
7553 int initial_content_len;
7554 int fd = -1;
7555 size_t len;
7556
7557 /* if a message was specified on the command line, just use it */
7558 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
7559 len = strlen(a->cmdline_log) + 1;
7560 *logmsg = malloc(len + 1);
7561 if (*logmsg == NULL)
7562 return got_error_from_errno("malloc");
7563 strlcpy(*logmsg, a->cmdline_log, len);
7564 return NULL;
7565 } else if (a->prepared_log != NULL && a->non_interactive)
7566 return read_prepared_logmsg(logmsg, a->prepared_log);
7567
7568 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7569 return got_error_from_errno("asprintf");
7570
7571 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
7572 if (err)
7573 goto done;
7574
7575 if (a->prepared_log) {
7576 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
7577 if (err)
7578 goto done;
7579 } else if (a->merged_log) {
7580 err = read_prepared_logmsg(&merged_msg, a->merged_log);
7581 if (err)
7582 goto done;
7583 }
7584
7585 initial_content_len = asprintf(&initial_content,
7586 "%s%s\n# changes to be committed:\n",
7587 prepared_msg ? prepared_msg : "",
7588 merged_msg ? merged_msg : "");
7589 if (initial_content_len == -1) {
7590 err = got_error_from_errno("asprintf");
7591 goto done;
7592 }
7593
7594 if (write(fd, initial_content, initial_content_len) == -1) {
7595 err = got_error_from_errno2("write", a->logmsg_path);
7596 goto done;
7597 }
7598
7599 TAILQ_FOREACH(pe, commitable_paths, entry) {
7600 struct got_commitable *ct = pe->data;
7601 dprintf(fd, "# %c %s\n",
7602 got_commitable_get_status(ct),
7603 got_commitable_get_path(ct));
7604 }
7605
7606 if (diff_path) {
7607 dprintf(fd, "# detailed changes can be viewed in %s\n",
7608 diff_path);
7609 }
7610
7611 if (close(fd) == -1) {
7612 err = got_error_from_errno2("close", a->logmsg_path);
7613 goto done;
7614 }
7615 fd = -1;
7616
7617 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7618 initial_content_len, a->prepared_log ? 0 : 1);
7619 done:
7620 free(initial_content);
7621 free(template);
7622 free(prepared_msg);
7623 free(merged_msg);
7624
7625 if (fd != -1 && close(fd) == -1 && err == NULL)
7626 err = got_error_from_errno2("close", a->logmsg_path);
7627
7628 /* Editor is done; we can now apply unveil(2) */
7629 if (err == NULL)
7630 err = got_dial_apply_unveil(a->dial_proto);
7631 if (err == NULL)
7632 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7633 if (err) {
7634 free(*logmsg);
7635 *logmsg = NULL;
7636 }
7637 return err;
7638 }
7639
7640 static const struct got_error *
7641 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
7642 const char *type, int has_content)
7643 {
7644 const struct got_error *err = NULL;
7645 char *logmsg = NULL;
7646
7647 err = got_object_commit_get_logmsg(&logmsg, commit);
7648 if (err)
7649 return err;
7650
7651 if (fprintf(f, "%s# log message of %s commit %s:%s",
7652 has_content ? "\n" : "", type, idstr, logmsg) < 0)
7653 err = got_ferror(f, GOT_ERR_IO);
7654
7655 free(logmsg);
7656 return err;
7657 }
7658
7659 /*
7660 * Lookup "logmsg" references of backed-out and cherrypicked commits
7661 * belonging to the current work tree. If found, and the worktree has
7662 * at least one modified file that was changed in the referenced commit,
7663 * add its log message to a new temporary file at *logmsg_path.
7664 * Add all refs found to matched_refs to be scheduled for removal on
7665 * successful commit.
7666 */
7667 static const struct got_error *
7668 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
7669 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
7670 struct got_repository *repo)
7671 {
7672 const struct got_error *err;
7673 struct got_commit_object *commit = NULL;
7674 struct got_object_id *id = NULL;
7675 struct got_reflist_head refs;
7676 struct got_reflist_entry *re, *re_match;
7677 FILE *f = NULL;
7678 char *uuidstr = NULL;
7679 int added_logmsg = 0;
7680
7681 TAILQ_INIT(&refs);
7682
7683 *logmsg_path = NULL;
7684
7685 err = got_worktree_get_uuid(&uuidstr, worktree);
7686 if (err)
7687 goto done;
7688
7689 err = got_ref_list(&refs, repo, "refs/got/worktree",
7690 got_ref_cmp_by_name, repo);
7691 if (err)
7692 goto done;
7693
7694 TAILQ_FOREACH(re, &refs, entry) {
7695 const char *refname, *type;
7696 struct wt_commitable_path_arg wcpa;
7697 int add_logmsg = 0;
7698
7699 refname = got_ref_get_name(re->ref);
7700
7701 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7702 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
7703 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7704 type = "cherrypicked";
7705 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7706 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
7707 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7708 type = "backed-out";
7709 } else
7710 continue;
7711
7712 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7713 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7714 else
7715 continue;
7716
7717 err = got_repo_match_object_id(&id, NULL, refname,
7718 GOT_OBJ_TYPE_COMMIT, NULL, repo);
7719 if (err)
7720 goto done;
7721
7722 err = got_object_open_as_commit(&commit, repo, id);
7723 if (err)
7724 goto done;
7725
7726 wcpa.commit_paths = paths;
7727 wcpa.has_changes = &add_logmsg;
7728
7729 err = commit_path_changed_in_worktree(&wcpa, id,
7730 worktree, repo);
7731 if (err)
7732 goto done;
7733
7734 if (add_logmsg) {
7735 if (f == NULL) {
7736 err = got_opentemp_named(logmsg_path, &f,
7737 "got-commit-logmsg", "");
7738 if (err)
7739 goto done;
7740 }
7741 err = cat_logmsg(f, commit, refname, type,
7742 added_logmsg);
7743 if (err)
7744 goto done;
7745 if (!added_logmsg)
7746 ++added_logmsg;
7747
7748 err = got_reflist_entry_dup(&re_match, re);
7749 if (err)
7750 goto done;
7751 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
7752 }
7753
7754 got_object_commit_close(commit);
7755 commit = NULL;
7756 free(id);
7757 id = NULL;
7758 }
7759
7760 done:
7761 free(id);
7762 free(uuidstr);
7763 got_ref_list_free(&refs);
7764 if (commit)
7765 got_object_commit_close(commit);
7766 if (f && fclose(f) == EOF && err == NULL)
7767 err = got_error_from_errno("fclose");
7768 if (!added_logmsg) {
7769 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
7770 err = got_error_from_errno2("unlink", *logmsg_path);
7771 *logmsg_path = NULL;
7772 }
7773 return err;
7774 }
7775
7776 static const struct got_error *
7777 cmd_commit(int argc, char *argv[])
7778 {
7779 const struct got_error *error = NULL;
7780 struct got_worktree *worktree = NULL;
7781 struct got_repository *repo = NULL;
7782 char *cwd = NULL, *id_str = NULL;
7783 struct got_object_id *id = NULL;
7784 const char *logmsg = NULL;
7785 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
7786 struct collect_commit_logmsg_arg cl_arg;
7787 const char *author = NULL;
7788 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
7789 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7790 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7791 int show_diff = 1, commit_conflicts = 0;
7792 struct got_pathlist_head paths;
7793 struct got_reflist_head refs;
7794 struct got_reflist_entry *re;
7795 int *pack_fds = NULL;
7796 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7797 const struct got_remote_repo *remotes, *remote = NULL;
7798 int nremotes;
7799 char *proto = NULL, *host = NULL, *port = NULL;
7800 char *repo_name = NULL, *server_path = NULL;
7801 const char *remote_name;
7802 int verbosity = 0;
7803 int i;
7804
7805 TAILQ_INIT(&refs);
7806 TAILQ_INIT(&paths);
7807 cl_arg.logmsg_path = NULL;
7808
7809 #ifndef PROFILE
7810 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7811 "unveil", NULL) == -1)
7812 err(1, "pledge");
7813 #endif
7814
7815 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
7816 switch (ch) {
7817 case 'A':
7818 author = optarg;
7819 error = valid_author(author);
7820 if (error)
7821 return error;
7822 break;
7823 case 'C':
7824 commit_conflicts = 1;
7825 break;
7826 case 'F':
7827 if (logmsg != NULL)
7828 option_conflict('F', 'm');
7829 prepared_logmsg = realpath(optarg, NULL);
7830 if (prepared_logmsg == NULL)
7831 return got_error_from_errno2("realpath",
7832 optarg);
7833 break;
7834 case 'm':
7835 if (prepared_logmsg)
7836 option_conflict('m', 'F');
7837 logmsg = optarg;
7838 break;
7839 case 'N':
7840 non_interactive = 1;
7841 break;
7842 case 'n':
7843 show_diff = 0;
7844 break;
7845 case 'S':
7846 allow_bad_symlinks = 1;
7847 break;
7848 default:
7849 usage_commit();
7850 /* NOTREACHED */
7851 }
7852 }
7853
7854 argc -= optind;
7855 argv += optind;
7856
7857 cwd = getcwd(NULL, 0);
7858 if (cwd == NULL) {
7859 error = got_error_from_errno("getcwd");
7860 goto done;
7861 }
7862
7863 error = got_repo_pack_fds_open(&pack_fds);
7864 if (error != NULL)
7865 goto done;
7866
7867 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
7868 if (error) {
7869 if (error->code == GOT_ERR_NOT_WORKTREE)
7870 error = wrap_not_worktree_error(error, "commit", cwd);
7871 goto done;
7872 }
7873
7874 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7875 if (error)
7876 goto done;
7877 if (rebase_in_progress) {
7878 error = got_error(GOT_ERR_REBASING);
7879 goto done;
7880 }
7881
7882 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7883 worktree);
7884 if (error)
7885 goto done;
7886
7887 error = get_gitconfig_path(&gitconfig_path);
7888 if (error)
7889 goto done;
7890 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7891 gitconfig_path, pack_fds);
7892 if (error != NULL)
7893 goto done;
7894
7895 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7896 if (error)
7897 goto done;
7898 if (merge_in_progress) {
7899 error = got_error(GOT_ERR_MERGE_BUSY);
7900 goto done;
7901 }
7902
7903 error = get_author(&committer, repo, worktree);
7904 if (error)
7905 goto done;
7906
7907 if (author == NULL)
7908 author = committer;
7909
7910 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
7911 worktree_conf = got_worktree_get_gotconfig(worktree);
7912 if (worktree_conf) {
7913 got_gotconfig_get_remotes(&nremotes, &remotes,
7914 worktree_conf);
7915 for (i = 0; i < nremotes; i++) {
7916 if (strcmp(remotes[i].name, remote_name) == 0) {
7917 remote = &remotes[i];
7918 break;
7919 }
7920 }
7921 }
7922 if (remote == NULL) {
7923 repo_conf = got_repo_get_gotconfig(repo);
7924 if (repo_conf) {
7925 got_gotconfig_get_remotes(&nremotes, &remotes,
7926 repo_conf);
7927 for (i = 0; i < nremotes; i++) {
7928 if (strcmp(remotes[i].name, remote_name) == 0) {
7929 remote = &remotes[i];
7930 break;
7931 }
7932 }
7933 }
7934 }
7935 if (remote == NULL) {
7936 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
7937 for (i = 0; i < nremotes; i++) {
7938 if (strcmp(remotes[i].name, remote_name) == 0) {
7939 remote = &remotes[i];
7940 break;
7941 }
7942 }
7943 }
7944 if (remote == NULL) {
7945 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
7946 goto done;
7947 }
7948
7949 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
7950 &repo_name, remote->fetch_url);
7951 if (error)
7952 goto done;
7953
7954 if (strcmp(proto, "git") == 0) {
7955 #ifndef PROFILE
7956 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7957 "sendfd dns inet unveil", NULL) == -1)
7958 err(1, "pledge");
7959 #endif
7960 } else if (strcmp(proto, "git+ssh") == 0 ||
7961 strcmp(proto, "ssh") == 0) {
7962 #ifndef PROFILE
7963 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7964 "sendfd unveil", NULL) == -1)
7965 err(1, "pledge");
7966 #endif
7967 } else if (strcmp(proto, "http") == 0 ||
7968 strcmp(proto, "git+http") == 0) {
7969 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
7970 goto done;
7971 } else {
7972 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
7973 goto done;
7974 }
7975
7976
7977 /*if (verbosity >= 0) {
7978 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
7979 remote->name, proto, host,
7980 port ? ":" : "", port ? port : "",
7981 *server_path == '/' ? "" : "/", server_path);
7982 }*/
7983
7984 /*
7985 * unveil(2) traverses exec(2); if an editor is used we have
7986 * to apply unveil after the log message has been written during
7987 * the callback.
7988 */
7989 if (logmsg == NULL || strlen(logmsg) == 0)
7990 error = get_editor(&editor);
7991 else {
7992 error = got_dial_apply_unveil(proto);
7993 if (error)
7994 goto done;
7995 error = apply_unveil(got_repo_get_path(repo), 0,
7996 got_worktree_get_root_path(worktree));
7997 }
7998 if (error)
7999 goto done;
8000
8001 if (prepared_logmsg == NULL) {
8002 error = lookup_logmsg_ref(&merged_logmsg,
8003 argc > 0 ? &paths : NULL, &refs, worktree, repo);
8004 if (error)
8005 goto done;
8006 }
8007
8008 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8009 if (error)
8010 goto done;
8011
8012 cl_arg.editor = editor;
8013 cl_arg.cmdline_log = logmsg;
8014 cl_arg.prepared_log = prepared_logmsg;
8015 cl_arg.merged_log = merged_logmsg;
8016 cl_arg.non_interactive = non_interactive;
8017 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8018 cl_arg.repo_path = got_repo_get_path(repo);
8019 cl_arg.dial_proto = proto;
8020 error = got_worktree_cvg_commit(&id, worktree, &paths, author,
8021 committer, allow_bad_symlinks, show_diff, commit_conflicts,
8022 collect_commit_logmsg, &cl_arg, print_status, NULL, proto, host,
8023 port, server_path, verbosity, remote, check_cancelled, repo);
8024 if (error) {
8025 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8026 cl_arg.logmsg_path != NULL)
8027 preserve_logmsg = 1;
8028 goto done;
8029 }
8030
8031 error = got_object_id_str(&id_str, id);
8032 if (error)
8033 goto done;
8034 printf("Created commit %s\n", id_str);
8035
8036 TAILQ_FOREACH(re, &refs, entry) {
8037 error = got_ref_delete(re->ref, repo);
8038 if (error)
8039 goto done;
8040 }
8041
8042 done:
8043 if (preserve_logmsg) {
8044 fprintf(stderr, "%s: log message preserved in %s\n",
8045 getprogname(), cl_arg.logmsg_path);
8046 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8047 error == NULL)
8048 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8049 free(cl_arg.logmsg_path);
8050 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
8051 error = got_error_from_errno2("unlink", merged_logmsg);
8052 free(merged_logmsg);
8053 if (repo) {
8054 const struct got_error *close_err = got_repo_close(repo);
8055 if (error == NULL)
8056 error = close_err;
8057 }
8058 if (worktree)
8059 got_worktree_close(worktree);
8060 if (pack_fds) {
8061 const struct got_error *pack_err =
8062 got_repo_pack_fds_close(pack_fds);
8063 if (error == NULL)
8064 error = pack_err;
8065 }
8066 got_ref_list_free(&refs);
8067 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8068 free(cwd);
8069 free(id_str);
8070 free(gitconfig_path);
8071 free(editor);
8072 free(committer);
8073 free(prepared_logmsg);
8074 return error;
8075 }
8076
8077 /*
8078 * Print and if delete is set delete all ref_prefix references.
8079 * If wanted_ref is not NULL, only print or delete this reference.
8080 */
8081 static const struct got_error *
8082 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
8083 const char *wanted_ref, int delete, struct got_worktree *worktree,
8084 struct got_repository *repo)
8085 {
8086 const struct got_error *err;
8087 struct got_pathlist_head paths;
8088 struct got_reflist_head refs;
8089 struct got_reflist_entry *re;
8090 struct got_reflist_object_id_map *refs_idmap = NULL;
8091 struct got_commit_object *commit = NULL;
8092 struct got_object_id *id = NULL;
8093 const char *header_prefix;
8094 char *uuidstr = NULL;
8095 int found = 0;
8096
8097 TAILQ_INIT(&refs);
8098 TAILQ_INIT(&paths);
8099
8100 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
8101 if (err)
8102 goto done;
8103
8104 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8105 if (err)
8106 goto done;
8107
8108 if (worktree != NULL) {
8109 err = got_worktree_get_uuid(&uuidstr, worktree);
8110 if (err)
8111 goto done;
8112 }
8113
8114 if (wanted_ref) {
8115 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
8116 wanted_ref += 11;
8117 }
8118
8119 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
8120 header_prefix = "backout";
8121 else
8122 header_prefix = "cherrypick";
8123
8124 TAILQ_FOREACH(re, &refs, entry) {
8125 const char *refname, *wt;
8126
8127 refname = got_ref_get_name(re->ref);
8128
8129 err = check_cancelled(NULL);
8130 if (err)
8131 goto done;
8132
8133 if (strncmp(refname, ref_prefix, prefix_len) == 0)
8134 refname += prefix_len + 1; /* skip '-' delimiter */
8135 else
8136 continue;
8137
8138 wt = refname;
8139
8140 if (worktree == NULL || strncmp(refname, uuidstr,
8141 GOT_WORKTREE_UUID_STRLEN) == 0)
8142 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8143 else
8144 continue;
8145
8146 err = got_repo_match_object_id(&id, NULL, refname,
8147 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8148 if (err)
8149 goto done;
8150
8151 err = got_object_open_as_commit(&commit, repo, id);
8152 if (err)
8153 goto done;
8154
8155 if (wanted_ref)
8156 found = strncmp(wanted_ref, refname,
8157 strlen(wanted_ref)) == 0;
8158 if (wanted_ref && !found) {
8159 struct got_reflist_head *ci_refs;
8160
8161 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
8162 id);
8163
8164 if (ci_refs) {
8165 char *refs_str = NULL;
8166 char const *r = NULL;
8167
8168 err = build_refs_str(&refs_str, ci_refs, id,
8169 repo, 1);
8170 if (err)
8171 goto done;
8172
8173 r = refs_str;
8174 while (r) {
8175 if (strncmp(r, wanted_ref,
8176 strlen(wanted_ref)) == 0) {
8177 found = 1;
8178 break;
8179 }
8180 r = strchr(r, ' ');
8181 if (r)
8182 ++r;
8183 }
8184 free(refs_str);
8185 }
8186 }
8187
8188 if (wanted_ref == NULL || found) {
8189 if (delete) {
8190 err = got_ref_delete(re->ref, repo);
8191 if (err)
8192 goto done;
8193 printf("Deleted: ");
8194 err = print_commit_oneline(commit, id, repo,
8195 refs_idmap);
8196 } else {
8197 /*
8198 * Print paths modified by commit to help
8199 * associate commits with worktree changes.
8200 */
8201 err = get_changed_paths(&paths, commit,
8202 repo, NULL);
8203 if (err)
8204 goto done;
8205
8206 err = print_commit(commit, id, repo, NULL,
8207 &paths, NULL, 0, 0, refs_idmap, NULL,
8208 header_prefix);
8209 got_pathlist_free(&paths,
8210 GOT_PATHLIST_FREE_ALL);
8211
8212 if (worktree == NULL)
8213 printf("work tree: %.*s\n\n",
8214 GOT_WORKTREE_UUID_STRLEN, wt);
8215 }
8216 if (err || found)
8217 goto done;
8218 }
8219
8220 got_object_commit_close(commit);
8221 commit = NULL;
8222 free(id);
8223 id = NULL;
8224 }
8225
8226 if (wanted_ref != NULL && !found)
8227 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
8228
8229 done:
8230 free(id);
8231 free(uuidstr);
8232 got_ref_list_free(&refs);
8233 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8234 if (refs_idmap)
8235 got_reflist_object_id_map_free(refs_idmap);
8236 if (commit)
8237 got_object_commit_close(commit);
8238 return err;
8239 }
8240
8241 /*
8242 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
8243 * identified by id for log messages to prepopulate the editor on commit.
8244 */
8245 static const struct got_error *
8246 logmsg_ref(struct got_object_id *id, const char *prefix,
8247 struct got_worktree *worktree, struct got_repository *repo)
8248 {
8249 const struct got_error *err = NULL;
8250 char *idstr, *ref = NULL, *refname = NULL;
8251 int histedit_in_progress;
8252 int rebase_in_progress, merge_in_progress;
8253
8254 /*
8255 * Silenty refuse to create merge reference if any histedit, merge,
8256 * or rebase operation is in progress.
8257 */
8258 err = got_worktree_histedit_in_progress(&histedit_in_progress,
8259 worktree);
8260 if (err)
8261 return err;
8262 if (histedit_in_progress)
8263 return NULL;
8264
8265 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8266 if (err)
8267 return err;
8268 if (rebase_in_progress)
8269 return NULL;
8270
8271 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
8272 repo);
8273 if (err)
8274 return err;
8275 if (merge_in_progress)
8276 return NULL;
8277
8278 err = got_object_id_str(&idstr, id);
8279 if (err)
8280 return err;
8281
8282 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
8283 if (err)
8284 goto done;
8285
8286 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
8287 err = got_error_from_errno("asprintf");
8288 goto done;
8289 }
8290
8291 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
8292 -1, repo);
8293 done:
8294 free(ref);
8295 free(idstr);
8296 free(refname);
8297 return err;
8298 }
8299
8300 __dead static void
8301 usage_cherrypick(void)
8302 {
8303 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
8304 getprogname());
8305 exit(1);
8306 }
8307
8308 static const struct got_error *
8309 cmd_cherrypick(int argc, char *argv[])
8310 {
8311 const struct got_error *error = NULL;
8312 struct got_worktree *worktree = NULL;
8313 struct got_repository *repo = NULL;
8314 char *cwd = NULL, *commit_id_str = NULL;
8315 struct got_object_id *commit_id = NULL;
8316 struct got_commit_object *commit = NULL;
8317 struct got_object_qid *pid;
8318 int ch, list_refs = 0, remove_refs = 0;
8319 struct got_update_progress_arg upa;
8320 int *pack_fds = NULL;
8321
8322 #ifndef PROFILE
8323 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8324 "unveil", NULL) == -1)
8325 err(1, "pledge");
8326 #endif
8327
8328 while ((ch = getopt(argc, argv, "lX")) != -1) {
8329 switch (ch) {
8330 case 'l':
8331 list_refs = 1;
8332 break;
8333 case 'X':
8334 remove_refs = 1;
8335 break;
8336 default:
8337 usage_cherrypick();
8338 /* NOTREACHED */
8339 }
8340 }
8341
8342 argc -= optind;
8343 argv += optind;
8344
8345 if (list_refs || remove_refs) {
8346 if (argc != 0 && argc != 1)
8347 usage_cherrypick();
8348 } else if (argc != 1)
8349 usage_cherrypick();
8350 if (list_refs && remove_refs)
8351 option_conflict('l', 'X');
8352
8353 cwd = getcwd(NULL, 0);
8354 if (cwd == NULL) {
8355 error = got_error_from_errno("getcwd");
8356 goto done;
8357 }
8358
8359 error = got_repo_pack_fds_open(&pack_fds);
8360 if (error != NULL)
8361 goto done;
8362
8363 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8364 if (error) {
8365 if (list_refs || remove_refs) {
8366 if (error->code != GOT_ERR_NOT_WORKTREE)
8367 goto done;
8368 } else {
8369 if (error->code == GOT_ERR_NOT_WORKTREE)
8370 error = wrap_not_worktree_error(error,
8371 "cherrypick", cwd);
8372 goto done;
8373 }
8374 }
8375
8376 error = got_repo_open(&repo,
8377 worktree ? got_worktree_get_repo_path(worktree) : cwd,
8378 NULL, pack_fds);
8379 if (error != NULL)
8380 goto done;
8381
8382 error = apply_unveil(got_repo_get_path(repo), 0,
8383 worktree ? got_worktree_get_root_path(worktree) : NULL);
8384 if (error)
8385 goto done;
8386
8387 if (list_refs || remove_refs) {
8388 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8389 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
8390 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8391 goto done;
8392 }
8393
8394 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8395 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8396 if (error)
8397 goto done;
8398 error = got_object_id_str(&commit_id_str, commit_id);
8399 if (error)
8400 goto done;
8401
8402 error = got_object_open_as_commit(&commit, repo, commit_id);
8403 if (error)
8404 goto done;
8405 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8406 memset(&upa, 0, sizeof(upa));
8407 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8408 commit_id, repo, update_progress, &upa, check_cancelled,
8409 NULL);
8410 if (error != NULL)
8411 goto done;
8412
8413 if (upa.did_something) {
8414 error = logmsg_ref(commit_id,
8415 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
8416 if (error)
8417 goto done;
8418 printf("Merged commit %s\n", commit_id_str);
8419 }
8420 print_merge_progress_stats(&upa);
8421 done:
8422 free(cwd);
8423 if (commit)
8424 got_object_commit_close(commit);
8425 free(commit_id_str);
8426 if (worktree)
8427 got_worktree_close(worktree);
8428 if (repo) {
8429 const struct got_error *close_err = got_repo_close(repo);
8430 if (error == NULL)
8431 error = close_err;
8432 }
8433 if (pack_fds) {
8434 const struct got_error *pack_err =
8435 got_repo_pack_fds_close(pack_fds);
8436 if (error == NULL)
8437 error = pack_err;
8438 }
8439
8440 return error;
8441 }
8442
8443 __dead static void
8444 usage_backout(void)
8445 {
8446 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
8447 exit(1);
8448 }
8449
8450 static const struct got_error *
8451 cmd_backout(int argc, char *argv[])
8452 {
8453 const struct got_error *error = NULL;
8454 struct got_worktree *worktree = NULL;
8455 struct got_repository *repo = NULL;
8456 char *cwd = NULL, *commit_id_str = NULL;
8457 struct got_object_id *commit_id = NULL;
8458 struct got_commit_object *commit = NULL;
8459 struct got_object_qid *pid;
8460 int ch, list_refs = 0, remove_refs = 0;
8461 struct got_update_progress_arg upa;
8462 int *pack_fds = NULL;
8463
8464 #ifndef PROFILE
8465 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8466 "unveil", NULL) == -1)
8467 err(1, "pledge");
8468 #endif
8469
8470 while ((ch = getopt(argc, argv, "lX")) != -1) {
8471 switch (ch) {
8472 case 'l':
8473 list_refs = 1;
8474 break;
8475 case 'X':
8476 remove_refs = 1;
8477 break;
8478 default:
8479 usage_backout();
8480 /* NOTREACHED */
8481 }
8482 }
8483
8484 argc -= optind;
8485 argv += optind;
8486
8487 if (list_refs || remove_refs) {
8488 if (argc != 0 && argc != 1)
8489 usage_backout();
8490 } else if (argc != 1)
8491 usage_backout();
8492 if (list_refs && remove_refs)
8493 option_conflict('l', 'X');
8494
8495 cwd = getcwd(NULL, 0);
8496 if (cwd == NULL) {
8497 error = got_error_from_errno("getcwd");
8498 goto done;
8499 }
8500
8501 error = got_repo_pack_fds_open(&pack_fds);
8502 if (error != NULL)
8503 goto done;
8504
8505 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8506 if (error) {
8507 if (list_refs || remove_refs) {
8508 if (error->code != GOT_ERR_NOT_WORKTREE)
8509 goto done;
8510 } else {
8511 if (error->code == GOT_ERR_NOT_WORKTREE)
8512 error = wrap_not_worktree_error(error,
8513 "backout", cwd);
8514 goto done;
8515 }
8516 }
8517
8518 error = got_repo_open(&repo,
8519 worktree ? got_worktree_get_repo_path(worktree) : cwd,
8520 NULL, pack_fds);
8521 if (error != NULL)
8522 goto done;
8523
8524 error = apply_unveil(got_repo_get_path(repo), 0,
8525 worktree ? got_worktree_get_root_path(worktree) : NULL);
8526 if (error)
8527 goto done;
8528
8529 if (list_refs || remove_refs) {
8530 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
8531 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
8532 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8533 goto done;
8534 }
8535
8536 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8537 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8538 if (error)
8539 goto done;
8540 error = got_object_id_str(&commit_id_str, commit_id);
8541 if (error)
8542 goto done;
8543
8544 error = got_object_open_as_commit(&commit, repo, commit_id);
8545 if (error)
8546 goto done;
8547 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8548 if (pid == NULL) {
8549 error = got_error(GOT_ERR_ROOT_COMMIT);
8550 goto done;
8551 }
8552
8553 memset(&upa, 0, sizeof(upa));
8554 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8555 repo, update_progress, &upa, check_cancelled, NULL);
8556 if (error != NULL)
8557 goto done;
8558
8559 if (upa.did_something) {
8560 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8561 worktree, repo);
8562 if (error)
8563 goto done;
8564 printf("Backed out commit %s\n", commit_id_str);
8565 }
8566 print_merge_progress_stats(&upa);
8567 done:
8568 free(cwd);
8569 if (commit)
8570 got_object_commit_close(commit);
8571 free(commit_id_str);
8572 if (worktree)
8573 got_worktree_close(worktree);
8574 if (repo) {
8575 const struct got_error *close_err = got_repo_close(repo);
8576 if (error == NULL)
8577 error = close_err;
8578 }
8579 if (pack_fds) {
8580 const struct got_error *pack_err =
8581 got_repo_pack_fds_close(pack_fds);
8582 if (error == NULL)
8583 error = pack_err;
8584 }
8585 return error;
8586 }
8587
8588 __dead static void
8589 usage_cat(void)
8590 {
8591 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
8592 "arg ...\n", getprogname());
8593 exit(1);
8594 }
8595
8596 static const struct got_error *
8597 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8598 {
8599 const struct got_error *err;
8600 struct got_blob_object *blob;
8601 int fd = -1;
8602
8603 fd = got_opentempfd();
8604 if (fd == -1)
8605 return got_error_from_errno("got_opentempfd");
8606
8607 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
8608 if (err)
8609 goto done;
8610
8611 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8612 done:
8613 if (fd != -1 && close(fd) == -1 && err == NULL)
8614 err = got_error_from_errno("close");
8615 if (blob)
8616 got_object_blob_close(blob);
8617 return err;
8618 }
8619
8620 static const struct got_error *
8621 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8622 {
8623 const struct got_error *err;
8624 struct got_tree_object *tree;
8625 int nentries, i;
8626
8627 err = got_object_open_as_tree(&tree, repo, id);
8628 if (err)
8629 return err;
8630
8631 nentries = got_object_tree_get_nentries(tree);
8632 for (i = 0; i < nentries; i++) {
8633 struct got_tree_entry *te;
8634 char *id_str;
8635 if (sigint_received || sigpipe_received)
8636 break;
8637 te = got_object_tree_get_entry(tree, i);
8638 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8639 if (err)
8640 break;
8641 fprintf(outfile, "%s %.7o %s\n", id_str,
8642 got_tree_entry_get_mode(te),
8643 got_tree_entry_get_name(te));
8644 free(id_str);
8645 }
8646
8647 got_object_tree_close(tree);
8648 return err;
8649 }
8650
8651 static const struct got_error *
8652 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8653 {
8654 const struct got_error *err;
8655 struct got_commit_object *commit;
8656 const struct got_object_id_queue *parent_ids;
8657 struct got_object_qid *pid;
8658 char *id_str = NULL;
8659 const char *logmsg = NULL;
8660 char gmtoff[6];
8661
8662 err = got_object_open_as_commit(&commit, repo, id);
8663 if (err)
8664 return err;
8665
8666 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8667 if (err)
8668 goto done;
8669
8670 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8671 parent_ids = got_object_commit_get_parent_ids(commit);
8672 fprintf(outfile, "numparents %d\n",
8673 got_object_commit_get_nparents(commit));
8674 STAILQ_FOREACH(pid, parent_ids, entry) {
8675 char *pid_str;
8676 err = got_object_id_str(&pid_str, &pid->id);
8677 if (err)
8678 goto done;
8679 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8680 free(pid_str);
8681 }
8682 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8683 got_object_commit_get_author_gmtoff(commit));
8684 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
8685 got_object_commit_get_author(commit),
8686 (long long)got_object_commit_get_author_time(commit),
8687 gmtoff);
8688
8689 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8690 got_object_commit_get_committer_gmtoff(commit));
8691 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
8692 got_object_commit_get_committer(commit),
8693 (long long)got_object_commit_get_committer_time(commit),
8694 gmtoff);
8695
8696 logmsg = got_object_commit_get_logmsg_raw(commit);
8697 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8698 fprintf(outfile, "%s", logmsg);
8699 done:
8700 free(id_str);
8701 got_object_commit_close(commit);
8702 return err;
8703 }
8704
8705 static const struct got_error *
8706 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8707 {
8708 const struct got_error *err;
8709 struct got_tag_object *tag;
8710 char *id_str = NULL;
8711 const char *tagmsg = NULL;
8712 char gmtoff[6];
8713
8714 err = got_object_open_as_tag(&tag, repo, id);
8715 if (err)
8716 return err;
8717
8718 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8719 if (err)
8720 goto done;
8721
8722 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8723
8724 switch (got_object_tag_get_object_type(tag)) {
8725 case GOT_OBJ_TYPE_BLOB:
8726 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8727 GOT_OBJ_LABEL_BLOB);
8728 break;
8729 case GOT_OBJ_TYPE_TREE:
8730 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8731 GOT_OBJ_LABEL_TREE);
8732 break;
8733 case GOT_OBJ_TYPE_COMMIT:
8734 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8735 GOT_OBJ_LABEL_COMMIT);
8736 break;
8737 case GOT_OBJ_TYPE_TAG:
8738 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8739 GOT_OBJ_LABEL_TAG);
8740 break;
8741 default:
8742 break;
8743 }
8744
8745 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8746 got_object_tag_get_name(tag));
8747
8748 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8749 got_object_tag_get_tagger_gmtoff(tag));
8750 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
8751 got_object_tag_get_tagger(tag),
8752 (long long)got_object_tag_get_tagger_time(tag),
8753 gmtoff);
8754
8755 tagmsg = got_object_tag_get_message(tag);
8756 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8757 fprintf(outfile, "%s", tagmsg);
8758 done:
8759 free(id_str);
8760 got_object_tag_close(tag);
8761 return err;
8762 }
8763
8764 static const struct got_error *
8765 cmd_cat(int argc, char *argv[])
8766 {
8767 const struct got_error *error;
8768 struct got_repository *repo = NULL;
8769 struct got_worktree *worktree = NULL;
8770 char *cwd = NULL, *repo_path = NULL, *label = NULL;
8771 const char *commit_id_str = NULL;
8772 struct got_object_id *id = NULL, *commit_id = NULL;
8773 struct got_commit_object *commit = NULL;
8774 int ch, obj_type, i, force_path = 0;
8775 struct got_reflist_head refs;
8776 int *pack_fds = NULL;
8777
8778 TAILQ_INIT(&refs);
8779
8780 #ifndef PROFILE
8781 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8782 NULL) == -1)
8783 err(1, "pledge");
8784 #endif
8785
8786 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
8787 switch (ch) {
8788 case 'c':
8789 commit_id_str = optarg;
8790 break;
8791 case 'P':
8792 force_path = 1;
8793 break;
8794 case 'r':
8795 repo_path = realpath(optarg, NULL);
8796 if (repo_path == NULL)
8797 return got_error_from_errno2("realpath",
8798 optarg);
8799 got_path_strip_trailing_slashes(repo_path);
8800 break;
8801 default:
8802 usage_cat();
8803 /* NOTREACHED */
8804 }
8805 }
8806
8807 argc -= optind;
8808 argv += optind;
8809
8810 cwd = getcwd(NULL, 0);
8811 if (cwd == NULL) {
8812 error = got_error_from_errno("getcwd");
8813 goto done;
8814 }
8815
8816 error = got_repo_pack_fds_open(&pack_fds);
8817 if (error != NULL)
8818 goto done;
8819
8820 if (repo_path == NULL) {
8821 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8822 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8823 goto done;
8824 if (worktree) {
8825 repo_path = strdup(
8826 got_worktree_get_repo_path(worktree));
8827 if (repo_path == NULL) {
8828 error = got_error_from_errno("strdup");
8829 goto done;
8830 }
8831
8832 /* Release work tree lock. */
8833 got_worktree_close(worktree);
8834 worktree = NULL;
8835 }
8836 }
8837
8838 if (repo_path == NULL) {
8839 repo_path = strdup(cwd);
8840 if (repo_path == NULL)
8841 return got_error_from_errno("strdup");
8842 }
8843
8844 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8845 free(repo_path);
8846 if (error != NULL)
8847 goto done;
8848
8849 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8850 if (error)
8851 goto done;
8852
8853 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8854 if (error)
8855 goto done;
8856
8857 if (commit_id_str == NULL)
8858 commit_id_str = GOT_REF_HEAD;
8859 error = got_repo_match_object_id(&commit_id, NULL,
8860 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8861 if (error)
8862 goto done;
8863
8864 error = got_object_open_as_commit(&commit, repo, commit_id);
8865 if (error)
8866 goto done;
8867
8868 for (i = 0; i < argc; i++) {
8869 if (force_path) {
8870 error = got_object_id_by_path(&id, repo, commit,
8871 argv[i]);
8872 if (error)
8873 break;
8874 } else {
8875 error = got_repo_match_object_id(&id, &label, argv[i],
8876 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
8877 repo);
8878 if (error) {
8879 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8880 error->code != GOT_ERR_NOT_REF)
8881 break;
8882 error = got_object_id_by_path(&id, repo,
8883 commit, argv[i]);
8884 if (error)
8885 break;
8886 }
8887 }
8888
8889 error = got_object_get_type(&obj_type, repo, id);
8890 if (error)
8891 break;
8892
8893 switch (obj_type) {
8894 case GOT_OBJ_TYPE_BLOB:
8895 error = cat_blob(id, repo, stdout);
8896 break;
8897 case GOT_OBJ_TYPE_TREE:
8898 error = cat_tree(id, repo, stdout);
8899 break;
8900 case GOT_OBJ_TYPE_COMMIT:
8901 error = cat_commit(id, repo, stdout);
8902 break;
8903 case GOT_OBJ_TYPE_TAG:
8904 error = cat_tag(id, repo, stdout);
8905 break;
8906 default:
8907 error = got_error(GOT_ERR_OBJ_TYPE);
8908 break;
8909 }
8910 if (error)
8911 break;
8912 free(label);
8913 label = NULL;
8914 free(id);
8915 id = NULL;
8916 }
8917 done:
8918 free(label);
8919 free(id);
8920 free(commit_id);
8921 if (commit)
8922 got_object_commit_close(commit);
8923 if (worktree)
8924 got_worktree_close(worktree);
8925 if (repo) {
8926 const struct got_error *close_err = got_repo_close(repo);
8927 if (error == NULL)
8928 error = close_err;
8929 }
8930 if (pack_fds) {
8931 const struct got_error *pack_err =
8932 got_repo_pack_fds_close(pack_fds);
8933 if (error == NULL)
8934 error = pack_err;
8935 }
8936
8937 got_ref_list_free(&refs);
8938 return error;
8939 }
8940
8941 __dead static void
8942 usage_info(void)
8943 {
8944 fprintf(stderr, "usage: %s info [path ...]\n",
8945 getprogname());
8946 exit(1);
8947 }
8948
8949 static const struct got_error *
8950 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
8951 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8952 struct got_object_id *commit_id)
8953 {
8954 const struct got_error *err = NULL;
8955 char *id_str = NULL;
8956 char datebuf[128];
8957 struct tm mytm, *tm;
8958 struct got_pathlist_head *paths = arg;
8959 struct got_pathlist_entry *pe;
8960
8961 /*
8962 * Clear error indication from any of the path arguments which
8963 * would cause this file index entry to be displayed.
8964 */
8965 TAILQ_FOREACH(pe, paths, entry) {
8966 if (got_path_cmp(path, pe->path, strlen(path),
8967 pe->path_len) == 0 ||
8968 got_path_is_child(path, pe->path, pe->path_len))
8969 pe->data = NULL; /* no error */
8970 }
8971
8972 printf(GOT_COMMIT_SEP_STR);
8973 if (S_ISLNK(mode))
8974 printf("symlink: %s\n", path);
8975 else if (S_ISREG(mode)) {
8976 printf("file: %s\n", path);
8977 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
8978 } else if (S_ISDIR(mode))
8979 printf("directory: %s\n", path);
8980 else
8981 printf("something: %s\n", path);
8982
8983 tm = localtime_r(&mtime, &mytm);
8984 if (tm == NULL)
8985 return NULL;
8986 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
8987 return got_error(GOT_ERR_NO_SPACE);
8988 printf("timestamp: %s\n", datebuf);
8989
8990 if (blob_id) {
8991 err = got_object_id_str(&id_str, blob_id);
8992 if (err)
8993 return err;
8994 printf("based on blob: %s\n", id_str);
8995 free(id_str);
8996 }
8997
8998 if (staged_blob_id) {
8999 err = got_object_id_str(&id_str, staged_blob_id);
9000 if (err)
9001 return err;
9002 printf("based on staged blob: %s\n", id_str);
9003 free(id_str);
9004 }
9005
9006 if (commit_id) {
9007 err = got_object_id_str(&id_str, commit_id);
9008 if (err)
9009 return err;
9010 printf("based on commit: %s\n", id_str);
9011 free(id_str);
9012 }
9013
9014 return NULL;
9015 }
9016
9017 static const struct got_error *
9018 cmd_info(int argc, char *argv[])
9019 {
9020 const struct got_error *error = NULL;
9021 struct got_worktree *worktree = NULL;
9022 char *cwd = NULL, *id_str = NULL;
9023 struct got_pathlist_head paths;
9024 char *uuidstr = NULL;
9025 int ch, show_files = 0;
9026
9027 TAILQ_INIT(&paths);
9028
9029 #ifndef PROFILE
9030 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9031 NULL) == -1)
9032 err(1, "pledge");
9033 #endif
9034
9035 while ((ch = getopt(argc, argv, "")) != -1) {
9036 switch (ch) {
9037 default:
9038 usage_info();
9039 /* NOTREACHED */
9040 }
9041 }
9042
9043 argc -= optind;
9044 argv += optind;
9045
9046 cwd = getcwd(NULL, 0);
9047 if (cwd == NULL) {
9048 error = got_error_from_errno("getcwd");
9049 goto done;
9050 }
9051
9052 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
9053 if (error) {
9054 if (error->code == GOT_ERR_NOT_WORKTREE)
9055 error = wrap_not_worktree_error(error, "info", cwd);
9056 goto done;
9057 }
9058
9059 #ifndef PROFILE
9060 /* Remove "wpath cpath proc exec sendfd" promises. */
9061 if (pledge("stdio rpath flock unveil", NULL) == -1)
9062 err(1, "pledge");
9063 #endif
9064 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9065 if (error)
9066 goto done;
9067
9068 if (argc >= 1) {
9069 error = get_worktree_paths_from_argv(&paths, argc, argv,
9070 worktree);
9071 if (error)
9072 goto done;
9073 show_files = 1;
9074 }
9075
9076 error = got_object_id_str(&id_str,
9077 got_worktree_get_base_commit_id(worktree));
9078 if (error)
9079 goto done;
9080
9081 error = got_worktree_get_uuid(&uuidstr, worktree);
9082 if (error)
9083 goto done;
9084
9085 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9086 printf("work tree base commit: %s\n", id_str);
9087 printf("work tree path prefix: %s\n",
9088 got_worktree_get_path_prefix(worktree));
9089 printf("work tree branch reference: %s\n",
9090 got_worktree_get_head_ref_name(worktree));
9091 printf("work tree UUID: %s\n", uuidstr);
9092 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9093
9094 if (show_files) {
9095 struct got_pathlist_entry *pe;
9096 TAILQ_FOREACH(pe, &paths, entry) {
9097 if (pe->path_len == 0)
9098 continue;
9099 /*
9100 * Assume this path will fail. This will be corrected
9101 * in print_path_info() in case the path does suceeed.
9102 */
9103 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
9104 }
9105 error = got_worktree_path_info(worktree, &paths,
9106 print_path_info, &paths, check_cancelled, NULL);
9107 if (error)
9108 goto done;
9109 TAILQ_FOREACH(pe, &paths, entry) {
9110 if (pe->data != NULL) {
9111 const struct got_error *perr;
9112
9113 perr = pe->data;
9114 error = got_error_fmt(perr->code, "%s",
9115 pe->path);
9116 break;
9117 }
9118 }
9119 }
9120 done:
9121 if (worktree)
9122 got_worktree_close(worktree);
9123 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9124 free(cwd);
9125 free(id_str);
9126 free(uuidstr);
9127 return error;
9128 }
portable version of Game of Trees