2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 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"
42 63219cd2 2019-01-04 stsp #include "got_privsep.h"
44 5c860e29 2018-03-12 stsp #ifndef nitems
45 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
48 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
49 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
52 99437157 2018-11-11 stsp catch_sigint(int signo)
54 99437157 2018-11-11 stsp sigint_received = 1;
58 99437157 2018-11-11 stsp catch_sigpipe(int signo)
60 99437157 2018-11-11 stsp sigpipe_received = 1;
64 5c860e29 2018-03-12 stsp struct cmd {
65 5c860e29 2018-03-12 stsp const char *cmd_name;
66 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
67 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
68 46a0db7d 2018-03-12 stsp const char *cmd_descr;
71 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
72 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
73 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
74 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
75 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
76 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
77 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
78 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
80 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
81 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
82 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
83 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
84 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
85 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
86 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 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
102 1b6b95a8 2018-03-12 stsp "show modification status of files" },
106 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
108 5c860e29 2018-03-12 stsp struct cmd *cmd;
109 5c860e29 2018-03-12 stsp unsigned int i;
111 1b6b95a8 2018-03-12 stsp int hflag = 0;
113 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
115 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
116 5c860e29 2018-03-12 stsp switch (ch) {
122 5c860e29 2018-03-12 stsp /* NOTREACHED */
126 5c860e29 2018-03-12 stsp argc -= optind;
127 5c860e29 2018-03-12 stsp argv += optind;
128 1e70621d 2018-03-27 stsp optind = 0;
130 5c860e29 2018-03-12 stsp if (argc <= 0)
133 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
134 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
136 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
137 d7d4f210 2018-03-12 stsp const struct got_error *error;
139 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
141 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
145 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
147 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
148 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
149 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
156 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
160 4ed7e80c 2018-05-20 stsp __dead static void
161 5c860e29 2018-03-12 stsp usage(void)
165 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
166 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
167 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
168 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
169 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
174 0266afb7 2019-01-04 stsp static const struct got_error *
175 0266afb7 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
177 0266afb7 2019-01-04 stsp const struct got_error *error;
179 0266afb7 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
180 0266afb7 2019-01-04 stsp return got_error_from_errno();
182 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
183 0266afb7 2019-01-04 stsp return got_error_from_errno();
185 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
186 0266afb7 2019-01-04 stsp return got_error_from_errno();
188 0266afb7 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
189 0266afb7 2019-01-04 stsp if (error != NULL)
190 0266afb7 2019-01-04 stsp return error;
192 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
193 0266afb7 2019-01-04 stsp return got_error_from_errno();
195 0266afb7 2019-01-04 stsp return NULL;
198 4ed7e80c 2018-05-20 stsp __dead static void
199 c09a553d 2018-03-12 stsp usage_checkout(void)
201 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
202 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
206 92a684f4 2018-03-12 stsp static void
207 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
209 92a684f4 2018-03-12 stsp char *worktree_path = arg;
211 92a684f4 2018-03-12 stsp while (path[0] == '/')
214 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
217 99437157 2018-11-11 stsp static const struct got_error *
218 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
220 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
221 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
222 99437157 2018-11-11 stsp return NULL;
225 8069f636 2019-01-12 stsp static const struct got_error *
226 8069f636 2019-01-12 stsp check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
227 8069f636 2019-01-12 stsp struct got_repository *repo)
229 8069f636 2019-01-12 stsp const struct got_error *err;
230 8069f636 2019-01-12 stsp struct got_reference *head_ref = NULL;
231 8069f636 2019-01-12 stsp struct got_object_id *head_commit_id = NULL;
232 8069f636 2019-01-12 stsp struct got_commit_graph *graph = NULL;
234 8069f636 2019-01-12 stsp head_ref = got_worktree_get_head_ref(worktree);
235 8069f636 2019-01-12 stsp if (head_ref == NULL)
236 8069f636 2019-01-12 stsp return got_error_from_errno();
238 8069f636 2019-01-12 stsp /* TODO: Check the reflog. The head ref may have been rebased. */
239 8069f636 2019-01-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
243 8069f636 2019-01-12 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
247 8069f636 2019-01-12 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
250 8069f636 2019-01-12 stsp while (1) {
251 8069f636 2019-01-12 stsp struct got_object_id *id;
253 8069f636 2019-01-12 stsp if (sigint_received || sigpipe_received)
256 8069f636 2019-01-12 stsp err = got_commit_graph_iter_next(&id, graph);
258 8069f636 2019-01-12 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
259 8069f636 2019-01-12 stsp err = got_error(GOT_ERR_ANCESTRY);
262 8069f636 2019-01-12 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
264 8069f636 2019-01-12 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
270 8069f636 2019-01-12 stsp if (id == NULL)
272 8069f636 2019-01-12 stsp if (got_object_id_cmp(id, commit_id) == 0)
276 8069f636 2019-01-12 stsp if (head_ref)
277 8069f636 2019-01-12 stsp got_ref_close(head_ref);
279 8069f636 2019-01-12 stsp got_commit_graph_close(graph);
280 8069f636 2019-01-12 stsp return err;
284 4ed7e80c 2018-05-20 stsp static const struct got_error *
285 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
287 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
288 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
289 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
290 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
291 c09a553d 2018-03-12 stsp char *repo_path = NULL;
292 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
293 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
294 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
295 e5dc7198 2018-12-29 stsp int ch, same_path_prefix;
297 8069f636 2019-01-12 stsp while ((ch = getopt(argc, argv, "c:p:")) != -1) {
298 0bb8a95e 2018-03-12 stsp switch (ch) {
300 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
301 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
302 8069f636 2019-01-12 stsp return got_error_from_errno();
305 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
309 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
313 0bb8a95e 2018-03-12 stsp argc -= optind;
314 0bb8a95e 2018-03-12 stsp argv += optind;
316 6715a751 2018-03-16 stsp #ifndef PROFILE
317 63219cd2 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
318 63219cd2 2019-01-04 stsp NULL) == -1)
319 c09a553d 2018-03-12 stsp err(1, "pledge");
321 0bb8a95e 2018-03-12 stsp if (argc == 1) {
322 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
323 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
324 76089277 2018-04-01 stsp if (repo_path == NULL)
325 76089277 2018-04-01 stsp return got_error_from_errno();
326 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
327 76089277 2018-04-01 stsp if (cwd == NULL) {
328 76089277 2018-04-01 stsp error = got_error_from_errno();
331 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
332 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
334 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
335 76089277 2018-04-01 stsp if (base == NULL) {
336 76089277 2018-04-01 stsp error = got_error_from_errno();
339 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
340 c09a553d 2018-03-12 stsp if (dotgit)
341 c09a553d 2018-03-12 stsp *dotgit = '\0';
342 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
343 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
348 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
349 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
350 76089277 2018-04-01 stsp if (repo_path == NULL) {
351 76089277 2018-04-01 stsp error = got_error_from_errno();
354 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
355 76089277 2018-04-01 stsp if (worktree_path == NULL) {
356 76089277 2018-04-01 stsp error = got_error_from_errno();
360 c09a553d 2018-03-12 stsp usage_checkout();
362 0266afb7 2019-01-04 stsp error = apply_unveil(repo_path, worktree_path);
366 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
367 c09a553d 2018-03-12 stsp if (error != NULL)
370 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
371 c09a553d 2018-03-12 stsp if (error != NULL)
374 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
375 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
378 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
379 c09a553d 2018-03-12 stsp if (error != NULL)
382 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
383 e5dc7198 2018-12-29 stsp path_prefix);
384 e5dc7198 2018-12-29 stsp if (error != NULL)
386 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
387 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
391 8069f636 2019-01-12 stsp if (commit_id_str) {
392 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
393 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
394 8069f636 2019-01-12 stsp commit_id_str);
395 8069f636 2019-01-12 stsp if (error != NULL)
397 8069f636 2019-01-12 stsp error = check_ancestry(worktree, commit_id, repo);
398 8069f636 2019-01-12 stsp if (error != NULL) {
399 8069f636 2019-01-12 stsp free(commit_id);
402 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
403 8069f636 2019-01-12 stsp commit_id);
404 8069f636 2019-01-12 stsp free(commit_id);
409 93a30277 2018-12-24 stsp error = got_worktree_checkout_files(worktree, repo,
410 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
411 c09a553d 2018-03-12 stsp if (error != NULL)
414 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
417 8069f636 2019-01-12 stsp free(commit_id_str);
418 76089277 2018-04-01 stsp free(repo_path);
419 507dc3bb 2018-12-29 stsp free(worktree_path);
420 507dc3bb 2018-12-29 stsp return error;
423 507dc3bb 2018-12-29 stsp __dead static void
424 507dc3bb 2018-12-29 stsp usage_update(void)
426 507dc3bb 2018-12-29 stsp fprintf(stderr, "usage: %s update [-c commit] [worktree-path]\n",
427 507dc3bb 2018-12-29 stsp getprogname());
431 507dc3bb 2018-12-29 stsp static void
432 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
434 784955db 2019-01-12 stsp int *did_something = arg;
436 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
439 784955db 2019-01-12 stsp *did_something = 1;
440 507dc3bb 2018-12-29 stsp while (path[0] == '/')
442 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
445 be7061eb 2018-12-30 stsp static const struct got_error *
446 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
448 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
449 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
450 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
451 507dc3bb 2018-12-29 stsp char *worktree_path = NULL;
452 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
453 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
454 784955db 2019-01-12 stsp int ch, did_something = 0;
456 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
457 507dc3bb 2018-12-29 stsp switch (ch) {
459 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
460 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
461 9c4b8182 2019-01-02 stsp return got_error_from_errno();
465 507dc3bb 2018-12-29 stsp /* NOTREACHED */
469 507dc3bb 2018-12-29 stsp argc -= optind;
470 507dc3bb 2018-12-29 stsp argv += optind;
472 507dc3bb 2018-12-29 stsp #ifndef PROFILE
473 0266afb7 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
474 0266afb7 2019-01-04 stsp NULL) == -1)
475 507dc3bb 2018-12-29 stsp err(1, "pledge");
477 507dc3bb 2018-12-29 stsp if (argc == 0) {
478 507dc3bb 2018-12-29 stsp worktree_path = getcwd(NULL, 0);
479 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
480 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
483 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
484 507dc3bb 2018-12-29 stsp worktree_path = realpath(argv[0], NULL);
485 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
486 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
490 507dc3bb 2018-12-29 stsp usage_update();
492 507dc3bb 2018-12-29 stsp error = got_worktree_open(&worktree, worktree_path);
493 507dc3bb 2018-12-29 stsp if (error != NULL)
496 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
497 507dc3bb 2018-12-29 stsp if (error != NULL)
500 8c02d095 2019-02-05 stsp error = apply_unveil(got_repo_get_path(repo),
501 8c02d095 2019-02-05 stsp got_worktree_get_root_path(worktree));
505 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
506 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
507 507dc3bb 2018-12-29 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
508 507dc3bb 2018-12-29 stsp if (error != NULL)
510 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
511 9c4b8182 2019-01-02 stsp if (error != NULL)
513 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
514 507dc3bb 2018-12-29 stsp if (error != NULL)
517 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
518 507dc3bb 2018-12-29 stsp commit_id_str);
519 507dc3bb 2018-12-29 stsp if (error != NULL)
523 be7061eb 2018-12-30 stsp error = check_ancestry(worktree, commit_id, repo);
524 be7061eb 2018-12-30 stsp if (error != NULL)
527 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
528 507dc3bb 2018-12-29 stsp commit_id) != 0) {
529 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
530 507dc3bb 2018-12-29 stsp commit_id);
535 507dc3bb 2018-12-29 stsp error = got_worktree_checkout_files(worktree, repo,
536 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
537 507dc3bb 2018-12-29 stsp if (error != NULL)
540 784955db 2019-01-12 stsp if (did_something)
541 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
543 784955db 2019-01-12 stsp printf("Already up-to-date\n");
545 c09a553d 2018-03-12 stsp free(worktree_path);
546 507dc3bb 2018-12-29 stsp free(commit_id);
547 9c4b8182 2019-01-02 stsp free(commit_id_str);
548 c09a553d 2018-03-12 stsp return error;
551 f42b1b34 2018-03-12 stsp static const struct got_error *
552 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
553 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
555 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
556 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
557 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
558 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
560 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
561 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
563 79109fed 2018-03-27 stsp return err;
565 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
566 79f35eb3 2018-06-11 stsp if (qid != NULL) {
567 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
569 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
571 79109fed 2018-03-27 stsp return err;
573 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
574 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
575 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
577 0f2b3dca 2018-12-22 stsp return err;
579 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
581 79109fed 2018-03-27 stsp return err;
584 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
588 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
589 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
592 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
593 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
594 0f2b3dca 2018-12-22 stsp free(id_str1);
595 0f2b3dca 2018-12-22 stsp free(id_str2);
596 79109fed 2018-03-27 stsp return err;
599 4bb494d5 2018-06-16 stsp static char *
600 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
602 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
603 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
609 79109fed 2018-03-27 stsp static const struct got_error *
610 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
611 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
612 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
614 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
615 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
616 6c281f94 2018-06-11 stsp char datebuf[26];
617 45d799e2 2018-12-23 stsp time_t committer_time;
618 45d799e2 2018-12-23 stsp const char *author, *committer;
619 199a4027 2019-02-02 stsp char *refs_str = NULL;
620 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
622 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
624 199a4027 2019-02-02 stsp const char *name;
625 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
627 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
628 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
630 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
632 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
634 199a4027 2019-02-02 stsp s = refs_str;
635 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
636 199a4027 2019-02-02 stsp name) == -1) {
637 199a4027 2019-02-02 stsp err = got_error_from_errno();
643 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
645 8bf5b3c9 2018-03-17 stsp return err;
647 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
648 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
649 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
650 832c249c 2018-06-10 stsp free(id_str);
651 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
652 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
653 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
654 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
655 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
656 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
657 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
658 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
659 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
660 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
661 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
663 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
664 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
665 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
667 a0603db2 2018-06-10 stsp return err;
668 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
669 a0603db2 2018-06-10 stsp free(id_str);
673 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
674 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
675 832c249c 2018-06-10 stsp return got_error_from_errno();
677 621015ac 2018-07-23 stsp logmsg = logmsg0;
679 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
681 832c249c 2018-06-10 stsp printf(" %s\n", line);
682 832c249c 2018-06-10 stsp } while (line);
683 621015ac 2018-07-23 stsp free(logmsg0);
685 971751ac 2018-03-27 stsp if (show_patch) {
686 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
687 971751ac 2018-03-27 stsp if (err == 0)
688 971751ac 2018-03-27 stsp printf("\n");
691 d82de447 2018-09-15 stsp fflush(stdout);
692 07862c20 2018-09-15 stsp return err;
695 f42b1b34 2018-03-12 stsp static const struct got_error *
696 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
697 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
698 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
700 f42b1b34 2018-03-12 stsp const struct got_error *err;
701 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
703 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
704 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
706 f42b1b34 2018-03-12 stsp return err;
707 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
710 31cedeaf 2018-09-15 stsp while (1) {
711 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
712 372ccdbb 2018-06-10 stsp struct got_object_id *id;
714 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
717 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
719 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
720 9ba79e04 2018-06-11 stsp err = NULL;
723 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
725 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
731 b43fbaa0 2018-06-11 stsp if (id == NULL)
734 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
737 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
739 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
740 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
744 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
745 f42b1b34 2018-03-12 stsp return err;
748 4ed7e80c 2018-05-20 stsp __dead static void
749 6f3d1eb0 2018-03-12 stsp usage_log(void)
751 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
752 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
756 4ed7e80c 2018-05-20 stsp static const struct got_error *
757 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
759 f42b1b34 2018-03-12 stsp const struct got_error *error;
760 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
761 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
762 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
763 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
764 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
765 d142fc45 2018-04-01 stsp char *start_commit = NULL;
766 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
767 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
768 64a96a6d 2018-04-01 stsp const char *errstr;
769 199a4027 2019-02-02 stsp struct got_reflist_head refs;
771 6715a751 2018-03-16 stsp #ifndef PROFILE
772 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
775 f42b1b34 2018-03-12 stsp err(1, "pledge");
778 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
779 79109fed 2018-03-27 stsp switch (ch) {
781 79109fed 2018-03-27 stsp show_patch = 1;
784 d142fc45 2018-04-01 stsp start_commit = optarg;
787 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
789 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
790 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
793 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
794 64a96a6d 2018-04-01 stsp if (errstr != NULL)
795 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
798 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
801 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
802 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
803 04ca23f4 2018-07-16 stsp err(1, "-r option");
807 79109fed 2018-03-27 stsp /* NOTREACHED */
811 79109fed 2018-03-27 stsp argc -= optind;
812 79109fed 2018-03-27 stsp argv += optind;
814 04ca23f4 2018-07-16 stsp if (argc == 0)
815 04ca23f4 2018-07-16 stsp path = strdup("");
816 04ca23f4 2018-07-16 stsp else if (argc == 1)
817 04ca23f4 2018-07-16 stsp path = strdup(argv[0]);
819 6f3d1eb0 2018-03-12 stsp usage_log();
820 04ca23f4 2018-07-16 stsp if (path == NULL)
821 04ca23f4 2018-07-16 stsp return got_error_from_errno();
823 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
824 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
825 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
829 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
830 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
832 cffc0aa4 2019-02-05 stsp error = NULL;
834 cffc0aa4 2019-02-05 stsp repo_path = worktree ?
835 cffc0aa4 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
836 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
837 cffc0aa4 2019-02-05 stsp error = got_error_from_errno();
841 6098196c 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
845 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
846 d7d4f210 2018-03-12 stsp if (error != NULL)
849 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
850 3235492e 2018-04-01 stsp struct got_reference *head_ref;
851 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
852 3235492e 2018-04-01 stsp if (error != NULL)
853 3235492e 2018-04-01 stsp return error;
854 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
855 3235492e 2018-04-01 stsp got_ref_close(head_ref);
856 3235492e 2018-04-01 stsp if (error != NULL)
857 3235492e 2018-04-01 stsp return error;
858 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
860 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
861 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
862 3235492e 2018-04-01 stsp if (error == NULL) {
863 1caad61b 2019-02-01 stsp int obj_type;
864 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
865 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
866 d1f2edc9 2018-06-13 stsp if (error != NULL)
868 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
869 1caad61b 2019-02-01 stsp if (error != NULL)
871 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
872 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
873 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
874 1caad61b 2019-02-01 stsp if (error != NULL)
876 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
877 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
878 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
879 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
883 1caad61b 2019-02-01 stsp id = got_object_id_dup(
884 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
885 1caad61b 2019-02-01 stsp if (id == NULL)
886 1caad61b 2019-02-01 stsp error = got_error_from_errno();
887 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
890 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
891 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
894 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
895 d1f2edc9 2018-06-13 stsp if (error != NULL)
898 15a94983 2018-12-23 stsp if (commit == NULL) {
899 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
900 d1f2edc9 2018-06-13 stsp start_commit);
901 d1f2edc9 2018-06-13 stsp if (error != NULL)
902 d1f2edc9 2018-06-13 stsp return error;
905 d7d4f210 2018-03-12 stsp if (error != NULL)
908 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
909 04ca23f4 2018-07-16 stsp if (error != NULL)
911 04ca23f4 2018-07-16 stsp if (in_repo_path) {
912 04ca23f4 2018-07-16 stsp free(path);
913 04ca23f4 2018-07-16 stsp path = in_repo_path;
916 199a4027 2019-02-02 stsp SIMPLEQ_INIT(&refs);
917 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
921 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
922 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
924 04ca23f4 2018-07-16 stsp free(path);
925 04ca23f4 2018-07-16 stsp free(repo_path);
928 cffc0aa4 2019-02-05 stsp if (worktree)
929 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
930 ad242220 2018-09-08 stsp if (repo) {
931 ad242220 2018-09-08 stsp const struct got_error *repo_error;
932 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
933 ad242220 2018-09-08 stsp if (error == NULL)
934 ad242220 2018-09-08 stsp error = repo_error;
936 8bf5b3c9 2018-03-17 stsp return error;
939 4ed7e80c 2018-05-20 stsp __dead static void
940 3f8b7d6a 2018-04-01 stsp usage_diff(void)
942 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
943 b72f483a 2019-02-05 stsp "[object1 object2]\n", getprogname());
947 b72f483a 2019-02-05 stsp struct print_diff_arg {
948 b72f483a 2019-02-05 stsp struct got_repository *repo;
949 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
950 b72f483a 2019-02-05 stsp int diff_context;
953 4ed7e80c 2018-05-20 stsp static const struct got_error *
954 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
955 b72f483a 2019-02-05 stsp struct got_object_id *id)
957 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
958 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
959 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
960 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
961 b72f483a 2019-02-05 stsp char *abspath = NULL;
962 b72f483a 2019-02-05 stsp struct stat sb;
964 b72f483a 2019-02-05 stsp if (status != GOT_STATUS_MODIFIY)
965 b72f483a 2019-02-05 stsp return NULL;
967 b72f483a 2019-02-05 stsp err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
971 b72f483a 2019-02-05 stsp if (asprintf(&abspath, "%s/%s",
972 b72f483a 2019-02-05 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
973 b72f483a 2019-02-05 stsp err = got_error_from_errno();
977 b72f483a 2019-02-05 stsp f2 = fopen(abspath, "r");
978 b72f483a 2019-02-05 stsp if (f2 == NULL) {
979 b72f483a 2019-02-05 stsp err = got_error_from_errno();
982 b72f483a 2019-02-05 stsp if (lstat(abspath, &sb) == -1) {
983 b72f483a 2019-02-05 stsp err = got_error_from_errno();
987 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
991 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
993 b72f483a 2019-02-05 stsp fclose(f2);
994 b72f483a 2019-02-05 stsp free(abspath);
995 b72f483a 2019-02-05 stsp return err;
998 b72f483a 2019-02-05 stsp static const struct got_error *
999 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1001 b00d56cd 2018-04-01 stsp const struct got_error *error;
1002 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1003 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1004 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1005 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1006 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1007 15a94983 2018-12-23 stsp int type1, type2;
1008 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1009 c0cc5c62 2018-10-18 stsp const char *errstr;
1011 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1012 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1013 25eccc22 2019-01-04 stsp NULL) == -1)
1014 b00d56cd 2018-04-01 stsp err(1, "pledge");
1017 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1018 b00d56cd 2018-04-01 stsp switch (ch) {
1020 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1021 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1022 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1025 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1026 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1027 b72f483a 2019-02-05 stsp err(1, "-r option");
1031 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1035 b00d56cd 2018-04-01 stsp argc -= optind;
1036 b00d56cd 2018-04-01 stsp argv += optind;
1038 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1039 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1040 b72f483a 2019-02-05 stsp error = got_error_from_errno();
1041 b72f483a 2019-02-05 stsp goto done;
1043 b00d56cd 2018-04-01 stsp if (argc == 0) {
1044 b72f483a 2019-02-05 stsp if (repo_path)
1046 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1047 b72f483a 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1048 b72f483a 2019-02-05 stsp if (error)
1049 b72f483a 2019-02-05 stsp goto done;
1050 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1051 3f8b7d6a 2018-04-01 stsp if (repo_path == NULL)
1052 e1e3f570 2018-04-01 stsp return got_error_from_errno();
1053 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1054 15a94983 2018-12-23 stsp id_str1 = argv[0];
1055 15a94983 2018-12-23 stsp id_str2 = argv[1];
1057 b00d56cd 2018-04-01 stsp usage_diff();
1059 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1060 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1061 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1062 b72f483a 2019-02-05 stsp return got_error_from_errno();
1065 b72f483a 2019-02-05 stsp error = apply_unveil(repo_path,
1066 b72f483a 2019-02-05 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1067 25eccc22 2019-01-04 stsp if (error)
1068 25eccc22 2019-01-04 stsp goto done;
1070 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1071 76089277 2018-04-01 stsp free(repo_path);
1072 b00d56cd 2018-04-01 stsp if (error != NULL)
1073 b00d56cd 2018-04-01 stsp goto done;
1075 b72f483a 2019-02-05 stsp if (worktree) {
1076 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1077 b72f483a 2019-02-05 stsp char *id_str;
1078 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1079 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1080 b72f483a 2019-02-05 stsp if (error)
1081 b72f483a 2019-02-05 stsp goto done;
1082 b72f483a 2019-02-05 stsp arg.repo = repo;
1083 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1084 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1086 b72f483a 2019-02-05 stsp printf("diff %s %s\n", id_str,
1087 b72f483a 2019-02-05 stsp got_worktree_get_root_path(worktree));
1088 b72f483a 2019-02-05 stsp error = got_worktree_status(worktree, repo, print_diff,
1089 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1090 b72f483a 2019-02-05 stsp free(id_str);
1091 b72f483a 2019-02-05 stsp goto done;
1094 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1095 6402fb3c 2018-09-15 stsp if (error)
1096 b00d56cd 2018-04-01 stsp goto done;
1098 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1099 6402fb3c 2018-09-15 stsp if (error)
1100 b00d56cd 2018-04-01 stsp goto done;
1102 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1103 15a94983 2018-12-23 stsp if (error)
1104 15a94983 2018-12-23 stsp goto done;
1106 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1107 15a94983 2018-12-23 stsp if (error)
1108 15a94983 2018-12-23 stsp goto done;
1110 15a94983 2018-12-23 stsp if (type1 != type2) {
1111 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1112 b00d56cd 2018-04-01 stsp goto done;
1115 15a94983 2018-12-23 stsp switch (type1) {
1116 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1117 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1118 54156555 2018-12-24 stsp diff_context, repo, stdout);
1120 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1121 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1122 54156555 2018-12-24 stsp diff_context, repo, stdout);
1124 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1125 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1127 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1128 c0cc5c62 2018-10-18 stsp repo, stdout);
1131 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1135 15a94983 2018-12-23 stsp free(id1);
1136 15a94983 2018-12-23 stsp free(id2);
1137 b72f483a 2019-02-05 stsp if (worktree)
1138 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1139 ad242220 2018-09-08 stsp if (repo) {
1140 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1141 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1142 ad242220 2018-09-08 stsp if (error == NULL)
1143 ad242220 2018-09-08 stsp error = repo_error;
1145 b00d56cd 2018-04-01 stsp return error;
1148 404c43c4 2018-06-21 stsp __dead static void
1149 404c43c4 2018-06-21 stsp usage_blame(void)
1151 9270e621 2019-02-05 stsp fprintf(stderr,
1152 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1153 404c43c4 2018-06-21 stsp getprogname());
1157 404c43c4 2018-06-21 stsp static const struct got_error *
1158 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1160 404c43c4 2018-06-21 stsp const struct got_error *error;
1161 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1162 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1163 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1164 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1165 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1168 404c43c4 2018-06-21 stsp #ifndef PROFILE
1169 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1170 36e2fb66 2019-01-04 stsp NULL) == -1)
1171 404c43c4 2018-06-21 stsp err(1, "pledge");
1174 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1175 404c43c4 2018-06-21 stsp switch (ch) {
1177 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1180 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1181 66bea077 2018-08-02 stsp if (repo_path == NULL)
1182 66bea077 2018-08-02 stsp err(1, "-r option");
1186 404c43c4 2018-06-21 stsp /* NOTREACHED */
1190 404c43c4 2018-06-21 stsp argc -= optind;
1191 404c43c4 2018-06-21 stsp argv += optind;
1193 a39318fd 2018-08-02 stsp if (argc == 1)
1194 404c43c4 2018-06-21 stsp path = argv[0];
1196 404c43c4 2018-06-21 stsp usage_blame();
1198 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1199 66bea077 2018-08-02 stsp if (cwd == NULL) {
1200 66bea077 2018-08-02 stsp error = got_error_from_errno();
1201 66bea077 2018-08-02 stsp goto done;
1203 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1204 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1205 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1206 66bea077 2018-08-02 stsp goto done;
1208 0c06baac 2019-02-05 stsp error = NULL;
1209 0c06baac 2019-02-05 stsp if (worktree) {
1210 0c06baac 2019-02-05 stsp repo_path =
1211 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1212 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1213 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1214 0c06baac 2019-02-05 stsp if (error)
1215 0c06baac 2019-02-05 stsp goto done;
1217 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1218 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1219 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1220 0c06baac 2019-02-05 stsp goto done;
1225 36e2fb66 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
1226 36e2fb66 2019-01-04 stsp if (error)
1227 36e2fb66 2019-01-04 stsp goto done;
1229 404c43c4 2018-06-21 stsp error = got_repo_open(&repo, repo_path);
1230 404c43c4 2018-06-21 stsp if (error != NULL)
1231 404c43c4 2018-06-21 stsp goto done;
1233 0c06baac 2019-02-05 stsp if (worktree) {
1234 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1235 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1236 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1237 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1238 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1239 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1240 6efaaa2d 2019-02-05 stsp path) == -1) {
1241 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1242 0c06baac 2019-02-05 stsp goto done;
1244 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1247 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1249 0c06baac 2019-02-05 stsp if (error)
1250 66bea077 2018-08-02 stsp goto done;
1252 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1253 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1254 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1255 404c43c4 2018-06-21 stsp if (error != NULL)
1256 66bea077 2018-08-02 stsp goto done;
1257 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1258 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1259 404c43c4 2018-06-21 stsp if (error != NULL)
1260 66bea077 2018-08-02 stsp goto done;
1262 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1263 15a94983 2018-12-23 stsp commit_id_str);
1264 404c43c4 2018-06-21 stsp if (error != NULL)
1265 66bea077 2018-08-02 stsp goto done;
1268 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1270 66bea077 2018-08-02 stsp free(in_repo_path);
1271 66bea077 2018-08-02 stsp free(repo_path);
1272 66bea077 2018-08-02 stsp free(cwd);
1273 404c43c4 2018-06-21 stsp free(commit_id);
1274 0c06baac 2019-02-05 stsp if (worktree)
1275 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1276 ad242220 2018-09-08 stsp if (repo) {
1277 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1278 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1279 ad242220 2018-09-08 stsp if (error == NULL)
1280 ad242220 2018-09-08 stsp error = repo_error;
1282 404c43c4 2018-06-21 stsp return error;
1285 5de5890b 2018-10-18 stsp __dead static void
1286 5de5890b 2018-10-18 stsp usage_tree(void)
1288 c1669e2e 2019-01-09 stsp fprintf(stderr,
1289 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1290 5de5890b 2018-10-18 stsp getprogname());
1294 c1669e2e 2019-01-09 stsp static void
1295 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1296 c1669e2e 2019-01-09 stsp const char *root_path)
1298 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1300 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1301 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1304 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1305 c1669e2e 2019-01-09 stsp is_root_path ? "" : "/",
1306 c1669e2e 2019-01-09 stsp te->name, S_ISDIR(te->mode) ? "/" : "");
1309 5de5890b 2018-10-18 stsp static const struct got_error *
1310 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1311 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1312 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1314 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1315 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1316 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1317 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1318 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1320 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1322 5de5890b 2018-10-18 stsp goto done;
1324 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1326 5de5890b 2018-10-18 stsp goto done;
1327 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1328 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1329 5de5890b 2018-10-18 stsp while (te) {
1330 5de5890b 2018-10-18 stsp char *id = NULL;
1332 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1335 5de5890b 2018-10-18 stsp if (show_ids) {
1336 5de5890b 2018-10-18 stsp char *id_str;
1337 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1339 5de5890b 2018-10-18 stsp goto done;
1340 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1341 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1342 5de5890b 2018-10-18 stsp free(id_str);
1343 5de5890b 2018-10-18 stsp goto done;
1345 5de5890b 2018-10-18 stsp free(id_str);
1347 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1350 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1351 c1669e2e 2019-01-09 stsp char *child_path;
1352 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1353 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1354 c1669e2e 2019-01-09 stsp te->name) == -1) {
1355 c1669e2e 2019-01-09 stsp err = got_error_from_errno();
1356 c1669e2e 2019-01-09 stsp goto done;
1358 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1359 c1669e2e 2019-01-09 stsp root_path, repo);
1360 c1669e2e 2019-01-09 stsp free(child_path);
1362 c1669e2e 2019-01-09 stsp goto done;
1365 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1369 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1370 5de5890b 2018-10-18 stsp free(tree_id);
1371 5de5890b 2018-10-18 stsp return err;
1374 5de5890b 2018-10-18 stsp static const struct got_error *
1375 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1377 5de5890b 2018-10-18 stsp const struct got_error *error;
1378 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1379 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1380 7a2c19d6 2019-02-05 stsp const char *path;
1381 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1382 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1383 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1384 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1387 5de5890b 2018-10-18 stsp #ifndef PROFILE
1388 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1389 0f8d269b 2019-01-04 stsp NULL) == -1)
1390 5de5890b 2018-10-18 stsp err(1, "pledge");
1393 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1394 5de5890b 2018-10-18 stsp switch (ch) {
1396 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1399 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1400 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1401 5de5890b 2018-10-18 stsp err(1, "-r option");
1404 5de5890b 2018-10-18 stsp show_ids = 1;
1407 c1669e2e 2019-01-09 stsp recurse = 1;
1411 5de5890b 2018-10-18 stsp /* NOTREACHED */
1415 5de5890b 2018-10-18 stsp argc -= optind;
1416 5de5890b 2018-10-18 stsp argv += optind;
1418 5de5890b 2018-10-18 stsp if (argc == 1)
1419 5de5890b 2018-10-18 stsp path = argv[0];
1420 5de5890b 2018-10-18 stsp else if (argc > 1)
1421 5de5890b 2018-10-18 stsp usage_tree();
1423 7a2c19d6 2019-02-05 stsp path = NULL;
1425 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1426 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1427 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1428 9bf7a39b 2019-02-05 stsp goto done;
1430 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1431 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1432 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1433 7a2c19d6 2019-02-05 stsp goto done;
1435 7a2c19d6 2019-02-05 stsp error = NULL;
1436 7a2c19d6 2019-02-05 stsp if (worktree) {
1437 7a2c19d6 2019-02-05 stsp repo_path =
1438 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1439 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1440 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1441 7a2c19d6 2019-02-05 stsp if (error)
1442 7a2c19d6 2019-02-05 stsp goto done;
1444 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1445 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1446 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1447 7a2c19d6 2019-02-05 stsp goto done;
1452 0f8d269b 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
1453 0f8d269b 2019-01-04 stsp if (error)
1454 0f8d269b 2019-01-04 stsp goto done;
1456 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1457 5de5890b 2018-10-18 stsp if (error != NULL)
1458 5de5890b 2018-10-18 stsp goto done;
1460 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1461 9bf7a39b 2019-02-05 stsp if (worktree) {
1462 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1463 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1464 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1465 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1466 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1467 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1468 9bf7a39b 2019-02-05 stsp goto done;
1470 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1472 9bf7a39b 2019-02-05 stsp if (error)
1473 9bf7a39b 2019-02-05 stsp goto done;
1475 9bf7a39b 2019-02-05 stsp path = "/";
1477 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1478 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1479 9bf7a39b 2019-02-05 stsp if (error != NULL)
1480 9bf7a39b 2019-02-05 stsp goto done;
1483 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1484 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1485 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1486 5de5890b 2018-10-18 stsp if (error != NULL)
1487 5de5890b 2018-10-18 stsp goto done;
1488 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1489 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1490 5de5890b 2018-10-18 stsp if (error != NULL)
1491 5de5890b 2018-10-18 stsp goto done;
1493 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1494 15a94983 2018-12-23 stsp commit_id_str);
1495 5de5890b 2018-10-18 stsp if (error != NULL)
1496 5de5890b 2018-10-18 stsp goto done;
1499 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1500 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1502 5de5890b 2018-10-18 stsp free(in_repo_path);
1503 5de5890b 2018-10-18 stsp free(repo_path);
1504 5de5890b 2018-10-18 stsp free(cwd);
1505 5de5890b 2018-10-18 stsp free(commit_id);
1506 7a2c19d6 2019-02-05 stsp if (worktree)
1507 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1508 5de5890b 2018-10-18 stsp if (repo) {
1509 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1510 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1511 5de5890b 2018-10-18 stsp if (error == NULL)
1512 5de5890b 2018-10-18 stsp error = repo_error;
1514 5de5890b 2018-10-18 stsp return error;
1517 6bad629b 2019-02-04 stsp __dead static void
1518 6bad629b 2019-02-04 stsp usage_status(void)
1520 6bad629b 2019-02-04 stsp fprintf(stderr, "usage: %s status [worktree-path]\n", getprogname());
1524 b72f483a 2019-02-05 stsp static const struct got_error *
1525 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1526 b72f483a 2019-02-05 stsp struct got_object_id *id)
1528 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1529 b72f483a 2019-02-05 stsp return NULL;
1532 6bad629b 2019-02-04 stsp static const struct got_error *
1533 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1535 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1536 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1537 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1538 6bad629b 2019-02-04 stsp char *worktree_path = NULL;
1541 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1542 6bad629b 2019-02-04 stsp switch (ch) {
1545 6bad629b 2019-02-04 stsp /* NOTREACHED */
1549 6bad629b 2019-02-04 stsp argc -= optind;
1550 6bad629b 2019-02-04 stsp argv += optind;
1552 6bad629b 2019-02-04 stsp #ifndef PROFILE
1553 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1554 6bad629b 2019-02-04 stsp NULL) == -1)
1555 6bad629b 2019-02-04 stsp err(1, "pledge");
1557 6bad629b 2019-02-04 stsp if (argc == 0) {
1558 6bad629b 2019-02-04 stsp worktree_path = getcwd(NULL, 0);
1559 6bad629b 2019-02-04 stsp if (worktree_path == NULL) {
1560 6bad629b 2019-02-04 stsp error = got_error_from_errno();
1561 6bad629b 2019-02-04 stsp goto done;
1563 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1564 6bad629b 2019-02-04 stsp worktree_path = realpath(argv[0], NULL);
1565 6bad629b 2019-02-04 stsp if (worktree_path == NULL) {
1566 6bad629b 2019-02-04 stsp error = got_error_from_errno();
1567 6bad629b 2019-02-04 stsp goto done;
1570 6bad629b 2019-02-04 stsp usage_status();
1572 6bad629b 2019-02-04 stsp error = got_worktree_open(&worktree, worktree_path);
1573 6bad629b 2019-02-04 stsp if (error != NULL)
1574 6bad629b 2019-02-04 stsp goto done;
1576 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1577 6bad629b 2019-02-04 stsp if (error != NULL)
1578 6bad629b 2019-02-04 stsp goto done;
1580 c7f4312f 2019-02-05 stsp error = apply_unveil(got_repo_get_path(repo),
1581 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(worktree));
1582 6bad629b 2019-02-04 stsp if (error)
1583 6bad629b 2019-02-04 stsp goto done;
1585 6bad629b 2019-02-04 stsp error = got_worktree_status(worktree, repo, print_status, NULL,
1586 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1588 6bad629b 2019-02-04 stsp free(worktree_path);
1589 6bad629b 2019-02-04 stsp return error;