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 2944241d 2018-12-30 stsp /* TODO: Check the reflog. The head ref may have been rebased. */
345 be7061eb 2018-12-30 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
349 be7061eb 2018-12-30 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
353 be7061eb 2018-12-30 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
356 be7061eb 2018-12-30 stsp while (1) {
357 be7061eb 2018-12-30 stsp struct got_object_id *id;
359 be7061eb 2018-12-30 stsp if (sigint_received || sigpipe_received)
362 be7061eb 2018-12-30 stsp err = got_commit_graph_iter_next(&id, graph);
364 be7061eb 2018-12-30 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
365 be7061eb 2018-12-30 stsp err = got_error(GOT_ERR_ANCESTRY);
368 be7061eb 2018-12-30 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
370 be7061eb 2018-12-30 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
376 be7061eb 2018-12-30 stsp if (id == NULL)
378 be7061eb 2018-12-30 stsp if (got_object_id_cmp(id, commit_id) == 0)
382 be7061eb 2018-12-30 stsp if (head_ref)
383 be7061eb 2018-12-30 stsp got_ref_close(head_ref);
385 be7061eb 2018-12-30 stsp got_commit_graph_close(graph);
386 be7061eb 2018-12-30 stsp return err;
389 be7061eb 2018-12-30 stsp static const struct got_error *
390 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
392 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
393 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
394 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
395 507dc3bb 2018-12-29 stsp char *worktree_path = NULL;
396 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
397 507dc3bb 2018-12-29 stsp const char *commit_id_str = NULL;
400 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
401 507dc3bb 2018-12-29 stsp switch (ch) {
403 507dc3bb 2018-12-29 stsp commit_id_str = optarg;
407 507dc3bb 2018-12-29 stsp /* NOTREACHED */
411 507dc3bb 2018-12-29 stsp argc -= optind;
412 507dc3bb 2018-12-29 stsp argv += optind;
414 507dc3bb 2018-12-29 stsp #ifndef PROFILE
415 507dc3bb 2018-12-29 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
417 507dc3bb 2018-12-29 stsp err(1, "pledge");
419 507dc3bb 2018-12-29 stsp if (argc == 0) {
420 507dc3bb 2018-12-29 stsp worktree_path = getcwd(NULL, 0);
421 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
422 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
425 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
426 507dc3bb 2018-12-29 stsp worktree_path = realpath(argv[0], NULL);
427 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
428 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
432 507dc3bb 2018-12-29 stsp usage_update();
434 507dc3bb 2018-12-29 stsp error = got_worktree_open(&worktree, worktree_path);
435 507dc3bb 2018-12-29 stsp if (error != NULL)
438 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
439 507dc3bb 2018-12-29 stsp if (error != NULL)
442 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
443 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
444 507dc3bb 2018-12-29 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
445 507dc3bb 2018-12-29 stsp if (error != NULL)
447 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
448 507dc3bb 2018-12-29 stsp if (error != NULL)
451 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
452 507dc3bb 2018-12-29 stsp commit_id_str);
453 507dc3bb 2018-12-29 stsp if (error != NULL)
457 be7061eb 2018-12-30 stsp error = check_ancestry(worktree, commit_id, repo);
458 be7061eb 2018-12-30 stsp if (error != NULL)
461 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
462 507dc3bb 2018-12-29 stsp commit_id) != 0) {
463 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
464 507dc3bb 2018-12-29 stsp commit_id);
469 507dc3bb 2018-12-29 stsp error = got_worktree_checkout_files(worktree, repo,
470 507dc3bb 2018-12-29 stsp update_progress, NULL, checkout_cancel, NULL);
471 507dc3bb 2018-12-29 stsp if (error != NULL)
474 c09a553d 2018-03-12 stsp free(worktree_path);
475 507dc3bb 2018-12-29 stsp free(commit_id);
476 c09a553d 2018-03-12 stsp return error;
479 f42b1b34 2018-03-12 stsp static const struct got_error *
480 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
481 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
483 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
484 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
485 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
486 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
488 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
489 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
491 79109fed 2018-03-27 stsp return err;
493 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
494 79f35eb3 2018-06-11 stsp if (qid != NULL) {
495 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
497 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
499 79109fed 2018-03-27 stsp return err;
501 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
502 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
503 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
505 0f2b3dca 2018-12-22 stsp return err;
507 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
509 79109fed 2018-03-27 stsp return err;
512 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
516 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
517 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
520 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
521 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
522 0f2b3dca 2018-12-22 stsp free(id_str1);
523 0f2b3dca 2018-12-22 stsp free(id_str2);
524 79109fed 2018-03-27 stsp return err;
527 4bb494d5 2018-06-16 stsp static char *
528 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
530 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
531 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
537 79109fed 2018-03-27 stsp static const struct got_error *
538 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
539 c0cc5c62 2018-10-18 stsp struct got_repository *repo, int show_patch, int diff_context)
541 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
542 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
543 6c281f94 2018-06-11 stsp char datebuf[26];
544 45d799e2 2018-12-23 stsp time_t committer_time;
545 45d799e2 2018-12-23 stsp const char *author, *committer;
547 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
549 8bf5b3c9 2018-03-17 stsp return err;
551 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
552 832c249c 2018-06-10 stsp printf("commit %s\n", id_str);
553 832c249c 2018-06-10 stsp free(id_str);
554 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
555 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
556 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
557 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
558 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
559 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
560 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
561 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
562 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
563 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
564 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
566 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
567 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
568 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
570 a0603db2 2018-06-10 stsp return err;
571 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
572 a0603db2 2018-06-10 stsp free(id_str);
576 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
577 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
578 832c249c 2018-06-10 stsp return got_error_from_errno();
580 621015ac 2018-07-23 stsp logmsg = logmsg0;
582 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
584 832c249c 2018-06-10 stsp printf(" %s\n", line);
585 832c249c 2018-06-10 stsp } while (line);
586 621015ac 2018-07-23 stsp free(logmsg0);
588 971751ac 2018-03-27 stsp if (show_patch) {
589 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
590 971751ac 2018-03-27 stsp if (err == 0)
591 971751ac 2018-03-27 stsp printf("\n");
594 d82de447 2018-09-15 stsp fflush(stdout);
595 07862c20 2018-09-15 stsp return err;
598 f42b1b34 2018-03-12 stsp static const struct got_error *
599 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
600 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
601 15a94983 2018-12-23 stsp int first_parent_traversal)
603 f42b1b34 2018-03-12 stsp const struct got_error *err;
604 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
606 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
607 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
609 f42b1b34 2018-03-12 stsp return err;
610 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
613 31cedeaf 2018-09-15 stsp while (1) {
614 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
615 372ccdbb 2018-06-10 stsp struct got_object_id *id;
617 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
620 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
622 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
623 9ba79e04 2018-06-11 stsp err = NULL;
626 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
628 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
634 b43fbaa0 2018-06-11 stsp if (id == NULL)
637 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
640 c0cc5c62 2018-10-18 stsp err = print_commit(commit, id, repo, show_patch, diff_context);
641 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
642 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
646 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
647 f42b1b34 2018-03-12 stsp return err;
650 4ed7e80c 2018-05-20 stsp __dead static void
651 6f3d1eb0 2018-03-12 stsp usage_log(void)
653 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
654 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
658 4ed7e80c 2018-05-20 stsp static const struct got_error *
659 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
661 f42b1b34 2018-03-12 stsp const struct got_error *error;
662 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
663 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
664 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
665 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
666 d142fc45 2018-04-01 stsp char *start_commit = NULL;
667 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
668 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
669 64a96a6d 2018-04-01 stsp const char *errstr;
671 6715a751 2018-03-16 stsp #ifndef PROFILE
672 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
674 f42b1b34 2018-03-12 stsp err(1, "pledge");
677 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
678 79109fed 2018-03-27 stsp switch (ch) {
680 79109fed 2018-03-27 stsp show_patch = 1;
683 d142fc45 2018-04-01 stsp start_commit = optarg;
686 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
688 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
689 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
692 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
693 64a96a6d 2018-04-01 stsp if (errstr != NULL)
694 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
697 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
700 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
701 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
702 04ca23f4 2018-07-16 stsp err(1, "-r option");
706 79109fed 2018-03-27 stsp /* NOTREACHED */
710 79109fed 2018-03-27 stsp argc -= optind;
711 79109fed 2018-03-27 stsp argv += optind;
713 04ca23f4 2018-07-16 stsp if (argc == 0)
714 04ca23f4 2018-07-16 stsp path = strdup("");
715 04ca23f4 2018-07-16 stsp else if (argc == 1)
716 04ca23f4 2018-07-16 stsp path = strdup(argv[0]);
718 6f3d1eb0 2018-03-12 stsp usage_log();
719 04ca23f4 2018-07-16 stsp if (path == NULL)
720 04ca23f4 2018-07-16 stsp return got_error_from_errno();
722 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
723 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
724 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
727 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
728 04ca23f4 2018-07-16 stsp repo_path = strdup(cwd);
729 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
730 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
735 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
736 d7d4f210 2018-03-12 stsp if (error != NULL)
739 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
740 3235492e 2018-04-01 stsp struct got_reference *head_ref;
741 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
742 3235492e 2018-04-01 stsp if (error != NULL)
743 3235492e 2018-04-01 stsp return error;
744 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
745 3235492e 2018-04-01 stsp got_ref_close(head_ref);
746 3235492e 2018-04-01 stsp if (error != NULL)
747 3235492e 2018-04-01 stsp return error;
748 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
750 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
751 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
752 3235492e 2018-04-01 stsp if (error == NULL) {
753 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
754 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
755 d1f2edc9 2018-06-13 stsp if (error != NULL)
756 d1f2edc9 2018-06-13 stsp return error;
757 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
758 d1f2edc9 2018-06-13 stsp if (error != NULL)
759 d1f2edc9 2018-06-13 stsp return error;
761 15a94983 2018-12-23 stsp if (commit == NULL) {
762 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
763 d1f2edc9 2018-06-13 stsp start_commit);
764 d1f2edc9 2018-06-13 stsp if (error != NULL)
765 d1f2edc9 2018-06-13 stsp return error;
768 d7d4f210 2018-03-12 stsp if (error != NULL)
771 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
772 04ca23f4 2018-07-16 stsp if (error != NULL)
774 04ca23f4 2018-07-16 stsp if (in_repo_path) {
775 04ca23f4 2018-07-16 stsp free(path);
776 04ca23f4 2018-07-16 stsp path = in_repo_path;
779 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
780 c0cc5c62 2018-10-18 stsp diff_context, limit, first_parent_traversal);
782 04ca23f4 2018-07-16 stsp free(path);
783 04ca23f4 2018-07-16 stsp free(repo_path);
786 ad242220 2018-09-08 stsp if (repo) {
787 ad242220 2018-09-08 stsp const struct got_error *repo_error;
788 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
789 ad242220 2018-09-08 stsp if (error == NULL)
790 ad242220 2018-09-08 stsp error = repo_error;
792 8bf5b3c9 2018-03-17 stsp return error;
795 4ed7e80c 2018-05-20 stsp __dead static void
796 3f8b7d6a 2018-04-01 stsp usage_diff(void)
798 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s diff [-C number] [repository-path] "
799 c0cc5c62 2018-10-18 stsp "object1 object2\n", getprogname());
803 4ed7e80c 2018-05-20 stsp static const struct got_error *
804 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
806 b00d56cd 2018-04-01 stsp const struct got_error *error;
807 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
808 b00d56cd 2018-04-01 stsp char *repo_path = NULL;
809 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
810 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
811 15a94983 2018-12-23 stsp int type1, type2;
812 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
813 c0cc5c62 2018-10-18 stsp const char *errstr;
815 b00d56cd 2018-04-01 stsp #ifndef PROFILE
816 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
818 b00d56cd 2018-04-01 stsp err(1, "pledge");
821 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "C:")) != -1) {
822 b00d56cd 2018-04-01 stsp switch (ch) {
824 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
825 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
826 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
830 b00d56cd 2018-04-01 stsp /* NOTREACHED */
834 b00d56cd 2018-04-01 stsp argc -= optind;
835 b00d56cd 2018-04-01 stsp argv += optind;
837 b00d56cd 2018-04-01 stsp if (argc == 0) {
838 b00d56cd 2018-04-01 stsp usage_diff(); /* TODO show local worktree changes */
839 3f8b7d6a 2018-04-01 stsp } else if (argc == 2) {
840 3f8b7d6a 2018-04-01 stsp repo_path = getcwd(NULL, 0);
841 3f8b7d6a 2018-04-01 stsp if (repo_path == NULL)
842 e1e3f570 2018-04-01 stsp return got_error_from_errno();
843 15a94983 2018-12-23 stsp id_str1 = argv[0];
844 15a94983 2018-12-23 stsp id_str2 = argv[1];
845 b00d56cd 2018-04-01 stsp } else if (argc == 3) {
846 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
847 76089277 2018-04-01 stsp if (repo_path == NULL)
848 76089277 2018-04-01 stsp return got_error_from_errno();
849 15a94983 2018-12-23 stsp id_str1 = argv[1];
850 15a94983 2018-12-23 stsp id_str2 = argv[2];
852 b00d56cd 2018-04-01 stsp usage_diff();
854 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
855 76089277 2018-04-01 stsp free(repo_path);
856 b00d56cd 2018-04-01 stsp if (error != NULL)
859 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
863 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
867 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
871 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
875 15a94983 2018-12-23 stsp if (type1 != type2) {
876 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
880 15a94983 2018-12-23 stsp switch (type1) {
881 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
882 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
883 54156555 2018-12-24 stsp diff_context, repo, stdout);
885 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
886 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
887 54156555 2018-12-24 stsp diff_context, repo, stdout);
889 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
890 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
892 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
893 c0cc5c62 2018-10-18 stsp repo, stdout);
896 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
902 ad242220 2018-09-08 stsp if (repo) {
903 ad242220 2018-09-08 stsp const struct got_error *repo_error;
904 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
905 ad242220 2018-09-08 stsp if (error == NULL)
906 ad242220 2018-09-08 stsp error = repo_error;
908 b00d56cd 2018-04-01 stsp return error;
911 404c43c4 2018-06-21 stsp __dead static void
912 404c43c4 2018-06-21 stsp usage_blame(void)
914 66bea077 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
915 404c43c4 2018-06-21 stsp getprogname());
919 404c43c4 2018-06-21 stsp static const struct got_error *
920 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
922 404c43c4 2018-06-21 stsp const struct got_error *error;
923 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
924 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
925 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
926 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
929 404c43c4 2018-06-21 stsp #ifndef PROFILE
930 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
932 404c43c4 2018-06-21 stsp err(1, "pledge");
935 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
936 404c43c4 2018-06-21 stsp switch (ch) {
938 404c43c4 2018-06-21 stsp commit_id_str = optarg;
941 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
942 66bea077 2018-08-02 stsp if (repo_path == NULL)
943 66bea077 2018-08-02 stsp err(1, "-r option");
947 404c43c4 2018-06-21 stsp /* NOTREACHED */
951 404c43c4 2018-06-21 stsp argc -= optind;
952 404c43c4 2018-06-21 stsp argv += optind;
954 a39318fd 2018-08-02 stsp if (argc == 1)
955 404c43c4 2018-06-21 stsp path = argv[0];
957 404c43c4 2018-06-21 stsp usage_blame();
959 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
960 66bea077 2018-08-02 stsp if (cwd == NULL) {
961 66bea077 2018-08-02 stsp error = got_error_from_errno();
964 66bea077 2018-08-02 stsp if (repo_path == NULL) {
965 66bea077 2018-08-02 stsp repo_path = strdup(cwd);
966 66bea077 2018-08-02 stsp if (repo_path == NULL) {
967 66bea077 2018-08-02 stsp error = got_error_from_errno();
972 404c43c4 2018-06-21 stsp error = got_repo_open(&repo, repo_path);
973 404c43c4 2018-06-21 stsp if (error != NULL)
976 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
977 66bea077 2018-08-02 stsp if (error != NULL)
980 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
981 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
982 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
983 404c43c4 2018-06-21 stsp if (error != NULL)
985 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
986 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
987 404c43c4 2018-06-21 stsp if (error != NULL)
990 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
991 15a94983 2018-12-23 stsp commit_id_str);
992 404c43c4 2018-06-21 stsp if (error != NULL)
996 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
998 66bea077 2018-08-02 stsp free(in_repo_path);
999 66bea077 2018-08-02 stsp free(repo_path);
1000 66bea077 2018-08-02 stsp free(cwd);
1001 404c43c4 2018-06-21 stsp free(commit_id);
1002 ad242220 2018-09-08 stsp if (repo) {
1003 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1004 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1005 ad242220 2018-09-08 stsp if (error == NULL)
1006 ad242220 2018-09-08 stsp error = repo_error;
1008 404c43c4 2018-06-21 stsp return error;
1011 5de5890b 2018-10-18 stsp __dead static void
1012 5de5890b 2018-10-18 stsp usage_tree(void)
1014 5de5890b 2018-10-18 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [-i] path\n",
1015 5de5890b 2018-10-18 stsp getprogname());
1020 5de5890b 2018-10-18 stsp static const struct got_error *
1021 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1022 5de5890b 2018-10-18 stsp int show_ids, struct got_repository *repo)
1024 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1025 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1026 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1027 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1028 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1030 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1032 5de5890b 2018-10-18 stsp goto done;
1034 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1036 5de5890b 2018-10-18 stsp goto done;
1037 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1038 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1039 5de5890b 2018-10-18 stsp while (te) {
1040 5de5890b 2018-10-18 stsp char *id = NULL;
1042 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1045 5de5890b 2018-10-18 stsp if (show_ids) {
1046 5de5890b 2018-10-18 stsp char *id_str;
1047 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1049 5de5890b 2018-10-18 stsp goto done;
1050 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1051 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1052 5de5890b 2018-10-18 stsp free(id_str);
1053 5de5890b 2018-10-18 stsp goto done;
1055 5de5890b 2018-10-18 stsp free(id_str);
1057 5de5890b 2018-10-18 stsp printf("%s%s%s\n", id ? id : "",
1058 5de5890b 2018-10-18 stsp te->name, S_ISDIR(te->mode) ? "/" : "");
1059 5de5890b 2018-10-18 stsp te = SIMPLEQ_NEXT(te, entry);
1064 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1065 5de5890b 2018-10-18 stsp free(tree_id);
1066 5de5890b 2018-10-18 stsp return err;
1069 5de5890b 2018-10-18 stsp static const struct got_error *
1070 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1072 5de5890b 2018-10-18 stsp const struct got_error *error;
1073 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1074 5de5890b 2018-10-18 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1075 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1076 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1077 5de5890b 2018-10-18 stsp int show_ids = 0;
1080 5de5890b 2018-10-18 stsp #ifndef PROFILE
1081 5de5890b 2018-10-18 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
1083 5de5890b 2018-10-18 stsp err(1, "pledge");
1086 5de5890b 2018-10-18 stsp while ((ch = getopt(argc, argv, "c:r:i")) != -1) {
1087 5de5890b 2018-10-18 stsp switch (ch) {
1089 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1092 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1093 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1094 5de5890b 2018-10-18 stsp err(1, "-r option");
1097 5de5890b 2018-10-18 stsp show_ids = 1;
1101 5de5890b 2018-10-18 stsp /* NOTREACHED */
1105 5de5890b 2018-10-18 stsp argc -= optind;
1106 5de5890b 2018-10-18 stsp argv += optind;
1108 5de5890b 2018-10-18 stsp if (argc == 1)
1109 5de5890b 2018-10-18 stsp path = argv[0];
1110 5de5890b 2018-10-18 stsp else if (argc > 1)
1111 5de5890b 2018-10-18 stsp usage_tree();
1113 5de5890b 2018-10-18 stsp path = "/";
1115 5de5890b 2018-10-18 stsp cwd = getcwd(NULL, 0);
1116 5de5890b 2018-10-18 stsp if (cwd == NULL) {
1117 5de5890b 2018-10-18 stsp error = got_error_from_errno();
1118 5de5890b 2018-10-18 stsp goto done;
1120 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1121 5de5890b 2018-10-18 stsp repo_path = strdup(cwd);
1122 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1123 5de5890b 2018-10-18 stsp error = got_error_from_errno();
1124 5de5890b 2018-10-18 stsp goto done;
1128 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1129 5de5890b 2018-10-18 stsp if (error != NULL)
1130 5de5890b 2018-10-18 stsp goto done;
1132 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1133 5de5890b 2018-10-18 stsp if (error != NULL)
1134 5de5890b 2018-10-18 stsp goto done;
1136 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1137 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1138 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1139 5de5890b 2018-10-18 stsp if (error != NULL)
1140 5de5890b 2018-10-18 stsp goto done;
1141 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1142 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1143 5de5890b 2018-10-18 stsp if (error != NULL)
1144 5de5890b 2018-10-18 stsp goto done;
1146 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1147 15a94983 2018-12-23 stsp commit_id_str);
1148 5de5890b 2018-10-18 stsp if (error != NULL)
1149 5de5890b 2018-10-18 stsp goto done;
1152 5de5890b 2018-10-18 stsp error = print_tree(in_repo_path, commit_id, show_ids, repo);
1154 5de5890b 2018-10-18 stsp free(in_repo_path);
1155 5de5890b 2018-10-18 stsp free(repo_path);
1156 5de5890b 2018-10-18 stsp free(cwd);
1157 5de5890b 2018-10-18 stsp free(commit_id);
1158 5de5890b 2018-10-18 stsp if (repo) {
1159 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1160 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1161 5de5890b 2018-10-18 stsp if (error == NULL)
1162 5de5890b 2018-10-18 stsp error = repo_error;
1164 5de5890b 2018-10-18 stsp return error;
1167 f42b1b34 2018-03-12 stsp #ifdef notyet
1168 4ed7e80c 2018-05-20 stsp static const struct got_error *
1169 5c860e29 2018-03-12 stsp cmd_status(int argc __unused, char *argv[] __unused)
1171 5c860e29 2018-03-12 stsp git_repository *repo = NULL;
1172 5c860e29 2018-03-12 stsp git_status_list *status;
1173 5c860e29 2018-03-12 stsp git_status_options statusopts;
1176 5c860e29 2018-03-12 stsp git_libgit2_init();
1178 5c860e29 2018-03-12 stsp if (git_repository_open_ext(&repo, ".", 0, NULL))
1179 5c860e29 2018-03-12 stsp errx(1, "git_repository_open: %s", giterr_last()->message);
1181 5c860e29 2018-03-12 stsp if (git_repository_is_bare(repo))
1182 5c860e29 2018-03-12 stsp errx(1, "bar repository");
1184 5c860e29 2018-03-12 stsp if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
1185 5c860e29 2018-03-12 stsp errx(1, "git_status_init_options: %s", giterr_last()->message);
1187 5c860e29 2018-03-12 stsp statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
1188 5c860e29 2018-03-12 stsp statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
1189 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
1190 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
1192 5c860e29 2018-03-12 stsp if (git_status_list_new(&status, repo, &statusopts))
1193 5c860e29 2018-03-12 stsp errx(1, "git_status_list_new: %s", giterr_last()->message);
1195 5c860e29 2018-03-12 stsp for (i = 0; i < git_status_list_entrycount(status); i++) {
1196 5c860e29 2018-03-12 stsp const git_status_entry *se;
1198 5c860e29 2018-03-12 stsp se = git_status_byindex(status, i);
1199 5c860e29 2018-03-12 stsp switch (se->status) {
1200 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_NEW:
1201 5c860e29 2018-03-12 stsp printf("? %s\n", se->index_to_workdir->new_file.path);
1203 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_MODIFIED:
1204 5c860e29 2018-03-12 stsp printf("M %s\n", se->index_to_workdir->new_file.path);
1206 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_DELETED:
1207 5c860e29 2018-03-12 stsp printf("R %s\n", se->index_to_workdir->new_file.path);
1209 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_RENAMED:
1210 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
1211 5c860e29 2018-03-12 stsp se->index_to_workdir->old_file.path,
1212 5c860e29 2018-03-12 stsp se->index_to_workdir->new_file.path);
1214 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_TYPECHANGE:
1215 5c860e29 2018-03-12 stsp printf("t %s\n", se->index_to_workdir->new_file.path);
1217 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_NEW:
1218 5c860e29 2018-03-12 stsp printf("A %s\n", se->head_to_index->new_file.path);
1220 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_MODIFIED:
1221 5c860e29 2018-03-12 stsp printf("M %s\n", se->head_to_index->old_file.path);
1223 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_DELETED:
1224 5c860e29 2018-03-12 stsp printf("R %s\n", se->head_to_index->old_file.path);
1226 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_RENAMED:
1227 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
1228 5c860e29 2018-03-12 stsp se->head_to_index->old_file.path,
1229 5c860e29 2018-03-12 stsp se->head_to_index->new_file.path);
1231 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_TYPECHANGE:
1232 5c860e29 2018-03-12 stsp printf("t %s\n", se->head_to_index->old_file.path);
1234 5c860e29 2018-03-12 stsp case GIT_STATUS_CURRENT:
1240 5c860e29 2018-03-12 stsp git_status_list_free(status);
1241 5c860e29 2018-03-12 stsp git_repository_free(repo);
1242 5c860e29 2018-03-12 stsp git_libgit2_shutdown();