Got Mirror

Blob

Date:: Tue Mar 27 21:29:21 2018 UTC
Message:: fix wrong argv[] index in cmd_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 
20 #include <err.h>
21 #include <errno.h>
22 #include <locale.h>
23 #include <stdio.h>
24 #include <stdlib.h>
25 #include <string.h>
26 #include <unistd.h>
27 #include <libgen.h>
28 
29 #include "got_error.h"
30 #include "got_object.h"
31 #include "got_refs.h"
32 #include "got_repository.h"
33 #include "got_worktree.h"
34 #include "got_diff.h"
35 
36 #ifndef nitems
37 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
38 #endif
39 
40 struct cmd {
41 	const char	 *cmd_name;
42 	const struct got_error *(*cmd_main)(int, char *[]);
43 	void		(*cmd_usage)(void);
44 	const char	 *cmd_descr;
45 };
46 
47 __dead void	usage(void);
48 __dead void	usage_checkout(void);
49 __dead void	usage_log(void);
50 
51 const struct got_error*		cmd_checkout(int, char *[]);
52 const struct got_error*		cmd_log(int, char *[]);
53 const struct got_error*		cmd_status(int, char *[]);
54 
55 struct cmd got_commands[] = {
56 	{ "checkout",	cmd_checkout,	usage_checkout,
57 	    "check out a new work tree from a repository" },
58 	{ "log",	cmd_log,	usage_log,
59 	    "show repository history" },
60 #ifdef notyet
61 	{ "status",	cmd_status,	usage_status,
62 	    "show modification status of files" },
63 #endif
64 };
65 
66 int
67 main(int argc, char *argv[])
68 {
69 	struct cmd *cmd;
70 	unsigned int i;
71 	int ch;
72 	int hflag = 0;
73 
74 	setlocale(LC_ALL, "");
75 
76 	while ((ch = getopt(argc, argv, "h")) != -1) {
77 		switch (ch) {
78 		case 'h':
79 			hflag = 1;
80 			break;
81 		default:
82 			usage();
83 			/* NOTREACHED */
84 		}
85 	}
86 
87 	argc -= optind;
88 	argv += optind;
89 	optind = 0;
90 
91 	if (argc <= 0)
92 		usage();
93 
94 	for (i = 0; i < nitems(got_commands); i++) {
95 		const struct got_error *error;
96 
97 		cmd = &got_commands[i];
98 
99 		if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
100 			continue;
101 
102 		if (hflag)
103 			got_commands[i].cmd_usage();
104 
105 		error = got_commands[i].cmd_main(argc, argv);
106 		if (error) {
107 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
108 			return 1;
109 		}
110 
111 		return 0;
112 	}
113 
114 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
115 	return 1;
116 }
117 
118 __dead void
119 usage(void)
120 {
121 	int i;
122 
123 	fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
124 	    "Available commands:\n", getprogname());
125 	for (i = 0; i < nitems(got_commands); i++) {
126 		struct cmd *cmd = &got_commands[i];
127 		fprintf(stderr, "    %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
128 	}
129 	exit(1);
130 }
131 
132 __dead void
133 usage_checkout(void)
134 {
135 	fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
136 	    "[worktree-path]\n", getprogname());
137 	exit(1);
138 }
139 
140 static void
141 checkout_progress(void *arg, const char *path)
142 {
143 	char *worktree_path = arg;
144 
145 	while (path[0] == '/')
146 		path++;
147 
148 	printf("A  %s/%s\n", worktree_path, path);
149 }
150 
151 const struct got_error *
152 cmd_checkout(int argc, char *argv[])
153 {
154 	const struct got_error *error = NULL;
155 	struct got_repository *repo = NULL;
156 	struct got_reference *head_ref = NULL;
157 	struct got_worktree *worktree = NULL;
158 	char *repo_path = NULL;
159 	char *worktree_path = NULL;
160 	const char *path_prefix = "";
161 	int ch;
162 
163 	while ((ch = getopt(argc, argv, "p:")) != -1) {
164 		switch (ch) {
165 		case 'p':
166 			path_prefix = optarg;
167 			break;
168 		default:
169 			usage();
170 			/* NOTREACHED */
171 		}
172 	}
173 
174 	argc -= optind;
175 	argv += optind;
176 
177 #ifndef PROFILE
178 	if (pledge("stdio rpath wpath cpath flock", NULL) == -1)
179 		err(1, "pledge");
180 #endif
181 	if (argc == 1) {
182 		char *cwd, *base, *dotgit;
183 		repo_path = argv[0];
184 		cwd = getcwd(NULL, 0);
185 		if (cwd == NULL)
186 			err(1, "getcwd");
187 		base = basename(repo_path);
188 		if (base == NULL)
189 			err(1, "basename");
190 		dotgit = strstr(base, ".git");
191 		if (dotgit)
192 			*dotgit = '\0';
193 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
194 			error = got_error_from_errno();
195 			free(cwd);
196 			return error;
197 		}
198 		free(cwd);
199 	} else if (argc == 2) {
200 		repo_path = argv[0];
201 		worktree_path = strdup(argv[1]);
202 		if (worktree_path == NULL)
203 			return got_error_from_errno();
204 	} else
205 		usage_checkout();
206 
207 	error = got_repo_open(&repo, repo_path);
208 	if (error != NULL)
209 		goto done;
210 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
211 	if (error != NULL)
212 		goto done;
213 
214 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
215 	if (error != NULL)
216 		goto done;
217 
218 	error = got_worktree_open(&worktree, worktree_path);
219 	if (error != NULL)
220 		goto done;
221 
222 	error = got_worktree_checkout_files(worktree, head_ref, repo,
223 	    checkout_progress, worktree_path);
224 	if (error != NULL)
225 		goto done;
226 
227 	printf("checked out %s\n", worktree_path);
228 
229 done:
230 	free(worktree_path);
231 	return error;
232 }
233 
234 static const struct got_error *
235 print_patch(struct got_commit_object *commit, struct got_object_id *id,
236     struct got_repository *repo)
237 {
238 	const struct got_error *err = NULL;
239 	struct got_tree_object *tree1 = NULL, *tree2;
240 	struct got_object *obj;
241 	struct got_parent_id *pid;
242 
243 	err = got_object_open(&obj, repo, commit->tree_id);
244 	if (err)
245 		return err;
246 
247 	err = got_object_tree_open(&tree2, repo, obj);
248 	got_object_close(obj);
249 	if (err)
250 		return err;
251 
252 	pid = SIMPLEQ_FIRST(&commit->parent_ids);
253 	if (pid != NULL) {
254 		struct got_commit_object *pcommit;
255 
256 		err = got_object_open(&obj, repo, pid->id);
257 		if (err)
258 			return err;
259 
260 		err = got_object_commit_open(&pcommit, repo, obj);
261 		got_object_close(obj);
262 		if (err)
263 			return err;
264 
265 		err = got_object_open(&obj, repo, pcommit->tree_id);
266 		got_object_commit_close(pcommit);
267 		if (err)
268 			return err;
269 		err = got_object_tree_open(&tree1, repo, obj);
270 		got_object_close(obj);
271 		if (err)
272 			return err;
273 	}
274 
275 	err = got_diff_tree(tree1, tree2, repo, stdout);
276 	if (tree1)
277 		got_object_tree_close(tree1);
278 	got_object_tree_close(tree2);
279 	return err;
280 }
281 
282 static const struct got_error *
283 print_commit(struct got_commit_object *commit, struct got_object_id *id,
284     struct got_repository *repo, int show_patch)
285 {
286 	const struct got_error *err = NULL;
287 	char *buf;
288 
289 	err = got_object_id_str(&buf, id);
290 	if (err)
291 		return err;
292 
293 	printf("-----------------------------------------------\n");
294 	printf("commit: %s\n", buf);
295 	printf("Author: %s\n", commit->author);
296 	printf("\n%s\n", commit->logmsg);
297 
298 	if (show_patch) {
299 		err = print_patch(commit, id, repo);
300 		if (err == 0)
301 			printf("\n");
302 	}
303 
304 	free(buf);
305 	return err;
306 }
307 
308 struct commit_queue_entry {
309 	TAILQ_ENTRY(commit_queue_entry) entry;
310 	struct got_object_id *id;
311 	struct got_commit_object *commit;
312 };
313 
314 static const struct got_error *
315 print_commits(struct got_object *root_obj, struct got_object_id *root_id,
316     struct got_repository *repo, int show_patch)
317 {
318 	const struct got_error *err;
319 	struct got_commit_object *root_commit;
320 	TAILQ_HEAD(, commit_queue_entry) commits;
321 	struct commit_queue_entry *entry;
322 
323 	TAILQ_INIT(&commits);
324 
325 	err = got_object_commit_open(&root_commit, repo, root_obj);
326 	if (err)
327 		return err;
328 
329 	entry = calloc(1, sizeof(*entry));
330 	if (entry == NULL)
331 		return got_error_from_errno();
332 	entry->id = got_object_id_dup(root_id);
333 	if (entry->id == NULL) {
334 		err = got_error_from_errno();
335 		free(entry);
336 		return err;
337 	}
338 	entry->commit = root_commit;
339 	TAILQ_INSERT_HEAD(&commits, entry, entry);
340 
341 	while (!TAILQ_EMPTY(&commits)) {
342 		struct got_parent_id *pid;
343 
344 		entry = TAILQ_FIRST(&commits);
345 		err = print_commit(entry->commit, entry->id, repo, show_patch);
346 		if (err)
347 			break;
348 
349 		SIMPLEQ_FOREACH(pid, &entry->commit->parent_ids, entry) {
350 			struct got_object *obj;
351 			struct got_commit_object *pcommit;
352 			struct commit_queue_entry *pentry;
353 
354 			err = got_object_open(&obj, repo, pid->id);
355 			if (err)
356 				break;
357 			if (got_object_get_type(obj) != GOT_OBJ_TYPE_COMMIT) {
358 				err = got_error(GOT_ERR_OBJ_TYPE);
359 				break;
360 			}
361 
362 			err = got_object_commit_open(&pcommit, repo, obj);
363 			got_object_close(obj);
364 			if (err)
365 				break;
366 
367 			pentry = calloc(1, sizeof(*pentry));
368 			if (pentry == NULL) {
369 				err = got_error_from_errno();
370 				got_object_commit_close(pcommit);
371 				break;
372 			}
373 			pentry->id = got_object_id_dup(pid->id);
374 			if (pentry->id == NULL) {
375 				err = got_error_from_errno();
376 				got_object_commit_close(pcommit);
377 				break;
378 			}
379 			pentry->commit = pcommit;
380 			TAILQ_INSERT_TAIL(&commits, pentry, entry);
381 		}
382 
383 		TAILQ_REMOVE(&commits, entry, entry);
384 		got_object_commit_close(entry->commit);
385 		free(entry->id);
386 		free(entry);
387 	}
388 
389 	return err;
390 }
391 
392 __dead void
393 usage_log(void)
394 {
395 	fprintf(stderr, "usage: %s log [-p] [repository-path]\n",
396 	    getprogname());
397 	exit(1);
398 }
399 
400 const struct got_error *
401 cmd_log(int argc, char *argv[])
402 {
403 	const struct got_error *error;
404 	struct got_repository *repo;
405 	struct got_reference *head_ref;
406 	struct got_object_id *id;
407 	struct got_object *obj;
408 	char *repo_path = NULL;
409 	int ch;
410 	int show_patch = 0;
411 
412 #ifndef PROFILE
413 	if (pledge("stdio rpath wpath cpath", NULL) == -1)
414 		err(1, "pledge");
415 #endif
416 
417 	while ((ch = getopt(argc, argv, "p")) != -1) {
418 		switch (ch) {
419 		case 'p':
420 			show_patch = 1;
421 			break;
422 		default:
423 			usage();
424 			/* NOTREACHED */
425 		}
426 	}
427 
428 	argc -= optind;
429 	argv += optind;
430 
431 	if (argc == 0) {
432 		repo_path = getcwd(NULL, 0);
433 		if (repo_path == NULL)
434 			err(1, "getcwd");
435 	} else if (argc == 1)
436 		repo_path = argv[0];
437 	else
438 		usage_log();
439 
440 	error = got_repo_open(&repo, repo_path);
441 	if (error != NULL)
442 		return error;
443 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
444 	if (error != NULL)
445 		return error;
446 	error = got_ref_resolve(&id, repo, head_ref);
447 	if (error != NULL)
448 		return error;
449 
450 	error = got_object_open(&obj, repo, id);
451 	if (error != NULL)
452 		return error;
453 	if (got_object_get_type(obj) == GOT_OBJ_TYPE_COMMIT)
454 		error = print_commits(obj, id, repo, show_patch);
455 	else
456 		error = got_error(GOT_ERR_OBJ_TYPE);
457 	got_object_close(obj);
458 	free(id);
459 	got_ref_close(head_ref);
460 	got_repo_close(repo);
461 	return error;
462 }
463 
464 #ifdef notyet
465 const struct got_error *
466 cmd_status(int argc __unused, char *argv[] __unused)
467 {
468 	git_repository *repo = NULL;
469 	git_status_list *status;
470 	git_status_options statusopts;
471 	size_t i;
472 
473 	git_libgit2_init();
474 
475 	if (git_repository_open_ext(&repo, ".", 0, NULL))
476 		errx(1, "git_repository_open: %s", giterr_last()->message);
477 
478 	if (git_repository_is_bare(repo))
479 		errx(1, "bar repository");
480 
481 	if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
482 		errx(1, "git_status_init_options: %s", giterr_last()->message);
483 
484 	statusopts.show  = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
485 	statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
486 	    GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
487 	    GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
488 
489 	if (git_status_list_new(&status, repo, &statusopts))
490 		errx(1, "git_status_list_new: %s", giterr_last()->message);
491 
492 	for (i = 0; i < git_status_list_entrycount(status); i++) {
493 		const git_status_entry *se;
494 
495 		se = git_status_byindex(status, i);
496 		switch (se->status) {
497 		case GIT_STATUS_WT_NEW:
498 			printf("? %s\n", se->index_to_workdir->new_file.path);
499 			break;
500 		case GIT_STATUS_WT_MODIFIED:
501 			printf("M %s\n", se->index_to_workdir->new_file.path);
502 			break;
503 		case GIT_STATUS_WT_DELETED:
504 			printf("R %s\n", se->index_to_workdir->new_file.path);
505 			break;
506 		case GIT_STATUS_WT_RENAMED:
507 			printf("m %s -> %s\n",
508 			    se->index_to_workdir->old_file.path,
509 			    se->index_to_workdir->new_file.path);
510 			break;
511 		case GIT_STATUS_WT_TYPECHANGE:
512 			printf("t %s\n", se->index_to_workdir->new_file.path);
513 			break;
514 		case GIT_STATUS_INDEX_NEW:
515 			printf("A %s\n", se->head_to_index->new_file.path);
516 			break;
517 		case GIT_STATUS_INDEX_MODIFIED:
518 			printf("M %s\n", se->head_to_index->old_file.path);
519 			break;
520 		case GIT_STATUS_INDEX_DELETED:
521 			printf("R %s\n", se->head_to_index->old_file.path);
522 			break;
523 		case GIT_STATUS_INDEX_RENAMED:
524 			printf("m %s -> %s\n",
525 			    se->head_to_index->old_file.path,
526 			    se->head_to_index->new_file.path);
527 			break;
528 		case GIT_STATUS_INDEX_TYPECHANGE:
529 			printf("t %s\n", se->head_to_index->old_file.path);
530 			break;
531 		case GIT_STATUS_CURRENT:
532 		default:
533 			break;
534 		}
535 	}
536 
537 	git_status_list_free(status);
538 	git_repository_free(repo);
539 	git_libgit2_shutdown();
540 
541 	return 0;
542 }
543 #endif