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;
308 2deda0b9 2019-03-07 stsp usage_checkout();
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 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
318 68ed9ba5 2019-02-10 stsp "unveil", 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 1545c615 2019-02-10 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();
464 2deda0b9 2019-03-07 stsp usage_update();
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 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
474 68ed9ba5 2019-02-10 stsp "unveil", 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 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
630 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
632 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
634 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
636 199a4027 2019-02-02 stsp s = refs_str;
637 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
638 199a4027 2019-02-02 stsp name) == -1) {
639 199a4027 2019-02-02 stsp err = got_error_from_errno();
645 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
647 8bf5b3c9 2018-03-17 stsp return err;
649 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
650 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
651 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
652 832c249c 2018-06-10 stsp free(id_str);
653 d3d493d7 2019-02-21 stsp id_str = NULL;
654 d3d493d7 2019-02-21 stsp free(refs_str);
655 d3d493d7 2019-02-21 stsp refs_str = NULL;
656 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
657 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
658 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
659 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
660 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
661 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
662 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
663 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
664 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
665 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
666 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
668 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
669 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
670 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
672 a0603db2 2018-06-10 stsp return err;
673 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
674 a0603db2 2018-06-10 stsp free(id_str);
678 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
679 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
680 832c249c 2018-06-10 stsp return got_error_from_errno();
682 621015ac 2018-07-23 stsp logmsg = logmsg0;
684 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
686 832c249c 2018-06-10 stsp printf(" %s\n", line);
687 832c249c 2018-06-10 stsp } while (line);
688 621015ac 2018-07-23 stsp free(logmsg0);
690 971751ac 2018-03-27 stsp if (show_patch) {
691 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
692 971751ac 2018-03-27 stsp if (err == 0)
693 971751ac 2018-03-27 stsp printf("\n");
696 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
697 cbe7f848 2019-02-11 stsp err = got_error_from_errno();
698 07862c20 2018-09-15 stsp return err;
701 f42b1b34 2018-03-12 stsp static const struct got_error *
702 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
703 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
704 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
706 f42b1b34 2018-03-12 stsp const struct got_error *err;
707 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
709 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
710 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
712 f42b1b34 2018-03-12 stsp return err;
713 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
716 31cedeaf 2018-09-15 stsp while (1) {
717 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
718 372ccdbb 2018-06-10 stsp struct got_object_id *id;
720 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
723 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
725 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
726 9ba79e04 2018-06-11 stsp err = NULL;
729 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
731 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
737 b43fbaa0 2018-06-11 stsp if (id == NULL)
740 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
743 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
745 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
746 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
750 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
751 f42b1b34 2018-03-12 stsp return err;
754 4ed7e80c 2018-05-20 stsp __dead static void
755 6f3d1eb0 2018-03-12 stsp usage_log(void)
757 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
758 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
762 4ed7e80c 2018-05-20 stsp static const struct got_error *
763 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
765 f42b1b34 2018-03-12 stsp const struct got_error *error;
766 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
767 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
768 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
769 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
770 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
771 d142fc45 2018-04-01 stsp char *start_commit = NULL;
772 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
773 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
774 64a96a6d 2018-04-01 stsp const char *errstr;
775 199a4027 2019-02-02 stsp struct got_reflist_head refs;
777 6715a751 2018-03-16 stsp #ifndef PROFILE
778 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
781 f42b1b34 2018-03-12 stsp err(1, "pledge");
784 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
785 79109fed 2018-03-27 stsp switch (ch) {
787 79109fed 2018-03-27 stsp show_patch = 1;
790 d142fc45 2018-04-01 stsp start_commit = optarg;
793 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
795 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
796 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
799 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
800 64a96a6d 2018-04-01 stsp if (errstr != NULL)
801 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
804 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
807 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
808 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
809 04ca23f4 2018-07-16 stsp err(1, "-r option");
812 2deda0b9 2019-03-07 stsp usage_log();
813 79109fed 2018-03-27 stsp /* NOTREACHED */
817 79109fed 2018-03-27 stsp argc -= optind;
818 79109fed 2018-03-27 stsp argv += optind;
820 04ca23f4 2018-07-16 stsp if (argc == 0)
821 04ca23f4 2018-07-16 stsp path = strdup("");
822 04ca23f4 2018-07-16 stsp else if (argc == 1)
823 04ca23f4 2018-07-16 stsp path = strdup(argv[0]);
825 6f3d1eb0 2018-03-12 stsp usage_log();
826 04ca23f4 2018-07-16 stsp if (path == NULL)
827 04ca23f4 2018-07-16 stsp return got_error_from_errno();
829 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
830 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
831 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
835 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
836 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
838 cffc0aa4 2019-02-05 stsp error = NULL;
840 cffc0aa4 2019-02-05 stsp repo_path = worktree ?
841 cffc0aa4 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
842 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
843 cffc0aa4 2019-02-05 stsp error = got_error_from_errno();
847 efcae1c6 2019-03-07 stsp error = apply_unveil(repo_path,
848 efcae1c6 2019-03-07 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
852 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
853 d7d4f210 2018-03-12 stsp if (error != NULL)
856 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
857 3235492e 2018-04-01 stsp struct got_reference *head_ref;
858 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
859 3235492e 2018-04-01 stsp if (error != NULL)
860 3235492e 2018-04-01 stsp return error;
861 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
862 3235492e 2018-04-01 stsp got_ref_close(head_ref);
863 3235492e 2018-04-01 stsp if (error != NULL)
864 3235492e 2018-04-01 stsp return error;
865 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
867 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
868 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
869 3235492e 2018-04-01 stsp if (error == NULL) {
870 1caad61b 2019-02-01 stsp int obj_type;
871 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
872 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
873 d1f2edc9 2018-06-13 stsp if (error != NULL)
875 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
876 1caad61b 2019-02-01 stsp if (error != NULL)
878 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
879 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
880 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
881 1caad61b 2019-02-01 stsp if (error != NULL)
883 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
884 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
885 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
886 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
890 1caad61b 2019-02-01 stsp id = got_object_id_dup(
891 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
892 1caad61b 2019-02-01 stsp if (id == NULL)
893 1caad61b 2019-02-01 stsp error = got_error_from_errno();
894 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
897 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
898 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
901 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
902 d1f2edc9 2018-06-13 stsp if (error != NULL)
905 15a94983 2018-12-23 stsp if (commit == NULL) {
906 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
907 d1f2edc9 2018-06-13 stsp start_commit);
908 d1f2edc9 2018-06-13 stsp if (error != NULL)
909 d1f2edc9 2018-06-13 stsp return error;
912 d7d4f210 2018-03-12 stsp if (error != NULL)
915 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
916 04ca23f4 2018-07-16 stsp if (error != NULL)
918 04ca23f4 2018-07-16 stsp if (in_repo_path) {
919 04ca23f4 2018-07-16 stsp free(path);
920 04ca23f4 2018-07-16 stsp path = in_repo_path;
923 199a4027 2019-02-02 stsp SIMPLEQ_INIT(&refs);
924 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
928 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
929 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
931 04ca23f4 2018-07-16 stsp free(path);
932 04ca23f4 2018-07-16 stsp free(repo_path);
935 cffc0aa4 2019-02-05 stsp if (worktree)
936 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
937 ad242220 2018-09-08 stsp if (repo) {
938 ad242220 2018-09-08 stsp const struct got_error *repo_error;
939 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
940 ad242220 2018-09-08 stsp if (error == NULL)
941 ad242220 2018-09-08 stsp error = repo_error;
943 8bf5b3c9 2018-03-17 stsp return error;
946 4ed7e80c 2018-05-20 stsp __dead static void
947 3f8b7d6a 2018-04-01 stsp usage_diff(void)
949 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
950 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
954 b72f483a 2019-02-05 stsp struct print_diff_arg {
955 b72f483a 2019-02-05 stsp struct got_repository *repo;
956 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
957 b72f483a 2019-02-05 stsp int diff_context;
958 3fc0c068 2019-02-10 stsp const char *id_str;
959 3fc0c068 2019-02-10 stsp int header_shown;
962 4ed7e80c 2018-05-20 stsp static const struct got_error *
963 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
964 b72f483a 2019-02-05 stsp struct got_object_id *id)
966 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
967 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
968 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
969 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
970 b72f483a 2019-02-05 stsp char *abspath = NULL;
971 b72f483a 2019-02-05 stsp struct stat sb;
973 276262e8 2019-02-08 stsp if (status != GOT_STATUS_MODIFY)
974 b72f483a 2019-02-05 stsp return NULL;
976 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
977 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
978 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
979 3fc0c068 2019-02-10 stsp a->header_shown = 1;
982 b72f483a 2019-02-05 stsp err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
986 b72f483a 2019-02-05 stsp if (asprintf(&abspath, "%s/%s",
987 b72f483a 2019-02-05 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
988 b72f483a 2019-02-05 stsp err = got_error_from_errno();
992 b72f483a 2019-02-05 stsp f2 = fopen(abspath, "r");
993 b72f483a 2019-02-05 stsp if (f2 == NULL) {
994 b72f483a 2019-02-05 stsp err = got_error_from_errno();
997 b72f483a 2019-02-05 stsp if (lstat(abspath, &sb) == -1) {
998 b72f483a 2019-02-05 stsp err = got_error_from_errno();
1002 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1005 b72f483a 2019-02-05 stsp if (blob1)
1006 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1007 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1008 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
1009 b72f483a 2019-02-05 stsp free(abspath);
1010 927df6b7 2019-02-10 stsp return err;
1013 927df6b7 2019-02-10 stsp static const struct got_error *
1014 927df6b7 2019-02-10 stsp get_status_path(char **status_path, struct got_worktree *worktree,
1015 927df6b7 2019-02-10 stsp const char *arg)
1017 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
1018 927df6b7 2019-02-10 stsp char *resolved, *path = NULL;
1019 927df6b7 2019-02-10 stsp size_t len;
1021 927df6b7 2019-02-10 stsp *status_path = NULL;
1023 927df6b7 2019-02-10 stsp resolved = realpath(arg, NULL);
1024 927df6b7 2019-02-10 stsp if (resolved == NULL)
1025 927df6b7 2019-02-10 stsp return got_error_from_errno();
1027 927df6b7 2019-02-10 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
1028 927df6b7 2019-02-10 stsp strlen(got_worktree_get_root_path(worktree)))) {
1029 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
1030 927df6b7 2019-02-10 stsp goto done;
1033 927df6b7 2019-02-10 stsp path = strdup(resolved + strlen(got_worktree_get_root_path(worktree)));
1034 927df6b7 2019-02-10 stsp if (path == NULL) {
1035 927df6b7 2019-02-10 stsp err = got_error_from_errno();
1036 927df6b7 2019-02-10 stsp goto done;
1039 927df6b7 2019-02-10 stsp /* XXX status walk can't deal with trailing slash! */
1040 927df6b7 2019-02-10 stsp len = strlen(path);
1041 927df6b7 2019-02-10 stsp while (path[len - 1] == '/') {
1042 927df6b7 2019-02-10 stsp path[len - 1] = '\0';
1046 927df6b7 2019-02-10 stsp free(resolved);
1047 927df6b7 2019-02-10 stsp if (err == NULL)
1048 927df6b7 2019-02-10 stsp *status_path = path;
1050 927df6b7 2019-02-10 stsp free(path);
1051 b72f483a 2019-02-05 stsp return err;
1054 b72f483a 2019-02-05 stsp static const struct got_error *
1055 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1057 b00d56cd 2018-04-01 stsp const struct got_error *error;
1058 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1059 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1060 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1061 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1062 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1063 15a94983 2018-12-23 stsp int type1, type2;
1064 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1065 c0cc5c62 2018-10-18 stsp const char *errstr;
1066 927df6b7 2019-02-10 stsp char *path = NULL;
1068 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1069 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1070 25eccc22 2019-01-04 stsp NULL) == -1)
1071 b00d56cd 2018-04-01 stsp err(1, "pledge");
1074 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1075 b00d56cd 2018-04-01 stsp switch (ch) {
1077 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1078 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1079 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1082 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1083 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1084 b72f483a 2019-02-05 stsp err(1, "-r option");
1087 2deda0b9 2019-03-07 stsp usage_diff();
1088 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1092 b00d56cd 2018-04-01 stsp argc -= optind;
1093 b00d56cd 2018-04-01 stsp argv += optind;
1095 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1096 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1097 b72f483a 2019-02-05 stsp error = got_error_from_errno();
1098 b72f483a 2019-02-05 stsp goto done;
1100 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1101 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1102 927df6b7 2019-02-10 stsp goto done;
1103 927df6b7 2019-02-10 stsp if (argc <= 1) {
1104 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1105 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1106 927df6b7 2019-02-10 stsp goto done;
1108 b72f483a 2019-02-05 stsp if (repo_path)
1110 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1111 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1112 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1113 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1114 927df6b7 2019-02-10 stsp goto done;
1116 927df6b7 2019-02-10 stsp if (argc == 1) {
1117 927df6b7 2019-02-10 stsp error = get_status_path(&path, worktree, argv[0]);
1118 927df6b7 2019-02-10 stsp if (error)
1119 927df6b7 2019-02-10 stsp goto done;
1121 927df6b7 2019-02-10 stsp path = strdup("");
1122 927df6b7 2019-02-10 stsp if (path == NULL) {
1123 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1124 927df6b7 2019-02-10 stsp goto done;
1127 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1128 15a94983 2018-12-23 stsp id_str1 = argv[0];
1129 15a94983 2018-12-23 stsp id_str2 = argv[1];
1131 b00d56cd 2018-04-01 stsp usage_diff();
1133 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1134 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1135 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1136 b72f483a 2019-02-05 stsp return got_error_from_errno();
1139 b72f483a 2019-02-05 stsp error = apply_unveil(repo_path,
1140 b72f483a 2019-02-05 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1141 25eccc22 2019-01-04 stsp if (error)
1142 25eccc22 2019-01-04 stsp goto done;
1144 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1145 76089277 2018-04-01 stsp free(repo_path);
1146 b00d56cd 2018-04-01 stsp if (error != NULL)
1147 b00d56cd 2018-04-01 stsp goto done;
1149 b72f483a 2019-02-05 stsp if (worktree) {
1150 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1151 b72f483a 2019-02-05 stsp char *id_str;
1152 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1153 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1154 b72f483a 2019-02-05 stsp if (error)
1155 b72f483a 2019-02-05 stsp goto done;
1156 b72f483a 2019-02-05 stsp arg.repo = repo;
1157 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1158 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1159 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1160 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1162 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1163 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1164 b72f483a 2019-02-05 stsp free(id_str);
1165 b72f483a 2019-02-05 stsp goto done;
1168 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1169 6402fb3c 2018-09-15 stsp if (error)
1170 b00d56cd 2018-04-01 stsp goto done;
1172 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1173 6402fb3c 2018-09-15 stsp if (error)
1174 b00d56cd 2018-04-01 stsp goto done;
1176 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1177 15a94983 2018-12-23 stsp if (error)
1178 15a94983 2018-12-23 stsp goto done;
1180 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1181 15a94983 2018-12-23 stsp if (error)
1182 15a94983 2018-12-23 stsp goto done;
1184 15a94983 2018-12-23 stsp if (type1 != type2) {
1185 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1186 b00d56cd 2018-04-01 stsp goto done;
1189 15a94983 2018-12-23 stsp switch (type1) {
1190 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1191 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1192 54156555 2018-12-24 stsp diff_context, repo, stdout);
1194 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1195 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1196 54156555 2018-12-24 stsp diff_context, repo, stdout);
1198 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1199 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1201 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1202 c0cc5c62 2018-10-18 stsp repo, stdout);
1205 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1209 15a94983 2018-12-23 stsp free(id1);
1210 15a94983 2018-12-23 stsp free(id2);
1211 927df6b7 2019-02-10 stsp free(path);
1212 b72f483a 2019-02-05 stsp if (worktree)
1213 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1214 ad242220 2018-09-08 stsp if (repo) {
1215 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1216 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1217 ad242220 2018-09-08 stsp if (error == NULL)
1218 ad242220 2018-09-08 stsp error = repo_error;
1220 b00d56cd 2018-04-01 stsp return error;
1223 404c43c4 2018-06-21 stsp __dead static void
1224 404c43c4 2018-06-21 stsp usage_blame(void)
1226 9270e621 2019-02-05 stsp fprintf(stderr,
1227 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1228 404c43c4 2018-06-21 stsp getprogname());
1232 404c43c4 2018-06-21 stsp static const struct got_error *
1233 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1235 404c43c4 2018-06-21 stsp const struct got_error *error;
1236 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1237 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1238 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1239 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1240 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1243 404c43c4 2018-06-21 stsp #ifndef PROFILE
1244 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1245 36e2fb66 2019-01-04 stsp NULL) == -1)
1246 404c43c4 2018-06-21 stsp err(1, "pledge");
1249 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1250 404c43c4 2018-06-21 stsp switch (ch) {
1252 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1255 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1256 66bea077 2018-08-02 stsp if (repo_path == NULL)
1257 66bea077 2018-08-02 stsp err(1, "-r option");
1260 2deda0b9 2019-03-07 stsp usage_blame();
1261 404c43c4 2018-06-21 stsp /* NOTREACHED */
1265 404c43c4 2018-06-21 stsp argc -= optind;
1266 404c43c4 2018-06-21 stsp argv += optind;
1268 a39318fd 2018-08-02 stsp if (argc == 1)
1269 404c43c4 2018-06-21 stsp path = argv[0];
1271 404c43c4 2018-06-21 stsp usage_blame();
1273 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1274 66bea077 2018-08-02 stsp if (cwd == NULL) {
1275 66bea077 2018-08-02 stsp error = got_error_from_errno();
1276 66bea077 2018-08-02 stsp goto done;
1278 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1279 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1280 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1281 66bea077 2018-08-02 stsp goto done;
1283 0c06baac 2019-02-05 stsp error = NULL;
1284 0c06baac 2019-02-05 stsp if (worktree) {
1285 0c06baac 2019-02-05 stsp repo_path =
1286 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1287 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1288 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1289 0c06baac 2019-02-05 stsp if (error)
1290 0c06baac 2019-02-05 stsp goto done;
1292 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1293 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1294 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1295 0c06baac 2019-02-05 stsp goto done;
1300 36e2fb66 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
1301 36e2fb66 2019-01-04 stsp if (error)
1302 36e2fb66 2019-01-04 stsp goto done;
1304 404c43c4 2018-06-21 stsp error = got_repo_open(&repo, repo_path);
1305 404c43c4 2018-06-21 stsp if (error != NULL)
1306 404c43c4 2018-06-21 stsp goto done;
1308 0c06baac 2019-02-05 stsp if (worktree) {
1309 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1310 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1311 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1312 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1313 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1314 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1315 6efaaa2d 2019-02-05 stsp path) == -1) {
1316 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1317 0c06baac 2019-02-05 stsp goto done;
1319 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1322 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1324 0c06baac 2019-02-05 stsp if (error)
1325 66bea077 2018-08-02 stsp goto done;
1327 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1328 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1329 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1330 404c43c4 2018-06-21 stsp if (error != NULL)
1331 66bea077 2018-08-02 stsp goto done;
1332 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1333 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1334 404c43c4 2018-06-21 stsp if (error != NULL)
1335 66bea077 2018-08-02 stsp goto done;
1337 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1338 15a94983 2018-12-23 stsp commit_id_str);
1339 404c43c4 2018-06-21 stsp if (error != NULL)
1340 66bea077 2018-08-02 stsp goto done;
1343 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1345 66bea077 2018-08-02 stsp free(in_repo_path);
1346 66bea077 2018-08-02 stsp free(repo_path);
1347 66bea077 2018-08-02 stsp free(cwd);
1348 404c43c4 2018-06-21 stsp free(commit_id);
1349 0c06baac 2019-02-05 stsp if (worktree)
1350 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1351 ad242220 2018-09-08 stsp if (repo) {
1352 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1353 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1354 ad242220 2018-09-08 stsp if (error == NULL)
1355 ad242220 2018-09-08 stsp error = repo_error;
1357 404c43c4 2018-06-21 stsp return error;
1360 5de5890b 2018-10-18 stsp __dead static void
1361 5de5890b 2018-10-18 stsp usage_tree(void)
1363 c1669e2e 2019-01-09 stsp fprintf(stderr,
1364 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1365 5de5890b 2018-10-18 stsp getprogname());
1369 c1669e2e 2019-01-09 stsp static void
1370 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1371 c1669e2e 2019-01-09 stsp const char *root_path)
1373 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1375 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1376 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1379 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1380 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1381 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1384 5de5890b 2018-10-18 stsp static const struct got_error *
1385 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1386 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1387 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1389 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1390 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1391 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1392 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1393 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1395 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1397 5de5890b 2018-10-18 stsp goto done;
1399 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1401 5de5890b 2018-10-18 stsp goto done;
1402 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1403 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1404 5de5890b 2018-10-18 stsp while (te) {
1405 5de5890b 2018-10-18 stsp char *id = NULL;
1407 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1410 5de5890b 2018-10-18 stsp if (show_ids) {
1411 5de5890b 2018-10-18 stsp char *id_str;
1412 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1414 5de5890b 2018-10-18 stsp goto done;
1415 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1416 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1417 5de5890b 2018-10-18 stsp free(id_str);
1418 5de5890b 2018-10-18 stsp goto done;
1420 5de5890b 2018-10-18 stsp free(id_str);
1422 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1425 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1426 c1669e2e 2019-01-09 stsp char *child_path;
1427 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1428 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1429 c1669e2e 2019-01-09 stsp te->name) == -1) {
1430 c1669e2e 2019-01-09 stsp err = got_error_from_errno();
1431 c1669e2e 2019-01-09 stsp goto done;
1433 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1434 c1669e2e 2019-01-09 stsp root_path, repo);
1435 c1669e2e 2019-01-09 stsp free(child_path);
1437 c1669e2e 2019-01-09 stsp goto done;
1440 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1444 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1445 5de5890b 2018-10-18 stsp free(tree_id);
1446 5de5890b 2018-10-18 stsp return err;
1449 5de5890b 2018-10-18 stsp static const struct got_error *
1450 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1452 5de5890b 2018-10-18 stsp const struct got_error *error;
1453 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1454 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1455 7a2c19d6 2019-02-05 stsp const char *path;
1456 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1457 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1458 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1459 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1462 5de5890b 2018-10-18 stsp #ifndef PROFILE
1463 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1464 0f8d269b 2019-01-04 stsp NULL) == -1)
1465 5de5890b 2018-10-18 stsp err(1, "pledge");
1468 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1469 5de5890b 2018-10-18 stsp switch (ch) {
1471 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1474 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1475 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1476 5de5890b 2018-10-18 stsp err(1, "-r option");
1479 5de5890b 2018-10-18 stsp show_ids = 1;
1482 c1669e2e 2019-01-09 stsp recurse = 1;
1485 2deda0b9 2019-03-07 stsp usage_tree();
1486 5de5890b 2018-10-18 stsp /* NOTREACHED */
1490 5de5890b 2018-10-18 stsp argc -= optind;
1491 5de5890b 2018-10-18 stsp argv += optind;
1493 5de5890b 2018-10-18 stsp if (argc == 1)
1494 5de5890b 2018-10-18 stsp path = argv[0];
1495 5de5890b 2018-10-18 stsp else if (argc > 1)
1496 5de5890b 2018-10-18 stsp usage_tree();
1498 7a2c19d6 2019-02-05 stsp path = NULL;
1500 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1501 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1502 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1503 9bf7a39b 2019-02-05 stsp goto done;
1505 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1506 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1507 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1508 7a2c19d6 2019-02-05 stsp goto done;
1510 7a2c19d6 2019-02-05 stsp error = NULL;
1511 7a2c19d6 2019-02-05 stsp if (worktree) {
1512 7a2c19d6 2019-02-05 stsp repo_path =
1513 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1514 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1515 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1516 7a2c19d6 2019-02-05 stsp if (error)
1517 7a2c19d6 2019-02-05 stsp goto done;
1519 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1520 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1521 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1522 7a2c19d6 2019-02-05 stsp goto done;
1527 0f8d269b 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
1528 0f8d269b 2019-01-04 stsp if (error)
1529 0f8d269b 2019-01-04 stsp goto done;
1531 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1532 5de5890b 2018-10-18 stsp if (error != NULL)
1533 5de5890b 2018-10-18 stsp goto done;
1535 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1536 9bf7a39b 2019-02-05 stsp if (worktree) {
1537 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1538 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1539 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1540 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1541 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1542 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1543 9bf7a39b 2019-02-05 stsp goto done;
1545 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1547 9bf7a39b 2019-02-05 stsp if (error)
1548 9bf7a39b 2019-02-05 stsp goto done;
1550 9bf7a39b 2019-02-05 stsp path = "/";
1552 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1553 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1554 9bf7a39b 2019-02-05 stsp if (error != NULL)
1555 9bf7a39b 2019-02-05 stsp goto done;
1558 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1559 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1560 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1561 5de5890b 2018-10-18 stsp if (error != NULL)
1562 5de5890b 2018-10-18 stsp goto done;
1563 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1564 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1565 5de5890b 2018-10-18 stsp if (error != NULL)
1566 5de5890b 2018-10-18 stsp goto done;
1568 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1569 15a94983 2018-12-23 stsp commit_id_str);
1570 5de5890b 2018-10-18 stsp if (error != NULL)
1571 5de5890b 2018-10-18 stsp goto done;
1574 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1575 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1577 5de5890b 2018-10-18 stsp free(in_repo_path);
1578 5de5890b 2018-10-18 stsp free(repo_path);
1579 5de5890b 2018-10-18 stsp free(cwd);
1580 5de5890b 2018-10-18 stsp free(commit_id);
1581 7a2c19d6 2019-02-05 stsp if (worktree)
1582 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1583 5de5890b 2018-10-18 stsp if (repo) {
1584 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1585 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1586 5de5890b 2018-10-18 stsp if (error == NULL)
1587 5de5890b 2018-10-18 stsp error = repo_error;
1589 5de5890b 2018-10-18 stsp return error;
1592 6bad629b 2019-02-04 stsp __dead static void
1593 6bad629b 2019-02-04 stsp usage_status(void)
1595 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1599 b72f483a 2019-02-05 stsp static const struct got_error *
1600 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1601 b72f483a 2019-02-05 stsp struct got_object_id *id)
1603 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1604 b72f483a 2019-02-05 stsp return NULL;
1607 6bad629b 2019-02-04 stsp static const struct got_error *
1608 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1610 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1611 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1612 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1613 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1616 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1617 6bad629b 2019-02-04 stsp switch (ch) {
1619 2deda0b9 2019-03-07 stsp usage_status();
1620 6bad629b 2019-02-04 stsp /* NOTREACHED */
1624 6bad629b 2019-02-04 stsp argc -= optind;
1625 6bad629b 2019-02-04 stsp argv += optind;
1627 6bad629b 2019-02-04 stsp #ifndef PROFILE
1628 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1629 6bad629b 2019-02-04 stsp NULL) == -1)
1630 6bad629b 2019-02-04 stsp err(1, "pledge");
1632 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1633 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1634 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1635 927df6b7 2019-02-10 stsp goto done;
1638 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1639 927df6b7 2019-02-10 stsp if (error != NULL)
1640 927df6b7 2019-02-10 stsp goto done;
1642 6bad629b 2019-02-04 stsp if (argc == 0) {
1643 927df6b7 2019-02-10 stsp path = strdup("");
1644 927df6b7 2019-02-10 stsp if (path == NULL) {
1645 6bad629b 2019-02-04 stsp error = got_error_from_errno();
1646 6bad629b 2019-02-04 stsp goto done;
1648 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1649 927df6b7 2019-02-10 stsp error = get_status_path(&path, worktree, argv[0]);
1650 927df6b7 2019-02-10 stsp if (error)
1651 6bad629b 2019-02-04 stsp goto done;
1653 6bad629b 2019-02-04 stsp usage_status();
1655 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1656 6bad629b 2019-02-04 stsp if (error != NULL)
1657 6bad629b 2019-02-04 stsp goto done;
1659 c7f4312f 2019-02-05 stsp error = apply_unveil(got_repo_get_path(repo),
1660 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(worktree));
1661 6bad629b 2019-02-04 stsp if (error)
1662 6bad629b 2019-02-04 stsp goto done;
1664 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1665 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1667 927df6b7 2019-02-10 stsp free(cwd);
1668 927df6b7 2019-02-10 stsp free(path);
1669 6bad629b 2019-02-04 stsp return error;