Gotweb

Blob

Date:: Mon Jun 11 00:20:38 2018 UTC
Message:: fix check for author != committer in 'got log'
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 
22 #include <err.h>
23 #include <errno.h>
24 #include <locale.h>
25 #include <stdio.h>
26 #include <stdlib.h>
27 #include <string.h>
28 #include <unistd.h>
29 #include <libgen.h>
30 #include <time.h>
31 
32 #include "got_error.h"
33 #include "got_object.h"
34 #include "got_reference.h"
35 #include "got_repository.h"
36 #include "got_worktree.h"
37 #include "got_diff.h"
38 #include "got_commit_graph.h"
39 
40 #ifndef nitems
41 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
42 #endif
43 
44 struct cmd {
45 	const char	 *cmd_name;
46 	const struct got_error *(*cmd_main)(int, char *[]);
47 	void		(*cmd_usage)(void);
48 	const char	 *cmd_descr;
49 };
50 
51 __dead static void	usage(void);
52 __dead static void	usage_checkout(void);
53 __dead static void	usage_log(void);
54 __dead static void	usage_diff(void);
55 
56 static const struct got_error*		cmd_checkout(int, char *[]);
57 static const struct got_error*		cmd_log(int, char *[]);
58 static const struct got_error*		cmd_diff(int, char *[]);
59 #ifdef notyet
60 static const struct got_error*		cmd_status(int, char *[]);
61 #endif
62 
63 static struct cmd got_commands[] = {
64 	{ "checkout",	cmd_checkout,	usage_checkout,
65 	    "check out a new work tree from a repository" },
66 	{ "log",	cmd_log,	usage_log,
67 	    "show repository history" },
68 	{ "diff",	cmd_diff,	usage_diff,
69 	    "compare files and directories" },
70 #ifdef notyet
71 	{ "status",	cmd_status,	usage_status,
72 	    "show modification status of files" },
73 #endif
74 };
75 
76 int
77 main(int argc, char *argv[])
78 {
79 	struct cmd *cmd;
80 	unsigned int i;
81 	int ch;
82 	int hflag = 0;
83 
84 	setlocale(LC_ALL, "");
85 
86 	while ((ch = getopt(argc, argv, "h")) != -1) {
87 		switch (ch) {
88 		case 'h':
89 			hflag = 1;
90 			break;
91 		default:
92 			usage();
93 			/* NOTREACHED */
94 		}
95 	}
96 
97 	argc -= optind;
98 	argv += optind;
99 	optind = 0;
100 
101 	if (argc <= 0)
102 		usage();
103 
104 	for (i = 0; i < nitems(got_commands); i++) {
105 		const struct got_error *error;
106 
107 		cmd = &got_commands[i];
108 
109 		if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
110 			continue;
111 
112 		if (hflag)
113 			got_commands[i].cmd_usage();
114 
115 		error = got_commands[i].cmd_main(argc, argv);
116 		if (error) {
117 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
118 			return 1;
119 		}
120 
121 		return 0;
122 	}
123 
124 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
125 	return 1;
126 }
127 
128 __dead static void
129 usage(void)
130 {
131 	int i;
132 
133 	fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
134 	    "Available commands:\n", getprogname());
135 	for (i = 0; i < nitems(got_commands); i++) {
136 		struct cmd *cmd = &got_commands[i];
137 		fprintf(stderr, "    %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
138 	}
139 	exit(1);
140 }
141 
142 __dead static void
143 usage_checkout(void)
144 {
145 	fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
146 	    "[worktree-path]\n", getprogname());
147 	exit(1);
148 }
149 
150 static void
151 checkout_progress(void *arg, const char *path)
152 {
153 	char *worktree_path = arg;
154 
155 	while (path[0] == '/')
156 		path++;
157 
158 	printf("A  %s/%s\n", worktree_path, path);
159 }
160 
161 static const struct got_error *
162 cmd_checkout(int argc, char *argv[])
163 {
164 	const struct got_error *error = NULL;
165 	struct got_repository *repo = NULL;
166 	struct got_reference *head_ref = NULL;
167 	struct got_worktree *worktree = NULL;
168 	char *repo_path = NULL;
169 	char *worktree_path = NULL;
170 	const char *path_prefix = "";
171 	int ch;
172 
173 	while ((ch = getopt(argc, argv, "p:")) != -1) {
174 		switch (ch) {
175 		case 'p':
176 			path_prefix = optarg;
177 			break;
178 		default:
179 			usage();
180 			/* NOTREACHED */
181 		}
182 	}
183 
184 	argc -= optind;
185 	argv += optind;
186 
187 #ifndef PROFILE
188 	if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
189 		err(1, "pledge");
190 #endif
191 	if (argc == 1) {
192 		char *cwd, *base, *dotgit;
193 		repo_path = realpath(argv[0], NULL);
194 		if (repo_path == NULL)
195 			return got_error_from_errno();
196 		cwd = getcwd(NULL, 0);
197 		if (cwd == NULL) {
198 			error = got_error_from_errno();
199 			goto done;
200 		}
201 		if (path_prefix[0])
202 			base = basename(path_prefix);
203 		else
204 			base = basename(repo_path);
205 		if (base == NULL) {
206 			error = got_error_from_errno();
207 			goto done;
208 		}
209 		dotgit = strstr(base, ".git");
210 		if (dotgit)
211 			*dotgit = '\0';
212 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
213 			error = got_error_from_errno();
214 			free(cwd);
215 			goto done;
216 		}
217 		free(cwd);
218 	} else if (argc == 2) {
219 		repo_path = realpath(argv[0], NULL);
220 		if (repo_path == NULL) {
221 			error = got_error_from_errno();
222 			goto done;
223 		}
224 		worktree_path = realpath(argv[1], NULL);
225 		if (worktree_path == NULL) {
226 			error = got_error_from_errno();
227 			goto done;
228 		}
229 	} else
230 		usage_checkout();
231 
232 	error = got_repo_open(&repo, repo_path);
233 	if (error != NULL)
234 		goto done;
235 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
236 	if (error != NULL)
237 		goto done;
238 
239 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
240 	if (error != NULL)
241 		goto done;
242 
243 	error = got_worktree_open(&worktree, worktree_path);
244 	if (error != NULL)
245 		goto done;
246 
247 	error = got_worktree_checkout_files(worktree, head_ref, repo,
248 	    checkout_progress, worktree_path);
249 	if (error != NULL)
250 		goto done;
251 
252 	printf("Checked out %s\n", worktree_path);
253 	printf("Now shut up and hack\n");
254 
255 done:
256 	free(repo_path);
257 	free(worktree_path);
258 	return error;
259 }
260 
261 static const struct got_error *
262 print_patch(struct got_commit_object *commit, struct got_object_id *id,
263     struct got_repository *repo)
264 {
265 	const struct got_error *err = NULL;
266 	struct got_tree_object *tree1 = NULL, *tree2;
267 	struct got_object *obj;
268 	struct got_parent_id *pid;
269 
270 	err = got_object_open(&obj, repo, commit->tree_id);
271 	if (err)
272 		return err;
273 
274 	err = got_object_tree_open(&tree2, repo, obj);
275 	got_object_close(obj);
276 	if (err)
277 		return err;
278 
279 	pid = SIMPLEQ_FIRST(&commit->parent_ids);
280 	if (pid != NULL) {
281 		struct got_commit_object *pcommit;
282 
283 		err = got_object_open(&obj, repo, pid->id);
284 		if (err)
285 			return err;
286 
287 		err = got_object_commit_open(&pcommit, repo, obj);
288 		got_object_close(obj);
289 		if (err)
290 			return err;
291 
292 		err = got_object_open(&obj, repo, pcommit->tree_id);
293 		got_object_commit_close(pcommit);
294 		if (err)
295 			return err;
296 		err = got_object_tree_open(&tree1, repo, obj);
297 		got_object_close(obj);
298 		if (err)
299 			return err;
300 	}
301 
302 	err = got_diff_tree(tree1, tree2, repo, stdout);
303 	if (tree1)
304 		got_object_tree_close(tree1);
305 	got_object_tree_close(tree2);
306 	return err;
307 }
308 
309 char *
310 get_datestr(time_t *time, char *datebuf)
311 {
312 	char *p, *s = ctime_r(time, datebuf);
313 	p = strchr(s, '\n');
314 	if (p)
315 		*p = '\0';
316 	return s;
317 }
318 
319 static const struct got_error *
320 print_commit(struct got_commit_object *commit, struct got_object_id *id,
321     struct got_repository *repo, int show_patch, int verbose)
322 {
323 	const struct got_error *err = NULL;
324 	char *id_str, *datestr, *logmsg, *line;
325 	char datebuf[26];
326 
327 	err = got_object_id_str(&id_str, id);
328 	if (err)
329 		return err;
330 
331 	printf("-----------------------------------------------\n");
332 	printf("commit %s\n", id_str);
333 	free(id_str);
334 	datestr = get_datestr(&commit->author_time, datebuf);
335 	printf("author: %s  %s %s\n", commit->author, datestr,
336 	    commit->author_tzoff);
337 	if (strcmp(commit->author, commit->committer) != 0 ||
338 	    commit->author_time != commit->committer_time ||
339 	    strcmp(commit->author_tzoff, commit->committer_tzoff) != 0) {
340 		datestr = get_datestr(&commit->committer_time, datebuf);
341 		printf("committer: %s  %s %s\n", commit->committer,
342 		    datestr, commit->committer_tzoff);
343 	}
344 	if (commit->nparents > 1) {
345 		struct got_parent_id *pid;
346 		int n = 1;
347 		SIMPLEQ_FOREACH(pid, &commit->parent_ids, entry) {
348 			err = got_object_id_str(&id_str, pid->id);
349 			if (err)
350 				return err;
351 			printf("parent %d: %s\n", n++, id_str);
352 			free(id_str);
353 		}
354 	}
355 
356 	logmsg = strdup(commit->logmsg);
357 	if (logmsg == NULL)
358 		return got_error_from_errno();
359 
360 	do {
361 		line = strsep(&logmsg, "\n");
362 		if (line)
363 			printf(" %s\n", line);
364 	} while (line);
365 	free(logmsg);
366 
367 	if (show_patch) {
368 		err = print_patch(commit, id, repo);
369 		if (err == 0)
370 			printf("\n");
371 	}
372 
373 	return err;
374 }
375 
376 static const struct got_error *
377 print_commits(struct got_object *root_obj, struct got_object_id *root_id,
378     struct got_repository *repo, int show_patch, int limit, int verbose)
379 {
380 	const struct got_error *err;
381 	struct got_commit_graph *graph;
382 	int ncommits;
383 
384 	err = got_commit_graph_open(&graph, root_id, repo);
385 	if (err)
386 		return err;
387 	err = got_commit_graph_iter_start(graph, root_id);
388 	if (err)
389 		return err;
390 	do {
391 		struct got_commit_object *commit;
392 		struct got_object_id *id;
393 
394 		err = got_commit_graph_iter_next(&commit, &id, graph);
395 		if (err) {
396 			if (err->code != GOT_ERR_ITER_NEED_MORE)
397 				break;
398 			err = got_commit_graph_fetch_commits(&ncommits,
399 			    graph, 1, repo);
400 			if (err)
401 				break;
402 			else
403 				continue;
404 		}
405 		if (commit == NULL)
406 			break;
407 		err = print_commit(commit, id, repo, show_patch, verbose);
408 		if (err || (limit && --limit == 0))
409 			break;
410 	} while (ncommits > 0);
411 
412 	got_commit_graph_close(graph);
413 	return err;
414 }
415 
416 __dead static void
417 usage_log(void)
418 {
419 	fprintf(stderr, "usage: %s log [-p] [-c commit] [ -l N ] "
420 	    "[repository-path]\n", getprogname());
421 	exit(1);
422 }
423 
424 static const struct got_error *
425 cmd_log(int argc, char *argv[])
426 {
427 	const struct got_error *error;
428 	struct got_repository *repo;
429 	struct got_object_id *id = NULL;
430 	struct got_object *obj;
431 	char *repo_path = NULL;
432 	char *start_commit = NULL;
433 	int ch;
434 	int show_patch = 0, limit = 0, verbose = 0;
435 	const char *errstr;
436 
437 #ifndef PROFILE
438 	if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
439 		err(1, "pledge");
440 #endif
441 
442 	while ((ch = getopt(argc, argv, "pc:l:v")) != -1) {
443 		switch (ch) {
444 		case 'p':
445 			show_patch = 1;
446 			break;
447 		case 'c':
448 			start_commit = optarg;
449 			break;
450 		case 'l':
451 			limit = strtonum(optarg, 1, INT_MAX, &errstr);
452 			if (errstr != NULL)
453 				err(1, "-l option %s", errstr);
454 			break;
455 		case 'v':
456 			verbose = 1;
457 			break;
458 		default:
459 			usage();
460 			/* NOTREACHED */
461 		}
462 	}
463 
464 	argc -= optind;
465 	argv += optind;
466 
467 	if (argc == 0) {
468 		repo_path = getcwd(NULL, 0);
469 		if (repo_path == NULL)
470 			return got_error_from_errno();
471 	} else if (argc == 1) {
472 		repo_path = realpath(argv[0], NULL);
473 		if (repo_path == NULL)
474 			return got_error_from_errno();
475 	} else
476 		usage_log();
477 
478 	error = got_repo_open(&repo, repo_path);
479 	free(repo_path);
480 	if (error != NULL)
481 		return error;
482 
483 	if (start_commit == NULL) {
484 		struct got_reference *head_ref;
485 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
486 		if (error != NULL)
487 			return error;
488 		error = got_ref_resolve(&id, repo, head_ref);
489 		got_ref_close(head_ref);
490 		if (error != NULL)
491 			return error;
492 		error = got_object_open(&obj, repo, id);
493 	} else {
494 		error = got_object_open_by_id_str(&obj, repo, start_commit);
495 		if (error == NULL) {
496 			id = got_object_get_id(obj);
497 			if (id == NULL)
498 				error = got_error_from_errno();
499 		}
500 	}
501 	if (error != NULL)
502 		return error;
503 	if (got_object_get_type(obj) == GOT_OBJ_TYPE_COMMIT)
504 		error = print_commits(obj, id, repo, show_patch, limit,
505 		    verbose);
506 	else
507 		error = got_error(GOT_ERR_OBJ_TYPE);
508 	got_object_close(obj);
509 	free(id);
510 	got_repo_close(repo);
511 	return error;
512 }
513 
514 __dead static void
515 usage_diff(void)
516 {
517 	fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
518 	    getprogname());
519 	exit(1);
520 }
521 
522 static const struct got_error *
523 cmd_diff(int argc, char *argv[])
524 {
525 	const struct got_error *error;
526 	struct got_repository *repo = NULL;
527 	struct got_object_id *id1 = NULL, *id2 = NULL;
528 	struct got_object *obj1 = NULL, *obj2 = NULL;
529 	char *repo_path = NULL;
530 	char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
531 	int ch;
532 
533 #ifndef PROFILE
534 	if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
535 		err(1, "pledge");
536 #endif
537 
538 	while ((ch = getopt(argc, argv, "")) != -1) {
539 		switch (ch) {
540 		default:
541 			usage();
542 			/* NOTREACHED */
543 		}
544 	}
545 
546 	argc -= optind;
547 	argv += optind;
548 
549 	if (argc == 0) {
550 		usage_diff(); /* TODO show local worktree changes */
551 	} else if (argc == 2) {
552 		repo_path = getcwd(NULL, 0);
553 		if (repo_path == NULL)
554 			return got_error_from_errno();
555 		obj_id_str1 = argv[0];
556 		obj_id_str2 = argv[1];
557 	} else if (argc == 3) {
558 		repo_path = realpath(argv[0], NULL);
559 		if (repo_path == NULL)
560 			return got_error_from_errno();
561 		obj_id_str1 = argv[1];
562 		obj_id_str2 = argv[2];
563 	} else
564 		usage_diff();
565 
566 	error = got_repo_open(&repo, repo_path);
567 	free(repo_path);
568 	if (error != NULL)
569 		goto done;
570 
571 	error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
572 	if (error == NULL) {
573 		id1 = got_object_get_id(obj1);
574 		if (id1 == NULL)
575 			error = got_error_from_errno();
576 	}
577 	if (error != NULL)
578 		goto done;
579 
580 	error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
581 	if (error == NULL) {
582 		id2 = got_object_get_id(obj2);
583 		if (id2 == NULL)
584 			error = got_error_from_errno();
585 	}
586 	if (error != NULL)
587 		goto done;
588 
589 	if (got_object_get_type(obj1) != got_object_get_type(obj2)) {
590 		error = got_error(GOT_ERR_OBJ_TYPE);
591 		goto done;
592 	}
593 
594 	switch (got_object_get_type(obj1)) {
595 	case GOT_OBJ_TYPE_BLOB:
596 		error = got_diff_objects_as_blobs(obj1, obj2, repo, stdout);
597 		break;
598 	case GOT_OBJ_TYPE_TREE:
599 		error = got_diff_objects_as_trees(obj1, obj2, repo, stdout);
600 		break;
601 	case GOT_OBJ_TYPE_COMMIT:
602 		error = got_diff_objects_as_commits(obj1, obj2, repo, stdout);
603 		break;
604 	default:
605 		error = got_error(GOT_ERR_OBJ_TYPE);
606 	}
607 
608 done:
609 	if (obj1)
610 		got_object_close(obj1);
611 	if (obj2)
612 		got_object_close(obj2);
613 	if (id1)
614 		free(id1);
615 	if (id2)
616 		free(id2);
617 	if (repo)
618 		got_repo_close(repo);
619 	return error;
620 }
621 
622 #ifdef notyet
623 static const struct got_error *
624 cmd_status(int argc __unused, char *argv[] __unused)
625 {
626 	git_repository *repo = NULL;
627 	git_status_list *status;
628 	git_status_options statusopts;
629 	size_t i;
630 
631 	git_libgit2_init();
632 
633 	if (git_repository_open_ext(&repo, ".", 0, NULL))
634 		errx(1, "git_repository_open: %s", giterr_last()->message);
635 
636 	if (git_repository_is_bare(repo))
637 		errx(1, "bar repository");
638 
639 	if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
640 		errx(1, "git_status_init_options: %s", giterr_last()->message);
641 
642 	statusopts.show  = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
643 	statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
644 	    GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
645 	    GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
646 
647 	if (git_status_list_new(&status, repo, &statusopts))
648 		errx(1, "git_status_list_new: %s", giterr_last()->message);
649 
650 	for (i = 0; i < git_status_list_entrycount(status); i++) {
651 		const git_status_entry *se;
652 
653 		se = git_status_byindex(status, i);
654 		switch (se->status) {
655 		case GIT_STATUS_WT_NEW:
656 			printf("? %s\n", se->index_to_workdir->new_file.path);
657 			break;
658 		case GIT_STATUS_WT_MODIFIED:
659 			printf("M %s\n", se->index_to_workdir->new_file.path);
660 			break;
661 		case GIT_STATUS_WT_DELETED:
662 			printf("R %s\n", se->index_to_workdir->new_file.path);
663 			break;
664 		case GIT_STATUS_WT_RENAMED:
665 			printf("m %s -> %s\n",
666 			    se->index_to_workdir->old_file.path,
667 			    se->index_to_workdir->new_file.path);
668 			break;
669 		case GIT_STATUS_WT_TYPECHANGE:
670 			printf("t %s\n", se->index_to_workdir->new_file.path);
671 			break;
672 		case GIT_STATUS_INDEX_NEW:
673 			printf("A %s\n", se->head_to_index->new_file.path);
674 			break;
675 		case GIT_STATUS_INDEX_MODIFIED:
676 			printf("M %s\n", se->head_to_index->old_file.path);
677 			break;
678 		case GIT_STATUS_INDEX_DELETED:
679 			printf("R %s\n", se->head_to_index->old_file.path);
680 			break;
681 		case GIT_STATUS_INDEX_RENAMED:
682 			printf("m %s -> %s\n",
683 			    se->head_to_index->old_file.path,
684 			    se->head_to_index->new_file.path);
685 			break;
686 		case GIT_STATUS_INDEX_TYPECHANGE:
687 			printf("t %s\n", se->head_to_index->old_file.path);
688 			break;
689 		case GIT_STATUS_CURRENT:
690 		default:
691 			break;
692 		}
693 	}
694 
695 	git_status_list_free(status);
696 	git_repository_free(repo);
697 	git_libgit2_shutdown();
698 
699 	return 0;
700 }
701 #endif