op public repos

Blob

Date:: Mon Dec 24 09:58:32 2018 UTC
Message:: undo commit timestamps next to paths in diffs; they are redundant
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3  * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
4  *
5  * Permission to use, copy, modify, and distribute this software for any
6  * purpose with or without fee is hereby granted, provided that the above
7  * copyright notice and this permission notice appear in all copies.
8  *
9  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16  */
17 
18 #include <sys/queue.h>
19 #include <sys/limits.h>
20 #include <sys/types.h>
21 #include <sys/stat.h>
22 
23 #include <err.h>
24 #include <errno.h>
25 #include <locale.h>
26 #include <signal.h>
27 #include <stdio.h>
28 #include <stdlib.h>
29 #include <string.h>
30 #include <unistd.h>
31 #include <libgen.h>
32 #include <time.h>
33 
34 #include "got_error.h"
35 #include "got_object.h"
36 #include "got_reference.h"
37 #include "got_repository.h"
38 #include "got_worktree.h"
39 #include "got_diff.h"
40 #include "got_commit_graph.h"
41 #include "got_blame.h"
42 
43 #ifndef nitems
44 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
45 #endif
46 
47 static volatile sig_atomic_t sigint_received;
48 static volatile sig_atomic_t sigpipe_received;
49 
50 static void
51 catch_sigint(int signo)
52 {
53 	sigint_received = 1;
54 }
55 
56 static void
57 catch_sigpipe(int signo)
58 {
59 	sigpipe_received = 1;
60 }
61 
62 
63 struct cmd {
64 	const char	 *cmd_name;
65 	const struct got_error *(*cmd_main)(int, char *[]);
66 	void		(*cmd_usage)(void);
67 	const char	 *cmd_descr;
68 };
69 
70 __dead static void	usage(void);
71 __dead static void	usage_checkout(void);
72 __dead static void	usage_log(void);
73 __dead static void	usage_diff(void);
74 __dead static void	usage_blame(void);
75 __dead static void	usage_tree(void);
76 
77 static const struct got_error*		cmd_checkout(int, char *[]);
78 static const struct got_error*		cmd_log(int, char *[]);
79 static const struct got_error*		cmd_diff(int, char *[]);
80 static const struct got_error*		cmd_blame(int, char *[]);
81 static const struct got_error*		cmd_tree(int, char *[]);
82 #ifdef notyet
83 static const struct got_error*		cmd_status(int, char *[]);
84 #endif
85 
86 static struct cmd got_commands[] = {
87 	{ "checkout",	cmd_checkout,	usage_checkout,
88 	    "check out a new work tree from a repository" },
89 	{ "log",	cmd_log,	usage_log,
90 	    "show repository history" },
91 	{ "diff",	cmd_diff,	usage_diff,
92 	    "compare files and directories" },
93 	{ "blame",	cmd_blame,	usage_blame,
94 	    " show when lines in a file were changed" },
95 	{ "tree",	cmd_tree,	usage_tree,
96 	    " list files and directories in repository" },
97 #ifdef notyet
98 	{ "status",	cmd_status,	usage_status,
99 	    "show modification status of files" },
100 #endif
101 };
102 
103 int
104 main(int argc, char *argv[])
105 {
106 	struct cmd *cmd;
107 	unsigned int i;
108 	int ch;
109 	int hflag = 0;
110 
111 	setlocale(LC_ALL, "");
112 
113 	while ((ch = getopt(argc, argv, "h")) != -1) {
114 		switch (ch) {
115 		case 'h':
116 			hflag = 1;
117 			break;
118 		default:
119 			usage();
120 			/* NOTREACHED */
121 		}
122 	}
123 
124 	argc -= optind;
125 	argv += optind;
126 	optind = 0;
127 
128 	if (argc <= 0)
129 		usage();
130 
131 	signal(SIGINT, catch_sigint);
132 	signal(SIGPIPE, catch_sigpipe);
133 
134 	for (i = 0; i < nitems(got_commands); i++) {
135 		const struct got_error *error;
136 
137 		cmd = &got_commands[i];
138 
139 		if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
140 			continue;
141 
142 		if (hflag)
143 			got_commands[i].cmd_usage();
144 
145 		error = got_commands[i].cmd_main(argc, argv);
146 		if (error && !(sigint_received || sigpipe_received)) {
147 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
148 			return 1;
149 		}
150 
151 		return 0;
152 	}
153 
154 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
155 	return 1;
156 }
157 
158 __dead static void
159 usage(void)
160 {
161 	int i;
162 
163 	fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
164 	    "Available commands:\n", getprogname());
165 	for (i = 0; i < nitems(got_commands); i++) {
166 		struct cmd *cmd = &got_commands[i];
167 		fprintf(stderr, "    %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
168 	}
169 	exit(1);
170 }
171 
172 __dead static void
173 usage_checkout(void)
174 {
175 	fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
176 	    "[worktree-path]\n", getprogname());
177 	exit(1);
178 }
179 
180 static void
181 checkout_progress(void *arg, const char *path)
182 {
183 	char *worktree_path = arg;
184 
185 	while (path[0] == '/')
186 		path++;
187 
188 	printf("A  %s/%s\n", worktree_path, path);
189 }
190 
191 static const struct got_error *
192 checkout_cancel(void *arg)
193 {
194 	if (sigint_received || sigpipe_received)
195 		return got_error(GOT_ERR_CANCELLED);
196 	return NULL;
197 }
198 
199 static const struct got_error *
200 cmd_checkout(int argc, char *argv[])
201 {
202 	const struct got_error *error = NULL;
203 	struct got_repository *repo = NULL;
204 	struct got_reference *head_ref = NULL;
205 	struct got_worktree *worktree = NULL;
206 	char *repo_path = NULL;
207 	char *worktree_path = NULL;
208 	const char *path_prefix = "";
209 	int ch;
210 
211 	while ((ch = getopt(argc, argv, "p:")) != -1) {
212 		switch (ch) {
213 		case 'p':
214 			path_prefix = optarg;
215 			break;
216 		default:
217 			usage();
218 			/* NOTREACHED */
219 		}
220 	}
221 
222 	argc -= optind;
223 	argv += optind;
224 
225 #ifndef PROFILE
226 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
227 	    == -1)
228 		err(1, "pledge");
229 #endif
230 	if (argc == 1) {
231 		char *cwd, *base, *dotgit;
232 		repo_path = realpath(argv[0], NULL);
233 		if (repo_path == NULL)
234 			return got_error_from_errno();
235 		cwd = getcwd(NULL, 0);
236 		if (cwd == NULL) {
237 			error = got_error_from_errno();
238 			goto done;
239 		}
240 		if (path_prefix[0])
241 			base = basename(path_prefix);
242 		else
243 			base = basename(repo_path);
244 		if (base == NULL) {
245 			error = got_error_from_errno();
246 			goto done;
247 		}
248 		dotgit = strstr(base, ".git");
249 		if (dotgit)
250 			*dotgit = '\0';
251 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
252 			error = got_error_from_errno();
253 			free(cwd);
254 			goto done;
255 		}
256 		free(cwd);
257 	} else if (argc == 2) {
258 		repo_path = realpath(argv[0], NULL);
259 		if (repo_path == NULL) {
260 			error = got_error_from_errno();
261 			goto done;
262 		}
263 		worktree_path = realpath(argv[1], NULL);
264 		if (worktree_path == NULL) {
265 			error = got_error_from_errno();
266 			goto done;
267 		}
268 	} else
269 		usage_checkout();
270 
271 	error = got_repo_open(&repo, repo_path);
272 	if (error != NULL)
273 		goto done;
274 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
275 	if (error != NULL)
276 		goto done;
277 
278 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
279 	if (error != NULL)
280 		goto done;
281 
282 	error = got_worktree_open(&worktree, worktree_path);
283 	if (error != NULL)
284 		goto done;
285 
286 	error = got_worktree_checkout_files(worktree, head_ref, repo,
287 	    checkout_progress, worktree_path, checkout_cancel, NULL);
288 	if (error != NULL)
289 		goto done;
290 
291 	printf("Now shut up and hack\n");
292 
293 done:
294 	free(repo_path);
295 	free(worktree_path);
296 	return error;
297 }
298 
299 static const struct got_error *
300 print_patch(struct got_commit_object *commit, struct got_object_id *id,
301     int diff_context, struct got_repository *repo)
302 {
303 	const struct got_error *err = NULL;
304 	struct got_tree_object *tree1 = NULL, *tree2;
305 	struct got_object_qid *qid;
306 	char *id_str1 = NULL, *id_str2;
307 
308 	err = got_object_open_as_tree(&tree2, repo,
309 	    got_object_commit_get_tree_id(commit));
310 	if (err)
311 		return err;
312 
313 	qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
314 	if (qid != NULL) {
315 		struct got_commit_object *pcommit;
316 
317 		err = got_object_open_as_commit(&pcommit, repo, qid->id);
318 		if (err)
319 			return err;
320 
321 		err = got_object_open_as_tree(&tree1, repo,
322 		    got_object_commit_get_tree_id(pcommit));
323 		got_object_commit_close(pcommit);
324 		if (err)
325 			return err;
326 
327 		err = got_object_id_str(&id_str1, qid->id);
328 		if (err)
329 			return err;
330 	}
331 
332 	err = got_object_id_str(&id_str2, id);
333 	if (err)
334 		goto done;
335 
336 	printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
337 	err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
338 done:
339 	if (tree1)
340 		got_object_tree_close(tree1);
341 	got_object_tree_close(tree2);
342 	free(id_str1);
343 	free(id_str2);
344 	return err;
345 }
346 
347 static char *
348 get_datestr(time_t *time, char *datebuf)
349 {
350 	char *p, *s = ctime_r(time, datebuf);
351 	p = strchr(s, '\n');
352 	if (p)
353 		*p = '\0';
354 	return s;
355 }
356 
357 static const struct got_error *
358 print_commit(struct got_commit_object *commit, struct got_object_id *id,
359     struct got_repository *repo, int show_patch, int diff_context)
360 {
361 	const struct got_error *err = NULL;
362 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
363 	char datebuf[26];
364 	time_t committer_time;
365 	const char *author, *committer;
366 
367 	err = got_object_id_str(&id_str, id);
368 	if (err)
369 		return err;
370 
371 	printf("-----------------------------------------------\n");
372 	printf("commit %s\n", id_str);
373 	free(id_str);
374 	printf("from: %s\n", got_object_commit_get_author(commit));
375 	committer_time = got_object_commit_get_committer_time(commit);
376 	datestr = get_datestr(&committer_time, datebuf);
377 	printf("date: %s UTC\n", datestr);
378 	author = got_object_commit_get_author(commit);
379 	committer = got_object_commit_get_committer(commit);
380 	if (strcmp(author, committer) != 0)
381 		printf("via: %s\n", committer);
382 	if (got_object_commit_get_nparents(commit) > 1) {
383 		const struct got_object_id_queue *parent_ids;
384 		struct got_object_qid *qid;
385 		int n = 1;
386 		parent_ids = got_object_commit_get_parent_ids(commit);
387 		SIMPLEQ_FOREACH(qid, parent_ids, entry) {
388 			err = got_object_id_str(&id_str, qid->id);
389 			if (err)
390 				return err;
391 			printf("parent %d: %s\n", n++, id_str);
392 			free(id_str);
393 		}
394 	}
395 
396 	logmsg0 = strdup(got_object_commit_get_logmsg(commit));
397 	if (logmsg0 == NULL)
398 		return got_error_from_errno();
399 
400 	logmsg = logmsg0;
401 	do {
402 		line = strsep(&logmsg, "\n");
403 		if (line)
404 			printf(" %s\n", line);
405 	} while (line);
406 	free(logmsg0);
407 
408 	if (show_patch) {
409 		err = print_patch(commit, id, diff_context, repo);
410 		if (err == 0)
411 			printf("\n");
412 	}
413 
414 	fflush(stdout);
415 	return err;
416 }
417 
418 static const struct got_error *
419 print_commits(struct got_object_id *root_id, struct got_repository *repo,
420     char *path, int show_patch, int diff_context, int limit,
421     int first_parent_traversal)
422 {
423 	const struct got_error *err;
424 	struct got_commit_graph *graph;
425 
426 	err = got_commit_graph_open(&graph, root_id, path,
427 	    first_parent_traversal, repo);
428 	if (err)
429 		return err;
430 	err = got_commit_graph_iter_start(graph, root_id, repo);
431 	if (err)
432 		goto done;
433 	while (1) {
434 		struct got_commit_object *commit;
435 		struct got_object_id *id;
436 
437 		if (sigint_received || sigpipe_received)
438 			break;
439 
440 		err = got_commit_graph_iter_next(&id, graph);
441 		if (err) {
442 			if (err->code == GOT_ERR_ITER_COMPLETED) {
443 				err = NULL;
444 				break;
445 			}
446 			if (err->code != GOT_ERR_ITER_NEED_MORE)
447 				break;
448 			err = got_commit_graph_fetch_commits(graph, 1, repo);
449 			if (err)
450 				break;
451 			else
452 				continue;
453 		}
454 		if (id == NULL)
455 			break;
456 
457 		err = got_object_open_as_commit(&commit, repo, id);
458 		if (err)
459 			break;
460 		err = print_commit(commit, id, repo, show_patch, diff_context);
461 		got_object_commit_close(commit);
462 		if (err || (limit && --limit == 0))
463 			break;
464 	}
465 done:
466 	got_commit_graph_close(graph);
467 	return err;
468 }
469 
470 __dead static void
471 usage_log(void)
472 {
473 	fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
474 	    "[-r repository-path] [path]\n", getprogname());
475 	exit(1);
476 }
477 
478 static const struct got_error *
479 cmd_log(int argc, char *argv[])
480 {
481 	const struct got_error *error;
482 	struct got_repository *repo = NULL;
483 	struct got_commit_object *commit = NULL;
484 	struct got_object_id *id = NULL;
485 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
486 	char *start_commit = NULL;
487 	int diff_context = 3, ch;
488 	int show_patch = 0, limit = 0, first_parent_traversal = 0;
489 	const char *errstr;
490 
491 #ifndef PROFILE
492 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
493 	    == -1)
494 		err(1, "pledge");
495 #endif
496 
497 	while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
498 		switch (ch) {
499 		case 'p':
500 			show_patch = 1;
501 			break;
502 		case 'c':
503 			start_commit = optarg;
504 			break;
505 		case 'C':
506 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
507 			    &errstr);
508 			if (errstr != NULL)
509 				err(1, "-C option %s", errstr);
510 			break;
511 		case 'l':
512 			limit = strtonum(optarg, 1, INT_MAX, &errstr);
513 			if (errstr != NULL)
514 				err(1, "-l option %s", errstr);
515 			break;
516 		case 'f':
517 			first_parent_traversal = 1;
518 			break;
519 		case 'r':
520 			repo_path = realpath(optarg, NULL);
521 			if (repo_path == NULL)
522 				err(1, "-r option");
523 			break;
524 		default:
525 			usage();
526 			/* NOTREACHED */
527 		}
528 	}
529 
530 	argc -= optind;
531 	argv += optind;
532 
533 	if (argc == 0)
534 		path = strdup("");
535 	else if (argc == 1)
536 		path = strdup(argv[0]);
537 	else
538 		usage_log();
539 	if (path == NULL)
540 		return got_error_from_errno();
541 
542 	cwd = getcwd(NULL, 0);
543 	if (cwd == NULL) {
544 		error = got_error_from_errno();
545 		goto done;
546 	}
547 	if (repo_path == NULL) {
548 		repo_path = strdup(cwd);
549 		if (repo_path == NULL) {
550 			error = got_error_from_errno();
551 			goto done;
552 		}
553 	}
554 
555 	error = got_repo_open(&repo, repo_path);
556 	if (error != NULL)
557 		goto done;
558 
559 	if (start_commit == NULL) {
560 		struct got_reference *head_ref;
561 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
562 		if (error != NULL)
563 			return error;
564 		error = got_ref_resolve(&id, repo, head_ref);
565 		got_ref_close(head_ref);
566 		if (error != NULL)
567 			return error;
568 		error = got_object_open_as_commit(&commit, repo, id);
569 	} else {
570 		struct got_reference *ref;
571 		error = got_ref_open(&ref, repo, start_commit);
572 		if (error == NULL) {
573 			error = got_ref_resolve(&id, repo, ref);
574 			got_ref_close(ref);
575 			if (error != NULL)
576 				return error;
577 			error = got_object_open_as_commit(&commit, repo, id);
578 			if (error != NULL)
579 				return error;
580 		}
581 		if (commit == NULL) {
582 			error = got_object_resolve_id_str(&id, repo,
583 			    start_commit);
584 			if (error != NULL)
585 				return error;
586 		}
587 	}
588 	if (error != NULL)
589 		goto done;
590 
591 	error = got_repo_map_path(&in_repo_path, repo, path, 1);
592 	if (error != NULL)
593 		goto done;
594 	if (in_repo_path) {
595 		free(path);
596 		path = in_repo_path;
597 	}
598 
599 	error = print_commits(id, repo, path, show_patch,
600 	    diff_context, limit, first_parent_traversal);
601 done:
602 	free(path);
603 	free(repo_path);
604 	free(cwd);
605 	free(id);
606 	if (repo) {
607 		const struct got_error *repo_error;
608 		repo_error = got_repo_close(repo);
609 		if (error == NULL)
610 			error = repo_error;
611 	}
612 	return error;
613 }
614 
615 __dead static void
616 usage_diff(void)
617 {
618 	fprintf(stderr, "usage: %s diff [-C number] [repository-path] "
619 	    "object1 object2\n", getprogname());
620 	exit(1);
621 }
622 
623 static const struct got_error *
624 cmd_diff(int argc, char *argv[])
625 {
626 	const struct got_error *error;
627 	struct got_repository *repo = NULL;
628 	char *repo_path = NULL;
629 	struct got_object_id *id1 = NULL, *id2 = NULL;
630 	char *id_str1 = NULL, *id_str2 = NULL;
631 	int type1, type2;
632 	int diff_context = 3, ch;
633 	const char *errstr;
634 
635 #ifndef PROFILE
636 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
637 	    == -1)
638 		err(1, "pledge");
639 #endif
640 
641 	while ((ch = getopt(argc, argv, "C:")) != -1) {
642 		switch (ch) {
643 		case 'C':
644 			diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
645 			if (errstr != NULL)
646 				err(1, "-C option %s", errstr);
647 			break;
648 		default:
649 			usage();
650 			/* NOTREACHED */
651 		}
652 	}
653 
654 	argc -= optind;
655 	argv += optind;
656 
657 	if (argc == 0) {
658 		usage_diff(); /* TODO show local worktree changes */
659 	} else if (argc == 2) {
660 		repo_path = getcwd(NULL, 0);
661 		if (repo_path == NULL)
662 			return got_error_from_errno();
663 		id_str1 = argv[0];
664 		id_str2 = argv[1];
665 	} else if (argc == 3) {
666 		repo_path = realpath(argv[0], NULL);
667 		if (repo_path == NULL)
668 			return got_error_from_errno();
669 		id_str1 = argv[1];
670 		id_str2 = argv[2];
671 	} else
672 		usage_diff();
673 
674 	error = got_repo_open(&repo, repo_path);
675 	free(repo_path);
676 	if (error != NULL)
677 		goto done;
678 
679 	error = got_object_resolve_id_str(&id1, repo, id_str1);
680 	if (error)
681 		goto done;
682 
683 	error = got_object_resolve_id_str(&id2, repo, id_str2);
684 	if (error)
685 		goto done;
686 
687 	error = got_object_get_type(&type1, repo, id1);
688 	if (error)
689 		goto done;
690 
691 	error = got_object_get_type(&type2, repo, id2);
692 	if (error)
693 		goto done;
694 
695 	if (type1 != type2) {
696 		error = got_error(GOT_ERR_OBJ_TYPE);
697 		goto done;
698 	}
699 
700 	switch (type1) {
701 	case GOT_OBJ_TYPE_BLOB:
702 		error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
703 		    diff_context, repo, stdout);
704 		break;
705 	case GOT_OBJ_TYPE_TREE:
706 		error = got_diff_objects_as_trees(id1, id2, "", "",
707 		    diff_context, repo, stdout);
708 		break;
709 	case GOT_OBJ_TYPE_COMMIT:
710 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
711 		    id_str2);
712 		error = got_diff_objects_as_commits(id1, id2, diff_context,
713 		    repo, stdout);
714 		break;
715 	default:
716 		error = got_error(GOT_ERR_OBJ_TYPE);
717 	}
718 
719 done:
720 	free(id1);
721 	free(id2);
722 	if (repo) {
723 		const struct got_error *repo_error;
724 		repo_error = got_repo_close(repo);
725 		if (error == NULL)
726 			error = repo_error;
727 	}
728 	return error;
729 }
730 
731 __dead static void
732 usage_blame(void)
733 {
734 	fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
735 	    getprogname());
736 	exit(1);
737 }
738 
739 static const struct got_error *
740 cmd_blame(int argc, char *argv[])
741 {
742 	const struct got_error *error;
743 	struct got_repository *repo = NULL;
744 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
745 	struct got_object_id *commit_id = NULL;
746 	char *commit_id_str = NULL;
747 	int ch;
748 
749 #ifndef PROFILE
750 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
751 	    == -1)
752 		err(1, "pledge");
753 #endif
754 
755 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
756 		switch (ch) {
757 		case 'c':
758 			commit_id_str = optarg;
759 			break;
760 		case 'r':
761 			repo_path = realpath(optarg, NULL);
762 			if (repo_path == NULL)
763 				err(1, "-r option");
764 			break;
765 		default:
766 			usage();
767 			/* NOTREACHED */
768 		}
769 	}
770 
771 	argc -= optind;
772 	argv += optind;
773 
774 	if (argc == 1)
775 		path = argv[0];
776 	else
777 		usage_blame();
778 
779 	cwd = getcwd(NULL, 0);
780 	if (cwd == NULL) {
781 		error = got_error_from_errno();
782 		goto done;
783 	}
784 	if (repo_path == NULL) {
785 		repo_path = strdup(cwd);
786 		if (repo_path == NULL) {
787 			error = got_error_from_errno();
788 			goto done;
789 		}
790 	}
791 
792 	error = got_repo_open(&repo, repo_path);
793 	if (error != NULL)
794 		goto done;
795 
796 	error = got_repo_map_path(&in_repo_path, repo, path, 1);
797 	if (error != NULL)
798 		goto done;
799 
800 	if (commit_id_str == NULL) {
801 		struct got_reference *head_ref;
802 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
803 		if (error != NULL)
804 			goto done;
805 		error = got_ref_resolve(&commit_id, repo, head_ref);
806 		got_ref_close(head_ref);
807 		if (error != NULL)
808 			goto done;
809 	} else {
810 		error = got_object_resolve_id_str(&commit_id, repo,
811 		    commit_id_str);
812 		if (error != NULL)
813 			goto done;
814 	}
815 
816 	error = got_blame(in_repo_path, commit_id, repo, stdout);
817 done:
818 	free(in_repo_path);
819 	free(repo_path);
820 	free(cwd);
821 	free(commit_id);
822 	if (repo) {
823 		const struct got_error *repo_error;
824 		repo_error = got_repo_close(repo);
825 		if (error == NULL)
826 			error = repo_error;
827 	}
828 	return error;
829 }
830 
831 __dead static void
832 usage_tree(void)
833 {
834 	fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [-i] path\n",
835 	    getprogname());
836 	exit(1);
837 }
838 
839 
840 static const struct got_error *
841 print_tree(const char *path, struct got_object_id *commit_id,
842     int show_ids, struct got_repository *repo)
843 {
844 	const struct got_error *err = NULL;
845 	struct got_object_id *tree_id = NULL;
846 	struct got_tree_object *tree = NULL;
847 	const struct got_tree_entries *entries;
848 	struct got_tree_entry *te;
849 
850 	err = got_object_id_by_path(&tree_id, repo, commit_id, path);
851 	if (err)
852 		goto done;
853 
854 	err = got_object_open_as_tree(&tree, repo, tree_id);
855 	if (err)
856 		goto done;
857 	entries = got_object_tree_get_entries(tree);
858 	te = SIMPLEQ_FIRST(&entries->head);
859 	while (te) {
860 		char *id = NULL;
861 
862 		if (sigint_received || sigpipe_received)
863 			break;
864 
865 		if (show_ids) {
866 			char *id_str;
867 			err = got_object_id_str(&id_str, te->id);
868 			if (err)
869 				goto done;
870 			if (asprintf(&id, "%s ", id_str) == -1) {
871 				err = got_error_from_errno();
872 				free(id_str);
873 				goto done;
874 			}
875 			free(id_str);
876 		}
877 		printf("%s%s%s\n", id ? id : "",
878 		    te->name, S_ISDIR(te->mode) ? "/" : "");
879 		te = SIMPLEQ_NEXT(te, entry);
880 		free(id);
881 	}
882 done:
883 	if (tree)
884 		got_object_tree_close(tree);
885 	free(tree_id);
886 	return err;
887 }
888 
889 static const struct got_error *
890 cmd_tree(int argc, char *argv[])
891 {
892 	const struct got_error *error;
893 	struct got_repository *repo = NULL;
894 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
895 	struct got_object_id *commit_id = NULL;
896 	char *commit_id_str = NULL;
897 	int show_ids = 0;
898 	int ch;
899 
900 #ifndef PROFILE
901 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
902 	    == -1)
903 		err(1, "pledge");
904 #endif
905 
906 	while ((ch = getopt(argc, argv, "c:r:i")) != -1) {
907 		switch (ch) {
908 		case 'c':
909 			commit_id_str = optarg;
910 			break;
911 		case 'r':
912 			repo_path = realpath(optarg, NULL);
913 			if (repo_path == NULL)
914 				err(1, "-r option");
915 			break;
916 		case 'i':
917 			show_ids = 1;
918 			break;
919 		default:
920 			usage();
921 			/* NOTREACHED */
922 		}
923 	}
924 
925 	argc -= optind;
926 	argv += optind;
927 
928 	if (argc == 1)
929 		path = argv[0];
930 	else if (argc > 1)
931 		usage_tree();
932 	else
933 		path = "/";
934 
935 	cwd = getcwd(NULL, 0);
936 	if (cwd == NULL) {
937 		error = got_error_from_errno();
938 		goto done;
939 	}
940 	if (repo_path == NULL) {
941 		repo_path = strdup(cwd);
942 		if (repo_path == NULL) {
943 			error = got_error_from_errno();
944 			goto done;
945 		}
946 	}
947 
948 	error = got_repo_open(&repo, repo_path);
949 	if (error != NULL)
950 		goto done;
951 
952 	error = got_repo_map_path(&in_repo_path, repo, path, 1);
953 	if (error != NULL)
954 		goto done;
955 
956 	if (commit_id_str == NULL) {
957 		struct got_reference *head_ref;
958 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
959 		if (error != NULL)
960 			goto done;
961 		error = got_ref_resolve(&commit_id, repo, head_ref);
962 		got_ref_close(head_ref);
963 		if (error != NULL)
964 			goto done;
965 	} else {
966 		error = got_object_resolve_id_str(&commit_id, repo,
967 		    commit_id_str);
968 		if (error != NULL)
969 			goto done;
970 	}
971 
972 	error = print_tree(in_repo_path, commit_id, show_ids, repo);
973 done:
974 	free(in_repo_path);
975 	free(repo_path);
976 	free(cwd);
977 	free(commit_id);
978 	if (repo) {
979 		const struct got_error *repo_error;
980 		repo_error = got_repo_close(repo);
981 		if (error == NULL)
982 			error = repo_error;
983 	}
984 	return error;
985 }
986 
987 #ifdef notyet
988 static const struct got_error *
989 cmd_status(int argc __unused, char *argv[] __unused)
990 {
991 	git_repository *repo = NULL;
992 	git_status_list *status;
993 	git_status_options statusopts;
994 	size_t i;
995 
996 	git_libgit2_init();
997 
998 	if (git_repository_open_ext(&repo, ".", 0, NULL))
999 		errx(1, "git_repository_open: %s", giterr_last()->message);
1000 
1001 	if (git_repository_is_bare(repo))
1002 		errx(1, "bar repository");
1003 
1004 	if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
1005 		errx(1, "git_status_init_options: %s", giterr_last()->message);
1006 
1007 	statusopts.show  = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
1008 	statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
1009 	    GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
1010 	    GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
1011 
1012 	if (git_status_list_new(&status, repo, &statusopts))
1013 		errx(1, "git_status_list_new: %s", giterr_last()->message);
1014 
1015 	for (i = 0; i < git_status_list_entrycount(status); i++) {
1016 		const git_status_entry *se;
1017 
1018 		se = git_status_byindex(status, i);
1019 		switch (se->status) {
1020 		case GIT_STATUS_WT_NEW:
1021 			printf("? %s\n", se->index_to_workdir->new_file.path);
1022 			break;
1023 		case GIT_STATUS_WT_MODIFIED:
1024 			printf("M %s\n", se->index_to_workdir->new_file.path);
1025 			break;
1026 		case GIT_STATUS_WT_DELETED:
1027 			printf("R %s\n", se->index_to_workdir->new_file.path);
1028 			break;
1029 		case GIT_STATUS_WT_RENAMED:
1030 			printf("m %s -> %s\n",
1031 			    se->index_to_workdir->old_file.path,
1032 			    se->index_to_workdir->new_file.path);
1033 			break;
1034 		case GIT_STATUS_WT_TYPECHANGE:
1035 			printf("t %s\n", se->index_to_workdir->new_file.path);
1036 			break;
1037 		case GIT_STATUS_INDEX_NEW:
1038 			printf("A %s\n", se->head_to_index->new_file.path);
1039 			break;
1040 		case GIT_STATUS_INDEX_MODIFIED:
1041 			printf("M %s\n", se->head_to_index->old_file.path);
1042 			break;
1043 		case GIT_STATUS_INDEX_DELETED:
1044 			printf("R %s\n", se->head_to_index->old_file.path);
1045 			break;
1046 		case GIT_STATUS_INDEX_RENAMED:
1047 			printf("m %s -> %s\n",
1048 			    se->head_to_index->old_file.path,
1049 			    se->head_to_index->new_file.path);
1050 			break;
1051 		case GIT_STATUS_INDEX_TYPECHANGE:
1052 			printf("t %s\n", se->head_to_index->old_file.path);
1053 			break;
1054 		case GIT_STATUS_CURRENT:
1055 		default:
1056 			break;
1057 		}
1058 	}
1059 
1060 	git_status_list_free(status);
1061 	git_repository_free(repo);
1062 	git_libgit2_shutdown();
1063 
1064 	return 0;
1065 }
1066 #endif