2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 f42b1b34 2018-03-12 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 64a96a6d 2018-04-01 stsp #include <sys/limits.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
23 5c860e29 2018-03-12 stsp #include <err.h>
24 5c860e29 2018-03-12 stsp #include <errno.h>
25 5c860e29 2018-03-12 stsp #include <locale.h>
26 99437157 2018-11-11 stsp #include <signal.h>
27 5c860e29 2018-03-12 stsp #include <stdio.h>
28 5c860e29 2018-03-12 stsp #include <stdlib.h>
29 5c860e29 2018-03-12 stsp #include <string.h>
30 5c860e29 2018-03-12 stsp #include <unistd.h>
31 c09a553d 2018-03-12 stsp #include <libgen.h>
32 c0768b0f 2018-06-10 stsp #include <time.h>
34 f42b1b34 2018-03-12 stsp #include "got_error.h"
35 f42b1b34 2018-03-12 stsp #include "got_object.h"
36 5261c201 2018-04-01 stsp #include "got_reference.h"
37 f42b1b34 2018-03-12 stsp #include "got_repository.h"
38 c09a553d 2018-03-12 stsp #include "got_worktree.h"
39 79109fed 2018-03-27 stsp #include "got_diff.h"
40 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
41 404c43c4 2018-06-21 stsp #include "got_blame.h"
43 5c860e29 2018-03-12 stsp #ifndef nitems
44 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
47 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
48 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
51 99437157 2018-11-11 stsp catch_sigint(int signo)
53 99437157 2018-11-11 stsp sigint_received = 1;
57 99437157 2018-11-11 stsp catch_sigpipe(int signo)
59 99437157 2018-11-11 stsp sigpipe_received = 1;
63 5c860e29 2018-03-12 stsp struct cmd {
64 5c860e29 2018-03-12 stsp const char *cmd_name;
65 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
66 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
67 46a0db7d 2018-03-12 stsp const char *cmd_descr;
70 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
71 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
72 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
73 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
74 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
75 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
76 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
78 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
79 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
80 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
81 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
82 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
83 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
84 4ed7e80c 2018-05-20 stsp #ifdef notyet
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
88 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
89 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
90 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
91 507dc3bb 2018-12-29 stsp { "update", cmd_update, usage_update,
92 507dc3bb 2018-12-29 stsp "update a work tree to a different commit" },
93 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
94 1b6b95a8 2018-03-12 stsp "show repository history" },
95 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
96 b00d56cd 2018-04-01 stsp "compare files and directories" },
97 404c43c4 2018-06-21 stsp { "blame", cmd_blame, usage_blame,
98 404c43c4 2018-06-21 stsp " show when lines in a file were changed" },
99 5de5890b 2018-10-18 stsp { "tree", cmd_tree, usage_tree,
100 5de5890b 2018-10-18 stsp " list files and directories in repository" },
101 f42b1b34 2018-03-12 stsp #ifdef notyet
102 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
103 1b6b95a8 2018-03-12 stsp "show modification status of files" },
108 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
110 5c860e29 2018-03-12 stsp struct cmd *cmd;
111 5c860e29 2018-03-12 stsp unsigned int i;
113 1b6b95a8 2018-03-12 stsp int hflag = 0;
115 5c860e29 2018-03-12 stsp setlocale(LC_ALL, "");
117 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
118 5c860e29 2018-03-12 stsp switch (ch) {
124 5c860e29 2018-03-12 stsp /* NOTREACHED */
128 5c860e29 2018-03-12 stsp argc -= optind;
129 5c860e29 2018-03-12 stsp argv += optind;
130 1e70621d 2018-03-27 stsp optind = 0;
132 5c860e29 2018-03-12 stsp if (argc <= 0)
135 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
136 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
138 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
139 d7d4f210 2018-03-12 stsp const struct got_error *error;
141 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
143 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
147 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
149 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
150 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
151 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
158 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
162 4ed7e80c 2018-05-20 stsp __dead static void
163 5c860e29 2018-03-12 stsp usage(void)
167 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
168 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
169 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
170 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
171 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
176 4ed7e80c 2018-05-20 stsp __dead static void
177 c09a553d 2018-03-12 stsp usage_checkout(void)
179 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
180 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
184 92a684f4 2018-03-12 stsp static void
185 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
187 92a684f4 2018-03-12 stsp char *worktree_path = arg;
189 92a684f4 2018-03-12 stsp while (path[0] == '/')
192 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
195 99437157 2018-11-11 stsp static const struct got_error *
196 99437157 2018-11-11 stsp checkout_cancel(void *arg)
198 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
199 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
200 99437157 2018-11-11 stsp return NULL;
203 4ed7e80c 2018-05-20 stsp static const struct got_error *
204 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
206 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
207 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
208 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
209 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
210 c09a553d 2018-03-12 stsp char *repo_path = NULL;
211 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
212 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
213 e5dc7198 2018-12-29 stsp int ch, same_path_prefix;
215 0bb8a95e 2018-03-12 stsp while ((ch = getopt(argc, argv, "p:")) != -1) {
216 0bb8a95e 2018-03-12 stsp switch (ch) {
218 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
222 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
226 0bb8a95e 2018-03-12 stsp argc -= optind;
227 0bb8a95e 2018-03-12 stsp argv += optind;
229 6715a751 2018-03-16 stsp #ifndef PROFILE
230 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
232 c09a553d 2018-03-12 stsp err(1, "pledge");
234 0bb8a95e 2018-03-12 stsp if (argc == 1) {
235 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
236 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
237 76089277 2018-04-01 stsp if (repo_path == NULL)
238 76089277 2018-04-01 stsp return got_error_from_errno();
239 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
240 76089277 2018-04-01 stsp if (cwd == NULL) {
241 76089277 2018-04-01 stsp error = got_error_from_errno();
244 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
245 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
247 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
248 76089277 2018-04-01 stsp if (base == NULL) {
249 76089277 2018-04-01 stsp error = got_error_from_errno();
252 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
253 c09a553d 2018-03-12 stsp if (dotgit)
254 c09a553d 2018-03-12 stsp *dotgit = '\0';
255 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
256 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
261 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
262 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
263 76089277 2018-04-01 stsp if (repo_path == NULL) {
264 76089277 2018-04-01 stsp error = got_error_from_errno();
267 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
268 76089277 2018-04-01 stsp if (worktree_path == NULL) {
269 76089277 2018-04-01 stsp error = got_error_from_errno();
273 c09a553d 2018-03-12 stsp usage_checkout();
275 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
276 c09a553d 2018-03-12 stsp if (error != NULL)
278 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
279 c09a553d 2018-03-12 stsp if (error != NULL)
282 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
283 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
286 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
287 c09a553d 2018-03-12 stsp if (error != NULL)
290 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
291 e5dc7198 2018-12-29 stsp path_prefix);
292 e5dc7198 2018-12-29 stsp if (error != NULL)
294 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
295 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
299 93a30277 2018-12-24 stsp error = got_worktree_checkout_files(worktree, repo,
300 99437157 2018-11-11 stsp checkout_progress, worktree_path, checkout_cancel, NULL);
301 c09a553d 2018-03-12 stsp if (error != NULL)
304 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
307 76089277 2018-04-01 stsp free(repo_path);
308 507dc3bb 2018-12-29 stsp free(worktree_path);
309 507dc3bb 2018-12-29 stsp return error;
312 507dc3bb 2018-12-29 stsp __dead static void
313 507dc3bb 2018-12-29 stsp usage_update(void)
315 507dc3bb 2018-12-29 stsp fprintf(stderr, "usage: %s update [-c commit] [worktree-path]\n",
316 507dc3bb 2018-12-29 stsp getprogname());
320 507dc3bb 2018-12-29 stsp static void
321 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
323 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
326 507dc3bb 2018-12-29 stsp while (path[0] == '/')
328 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
331 507dc3bb 2018-12-29 stsp static const struct got_error *
332 be7061eb 2018-12-30 stsp check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
333 be7061eb 2018-12-30 stsp struct got_repository *repo)
335 be7061eb 2018-12-30 stsp const struct got_error *err;
336 be7061eb 2018-12-30 stsp struct got_reference *head_ref = NULL;
337 be7061eb 2018-12-30 stsp struct got_object_id *head_commit_id = NULL;
338 be7061eb 2018-12-30 stsp struct got_commit_graph *graph = NULL;
340 be7061eb 2018-12-30 stsp head_ref = got_worktree_get_head_ref(worktree);
341 be7061eb 2018-12-30 stsp if (head_ref == NULL)
342 be7061eb 2018-12-30 stsp return got_error_from_errno();
344 be7061eb 2018-12-30 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
348 be7061eb 2018-12-30 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
352 be7061eb 2018-12-30 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
355 be7061eb 2018-12-30 stsp while (1) {
356 be7061eb 2018-12-30 stsp struct got_object_id *id;
358 be7061eb 2018-12-30 stsp if (sigint_received || sigpipe_received)
361 be7061eb 2018-12-30 stsp err = got_commit_graph_iter_next(&id, graph);
363 be7061eb 2018-12-30 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
364 be7061eb 2018-12-30 stsp err = got_error(GOT_ERR_ANCESTRY);
367 be7061eb 2018-12-30 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
369 be7061eb 2018-12-30 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
375 be7061eb 2018-12-30 stsp if (id == NULL)
377 be7061eb 2018-12-30 stsp if (got_object_id_cmp(id, commit_id) == 0)
381 be7061eb 2018-12-30 stsp if (head_ref)
382 be7061eb 2018-12-30 stsp got_ref_close(head_ref);
384 be7061eb 2018-12-30 stsp got_commit_graph_close(graph);
385 be7061eb 2018-12-30 stsp return err;
388 be7061eb 2018-12-30 stsp static const struct got_error *
389 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
391 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
392 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
393 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
394 507dc3bb 2018-12-29 stsp char *worktree_path = NULL;
395 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
396 507dc3bb 2018-12-29 stsp const char *commit_id_str = NULL;
399 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
400 507dc3bb 2018-12-29 stsp switch (ch) {
402 507dc3bb 2018-12-29 stsp commit_id_str = optarg;
406 507dc3bb 2018-12-29 stsp /* NOTREACHED */
410 507dc3bb 2018-12-29 stsp argc -= optind;
411 507dc3bb 2018-12-29 stsp argv += optind;
413 507dc3bb 2018-12-29 stsp #ifndef PROFILE
414 507dc3bb 2018-12-29 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
416 507dc3bb 2018-12-29 stsp err(1, "pledge");
418 507dc3bb 2018-12-29 stsp if (argc == 0) {
419 507dc3bb 2018-12-29 stsp worktree_path = getcwd(NULL, 0);
420 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
421 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
424 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
425 507dc3bb 2018-12-29 stsp worktree_path = realpath(argv[0], NULL);
426 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
427 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
431 507dc3bb 2018-12-29 stsp usage_update();
433 507dc3bb 2018-12-29 stsp error = got_worktree_open(&worktree, worktree_path);
434 507dc3bb 2018-12-29 stsp if (error != NULL)
437 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
438 507dc3bb 2018-12-29 stsp if (error != NULL)
441 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
442 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
443 507dc3bb 2018-12-29 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
444 507dc3bb 2018-12-29 stsp if (error != NULL)
446 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
447 507dc3bb 2018-12-29 stsp if (error != NULL)
450 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
451 507dc3bb 2018-12-29 stsp commit_id_str);
452 507dc3bb 2018-12-29 stsp if (error != NULL)
456 be7061eb 2018-12-30 stsp error = check_ancestry(worktree, commit_id, repo);
457 be7061eb 2018-12-30 stsp if (error != NULL)
460 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
461 507dc3bb 2018-12-29 stsp commit_id) != 0) {
462 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
463 507dc3bb 2018-12-29 stsp commit_id);
468 507dc3bb 2018-12-29 stsp error = got_worktree_checkout_files(worktree, repo,
469 507dc3bb 2018-12-29 stsp update_progress, NULL, checkout_cancel, NULL);
470 507dc3bb 2018-12-29 stsp if (error != NULL)
473 c09a553d 2018-03-12 stsp free(worktree_path);
474 507dc3bb 2018-12-29 stsp free(commit_id);
475 c09a553d 2018-03-12 stsp return error;
478 f42b1b34 2018-03-12 stsp static const struct got_error *
479 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
480 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
482 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
483 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
484 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
485 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
487 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
488 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
490 79109fed 2018-03-27 stsp return err;
492 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
493 79f35eb3 2018-06-11 stsp if (qid != NULL) {
494 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
496 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
498 79109fed 2018-03-27 stsp return err;
500 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
501 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
502 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
504 0f2b3dca 2018-12-22 stsp return err;
506 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
508 79109fed 2018-03-27 stsp return err;
511 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
515 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
516 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
519 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
520 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
521 0f2b3dca 2018-12-22 stsp free(id_str1);
522 0f2b3dca 2018-12-22 stsp free(id_str2);
523 79109fed 2018-03-27 stsp return err;
526 4bb494d5 2018-06-16 stsp static char *
527 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
529 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
530 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
536 79109fed 2018-03-27 stsp static const struct got_error *
537 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
538 c0cc5c62 2018-10-18 stsp struct got_repository *repo, int show_patch, int diff_context)
540 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
541 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
542 6c281f94 2018-06-11 stsp char datebuf[26];
543 45d799e2 2018-12-23 stsp time_t committer_time;
544 45d799e2 2018-12-23 stsp const char *author, *committer;
546 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
548 8bf5b3c9 2018-03-17 stsp return err;
550 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
551 832c249c 2018-06-10 stsp printf("commit %s\n", id_str);
552 832c249c 2018-06-10 stsp free(id_str);
553 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
554 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
555 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
556 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
557 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
558 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
559 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
560 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
561 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
562 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
563 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
565 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
566 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
567 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
569 a0603db2 2018-06-10 stsp return err;
570 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
571 a0603db2 2018-06-10 stsp free(id_str);
575 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
576 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
577 832c249c 2018-06-10 stsp return got_error_from_errno();
579 621015ac 2018-07-23 stsp logmsg = logmsg0;
581 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
583 832c249c 2018-06-10 stsp printf(" %s\n", line);
584 832c249c 2018-06-10 stsp } while (line);
585 621015ac 2018-07-23 stsp free(logmsg0);
587 971751ac 2018-03-27 stsp if (show_patch) {
588 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
589 971751ac 2018-03-27 stsp if (err == 0)
590 971751ac 2018-03-27 stsp printf("\n");
593 d82de447 2018-09-15 stsp fflush(stdout);
594 07862c20 2018-09-15 stsp return err;
597 f42b1b34 2018-03-12 stsp static const struct got_error *
598 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
599 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
600 15a94983 2018-12-23 stsp int first_parent_traversal)
602 f42b1b34 2018-03-12 stsp const struct got_error *err;
603 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
605 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
606 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
608 f42b1b34 2018-03-12 stsp return err;
609 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
612 31cedeaf 2018-09-15 stsp while (1) {
613 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
614 372ccdbb 2018-06-10 stsp struct got_object_id *id;
616 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
619 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
621 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
622 9ba79e04 2018-06-11 stsp err = NULL;
625 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
627 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
633 b43fbaa0 2018-06-11 stsp if (id == NULL)
636 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
639 c0cc5c62 2018-10-18 stsp err = print_commit(commit, id, repo, show_patch, diff_context);
640 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
641 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
645 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
646 f42b1b34 2018-03-12 stsp return err;
649 4ed7e80c 2018-05-20 stsp __dead static void
650 6f3d1eb0 2018-03-12 stsp usage_log(void)
652 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
653 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
657 4ed7e80c 2018-05-20 stsp static const struct got_error *
658 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
660 f42b1b34 2018-03-12 stsp const struct got_error *error;
661 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
662 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
663 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
664 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
665 d142fc45 2018-04-01 stsp char *start_commit = NULL;
666 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
667 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
668 64a96a6d 2018-04-01 stsp const char *errstr;
670 6715a751 2018-03-16 stsp #ifndef PROFILE
671 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
673 f42b1b34 2018-03-12 stsp err(1, "pledge");
676 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
677 79109fed 2018-03-27 stsp switch (ch) {
679 79109fed 2018-03-27 stsp show_patch = 1;
682 d142fc45 2018-04-01 stsp start_commit = optarg;
685 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
687 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
688 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
691 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
692 64a96a6d 2018-04-01 stsp if (errstr != NULL)
693 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
696 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
699 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
700 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
701 04ca23f4 2018-07-16 stsp err(1, "-r option");
705 79109fed 2018-03-27 stsp /* NOTREACHED */
709 79109fed 2018-03-27 stsp argc -= optind;
710 79109fed 2018-03-27 stsp argv += optind;
712 04ca23f4 2018-07-16 stsp if (argc == 0)
713 04ca23f4 2018-07-16 stsp path = strdup("");
714 04ca23f4 2018-07-16 stsp else if (argc == 1)
715 04ca23f4 2018-07-16 stsp path = strdup(argv[0]);
717 6f3d1eb0 2018-03-12 stsp usage_log();
718 04ca23f4 2018-07-16 stsp if (path == NULL)
719 04ca23f4 2018-07-16 stsp return got_error_from_errno();
721 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
722 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
723 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
726 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
727 04ca23f4 2018-07-16 stsp repo_path = strdup(cwd);
728 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
729 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
734 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
735 d7d4f210 2018-03-12 stsp if (error != NULL)
738 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
739 3235492e 2018-04-01 stsp struct got_reference *head_ref;
740 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
741 3235492e 2018-04-01 stsp if (error != NULL)
742 3235492e 2018-04-01 stsp return error;
743 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
744 3235492e 2018-04-01 stsp got_ref_close(head_ref);
745 3235492e 2018-04-01 stsp if (error != NULL)
746 3235492e 2018-04-01 stsp return error;
747 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
749 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
750 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
751 3235492e 2018-04-01 stsp if (error == NULL) {
752 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
753 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
754 d1f2edc9 2018-06-13 stsp if (error != NULL)
755 d1f2edc9 2018-06-13 stsp return error;
756 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
757 d1f2edc9 2018-06-13 stsp if (error != NULL)
758 d1f2edc9 2018-06-13 stsp return error;
760 15a94983 2018-12-23 stsp if (commit == NULL) {
761 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
762 d1f2edc9 2018-06-13 stsp start_commit);
763 d1f2edc9 2018-06-13 stsp if (error != NULL)
764 d1f2edc9 2018-06-13 stsp return error;
767 d7d4f210 2018-03-12 stsp if (error != NULL)
770 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
771 04ca23f4 2018-07-16 stsp if (error != NULL)
773 04ca23f4 2018-07-16 stsp if (in_repo_path) {
774 04ca23f4 2018-07-16 stsp free(path);
775 04ca23f4 2018-07-16 stsp path = in_repo_path;
778 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
779 c0cc5c62 2018-10-18 stsp diff_context, limit, first_parent_traversal);
781 04ca23f4 2018-07-16 stsp free(path);
782 04ca23f4 2018-07-16 stsp free(repo_path);
785 ad242220 2018-09-08 stsp if (repo) {
786 ad242220 2018-09-08 stsp const struct got_error *repo_error;
787 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
788 ad242220 2018-09-08 stsp if (error == NULL)
789 ad242220 2018-09-08 stsp error = repo_error;
791 8bf5b3c9 2018-03-17 stsp return error;
794 4ed7e80c 2018-05-20 stsp __dead static void
795 3f8b7d6a 2018-04-01 stsp usage_diff(void)
797 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s diff [-C number] [repository-path] "
798 c0cc5c62 2018-10-18 stsp "object1 object2\n", getprogname());
802 4ed7e80c 2018-05-20 stsp static const struct got_error *
803 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
805 b00d56cd 2018-04-01 stsp const struct got_error *error;
806 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
807 b00d56cd 2018-04-01 stsp char *repo_path = NULL;
808 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
809 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
810 15a94983 2018-12-23 stsp int type1, type2;
811 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
812 c0cc5c62 2018-10-18 stsp const char *errstr;
814 b00d56cd 2018-04-01 stsp #ifndef PROFILE
815 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
817 b00d56cd 2018-04-01 stsp err(1, "pledge");
820 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "C:")) != -1) {
821 b00d56cd 2018-04-01 stsp switch (ch) {
823 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
824 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
825 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
829 b00d56cd 2018-04-01 stsp /* NOTREACHED */
833 b00d56cd 2018-04-01 stsp argc -= optind;
834 b00d56cd 2018-04-01 stsp argv += optind;
836 b00d56cd 2018-04-01 stsp if (argc == 0) {
837 b00d56cd 2018-04-01 stsp usage_diff(); /* TODO show local worktree changes */
838 3f8b7d6a 2018-04-01 stsp } else if (argc == 2) {
839 3f8b7d6a 2018-04-01 stsp repo_path = getcwd(NULL, 0);
840 3f8b7d6a 2018-04-01 stsp if (repo_path == NULL)
841 e1e3f570 2018-04-01 stsp return got_error_from_errno();
842 15a94983 2018-12-23 stsp id_str1 = argv[0];
843 15a94983 2018-12-23 stsp id_str2 = argv[1];
844 b00d56cd 2018-04-01 stsp } else if (argc == 3) {
845 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
846 76089277 2018-04-01 stsp if (repo_path == NULL)
847 76089277 2018-04-01 stsp return got_error_from_errno();
848 15a94983 2018-12-23 stsp id_str1 = argv[1];
849 15a94983 2018-12-23 stsp id_str2 = argv[2];
851 b00d56cd 2018-04-01 stsp usage_diff();
853 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
854 76089277 2018-04-01 stsp free(repo_path);
855 b00d56cd 2018-04-01 stsp if (error != NULL)
858 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
862 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
866 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
870 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
874 15a94983 2018-12-23 stsp if (type1 != type2) {
875 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
879 15a94983 2018-12-23 stsp switch (type1) {
880 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
881 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
882 54156555 2018-12-24 stsp diff_context, repo, stdout);
884 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
885 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
886 54156555 2018-12-24 stsp diff_context, repo, stdout);
888 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
889 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
891 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
892 c0cc5c62 2018-10-18 stsp repo, stdout);
895 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
901 ad242220 2018-09-08 stsp if (repo) {
902 ad242220 2018-09-08 stsp const struct got_error *repo_error;
903 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
904 ad242220 2018-09-08 stsp if (error == NULL)
905 ad242220 2018-09-08 stsp error = repo_error;
907 b00d56cd 2018-04-01 stsp return error;
910 404c43c4 2018-06-21 stsp __dead static void
911 404c43c4 2018-06-21 stsp usage_blame(void)
913 66bea077 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
914 404c43c4 2018-06-21 stsp getprogname());
918 404c43c4 2018-06-21 stsp static const struct got_error *
919 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
921 404c43c4 2018-06-21 stsp const struct got_error *error;
922 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
923 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
924 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
925 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
928 404c43c4 2018-06-21 stsp #ifndef PROFILE
929 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
931 404c43c4 2018-06-21 stsp err(1, "pledge");
934 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
935 404c43c4 2018-06-21 stsp switch (ch) {
937 404c43c4 2018-06-21 stsp commit_id_str = optarg;
940 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
941 66bea077 2018-08-02 stsp if (repo_path == NULL)
942 66bea077 2018-08-02 stsp err(1, "-r option");
946 404c43c4 2018-06-21 stsp /* NOTREACHED */
950 404c43c4 2018-06-21 stsp argc -= optind;
951 404c43c4 2018-06-21 stsp argv += optind;
953 a39318fd 2018-08-02 stsp if (argc == 1)
954 404c43c4 2018-06-21 stsp path = argv[0];
956 404c43c4 2018-06-21 stsp usage_blame();
958 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
959 66bea077 2018-08-02 stsp if (cwd == NULL) {
960 66bea077 2018-08-02 stsp error = got_error_from_errno();
963 66bea077 2018-08-02 stsp if (repo_path == NULL) {
964 66bea077 2018-08-02 stsp repo_path = strdup(cwd);
965 66bea077 2018-08-02 stsp if (repo_path == NULL) {
966 66bea077 2018-08-02 stsp error = got_error_from_errno();
971 404c43c4 2018-06-21 stsp error = got_repo_open(&repo, repo_path);
972 404c43c4 2018-06-21 stsp if (error != NULL)
975 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
976 66bea077 2018-08-02 stsp if (error != NULL)
979 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
980 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
981 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
982 404c43c4 2018-06-21 stsp if (error != NULL)
984 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
985 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
986 404c43c4 2018-06-21 stsp if (error != NULL)
989 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
990 15a94983 2018-12-23 stsp commit_id_str);
991 404c43c4 2018-06-21 stsp if (error != NULL)
995 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
997 66bea077 2018-08-02 stsp free(in_repo_path);
998 66bea077 2018-08-02 stsp free(repo_path);
1000 404c43c4 2018-06-21 stsp free(commit_id);
1001 ad242220 2018-09-08 stsp if (repo) {
1002 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1003 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1004 ad242220 2018-09-08 stsp if (error == NULL)
1005 ad242220 2018-09-08 stsp error = repo_error;
1007 404c43c4 2018-06-21 stsp return error;
1010 5de5890b 2018-10-18 stsp __dead static void
1011 5de5890b 2018-10-18 stsp usage_tree(void)
1013 5de5890b 2018-10-18 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [-i] path\n",
1014 5de5890b 2018-10-18 stsp getprogname());
1019 5de5890b 2018-10-18 stsp static const struct got_error *
1020 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1021 5de5890b 2018-10-18 stsp int show_ids, struct got_repository *repo)
1023 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1024 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1025 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1026 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1027 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1029 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1031 5de5890b 2018-10-18 stsp goto done;
1033 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1035 5de5890b 2018-10-18 stsp goto done;
1036 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1037 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1038 5de5890b 2018-10-18 stsp while (te) {
1039 5de5890b 2018-10-18 stsp char *id = NULL;
1041 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1044 5de5890b 2018-10-18 stsp if (show_ids) {
1045 5de5890b 2018-10-18 stsp char *id_str;
1046 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1048 5de5890b 2018-10-18 stsp goto done;
1049 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1050 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1051 5de5890b 2018-10-18 stsp free(id_str);
1052 5de5890b 2018-10-18 stsp goto done;
1054 5de5890b 2018-10-18 stsp free(id_str);
1056 5de5890b 2018-10-18 stsp printf("%s%s%s\n", id ? id : "",
1057 5de5890b 2018-10-18 stsp te->name, S_ISDIR(te->mode) ? "/" : "");
1058 5de5890b 2018-10-18 stsp te = SIMPLEQ_NEXT(te, entry);
1063 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1064 5de5890b 2018-10-18 stsp free(tree_id);
1065 5de5890b 2018-10-18 stsp return err;
1068 5de5890b 2018-10-18 stsp static const struct got_error *
1069 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1071 5de5890b 2018-10-18 stsp const struct got_error *error;
1072 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1073 5de5890b 2018-10-18 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1074 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1075 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1076 5de5890b 2018-10-18 stsp int show_ids = 0;
1079 5de5890b 2018-10-18 stsp #ifndef PROFILE
1080 5de5890b 2018-10-18 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
1082 5de5890b 2018-10-18 stsp err(1, "pledge");
1085 5de5890b 2018-10-18 stsp while ((ch = getopt(argc, argv, "c:r:i")) != -1) {
1086 5de5890b 2018-10-18 stsp switch (ch) {
1088 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1091 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1092 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1093 5de5890b 2018-10-18 stsp err(1, "-r option");
1096 5de5890b 2018-10-18 stsp show_ids = 1;
1100 5de5890b 2018-10-18 stsp /* NOTREACHED */
1104 5de5890b 2018-10-18 stsp argc -= optind;
1105 5de5890b 2018-10-18 stsp argv += optind;
1107 5de5890b 2018-10-18 stsp if (argc == 1)
1108 5de5890b 2018-10-18 stsp path = argv[0];
1109 5de5890b 2018-10-18 stsp else if (argc > 1)
1110 5de5890b 2018-10-18 stsp usage_tree();
1112 5de5890b 2018-10-18 stsp path = "/";
1114 5de5890b 2018-10-18 stsp cwd = getcwd(NULL, 0);
1115 5de5890b 2018-10-18 stsp if (cwd == NULL) {
1116 5de5890b 2018-10-18 stsp error = got_error_from_errno();
1117 5de5890b 2018-10-18 stsp goto done;
1119 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1120 5de5890b 2018-10-18 stsp repo_path = strdup(cwd);
1121 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1122 5de5890b 2018-10-18 stsp error = got_error_from_errno();
1123 5de5890b 2018-10-18 stsp goto done;
1127 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1128 5de5890b 2018-10-18 stsp if (error != NULL)
1129 5de5890b 2018-10-18 stsp goto done;
1131 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1132 5de5890b 2018-10-18 stsp if (error != NULL)
1133 5de5890b 2018-10-18 stsp goto done;
1135 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1136 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1137 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1138 5de5890b 2018-10-18 stsp if (error != NULL)
1139 5de5890b 2018-10-18 stsp goto done;
1140 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1141 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1142 5de5890b 2018-10-18 stsp if (error != NULL)
1143 5de5890b 2018-10-18 stsp goto done;
1145 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1146 15a94983 2018-12-23 stsp commit_id_str);
1147 5de5890b 2018-10-18 stsp if (error != NULL)
1148 5de5890b 2018-10-18 stsp goto done;
1151 5de5890b 2018-10-18 stsp error = print_tree(in_repo_path, commit_id, show_ids, repo);
1153 5de5890b 2018-10-18 stsp free(in_repo_path);
1154 5de5890b 2018-10-18 stsp free(repo_path);
1155 5de5890b 2018-10-18 stsp free(cwd);
1156 5de5890b 2018-10-18 stsp free(commit_id);
1157 5de5890b 2018-10-18 stsp if (repo) {
1158 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1159 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1160 5de5890b 2018-10-18 stsp if (error == NULL)
1161 5de5890b 2018-10-18 stsp error = repo_error;
1163 5de5890b 2018-10-18 stsp return error;
1166 f42b1b34 2018-03-12 stsp #ifdef notyet
1167 4ed7e80c 2018-05-20 stsp static const struct got_error *
1168 5c860e29 2018-03-12 stsp cmd_status(int argc __unused, char *argv[] __unused)
1170 5c860e29 2018-03-12 stsp git_repository *repo = NULL;
1171 5c860e29 2018-03-12 stsp git_status_list *status;
1172 5c860e29 2018-03-12 stsp git_status_options statusopts;
1175 5c860e29 2018-03-12 stsp git_libgit2_init();
1177 5c860e29 2018-03-12 stsp if (git_repository_open_ext(&repo, ".", 0, NULL))
1178 5c860e29 2018-03-12 stsp errx(1, "git_repository_open: %s", giterr_last()->message);
1180 5c860e29 2018-03-12 stsp if (git_repository_is_bare(repo))
1181 5c860e29 2018-03-12 stsp errx(1, "bar repository");
1183 5c860e29 2018-03-12 stsp if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
1184 5c860e29 2018-03-12 stsp errx(1, "git_status_init_options: %s", giterr_last()->message);
1186 5c860e29 2018-03-12 stsp statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
1187 5c860e29 2018-03-12 stsp statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
1188 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
1189 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
1191 5c860e29 2018-03-12 stsp if (git_status_list_new(&status, repo, &statusopts))
1192 5c860e29 2018-03-12 stsp errx(1, "git_status_list_new: %s", giterr_last()->message);
1194 5c860e29 2018-03-12 stsp for (i = 0; i < git_status_list_entrycount(status); i++) {
1195 5c860e29 2018-03-12 stsp const git_status_entry *se;
1197 5c860e29 2018-03-12 stsp se = git_status_byindex(status, i);
1198 5c860e29 2018-03-12 stsp switch (se->status) {
1199 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_NEW:
1200 5c860e29 2018-03-12 stsp printf("? %s\n", se->index_to_workdir->new_file.path);
1202 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_MODIFIED:
1203 5c860e29 2018-03-12 stsp printf("M %s\n", se->index_to_workdir->new_file.path);
1205 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_DELETED:
1206 5c860e29 2018-03-12 stsp printf("R %s\n", se->index_to_workdir->new_file.path);
1208 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_RENAMED:
1209 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
1210 5c860e29 2018-03-12 stsp se->index_to_workdir->old_file.path,
1211 5c860e29 2018-03-12 stsp se->index_to_workdir->new_file.path);
1213 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_TYPECHANGE:
1214 5c860e29 2018-03-12 stsp printf("t %s\n", se->index_to_workdir->new_file.path);
1216 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_NEW:
1217 5c860e29 2018-03-12 stsp printf("A %s\n", se->head_to_index->new_file.path);
1219 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_MODIFIED:
1220 5c860e29 2018-03-12 stsp printf("M %s\n", se->head_to_index->old_file.path);
1222 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_DELETED:
1223 5c860e29 2018-03-12 stsp printf("R %s\n", se->head_to_index->old_file.path);
1225 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_RENAMED:
1226 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
1227 5c860e29 2018-03-12 stsp se->head_to_index->old_file.path,
1228 5c860e29 2018-03-12 stsp se->head_to_index->new_file.path);
1230 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_TYPECHANGE:
1231 5c860e29 2018-03-12 stsp printf("t %s\n", se->head_to_index->old_file.path);
1233 5c860e29 2018-03-12 stsp case GIT_STATUS_CURRENT:
1239 5c860e29 2018-03-12 stsp git_status_list_free(status);
1240 5c860e29 2018-03-12 stsp git_repository_free(repo);
1241 5c860e29 2018-03-12 stsp git_libgit2_shutdown();