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