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);
79 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
80 d00136be 2019-03-26 stsp __dead static void usage_add(void);
82 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
83 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
84 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
86 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
87 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
88 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
89 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
90 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
92 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
93 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
94 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
95 507dc3bb 2018-12-29 stsp { "update", cmd_update, usage_update,
96 507dc3bb 2018-12-29 stsp "update a work tree to a different commit" },
97 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
98 1b6b95a8 2018-03-12 stsp "show repository history" },
99 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
100 b00d56cd 2018-04-01 stsp "compare files and directories" },
101 404c43c4 2018-06-21 stsp { "blame", cmd_blame, usage_blame,
102 404c43c4 2018-06-21 stsp " show when lines in a file were changed" },
103 5de5890b 2018-10-18 stsp { "tree", cmd_tree, usage_tree,
104 5de5890b 2018-10-18 stsp " list files and directories in repository" },
105 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
106 1b6b95a8 2018-03-12 stsp "show modification status of files" },
107 d0eebce4 2019-03-11 stsp { "ref", cmd_ref, usage_ref,
108 d0eebce4 2019-03-11 stsp "manage references in repository" },
109 d00136be 2019-03-26 stsp { "add", cmd_add, usage_add,
110 d00136be 2019-03-26 stsp "add a new file to version control" },
114 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
116 5c860e29 2018-03-12 stsp struct cmd *cmd;
117 5c860e29 2018-03-12 stsp unsigned int i;
119 1b6b95a8 2018-03-12 stsp int hflag = 0;
121 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
123 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
124 5c860e29 2018-03-12 stsp switch (ch) {
130 5c860e29 2018-03-12 stsp /* NOTREACHED */
134 5c860e29 2018-03-12 stsp argc -= optind;
135 5c860e29 2018-03-12 stsp argv += optind;
136 1e70621d 2018-03-27 stsp optind = 0;
138 5c860e29 2018-03-12 stsp if (argc <= 0)
141 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
142 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
144 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
145 d7d4f210 2018-03-12 stsp const struct got_error *error;
147 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
149 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
153 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
155 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
156 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
157 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
164 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
168 4ed7e80c 2018-05-20 stsp __dead static void
169 5c860e29 2018-03-12 stsp usage(void)
173 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
174 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
175 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
176 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
177 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
182 0266afb7 2019-01-04 stsp static const struct got_error *
183 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
184 d0eebce4 2019-03-11 stsp const char *worktree_path)
186 0266afb7 2019-01-04 stsp const struct got_error *error;
188 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
189 0266afb7 2019-01-04 stsp return got_error_from_errno();
191 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
192 0266afb7 2019-01-04 stsp return got_error_from_errno();
194 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
195 0266afb7 2019-01-04 stsp return got_error_from_errno();
197 0266afb7 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
198 0266afb7 2019-01-04 stsp if (error != NULL)
199 0266afb7 2019-01-04 stsp return error;
201 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
202 0266afb7 2019-01-04 stsp return got_error_from_errno();
204 0266afb7 2019-01-04 stsp return NULL;
207 4ed7e80c 2018-05-20 stsp __dead static void
208 c09a553d 2018-03-12 stsp usage_checkout(void)
210 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
211 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
215 92a684f4 2018-03-12 stsp static void
216 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
218 92a684f4 2018-03-12 stsp char *worktree_path = arg;
220 92a684f4 2018-03-12 stsp while (path[0] == '/')
223 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
226 99437157 2018-11-11 stsp static const struct got_error *
227 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
229 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
230 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
231 99437157 2018-11-11 stsp return NULL;
234 8069f636 2019-01-12 stsp static const struct got_error *
235 8069f636 2019-01-12 stsp check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
236 8069f636 2019-01-12 stsp struct got_repository *repo)
238 8069f636 2019-01-12 stsp const struct got_error *err;
239 8069f636 2019-01-12 stsp struct got_reference *head_ref = NULL;
240 8069f636 2019-01-12 stsp struct got_object_id *head_commit_id = NULL;
241 8069f636 2019-01-12 stsp struct got_commit_graph *graph = NULL;
243 8069f636 2019-01-12 stsp head_ref = got_worktree_get_head_ref(worktree);
244 8069f636 2019-01-12 stsp if (head_ref == NULL)
245 8069f636 2019-01-12 stsp return got_error_from_errno();
247 8069f636 2019-01-12 stsp /* TODO: Check the reflog. The head ref may have been rebased. */
248 8069f636 2019-01-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
252 8069f636 2019-01-12 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
256 8069f636 2019-01-12 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
259 8069f636 2019-01-12 stsp while (1) {
260 8069f636 2019-01-12 stsp struct got_object_id *id;
262 8069f636 2019-01-12 stsp if (sigint_received || sigpipe_received)
265 8069f636 2019-01-12 stsp err = got_commit_graph_iter_next(&id, graph);
267 8069f636 2019-01-12 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
268 8069f636 2019-01-12 stsp err = got_error(GOT_ERR_ANCESTRY);
271 8069f636 2019-01-12 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
273 8069f636 2019-01-12 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
279 8069f636 2019-01-12 stsp if (id == NULL)
281 8069f636 2019-01-12 stsp if (got_object_id_cmp(id, commit_id) == 0)
285 8069f636 2019-01-12 stsp if (head_ref)
286 8069f636 2019-01-12 stsp got_ref_close(head_ref);
288 8069f636 2019-01-12 stsp got_commit_graph_close(graph);
289 8069f636 2019-01-12 stsp return err;
293 4ed7e80c 2018-05-20 stsp static const struct got_error *
294 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
296 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
297 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
298 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
299 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
300 c09a553d 2018-03-12 stsp char *repo_path = NULL;
301 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
302 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
303 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
304 e5dc7198 2018-12-29 stsp int ch, same_path_prefix;
306 8069f636 2019-01-12 stsp while ((ch = getopt(argc, argv, "c:p:")) != -1) {
307 0bb8a95e 2018-03-12 stsp switch (ch) {
309 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
310 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
311 8069f636 2019-01-12 stsp return got_error_from_errno();
314 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
317 2deda0b9 2019-03-07 stsp usage_checkout();
318 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
322 0bb8a95e 2018-03-12 stsp argc -= optind;
323 0bb8a95e 2018-03-12 stsp argv += optind;
325 6715a751 2018-03-16 stsp #ifndef PROFILE
326 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
327 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
328 c09a553d 2018-03-12 stsp err(1, "pledge");
330 0bb8a95e 2018-03-12 stsp if (argc == 1) {
331 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
332 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
333 76089277 2018-04-01 stsp if (repo_path == NULL)
334 76089277 2018-04-01 stsp return got_error_from_errno();
335 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
336 76089277 2018-04-01 stsp if (cwd == NULL) {
337 76089277 2018-04-01 stsp error = got_error_from_errno();
340 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
341 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
343 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
344 76089277 2018-04-01 stsp if (base == NULL) {
345 76089277 2018-04-01 stsp error = got_error_from_errno();
348 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
349 c09a553d 2018-03-12 stsp if (dotgit)
350 c09a553d 2018-03-12 stsp *dotgit = '\0';
351 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
352 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
357 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
358 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
359 76089277 2018-04-01 stsp if (repo_path == NULL) {
360 76089277 2018-04-01 stsp error = got_error_from_errno();
363 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
364 76089277 2018-04-01 stsp if (worktree_path == NULL) {
365 76089277 2018-04-01 stsp error = got_error_from_errno();
369 c09a553d 2018-03-12 stsp usage_checkout();
371 0cd1c46a 2019-03-11 stsp error = apply_unveil(repo_path, 0, worktree_path);
375 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
376 c09a553d 2018-03-12 stsp if (error != NULL)
379 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
380 c09a553d 2018-03-12 stsp if (error != NULL)
383 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
384 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
387 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
388 c09a553d 2018-03-12 stsp if (error != NULL)
391 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
392 e5dc7198 2018-12-29 stsp path_prefix);
393 e5dc7198 2018-12-29 stsp if (error != NULL)
395 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
396 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
400 8069f636 2019-01-12 stsp if (commit_id_str) {
401 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
402 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
403 8069f636 2019-01-12 stsp commit_id_str);
404 8069f636 2019-01-12 stsp if (error != NULL)
406 8069f636 2019-01-12 stsp error = check_ancestry(worktree, commit_id, repo);
407 8069f636 2019-01-12 stsp if (error != NULL) {
408 8069f636 2019-01-12 stsp free(commit_id);
411 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
412 8069f636 2019-01-12 stsp commit_id);
413 8069f636 2019-01-12 stsp free(commit_id);
418 93a30277 2018-12-24 stsp error = got_worktree_checkout_files(worktree, repo,
419 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
420 c09a553d 2018-03-12 stsp if (error != NULL)
423 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
426 8069f636 2019-01-12 stsp free(commit_id_str);
427 76089277 2018-04-01 stsp free(repo_path);
428 507dc3bb 2018-12-29 stsp free(worktree_path);
429 507dc3bb 2018-12-29 stsp return error;
432 507dc3bb 2018-12-29 stsp __dead static void
433 507dc3bb 2018-12-29 stsp usage_update(void)
435 507dc3bb 2018-12-29 stsp fprintf(stderr, "usage: %s update [-c commit] [worktree-path]\n",
436 507dc3bb 2018-12-29 stsp getprogname());
440 507dc3bb 2018-12-29 stsp static void
441 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
443 784955db 2019-01-12 stsp int *did_something = arg;
445 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
448 1545c615 2019-02-10 stsp *did_something = 1;
449 507dc3bb 2018-12-29 stsp while (path[0] == '/')
451 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
454 be7061eb 2018-12-30 stsp static const struct got_error *
455 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
457 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
458 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
459 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
460 507dc3bb 2018-12-29 stsp char *worktree_path = NULL;
461 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
462 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
463 784955db 2019-01-12 stsp int ch, did_something = 0;
465 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
466 507dc3bb 2018-12-29 stsp switch (ch) {
468 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
469 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
470 9c4b8182 2019-01-02 stsp return got_error_from_errno();
473 2deda0b9 2019-03-07 stsp usage_update();
474 507dc3bb 2018-12-29 stsp /* NOTREACHED */
478 507dc3bb 2018-12-29 stsp argc -= optind;
479 507dc3bb 2018-12-29 stsp argv += optind;
481 507dc3bb 2018-12-29 stsp #ifndef PROFILE
482 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
483 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
484 507dc3bb 2018-12-29 stsp err(1, "pledge");
486 507dc3bb 2018-12-29 stsp if (argc == 0) {
487 507dc3bb 2018-12-29 stsp worktree_path = getcwd(NULL, 0);
488 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
489 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
492 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
493 507dc3bb 2018-12-29 stsp worktree_path = realpath(argv[0], NULL);
494 507dc3bb 2018-12-29 stsp if (worktree_path == NULL) {
495 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
499 507dc3bb 2018-12-29 stsp usage_update();
501 507dc3bb 2018-12-29 stsp error = got_worktree_open(&worktree, worktree_path);
502 507dc3bb 2018-12-29 stsp if (error != NULL)
505 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
506 507dc3bb 2018-12-29 stsp if (error != NULL)
509 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
510 8c02d095 2019-02-05 stsp got_worktree_get_root_path(worktree));
514 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
515 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
516 507dc3bb 2018-12-29 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
517 507dc3bb 2018-12-29 stsp if (error != NULL)
519 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
520 9c4b8182 2019-01-02 stsp if (error != NULL)
522 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
523 507dc3bb 2018-12-29 stsp if (error != NULL)
526 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
527 507dc3bb 2018-12-29 stsp commit_id_str);
528 507dc3bb 2018-12-29 stsp if (error != NULL)
532 be7061eb 2018-12-30 stsp error = check_ancestry(worktree, commit_id, repo);
533 be7061eb 2018-12-30 stsp if (error != NULL)
536 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
537 507dc3bb 2018-12-29 stsp commit_id) != 0) {
538 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
539 507dc3bb 2018-12-29 stsp commit_id);
544 507dc3bb 2018-12-29 stsp error = got_worktree_checkout_files(worktree, repo,
545 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
546 507dc3bb 2018-12-29 stsp if (error != NULL)
549 784955db 2019-01-12 stsp if (did_something)
550 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
552 784955db 2019-01-12 stsp printf("Already up-to-date\n");
554 c09a553d 2018-03-12 stsp free(worktree_path);
555 507dc3bb 2018-12-29 stsp free(commit_id);
556 9c4b8182 2019-01-02 stsp free(commit_id_str);
557 c09a553d 2018-03-12 stsp return error;
560 f42b1b34 2018-03-12 stsp static const struct got_error *
561 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
562 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
564 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
565 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
566 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
567 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
569 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
570 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
572 79109fed 2018-03-27 stsp return err;
574 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
575 79f35eb3 2018-06-11 stsp if (qid != NULL) {
576 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
578 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
580 79109fed 2018-03-27 stsp return err;
582 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
583 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
584 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
586 0f2b3dca 2018-12-22 stsp return err;
588 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
590 79109fed 2018-03-27 stsp return err;
593 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
597 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
598 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
601 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
602 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
603 0f2b3dca 2018-12-22 stsp free(id_str1);
604 0f2b3dca 2018-12-22 stsp free(id_str2);
605 79109fed 2018-03-27 stsp return err;
608 4bb494d5 2018-06-16 stsp static char *
609 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
611 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
612 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
618 79109fed 2018-03-27 stsp static const struct got_error *
619 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
620 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
621 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
623 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
624 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
625 6c281f94 2018-06-11 stsp char datebuf[26];
626 45d799e2 2018-12-23 stsp time_t committer_time;
627 45d799e2 2018-12-23 stsp const char *author, *committer;
628 199a4027 2019-02-02 stsp char *refs_str = NULL;
629 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
631 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
633 199a4027 2019-02-02 stsp const char *name;
634 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
636 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
637 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
639 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
641 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
643 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
645 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
647 199a4027 2019-02-02 stsp s = refs_str;
648 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
649 199a4027 2019-02-02 stsp name) == -1) {
650 199a4027 2019-02-02 stsp err = got_error_from_errno();
656 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
658 8bf5b3c9 2018-03-17 stsp return err;
660 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
661 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
662 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
663 832c249c 2018-06-10 stsp free(id_str);
664 d3d493d7 2019-02-21 stsp id_str = NULL;
665 d3d493d7 2019-02-21 stsp free(refs_str);
666 d3d493d7 2019-02-21 stsp refs_str = NULL;
667 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
668 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
669 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
670 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
671 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
672 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
673 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
674 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
675 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
676 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
677 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
679 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
680 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
681 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
683 a0603db2 2018-06-10 stsp return err;
684 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
685 a0603db2 2018-06-10 stsp free(id_str);
689 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
690 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
691 832c249c 2018-06-10 stsp return got_error_from_errno();
693 621015ac 2018-07-23 stsp logmsg = logmsg0;
695 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
697 832c249c 2018-06-10 stsp printf(" %s\n", line);
698 832c249c 2018-06-10 stsp } while (line);
699 621015ac 2018-07-23 stsp free(logmsg0);
701 971751ac 2018-03-27 stsp if (show_patch) {
702 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
703 971751ac 2018-03-27 stsp if (err == 0)
704 971751ac 2018-03-27 stsp printf("\n");
707 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
708 cbe7f848 2019-02-11 stsp err = got_error_from_errno();
709 07862c20 2018-09-15 stsp return err;
712 f42b1b34 2018-03-12 stsp static const struct got_error *
713 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
714 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
715 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
717 f42b1b34 2018-03-12 stsp const struct got_error *err;
718 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
720 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
721 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
723 f42b1b34 2018-03-12 stsp return err;
724 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
727 31cedeaf 2018-09-15 stsp while (1) {
728 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
729 372ccdbb 2018-06-10 stsp struct got_object_id *id;
731 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
734 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
736 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
737 9ba79e04 2018-06-11 stsp err = NULL;
740 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
742 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
748 b43fbaa0 2018-06-11 stsp if (id == NULL)
751 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
754 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
756 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
757 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
761 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
762 f42b1b34 2018-03-12 stsp return err;
765 4ed7e80c 2018-05-20 stsp __dead static void
766 6f3d1eb0 2018-03-12 stsp usage_log(void)
768 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
769 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
773 4ed7e80c 2018-05-20 stsp static const struct got_error *
774 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
776 f42b1b34 2018-03-12 stsp const struct got_error *error;
777 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
778 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
779 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
780 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
781 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
782 d142fc45 2018-04-01 stsp char *start_commit = NULL;
783 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
784 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
785 64a96a6d 2018-04-01 stsp const char *errstr;
786 199a4027 2019-02-02 stsp struct got_reflist_head refs;
788 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
790 6715a751 2018-03-16 stsp #ifndef PROFILE
791 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
794 f42b1b34 2018-03-12 stsp err(1, "pledge");
797 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
798 79109fed 2018-03-27 stsp switch (ch) {
800 79109fed 2018-03-27 stsp show_patch = 1;
803 d142fc45 2018-04-01 stsp start_commit = optarg;
806 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
808 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
809 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
812 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
813 64a96a6d 2018-04-01 stsp if (errstr != NULL)
814 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
817 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
820 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
821 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
822 04ca23f4 2018-07-16 stsp err(1, "-r option");
825 2deda0b9 2019-03-07 stsp usage_log();
826 79109fed 2018-03-27 stsp /* NOTREACHED */
830 79109fed 2018-03-27 stsp argc -= optind;
831 79109fed 2018-03-27 stsp argv += optind;
833 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
834 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
835 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
839 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
840 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
842 cffc0aa4 2019-02-05 stsp error = NULL;
844 e7301579 2019-03-18 stsp if (argc == 0) {
845 cbd1af7a 2019-03-18 stsp path = strdup("");
846 e7301579 2019-03-18 stsp if (path == NULL) {
847 e7301579 2019-03-18 stsp error = got_error_from_errno();
850 e7301579 2019-03-18 stsp } else if (argc == 1) {
851 e7301579 2019-03-18 stsp if (worktree) {
852 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
857 e7301579 2019-03-18 stsp path = strdup(argv[0]);
858 e7301579 2019-03-18 stsp if (path == NULL) {
859 e7301579 2019-03-18 stsp error = got_error_from_errno();
864 cbd1af7a 2019-03-18 stsp usage_log();
866 cffc0aa4 2019-02-05 stsp repo_path = worktree ?
867 cffc0aa4 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
868 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
869 cffc0aa4 2019-02-05 stsp error = got_error_from_errno();
873 d0eebce4 2019-03-11 stsp error = apply_unveil(repo_path, 1,
874 efcae1c6 2019-03-07 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
878 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
879 d7d4f210 2018-03-12 stsp if (error != NULL)
882 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
883 3235492e 2018-04-01 stsp struct got_reference *head_ref;
884 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
885 3235492e 2018-04-01 stsp if (error != NULL)
886 3235492e 2018-04-01 stsp return error;
887 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
888 3235492e 2018-04-01 stsp got_ref_close(head_ref);
889 3235492e 2018-04-01 stsp if (error != NULL)
890 3235492e 2018-04-01 stsp return error;
891 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
893 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
894 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
895 3235492e 2018-04-01 stsp if (error == NULL) {
896 1caad61b 2019-02-01 stsp int obj_type;
897 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
898 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
899 d1f2edc9 2018-06-13 stsp if (error != NULL)
901 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
902 1caad61b 2019-02-01 stsp if (error != NULL)
904 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
905 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
906 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
907 1caad61b 2019-02-01 stsp if (error != NULL)
909 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
910 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
911 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
912 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
916 1caad61b 2019-02-01 stsp id = got_object_id_dup(
917 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
918 1caad61b 2019-02-01 stsp if (id == NULL)
919 1caad61b 2019-02-01 stsp error = got_error_from_errno();
920 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
923 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
924 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
927 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
928 d1f2edc9 2018-06-13 stsp if (error != NULL)
931 15a94983 2018-12-23 stsp if (commit == NULL) {
932 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
933 d1f2edc9 2018-06-13 stsp start_commit);
934 d1f2edc9 2018-06-13 stsp if (error != NULL)
935 d1f2edc9 2018-06-13 stsp return error;
938 d7d4f210 2018-03-12 stsp if (error != NULL)
941 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
942 04ca23f4 2018-07-16 stsp if (error != NULL)
944 04ca23f4 2018-07-16 stsp if (in_repo_path) {
945 04ca23f4 2018-07-16 stsp free(path);
946 04ca23f4 2018-07-16 stsp path = in_repo_path;
949 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
953 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
954 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
956 04ca23f4 2018-07-16 stsp free(path);
957 04ca23f4 2018-07-16 stsp free(repo_path);
960 cffc0aa4 2019-02-05 stsp if (worktree)
961 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
962 ad242220 2018-09-08 stsp if (repo) {
963 ad242220 2018-09-08 stsp const struct got_error *repo_error;
964 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
965 ad242220 2018-09-08 stsp if (error == NULL)
966 ad242220 2018-09-08 stsp error = repo_error;
968 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
969 8bf5b3c9 2018-03-17 stsp return error;
972 4ed7e80c 2018-05-20 stsp __dead static void
973 3f8b7d6a 2018-04-01 stsp usage_diff(void)
975 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
976 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
980 b72f483a 2019-02-05 stsp struct print_diff_arg {
981 b72f483a 2019-02-05 stsp struct got_repository *repo;
982 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
983 b72f483a 2019-02-05 stsp int diff_context;
984 3fc0c068 2019-02-10 stsp const char *id_str;
985 3fc0c068 2019-02-10 stsp int header_shown;
988 4ed7e80c 2018-05-20 stsp static const struct got_error *
989 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
990 b72f483a 2019-02-05 stsp struct got_object_id *id)
992 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
993 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
994 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
995 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
996 b72f483a 2019-02-05 stsp char *abspath = NULL;
997 b72f483a 2019-02-05 stsp struct stat sb;
999 d00136be 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD)
1000 b72f483a 2019-02-05 stsp return NULL;
1002 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1003 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1004 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1005 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1008 d00136be 2019-03-26 stsp if (status == GOT_STATUS_MODIFY) {
1009 d00136be 2019-03-26 stsp err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1011 d00136be 2019-03-26 stsp goto done;
1015 b72f483a 2019-02-05 stsp if (asprintf(&abspath, "%s/%s",
1016 b72f483a 2019-02-05 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1017 b72f483a 2019-02-05 stsp err = got_error_from_errno();
1018 b72f483a 2019-02-05 stsp goto done;
1021 b72f483a 2019-02-05 stsp f2 = fopen(abspath, "r");
1022 b72f483a 2019-02-05 stsp if (f2 == NULL) {
1023 b72f483a 2019-02-05 stsp err = got_error_from_errno();
1024 b72f483a 2019-02-05 stsp goto done;
1026 b72f483a 2019-02-05 stsp if (lstat(abspath, &sb) == -1) {
1027 b72f483a 2019-02-05 stsp err = got_error_from_errno();
1028 b72f483a 2019-02-05 stsp goto done;
1031 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1034 b72f483a 2019-02-05 stsp if (blob1)
1035 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1036 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1037 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
1038 b72f483a 2019-02-05 stsp free(abspath);
1039 927df6b7 2019-02-10 stsp return err;
1042 927df6b7 2019-02-10 stsp static const struct got_error *
1043 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1045 b00d56cd 2018-04-01 stsp const struct got_error *error;
1046 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1047 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1048 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1049 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1050 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1051 15a94983 2018-12-23 stsp int type1, type2;
1052 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1053 c0cc5c62 2018-10-18 stsp const char *errstr;
1054 927df6b7 2019-02-10 stsp char *path = NULL;
1056 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1057 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1058 25eccc22 2019-01-04 stsp NULL) == -1)
1059 b00d56cd 2018-04-01 stsp err(1, "pledge");
1062 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1063 b00d56cd 2018-04-01 stsp switch (ch) {
1065 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1066 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1067 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1070 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1071 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1072 b72f483a 2019-02-05 stsp err(1, "-r option");
1075 2deda0b9 2019-03-07 stsp usage_diff();
1076 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1080 b00d56cd 2018-04-01 stsp argc -= optind;
1081 b00d56cd 2018-04-01 stsp argv += optind;
1083 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1084 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1085 b72f483a 2019-02-05 stsp error = got_error_from_errno();
1086 b72f483a 2019-02-05 stsp goto done;
1088 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1089 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1090 927df6b7 2019-02-10 stsp goto done;
1091 927df6b7 2019-02-10 stsp if (argc <= 1) {
1092 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1093 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1094 927df6b7 2019-02-10 stsp goto done;
1096 b72f483a 2019-02-05 stsp if (repo_path)
1098 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1099 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1100 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1101 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1102 927df6b7 2019-02-10 stsp goto done;
1104 927df6b7 2019-02-10 stsp if (argc == 1) {
1105 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1107 927df6b7 2019-02-10 stsp if (error)
1108 927df6b7 2019-02-10 stsp goto done;
1110 927df6b7 2019-02-10 stsp path = strdup("");
1111 927df6b7 2019-02-10 stsp if (path == NULL) {
1112 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1113 927df6b7 2019-02-10 stsp goto done;
1116 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1117 15a94983 2018-12-23 stsp id_str1 = argv[0];
1118 15a94983 2018-12-23 stsp id_str2 = argv[1];
1120 b00d56cd 2018-04-01 stsp usage_diff();
1122 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1123 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1124 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1125 b72f483a 2019-02-05 stsp return got_error_from_errno();
1128 d0eebce4 2019-03-11 stsp error = apply_unveil(repo_path, 1,
1129 b72f483a 2019-02-05 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1130 25eccc22 2019-01-04 stsp if (error)
1131 25eccc22 2019-01-04 stsp goto done;
1133 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1134 76089277 2018-04-01 stsp free(repo_path);
1135 b00d56cd 2018-04-01 stsp if (error != NULL)
1136 b00d56cd 2018-04-01 stsp goto done;
1138 b72f483a 2019-02-05 stsp if (worktree) {
1139 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1140 b72f483a 2019-02-05 stsp char *id_str;
1141 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1142 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1143 b72f483a 2019-02-05 stsp if (error)
1144 b72f483a 2019-02-05 stsp goto done;
1145 b72f483a 2019-02-05 stsp arg.repo = repo;
1146 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1147 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1148 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1149 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1151 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1152 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1153 b72f483a 2019-02-05 stsp free(id_str);
1154 b72f483a 2019-02-05 stsp goto done;
1157 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1158 6402fb3c 2018-09-15 stsp if (error)
1159 b00d56cd 2018-04-01 stsp goto done;
1161 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1162 6402fb3c 2018-09-15 stsp if (error)
1163 b00d56cd 2018-04-01 stsp goto done;
1165 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1166 15a94983 2018-12-23 stsp if (error)
1167 15a94983 2018-12-23 stsp goto done;
1169 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1170 15a94983 2018-12-23 stsp if (error)
1171 15a94983 2018-12-23 stsp goto done;
1173 15a94983 2018-12-23 stsp if (type1 != type2) {
1174 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1175 b00d56cd 2018-04-01 stsp goto done;
1178 15a94983 2018-12-23 stsp switch (type1) {
1179 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1180 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1181 54156555 2018-12-24 stsp diff_context, repo, stdout);
1183 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1184 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1185 54156555 2018-12-24 stsp diff_context, repo, stdout);
1187 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1188 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1190 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1191 c0cc5c62 2018-10-18 stsp repo, stdout);
1194 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1198 15a94983 2018-12-23 stsp free(id1);
1199 15a94983 2018-12-23 stsp free(id2);
1200 927df6b7 2019-02-10 stsp free(path);
1201 b72f483a 2019-02-05 stsp if (worktree)
1202 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1203 ad242220 2018-09-08 stsp if (repo) {
1204 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1205 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1206 ad242220 2018-09-08 stsp if (error == NULL)
1207 ad242220 2018-09-08 stsp error = repo_error;
1209 b00d56cd 2018-04-01 stsp return error;
1212 404c43c4 2018-06-21 stsp __dead static void
1213 404c43c4 2018-06-21 stsp usage_blame(void)
1215 9270e621 2019-02-05 stsp fprintf(stderr,
1216 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1217 404c43c4 2018-06-21 stsp getprogname());
1221 404c43c4 2018-06-21 stsp static const struct got_error *
1222 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1224 404c43c4 2018-06-21 stsp const struct got_error *error;
1225 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1226 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1227 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1228 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1229 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1232 404c43c4 2018-06-21 stsp #ifndef PROFILE
1233 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1234 36e2fb66 2019-01-04 stsp NULL) == -1)
1235 404c43c4 2018-06-21 stsp err(1, "pledge");
1238 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1239 404c43c4 2018-06-21 stsp switch (ch) {
1241 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1244 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1245 66bea077 2018-08-02 stsp if (repo_path == NULL)
1246 66bea077 2018-08-02 stsp err(1, "-r option");
1249 2deda0b9 2019-03-07 stsp usage_blame();
1250 404c43c4 2018-06-21 stsp /* NOTREACHED */
1254 404c43c4 2018-06-21 stsp argc -= optind;
1255 404c43c4 2018-06-21 stsp argv += optind;
1257 a39318fd 2018-08-02 stsp if (argc == 1)
1258 404c43c4 2018-06-21 stsp path = argv[0];
1260 404c43c4 2018-06-21 stsp usage_blame();
1262 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1263 66bea077 2018-08-02 stsp if (cwd == NULL) {
1264 66bea077 2018-08-02 stsp error = got_error_from_errno();
1265 66bea077 2018-08-02 stsp goto done;
1267 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1268 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1269 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1270 66bea077 2018-08-02 stsp goto done;
1272 0c06baac 2019-02-05 stsp error = NULL;
1273 0c06baac 2019-02-05 stsp if (worktree) {
1274 0c06baac 2019-02-05 stsp repo_path =
1275 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1276 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1277 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1278 0c06baac 2019-02-05 stsp if (error)
1279 0c06baac 2019-02-05 stsp goto done;
1281 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1282 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1283 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1284 0c06baac 2019-02-05 stsp goto done;
1289 d0eebce4 2019-03-11 stsp error = apply_unveil(repo_path, 1, NULL);
1290 36e2fb66 2019-01-04 stsp if (error)
1291 36e2fb66 2019-01-04 stsp goto done;
1293 404c43c4 2018-06-21 stsp error = got_repo_open(&repo, repo_path);
1294 404c43c4 2018-06-21 stsp if (error != NULL)
1295 404c43c4 2018-06-21 stsp goto done;
1297 0c06baac 2019-02-05 stsp if (worktree) {
1298 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1299 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1300 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1301 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1302 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1303 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1304 6efaaa2d 2019-02-05 stsp path) == -1) {
1305 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1306 0c06baac 2019-02-05 stsp goto done;
1308 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1311 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1313 0c06baac 2019-02-05 stsp if (error)
1314 66bea077 2018-08-02 stsp goto done;
1316 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1317 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1318 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1319 404c43c4 2018-06-21 stsp if (error != NULL)
1320 66bea077 2018-08-02 stsp goto done;
1321 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1322 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1323 404c43c4 2018-06-21 stsp if (error != NULL)
1324 66bea077 2018-08-02 stsp goto done;
1326 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1327 15a94983 2018-12-23 stsp commit_id_str);
1328 404c43c4 2018-06-21 stsp if (error != NULL)
1329 66bea077 2018-08-02 stsp goto done;
1332 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1334 66bea077 2018-08-02 stsp free(in_repo_path);
1335 66bea077 2018-08-02 stsp free(repo_path);
1336 66bea077 2018-08-02 stsp free(cwd);
1337 404c43c4 2018-06-21 stsp free(commit_id);
1338 0c06baac 2019-02-05 stsp if (worktree)
1339 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1340 ad242220 2018-09-08 stsp if (repo) {
1341 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1342 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1343 ad242220 2018-09-08 stsp if (error == NULL)
1344 ad242220 2018-09-08 stsp error = repo_error;
1346 404c43c4 2018-06-21 stsp return error;
1349 5de5890b 2018-10-18 stsp __dead static void
1350 5de5890b 2018-10-18 stsp usage_tree(void)
1352 c1669e2e 2019-01-09 stsp fprintf(stderr,
1353 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1354 5de5890b 2018-10-18 stsp getprogname());
1358 c1669e2e 2019-01-09 stsp static void
1359 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1360 c1669e2e 2019-01-09 stsp const char *root_path)
1362 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1364 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1365 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1368 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1369 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1370 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1373 5de5890b 2018-10-18 stsp static const struct got_error *
1374 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1375 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1376 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1378 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1379 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1380 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1381 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1382 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1384 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1386 5de5890b 2018-10-18 stsp goto done;
1388 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1390 5de5890b 2018-10-18 stsp goto done;
1391 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1392 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1393 5de5890b 2018-10-18 stsp while (te) {
1394 5de5890b 2018-10-18 stsp char *id = NULL;
1396 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1399 5de5890b 2018-10-18 stsp if (show_ids) {
1400 5de5890b 2018-10-18 stsp char *id_str;
1401 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1403 5de5890b 2018-10-18 stsp goto done;
1404 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1405 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1406 5de5890b 2018-10-18 stsp free(id_str);
1407 5de5890b 2018-10-18 stsp goto done;
1409 5de5890b 2018-10-18 stsp free(id_str);
1411 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1414 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1415 c1669e2e 2019-01-09 stsp char *child_path;
1416 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1417 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1418 c1669e2e 2019-01-09 stsp te->name) == -1) {
1419 c1669e2e 2019-01-09 stsp err = got_error_from_errno();
1420 c1669e2e 2019-01-09 stsp goto done;
1422 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1423 c1669e2e 2019-01-09 stsp root_path, repo);
1424 c1669e2e 2019-01-09 stsp free(child_path);
1426 c1669e2e 2019-01-09 stsp goto done;
1429 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1433 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1434 5de5890b 2018-10-18 stsp free(tree_id);
1435 5de5890b 2018-10-18 stsp return err;
1438 5de5890b 2018-10-18 stsp static const struct got_error *
1439 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1441 5de5890b 2018-10-18 stsp const struct got_error *error;
1442 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1443 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1444 7a2c19d6 2019-02-05 stsp const char *path;
1445 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1446 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1447 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1448 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1451 5de5890b 2018-10-18 stsp #ifndef PROFILE
1452 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1453 0f8d269b 2019-01-04 stsp NULL) == -1)
1454 5de5890b 2018-10-18 stsp err(1, "pledge");
1457 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1458 5de5890b 2018-10-18 stsp switch (ch) {
1460 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1463 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1464 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1465 5de5890b 2018-10-18 stsp err(1, "-r option");
1468 5de5890b 2018-10-18 stsp show_ids = 1;
1471 c1669e2e 2019-01-09 stsp recurse = 1;
1474 2deda0b9 2019-03-07 stsp usage_tree();
1475 5de5890b 2018-10-18 stsp /* NOTREACHED */
1479 5de5890b 2018-10-18 stsp argc -= optind;
1480 5de5890b 2018-10-18 stsp argv += optind;
1482 5de5890b 2018-10-18 stsp if (argc == 1)
1483 5de5890b 2018-10-18 stsp path = argv[0];
1484 5de5890b 2018-10-18 stsp else if (argc > 1)
1485 5de5890b 2018-10-18 stsp usage_tree();
1487 7a2c19d6 2019-02-05 stsp path = NULL;
1489 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1490 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1491 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1492 9bf7a39b 2019-02-05 stsp goto done;
1494 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1495 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1496 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1497 7a2c19d6 2019-02-05 stsp goto done;
1499 7a2c19d6 2019-02-05 stsp error = NULL;
1500 7a2c19d6 2019-02-05 stsp if (worktree) {
1501 7a2c19d6 2019-02-05 stsp repo_path =
1502 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1503 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1504 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1505 7a2c19d6 2019-02-05 stsp if (error)
1506 7a2c19d6 2019-02-05 stsp goto done;
1508 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1509 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1510 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1511 7a2c19d6 2019-02-05 stsp goto done;
1516 d0eebce4 2019-03-11 stsp error = apply_unveil(repo_path, 1, NULL);
1517 0f8d269b 2019-01-04 stsp if (error)
1518 0f8d269b 2019-01-04 stsp goto done;
1520 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1521 5de5890b 2018-10-18 stsp if (error != NULL)
1522 5de5890b 2018-10-18 stsp goto done;
1524 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1525 9bf7a39b 2019-02-05 stsp if (worktree) {
1526 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1527 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1528 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1529 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1530 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1531 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1532 9bf7a39b 2019-02-05 stsp goto done;
1534 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1536 9bf7a39b 2019-02-05 stsp if (error)
1537 9bf7a39b 2019-02-05 stsp goto done;
1539 9bf7a39b 2019-02-05 stsp path = "/";
1541 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1542 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1543 9bf7a39b 2019-02-05 stsp if (error != NULL)
1544 9bf7a39b 2019-02-05 stsp goto done;
1547 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1548 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1549 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1550 5de5890b 2018-10-18 stsp if (error != NULL)
1551 5de5890b 2018-10-18 stsp goto done;
1552 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1553 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1554 5de5890b 2018-10-18 stsp if (error != NULL)
1555 5de5890b 2018-10-18 stsp goto done;
1557 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1558 15a94983 2018-12-23 stsp commit_id_str);
1559 5de5890b 2018-10-18 stsp if (error != NULL)
1560 5de5890b 2018-10-18 stsp goto done;
1563 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1564 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1566 5de5890b 2018-10-18 stsp free(in_repo_path);
1567 5de5890b 2018-10-18 stsp free(repo_path);
1568 5de5890b 2018-10-18 stsp free(cwd);
1569 5de5890b 2018-10-18 stsp free(commit_id);
1570 7a2c19d6 2019-02-05 stsp if (worktree)
1571 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1572 5de5890b 2018-10-18 stsp if (repo) {
1573 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1574 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1575 5de5890b 2018-10-18 stsp if (error == NULL)
1576 5de5890b 2018-10-18 stsp error = repo_error;
1578 5de5890b 2018-10-18 stsp return error;
1581 6bad629b 2019-02-04 stsp __dead static void
1582 6bad629b 2019-02-04 stsp usage_status(void)
1584 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1588 b72f483a 2019-02-05 stsp static const struct got_error *
1589 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1590 b72f483a 2019-02-05 stsp struct got_object_id *id)
1592 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1593 b72f483a 2019-02-05 stsp return NULL;
1596 6bad629b 2019-02-04 stsp static const struct got_error *
1597 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1599 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1600 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1601 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1602 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1605 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1606 6bad629b 2019-02-04 stsp switch (ch) {
1608 2deda0b9 2019-03-07 stsp usage_status();
1609 6bad629b 2019-02-04 stsp /* NOTREACHED */
1613 6bad629b 2019-02-04 stsp argc -= optind;
1614 6bad629b 2019-02-04 stsp argv += optind;
1616 6bad629b 2019-02-04 stsp #ifndef PROFILE
1617 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1618 6bad629b 2019-02-04 stsp NULL) == -1)
1619 6bad629b 2019-02-04 stsp err(1, "pledge");
1621 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1622 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1623 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1624 927df6b7 2019-02-10 stsp goto done;
1627 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1628 927df6b7 2019-02-10 stsp if (error != NULL)
1629 927df6b7 2019-02-10 stsp goto done;
1631 6bad629b 2019-02-04 stsp if (argc == 0) {
1632 927df6b7 2019-02-10 stsp path = strdup("");
1633 927df6b7 2019-02-10 stsp if (path == NULL) {
1634 6bad629b 2019-02-04 stsp error = got_error_from_errno();
1635 6bad629b 2019-02-04 stsp goto done;
1637 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1638 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1639 927df6b7 2019-02-10 stsp if (error)
1640 6bad629b 2019-02-04 stsp goto done;
1642 6bad629b 2019-02-04 stsp usage_status();
1644 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1645 6bad629b 2019-02-04 stsp if (error != NULL)
1646 6bad629b 2019-02-04 stsp goto done;
1648 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1649 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(worktree));
1650 6bad629b 2019-02-04 stsp if (error)
1651 6bad629b 2019-02-04 stsp goto done;
1653 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1654 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1656 927df6b7 2019-02-10 stsp free(cwd);
1657 927df6b7 2019-02-10 stsp free(path);
1658 d0eebce4 2019-03-11 stsp return error;
1661 d0eebce4 2019-03-11 stsp __dead static void
1662 d0eebce4 2019-03-11 stsp usage_ref(void)
1664 d0eebce4 2019-03-11 stsp fprintf(stderr,
1665 d0eebce4 2019-03-11 stsp "usage: %s ref [-r repository] -l | -d name | name object\n",
1666 d0eebce4 2019-03-11 stsp getprogname());
1670 d0eebce4 2019-03-11 stsp static const struct got_error *
1671 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1673 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1674 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1675 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1677 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1678 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1680 d0eebce4 2019-03-11 stsp return err;
1682 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1683 d0eebce4 2019-03-11 stsp char *refstr;
1684 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1685 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1686 d0eebce4 2019-03-11 stsp return got_error_from_errno();
1687 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1688 d0eebce4 2019-03-11 stsp free(refstr);
1691 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1692 d0eebce4 2019-03-11 stsp return NULL;
1695 d0eebce4 2019-03-11 stsp static const struct got_error *
1696 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1698 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1699 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1701 d0eebce4 2019-03-11 stsp err = got_ref_open(&ref, repo, refname);
1703 d0eebce4 2019-03-11 stsp return err;
1705 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1706 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1707 d0eebce4 2019-03-11 stsp return err;
1710 d0eebce4 2019-03-11 stsp static const struct got_error *
1711 d0eebce4 2019-03-11 stsp add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1713 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1714 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1715 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1717 d0eebce4 2019-03-11 stsp err = got_object_resolve_id_str(&id, repo, id_str);
1719 d0eebce4 2019-03-11 stsp return err;
1721 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1723 d0eebce4 2019-03-11 stsp goto done;
1725 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1728 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1730 d0eebce4 2019-03-11 stsp return err;
1733 d0eebce4 2019-03-11 stsp static const struct got_error *
1734 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1736 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1737 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1738 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1739 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1740 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1741 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1743 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1744 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1745 d0eebce4 2019-03-11 stsp switch (ch) {
1747 d0eebce4 2019-03-11 stsp delref = optarg;
1750 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1751 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1752 d0eebce4 2019-03-11 stsp err(1, "-r option");
1755 d0eebce4 2019-03-11 stsp do_list = 1;
1758 d0eebce4 2019-03-11 stsp usage_ref();
1759 d0eebce4 2019-03-11 stsp /* NOTREACHED */
1763 d0eebce4 2019-03-11 stsp if (do_list && delref)
1764 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
1766 d0eebce4 2019-03-11 stsp argc -= optind;
1767 d0eebce4 2019-03-11 stsp argv += optind;
1769 d0eebce4 2019-03-11 stsp if (do_list || delref) {
1770 d0eebce4 2019-03-11 stsp if (argc > 0)
1771 d0eebce4 2019-03-11 stsp usage_ref();
1772 d0eebce4 2019-03-11 stsp } else if (argc != 2)
1773 d0eebce4 2019-03-11 stsp usage_ref();
1775 d0eebce4 2019-03-11 stsp #ifndef PROFILE
1776 e0b57350 2019-03-12 stsp if (do_list) {
1777 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1778 e0b57350 2019-03-12 stsp NULL) == -1)
1779 e0b57350 2019-03-12 stsp err(1, "pledge");
1781 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1782 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
1783 e0b57350 2019-03-12 stsp err(1, "pledge");
1786 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
1787 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
1788 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1789 d0eebce4 2019-03-11 stsp goto done;
1792 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1793 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
1794 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1795 d0eebce4 2019-03-11 stsp goto done;
1797 d0eebce4 2019-03-11 stsp error = NULL;
1798 d0eebce4 2019-03-11 stsp if (worktree) {
1799 d0eebce4 2019-03-11 stsp repo_path =
1800 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
1801 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1802 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1803 d0eebce4 2019-03-11 stsp if (error)
1804 d0eebce4 2019-03-11 stsp goto done;
1806 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
1807 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1808 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1809 d0eebce4 2019-03-11 stsp goto done;
1814 d0eebce4 2019-03-11 stsp error = apply_unveil(repo_path, do_list,
1815 d0eebce4 2019-03-11 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1816 d0eebce4 2019-03-11 stsp if (error)
1817 d0eebce4 2019-03-11 stsp goto done;
1819 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
1820 d0eebce4 2019-03-11 stsp if (error != NULL)
1821 d0eebce4 2019-03-11 stsp goto done;
1823 d0eebce4 2019-03-11 stsp if (do_list)
1824 d0eebce4 2019-03-11 stsp error = list_refs(repo);
1825 d0eebce4 2019-03-11 stsp else if (delref)
1826 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
1828 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
1831 d0eebce4 2019-03-11 stsp got_repo_close(repo);
1832 d0eebce4 2019-03-11 stsp if (worktree)
1833 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
1834 d0eebce4 2019-03-11 stsp free(cwd);
1835 d0eebce4 2019-03-11 stsp free(repo_path);
1836 d00136be 2019-03-26 stsp return error;
1839 d00136be 2019-03-26 stsp __dead static void
1840 d00136be 2019-03-26 stsp usage_add(void)
1842 d00136be 2019-03-26 stsp fprintf(stderr, "usage: %s add file-path\n", getprogname());
1846 d00136be 2019-03-26 stsp static const struct got_error *
1847 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
1849 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
1850 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
1851 d00136be 2019-03-26 stsp char *cwd = NULL, *path = NULL, *relpath = NULL;
1854 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1855 d00136be 2019-03-26 stsp switch (ch) {
1857 d00136be 2019-03-26 stsp usage_add();
1858 d00136be 2019-03-26 stsp /* NOTREACHED */
1862 d00136be 2019-03-26 stsp argc -= optind;
1863 d00136be 2019-03-26 stsp argv += optind;
1865 d00136be 2019-03-26 stsp if (argc != 1)
1866 d00136be 2019-03-26 stsp usage_add();
1868 d00136be 2019-03-26 stsp path = realpath(argv[0], NULL);
1869 d00136be 2019-03-26 stsp if (path == NULL) {
1870 d00136be 2019-03-26 stsp error = got_error_from_errno();
1871 d00136be 2019-03-26 stsp goto done;
1874 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
1875 d00136be 2019-03-26 stsp if (cwd == NULL) {
1876 d00136be 2019-03-26 stsp error = got_error_from_errno();
1877 d00136be 2019-03-26 stsp goto done;
1879 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1880 d00136be 2019-03-26 stsp if (error)
1881 d00136be 2019-03-26 stsp goto done;
1883 d00136be 2019-03-26 stsp error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
1884 d00136be 2019-03-26 stsp if (error)
1885 d00136be 2019-03-26 stsp goto done;
1887 d00136be 2019-03-26 stsp error = got_worktree_schedule_add(&relpath, worktree, path);
1888 d00136be 2019-03-26 stsp if (error)
1889 d00136be 2019-03-26 stsp goto done;
1890 d00136be 2019-03-26 stsp printf("%c %s\n", GOT_STATUS_ADD, relpath);
1892 d00136be 2019-03-26 stsp if (worktree)
1893 d00136be 2019-03-26 stsp got_worktree_close(worktree);
1894 d00136be 2019-03-26 stsp free(path);
1895 d00136be 2019-03-26 stsp free(relpath);
1896 d00136be 2019-03-26 stsp free(cwd);
1897 6bad629b 2019-02-04 stsp return error;
