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);
81 2ec1f75b 2019-03-26 stsp __dead static void usage_rm(void);
82 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
83 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
86 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
87 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
88 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
89 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
90 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
91 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
92 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
93 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
94 2ec1f75b 2019-03-26 stsp static const struct got_error* cmd_rm(int, char *[]);
95 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
96 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
98 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
99 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
100 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
101 507dc3bb 2018-12-29 stsp { "update", cmd_update, usage_update,
102 507dc3bb 2018-12-29 stsp "update a work tree to a different commit" },
103 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
104 1b6b95a8 2018-03-12 stsp "show repository history" },
105 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
106 b00d56cd 2018-04-01 stsp "compare files and directories" },
107 404c43c4 2018-06-21 stsp { "blame", cmd_blame, usage_blame,
108 a67e2392 2019-03-26 stsp "show when lines in a file were changed" },
109 5de5890b 2018-10-18 stsp { "tree", cmd_tree, usage_tree,
110 a67e2392 2019-03-26 stsp "list files and directories in repository" },
111 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
112 1b6b95a8 2018-03-12 stsp "show modification status of files" },
113 d0eebce4 2019-03-11 stsp { "ref", cmd_ref, usage_ref,
114 d0eebce4 2019-03-11 stsp "manage references in repository" },
115 d00136be 2019-03-26 stsp { "add", cmd_add, usage_add,
116 d00136be 2019-03-26 stsp "add a new file to version control" },
117 2ec1f75b 2019-03-26 stsp { "rm", cmd_rm, usage_rm,
118 2ec1f75b 2019-03-26 stsp "remove a versioned file" },
119 a129376b 2019-03-28 stsp { "revert", cmd_revert, usage_revert,
120 a129376b 2019-03-28 stsp "revert uncommitted changes" },
121 c4296144 2019-05-09 stsp { "commit", cmd_commit, usage_commit,
122 c4296144 2019-05-09 stsp "create blob from file (WIP; can't create commits yet)" },
126 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
128 5c860e29 2018-03-12 stsp struct cmd *cmd;
129 5c860e29 2018-03-12 stsp unsigned int i;
131 1b6b95a8 2018-03-12 stsp int hflag = 0;
133 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
135 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
136 5c860e29 2018-03-12 stsp switch (ch) {
142 5c860e29 2018-03-12 stsp /* NOTREACHED */
146 5c860e29 2018-03-12 stsp argc -= optind;
147 5c860e29 2018-03-12 stsp argv += optind;
148 1e70621d 2018-03-27 stsp optind = 0;
150 5c860e29 2018-03-12 stsp if (argc <= 0)
153 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
154 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
156 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
157 d7d4f210 2018-03-12 stsp const struct got_error *error;
159 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
161 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
165 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
167 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
168 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
169 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
176 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
180 4ed7e80c 2018-05-20 stsp __dead static void
181 5c860e29 2018-03-12 stsp usage(void)
185 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
186 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
187 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
188 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
189 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
194 0266afb7 2019-01-04 stsp static const struct got_error *
195 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
196 d0eebce4 2019-03-11 stsp const char *worktree_path)
198 0266afb7 2019-01-04 stsp const struct got_error *error;
200 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
201 0266afb7 2019-01-04 stsp return got_error_from_errno();
203 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
204 0266afb7 2019-01-04 stsp return got_error_from_errno();
206 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
207 0266afb7 2019-01-04 stsp return got_error_from_errno();
209 0266afb7 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
210 0266afb7 2019-01-04 stsp if (error != NULL)
211 0266afb7 2019-01-04 stsp return error;
213 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
214 0266afb7 2019-01-04 stsp return got_error_from_errno();
216 0266afb7 2019-01-04 stsp return NULL;
219 4ed7e80c 2018-05-20 stsp __dead static void
220 c09a553d 2018-03-12 stsp usage_checkout(void)
222 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
223 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
227 92a684f4 2018-03-12 stsp static void
228 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
230 92a684f4 2018-03-12 stsp char *worktree_path = arg;
232 92a684f4 2018-03-12 stsp while (path[0] == '/')
235 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
238 99437157 2018-11-11 stsp static const struct got_error *
239 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
241 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
242 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
243 99437157 2018-11-11 stsp return NULL;
246 8069f636 2019-01-12 stsp static const struct got_error *
247 8069f636 2019-01-12 stsp check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
248 8069f636 2019-01-12 stsp struct got_repository *repo)
250 8069f636 2019-01-12 stsp const struct got_error *err;
251 8069f636 2019-01-12 stsp struct got_reference *head_ref = NULL;
252 8069f636 2019-01-12 stsp struct got_object_id *head_commit_id = NULL;
253 8069f636 2019-01-12 stsp struct got_commit_graph *graph = NULL;
255 8069f636 2019-01-12 stsp head_ref = got_worktree_get_head_ref(worktree);
256 8069f636 2019-01-12 stsp if (head_ref == NULL)
257 8069f636 2019-01-12 stsp return got_error_from_errno();
259 8069f636 2019-01-12 stsp /* TODO: Check the reflog. The head ref may have been rebased. */
260 8069f636 2019-01-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
264 8069f636 2019-01-12 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
268 8069f636 2019-01-12 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
271 8069f636 2019-01-12 stsp while (1) {
272 8069f636 2019-01-12 stsp struct got_object_id *id;
274 8069f636 2019-01-12 stsp if (sigint_received || sigpipe_received)
277 8069f636 2019-01-12 stsp err = got_commit_graph_iter_next(&id, graph);
279 8069f636 2019-01-12 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
280 8069f636 2019-01-12 stsp err = got_error(GOT_ERR_ANCESTRY);
283 8069f636 2019-01-12 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
285 8069f636 2019-01-12 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
291 8069f636 2019-01-12 stsp if (id == NULL)
293 8069f636 2019-01-12 stsp if (got_object_id_cmp(id, commit_id) == 0)
297 8069f636 2019-01-12 stsp if (head_ref)
298 8069f636 2019-01-12 stsp got_ref_close(head_ref);
300 8069f636 2019-01-12 stsp got_commit_graph_close(graph);
301 8069f636 2019-01-12 stsp return err;
305 4ed7e80c 2018-05-20 stsp static const struct got_error *
306 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
308 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
309 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
310 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
311 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
312 c09a553d 2018-03-12 stsp char *repo_path = NULL;
313 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
314 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
315 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
316 e5dc7198 2018-12-29 stsp int ch, same_path_prefix;
318 8069f636 2019-01-12 stsp while ((ch = getopt(argc, argv, "c:p:")) != -1) {
319 0bb8a95e 2018-03-12 stsp switch (ch) {
321 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
322 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
323 8069f636 2019-01-12 stsp return got_error_from_errno();
326 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
329 2deda0b9 2019-03-07 stsp usage_checkout();
330 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
334 0bb8a95e 2018-03-12 stsp argc -= optind;
335 0bb8a95e 2018-03-12 stsp argv += optind;
337 6715a751 2018-03-16 stsp #ifndef PROFILE
338 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
339 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
340 c09a553d 2018-03-12 stsp err(1, "pledge");
342 0bb8a95e 2018-03-12 stsp if (argc == 1) {
343 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
344 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
345 76089277 2018-04-01 stsp if (repo_path == NULL)
346 76089277 2018-04-01 stsp return got_error_from_errno();
347 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
348 76089277 2018-04-01 stsp if (cwd == NULL) {
349 76089277 2018-04-01 stsp error = got_error_from_errno();
352 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
353 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
355 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
356 76089277 2018-04-01 stsp if (base == NULL) {
357 76089277 2018-04-01 stsp error = got_error_from_errno();
360 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
361 c09a553d 2018-03-12 stsp if (dotgit)
362 c09a553d 2018-03-12 stsp *dotgit = '\0';
363 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
364 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
369 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
370 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
371 76089277 2018-04-01 stsp if (repo_path == NULL) {
372 76089277 2018-04-01 stsp error = got_error_from_errno();
375 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
376 76089277 2018-04-01 stsp if (worktree_path == NULL) {
377 76089277 2018-04-01 stsp error = got_error_from_errno();
381 c09a553d 2018-03-12 stsp usage_checkout();
383 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
384 c09a553d 2018-03-12 stsp if (error != NULL)
387 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
391 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
392 c09a553d 2018-03-12 stsp if (error != NULL)
395 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
396 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
399 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
400 c09a553d 2018-03-12 stsp if (error != NULL)
403 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
404 e5dc7198 2018-12-29 stsp path_prefix);
405 e5dc7198 2018-12-29 stsp if (error != NULL)
407 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
408 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
412 8069f636 2019-01-12 stsp if (commit_id_str) {
413 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
414 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
415 8069f636 2019-01-12 stsp commit_id_str);
416 8069f636 2019-01-12 stsp if (error != NULL)
418 8069f636 2019-01-12 stsp error = check_ancestry(worktree, commit_id, repo);
419 8069f636 2019-01-12 stsp if (error != NULL) {
420 8069f636 2019-01-12 stsp free(commit_id);
423 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
424 8069f636 2019-01-12 stsp commit_id);
425 8069f636 2019-01-12 stsp free(commit_id);
430 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
431 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
432 c09a553d 2018-03-12 stsp if (error != NULL)
435 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
438 8069f636 2019-01-12 stsp free(commit_id_str);
439 76089277 2018-04-01 stsp free(repo_path);
440 507dc3bb 2018-12-29 stsp free(worktree_path);
441 507dc3bb 2018-12-29 stsp return error;
444 507dc3bb 2018-12-29 stsp __dead static void
445 507dc3bb 2018-12-29 stsp usage_update(void)
447 c4cdcb68 2019-04-03 stsp fprintf(stderr, "usage: %s update [-c commit] [path]\n",
448 507dc3bb 2018-12-29 stsp getprogname());
452 507dc3bb 2018-12-29 stsp static void
453 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
455 784955db 2019-01-12 stsp int *did_something = arg;
457 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
460 1545c615 2019-02-10 stsp *did_something = 1;
461 507dc3bb 2018-12-29 stsp while (path[0] == '/')
463 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
466 be7061eb 2018-12-30 stsp static const struct got_error *
467 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
469 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
470 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
471 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
472 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
473 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
474 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
475 784955db 2019-01-12 stsp int ch, did_something = 0;
477 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
478 507dc3bb 2018-12-29 stsp switch (ch) {
480 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
481 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
482 9c4b8182 2019-01-02 stsp return got_error_from_errno();
485 2deda0b9 2019-03-07 stsp usage_update();
486 507dc3bb 2018-12-29 stsp /* NOTREACHED */
490 507dc3bb 2018-12-29 stsp argc -= optind;
491 507dc3bb 2018-12-29 stsp argv += optind;
493 507dc3bb 2018-12-29 stsp #ifndef PROFILE
494 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
495 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
496 507dc3bb 2018-12-29 stsp err(1, "pledge");
498 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
499 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
500 c4cdcb68 2019-04-03 stsp error = got_error_from_errno();
503 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
507 507dc3bb 2018-12-29 stsp if (argc == 0) {
508 c4cdcb68 2019-04-03 stsp path = strdup("");
509 c4cdcb68 2019-04-03 stsp if (path == NULL) {
510 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
513 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
514 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
518 507dc3bb 2018-12-29 stsp usage_update();
520 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
521 507dc3bb 2018-12-29 stsp if (error != NULL)
524 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
525 8c02d095 2019-02-05 stsp got_worktree_get_root_path(worktree));
529 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
530 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
531 507dc3bb 2018-12-29 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
532 507dc3bb 2018-12-29 stsp if (error != NULL)
534 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
535 9c4b8182 2019-01-02 stsp if (error != NULL)
537 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
538 507dc3bb 2018-12-29 stsp if (error != NULL)
541 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
542 507dc3bb 2018-12-29 stsp commit_id_str);
543 507dc3bb 2018-12-29 stsp if (error != NULL)
547 be7061eb 2018-12-30 stsp error = check_ancestry(worktree, commit_id, repo);
548 be7061eb 2018-12-30 stsp if (error != NULL)
551 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
552 507dc3bb 2018-12-29 stsp commit_id) != 0) {
553 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
554 507dc3bb 2018-12-29 stsp commit_id);
559 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
560 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
561 507dc3bb 2018-12-29 stsp if (error != NULL)
564 784955db 2019-01-12 stsp if (did_something)
565 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
567 784955db 2019-01-12 stsp printf("Already up-to-date\n");
569 c09a553d 2018-03-12 stsp free(worktree_path);
570 c4cdcb68 2019-04-03 stsp free(path);
571 507dc3bb 2018-12-29 stsp free(commit_id);
572 9c4b8182 2019-01-02 stsp free(commit_id_str);
573 c09a553d 2018-03-12 stsp return error;
576 f42b1b34 2018-03-12 stsp static const struct got_error *
577 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
578 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
580 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
581 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
582 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
583 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
585 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
586 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
588 79109fed 2018-03-27 stsp return err;
590 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
591 79f35eb3 2018-06-11 stsp if (qid != NULL) {
592 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
594 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
596 79109fed 2018-03-27 stsp return err;
598 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
599 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
600 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
602 0f2b3dca 2018-12-22 stsp return err;
604 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
606 79109fed 2018-03-27 stsp return err;
609 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
613 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
614 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
617 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
618 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
619 0f2b3dca 2018-12-22 stsp free(id_str1);
620 0f2b3dca 2018-12-22 stsp free(id_str2);
621 79109fed 2018-03-27 stsp return err;
624 4bb494d5 2018-06-16 stsp static char *
625 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
627 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
628 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
634 79109fed 2018-03-27 stsp static const struct got_error *
635 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
636 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
637 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
639 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
640 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
641 6c281f94 2018-06-11 stsp char datebuf[26];
642 45d799e2 2018-12-23 stsp time_t committer_time;
643 45d799e2 2018-12-23 stsp const char *author, *committer;
644 199a4027 2019-02-02 stsp char *refs_str = NULL;
645 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
647 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
649 199a4027 2019-02-02 stsp const char *name;
650 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
652 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
653 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
655 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
657 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
659 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
661 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
663 199a4027 2019-02-02 stsp s = refs_str;
664 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
665 199a4027 2019-02-02 stsp name) == -1) {
666 199a4027 2019-02-02 stsp err = got_error_from_errno();
672 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
674 8bf5b3c9 2018-03-17 stsp return err;
676 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
677 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
678 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
679 832c249c 2018-06-10 stsp free(id_str);
680 d3d493d7 2019-02-21 stsp id_str = NULL;
681 d3d493d7 2019-02-21 stsp free(refs_str);
682 d3d493d7 2019-02-21 stsp refs_str = NULL;
683 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
684 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
685 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
686 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
687 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
688 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
689 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
690 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
691 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
692 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
693 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
695 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
696 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
697 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
699 a0603db2 2018-06-10 stsp return err;
700 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
701 a0603db2 2018-06-10 stsp free(id_str);
705 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
706 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
707 832c249c 2018-06-10 stsp return got_error_from_errno();
709 621015ac 2018-07-23 stsp logmsg = logmsg0;
711 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
713 832c249c 2018-06-10 stsp printf(" %s\n", line);
714 832c249c 2018-06-10 stsp } while (line);
715 621015ac 2018-07-23 stsp free(logmsg0);
717 971751ac 2018-03-27 stsp if (show_patch) {
718 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
719 971751ac 2018-03-27 stsp if (err == 0)
720 971751ac 2018-03-27 stsp printf("\n");
723 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
724 cbe7f848 2019-02-11 stsp err = got_error_from_errno();
725 07862c20 2018-09-15 stsp return err;
728 f42b1b34 2018-03-12 stsp static const struct got_error *
729 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
730 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
731 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
733 f42b1b34 2018-03-12 stsp const struct got_error *err;
734 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
736 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
737 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
739 f42b1b34 2018-03-12 stsp return err;
740 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
743 31cedeaf 2018-09-15 stsp while (1) {
744 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
745 372ccdbb 2018-06-10 stsp struct got_object_id *id;
747 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
750 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
752 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
753 9ba79e04 2018-06-11 stsp err = NULL;
756 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
758 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
764 b43fbaa0 2018-06-11 stsp if (id == NULL)
767 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
770 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
772 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
773 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
777 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
778 f42b1b34 2018-03-12 stsp return err;
781 4ed7e80c 2018-05-20 stsp __dead static void
782 6f3d1eb0 2018-03-12 stsp usage_log(void)
784 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
785 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
789 4ed7e80c 2018-05-20 stsp static const struct got_error *
790 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
792 f42b1b34 2018-03-12 stsp const struct got_error *error;
793 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
794 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
795 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
796 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
797 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
798 d142fc45 2018-04-01 stsp char *start_commit = NULL;
799 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
800 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
801 64a96a6d 2018-04-01 stsp const char *errstr;
802 199a4027 2019-02-02 stsp struct got_reflist_head refs;
804 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
806 6715a751 2018-03-16 stsp #ifndef PROFILE
807 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
810 f42b1b34 2018-03-12 stsp err(1, "pledge");
813 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
814 79109fed 2018-03-27 stsp switch (ch) {
816 79109fed 2018-03-27 stsp show_patch = 1;
819 d142fc45 2018-04-01 stsp start_commit = optarg;
822 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
824 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
825 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
828 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
829 64a96a6d 2018-04-01 stsp if (errstr != NULL)
830 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
833 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
836 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
837 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
838 04ca23f4 2018-07-16 stsp err(1, "-r option");
841 2deda0b9 2019-03-07 stsp usage_log();
842 79109fed 2018-03-27 stsp /* NOTREACHED */
846 79109fed 2018-03-27 stsp argc -= optind;
847 79109fed 2018-03-27 stsp argv += optind;
849 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
850 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
851 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
855 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
856 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
858 cffc0aa4 2019-02-05 stsp error = NULL;
860 e7301579 2019-03-18 stsp if (argc == 0) {
861 cbd1af7a 2019-03-18 stsp path = strdup("");
862 e7301579 2019-03-18 stsp if (path == NULL) {
863 e7301579 2019-03-18 stsp error = got_error_from_errno();
866 e7301579 2019-03-18 stsp } else if (argc == 1) {
867 e7301579 2019-03-18 stsp if (worktree) {
868 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
873 e7301579 2019-03-18 stsp path = strdup(argv[0]);
874 e7301579 2019-03-18 stsp if (path == NULL) {
875 e7301579 2019-03-18 stsp error = got_error_from_errno();
880 cbd1af7a 2019-03-18 stsp usage_log();
882 cffc0aa4 2019-02-05 stsp repo_path = worktree ?
883 cffc0aa4 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
884 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
885 cffc0aa4 2019-02-05 stsp error = got_error_from_errno();
889 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
890 d7d4f210 2018-03-12 stsp if (error != NULL)
893 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
894 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
898 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
899 3235492e 2018-04-01 stsp struct got_reference *head_ref;
900 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
901 3235492e 2018-04-01 stsp if (error != NULL)
902 3235492e 2018-04-01 stsp return error;
903 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
904 3235492e 2018-04-01 stsp got_ref_close(head_ref);
905 3235492e 2018-04-01 stsp if (error != NULL)
906 3235492e 2018-04-01 stsp return error;
907 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
909 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
910 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
911 3235492e 2018-04-01 stsp if (error == NULL) {
912 1caad61b 2019-02-01 stsp int obj_type;
913 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
914 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
915 d1f2edc9 2018-06-13 stsp if (error != NULL)
917 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
918 1caad61b 2019-02-01 stsp if (error != NULL)
920 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
921 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
922 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
923 1caad61b 2019-02-01 stsp if (error != NULL)
925 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
926 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
927 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
928 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
932 1caad61b 2019-02-01 stsp id = got_object_id_dup(
933 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
934 1caad61b 2019-02-01 stsp if (id == NULL)
935 1caad61b 2019-02-01 stsp error = got_error_from_errno();
936 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
939 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
940 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
943 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
944 d1f2edc9 2018-06-13 stsp if (error != NULL)
947 15a94983 2018-12-23 stsp if (commit == NULL) {
948 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
949 d1f2edc9 2018-06-13 stsp start_commit);
950 d1f2edc9 2018-06-13 stsp if (error != NULL)
951 d1f2edc9 2018-06-13 stsp return error;
954 d7d4f210 2018-03-12 stsp if (error != NULL)
957 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
958 04ca23f4 2018-07-16 stsp if (error != NULL)
960 04ca23f4 2018-07-16 stsp if (in_repo_path) {
961 04ca23f4 2018-07-16 stsp free(path);
962 04ca23f4 2018-07-16 stsp path = in_repo_path;
965 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
969 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
970 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
972 04ca23f4 2018-07-16 stsp free(path);
973 04ca23f4 2018-07-16 stsp free(repo_path);
976 cffc0aa4 2019-02-05 stsp if (worktree)
977 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
978 ad242220 2018-09-08 stsp if (repo) {
979 ad242220 2018-09-08 stsp const struct got_error *repo_error;
980 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
981 ad242220 2018-09-08 stsp if (error == NULL)
982 ad242220 2018-09-08 stsp error = repo_error;
984 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
985 8bf5b3c9 2018-03-17 stsp return error;
988 4ed7e80c 2018-05-20 stsp __dead static void
989 3f8b7d6a 2018-04-01 stsp usage_diff(void)
991 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
992 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
996 b72f483a 2019-02-05 stsp struct print_diff_arg {
997 b72f483a 2019-02-05 stsp struct got_repository *repo;
998 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
999 b72f483a 2019-02-05 stsp int diff_context;
1000 3fc0c068 2019-02-10 stsp const char *id_str;
1001 3fc0c068 2019-02-10 stsp int header_shown;
1004 4ed7e80c 2018-05-20 stsp static const struct got_error *
1005 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1006 b72f483a 2019-02-05 stsp struct got_object_id *id)
1008 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1009 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1010 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1011 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1012 b72f483a 2019-02-05 stsp char *abspath = NULL;
1013 b72f483a 2019-02-05 stsp struct stat sb;
1015 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1016 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1017 b72f483a 2019-02-05 stsp return NULL;
1019 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1020 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1021 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1022 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1025 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1026 d00136be 2019-03-26 stsp err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1028 d00136be 2019-03-26 stsp goto done;
1032 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1033 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1034 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1035 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1036 2ec1f75b 2019-03-26 stsp goto done;
1039 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1040 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1041 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1042 2ec1f75b 2019-03-26 stsp goto done;
1044 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1045 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1046 2ec1f75b 2019-03-26 stsp goto done;
1049 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1051 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1054 b72f483a 2019-02-05 stsp if (blob1)
1055 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1056 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1057 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
1058 b72f483a 2019-02-05 stsp free(abspath);
1059 927df6b7 2019-02-10 stsp return err;
1062 927df6b7 2019-02-10 stsp static const struct got_error *
1063 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1065 b00d56cd 2018-04-01 stsp const struct got_error *error;
1066 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1067 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1068 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1069 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1070 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1071 15a94983 2018-12-23 stsp int type1, type2;
1072 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1073 c0cc5c62 2018-10-18 stsp const char *errstr;
1074 927df6b7 2019-02-10 stsp char *path = NULL;
1076 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1077 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1078 25eccc22 2019-01-04 stsp NULL) == -1)
1079 b00d56cd 2018-04-01 stsp err(1, "pledge");
1082 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1083 b00d56cd 2018-04-01 stsp switch (ch) {
1085 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1086 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1087 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1090 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1091 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1092 b72f483a 2019-02-05 stsp err(1, "-r option");
1095 2deda0b9 2019-03-07 stsp usage_diff();
1096 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1100 b00d56cd 2018-04-01 stsp argc -= optind;
1101 b00d56cd 2018-04-01 stsp argv += optind;
1103 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1104 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1105 b72f483a 2019-02-05 stsp error = got_error_from_errno();
1106 b72f483a 2019-02-05 stsp goto done;
1108 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1109 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1110 927df6b7 2019-02-10 stsp goto done;
1111 927df6b7 2019-02-10 stsp if (argc <= 1) {
1112 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1113 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1114 927df6b7 2019-02-10 stsp goto done;
1116 b72f483a 2019-02-05 stsp if (repo_path)
1118 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1119 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1120 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1121 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1122 927df6b7 2019-02-10 stsp goto done;
1124 927df6b7 2019-02-10 stsp if (argc == 1) {
1125 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1127 927df6b7 2019-02-10 stsp if (error)
1128 927df6b7 2019-02-10 stsp goto done;
1130 927df6b7 2019-02-10 stsp path = strdup("");
1131 927df6b7 2019-02-10 stsp if (path == NULL) {
1132 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1133 927df6b7 2019-02-10 stsp goto done;
1136 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1137 15a94983 2018-12-23 stsp id_str1 = argv[0];
1138 15a94983 2018-12-23 stsp id_str2 = argv[1];
1140 b00d56cd 2018-04-01 stsp usage_diff();
1142 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1143 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1144 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1145 b72f483a 2019-02-05 stsp return got_error_from_errno();
1148 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1149 76089277 2018-04-01 stsp free(repo_path);
1150 b00d56cd 2018-04-01 stsp if (error != NULL)
1151 b00d56cd 2018-04-01 stsp goto done;
1153 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1154 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1155 c02c541e 2019-03-29 stsp if (error)
1156 c02c541e 2019-03-29 stsp goto done;
1158 b72f483a 2019-02-05 stsp if (worktree) {
1159 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1160 b72f483a 2019-02-05 stsp char *id_str;
1161 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1162 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1163 b72f483a 2019-02-05 stsp if (error)
1164 b72f483a 2019-02-05 stsp goto done;
1165 b72f483a 2019-02-05 stsp arg.repo = repo;
1166 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1167 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1168 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1169 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1171 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1172 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1173 b72f483a 2019-02-05 stsp free(id_str);
1174 b72f483a 2019-02-05 stsp goto done;
1177 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1178 6402fb3c 2018-09-15 stsp if (error)
1179 b00d56cd 2018-04-01 stsp goto done;
1181 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1182 6402fb3c 2018-09-15 stsp if (error)
1183 b00d56cd 2018-04-01 stsp goto done;
1185 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1186 15a94983 2018-12-23 stsp if (error)
1187 15a94983 2018-12-23 stsp goto done;
1189 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1190 15a94983 2018-12-23 stsp if (error)
1191 15a94983 2018-12-23 stsp goto done;
1193 15a94983 2018-12-23 stsp if (type1 != type2) {
1194 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1195 b00d56cd 2018-04-01 stsp goto done;
1198 15a94983 2018-12-23 stsp switch (type1) {
1199 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1200 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1201 54156555 2018-12-24 stsp diff_context, repo, stdout);
1203 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1204 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1205 54156555 2018-12-24 stsp diff_context, repo, stdout);
1207 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1208 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1210 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1211 c0cc5c62 2018-10-18 stsp repo, stdout);
1214 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1218 15a94983 2018-12-23 stsp free(id1);
1219 15a94983 2018-12-23 stsp free(id2);
1220 927df6b7 2019-02-10 stsp free(path);
1221 b72f483a 2019-02-05 stsp if (worktree)
1222 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1223 ad242220 2018-09-08 stsp if (repo) {
1224 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1225 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1226 ad242220 2018-09-08 stsp if (error == NULL)
1227 ad242220 2018-09-08 stsp error = repo_error;
1229 b00d56cd 2018-04-01 stsp return error;
1232 404c43c4 2018-06-21 stsp __dead static void
1233 404c43c4 2018-06-21 stsp usage_blame(void)
1235 9270e621 2019-02-05 stsp fprintf(stderr,
1236 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1237 404c43c4 2018-06-21 stsp getprogname());
1241 404c43c4 2018-06-21 stsp static const struct got_error *
1242 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1244 404c43c4 2018-06-21 stsp const struct got_error *error;
1245 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1246 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1247 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1248 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1249 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1252 404c43c4 2018-06-21 stsp #ifndef PROFILE
1253 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1254 36e2fb66 2019-01-04 stsp NULL) == -1)
1255 404c43c4 2018-06-21 stsp err(1, "pledge");
1258 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1259 404c43c4 2018-06-21 stsp switch (ch) {
1261 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1264 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1265 66bea077 2018-08-02 stsp if (repo_path == NULL)
1266 66bea077 2018-08-02 stsp err(1, "-r option");
1269 2deda0b9 2019-03-07 stsp usage_blame();
1270 404c43c4 2018-06-21 stsp /* NOTREACHED */
1274 404c43c4 2018-06-21 stsp argc -= optind;
1275 404c43c4 2018-06-21 stsp argv += optind;
1277 a39318fd 2018-08-02 stsp if (argc == 1)
1278 404c43c4 2018-06-21 stsp path = argv[0];
1280 404c43c4 2018-06-21 stsp usage_blame();
1282 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1283 66bea077 2018-08-02 stsp if (cwd == NULL) {
1284 66bea077 2018-08-02 stsp error = got_error_from_errno();
1285 66bea077 2018-08-02 stsp goto done;
1287 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1288 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1289 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1290 66bea077 2018-08-02 stsp goto done;
1292 0c06baac 2019-02-05 stsp error = NULL;
1293 0c06baac 2019-02-05 stsp if (worktree) {
1294 0c06baac 2019-02-05 stsp repo_path =
1295 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1296 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1297 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1298 0c06baac 2019-02-05 stsp if (error)
1299 0c06baac 2019-02-05 stsp goto done;
1301 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1302 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1303 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1304 0c06baac 2019-02-05 stsp goto done;
1309 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1310 c02c541e 2019-03-29 stsp if (error != NULL)
1311 36e2fb66 2019-01-04 stsp goto done;
1313 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
1314 c02c541e 2019-03-29 stsp if (error)
1315 404c43c4 2018-06-21 stsp goto done;
1317 0c06baac 2019-02-05 stsp if (worktree) {
1318 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1319 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1320 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1321 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1322 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1323 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1324 6efaaa2d 2019-02-05 stsp path) == -1) {
1325 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1326 0c06baac 2019-02-05 stsp goto done;
1328 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1331 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1333 0c06baac 2019-02-05 stsp if (error)
1334 66bea077 2018-08-02 stsp goto done;
1336 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1337 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1338 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1339 404c43c4 2018-06-21 stsp if (error != NULL)
1340 66bea077 2018-08-02 stsp goto done;
1341 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1342 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1343 404c43c4 2018-06-21 stsp if (error != NULL)
1344 66bea077 2018-08-02 stsp goto done;
1346 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1347 15a94983 2018-12-23 stsp commit_id_str);
1348 404c43c4 2018-06-21 stsp if (error != NULL)
1349 66bea077 2018-08-02 stsp goto done;
1352 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1354 66bea077 2018-08-02 stsp free(in_repo_path);
1355 66bea077 2018-08-02 stsp free(repo_path);
1356 66bea077 2018-08-02 stsp free(cwd);
1357 404c43c4 2018-06-21 stsp free(commit_id);
1358 0c06baac 2019-02-05 stsp if (worktree)
1359 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1360 ad242220 2018-09-08 stsp if (repo) {
1361 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1362 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1363 ad242220 2018-09-08 stsp if (error == NULL)
1364 ad242220 2018-09-08 stsp error = repo_error;
1366 404c43c4 2018-06-21 stsp return error;
1369 5de5890b 2018-10-18 stsp __dead static void
1370 5de5890b 2018-10-18 stsp usage_tree(void)
1372 c1669e2e 2019-01-09 stsp fprintf(stderr,
1373 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1374 5de5890b 2018-10-18 stsp getprogname());
1378 c1669e2e 2019-01-09 stsp static void
1379 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1380 c1669e2e 2019-01-09 stsp const char *root_path)
1382 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1384 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1385 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1388 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1389 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1390 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1393 5de5890b 2018-10-18 stsp static const struct got_error *
1394 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1395 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1396 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1398 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1399 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1400 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1401 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1402 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1404 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1406 5de5890b 2018-10-18 stsp goto done;
1408 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1410 5de5890b 2018-10-18 stsp goto done;
1411 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1412 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1413 5de5890b 2018-10-18 stsp while (te) {
1414 5de5890b 2018-10-18 stsp char *id = NULL;
1416 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1419 5de5890b 2018-10-18 stsp if (show_ids) {
1420 5de5890b 2018-10-18 stsp char *id_str;
1421 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1423 5de5890b 2018-10-18 stsp goto done;
1424 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1425 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1426 5de5890b 2018-10-18 stsp free(id_str);
1427 5de5890b 2018-10-18 stsp goto done;
1429 5de5890b 2018-10-18 stsp free(id_str);
1431 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1434 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1435 c1669e2e 2019-01-09 stsp char *child_path;
1436 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1437 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1438 c1669e2e 2019-01-09 stsp te->name) == -1) {
1439 c1669e2e 2019-01-09 stsp err = got_error_from_errno();
1440 c1669e2e 2019-01-09 stsp goto done;
1442 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1443 c1669e2e 2019-01-09 stsp root_path, repo);
1444 c1669e2e 2019-01-09 stsp free(child_path);
1446 c1669e2e 2019-01-09 stsp goto done;
1449 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1453 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1454 5de5890b 2018-10-18 stsp free(tree_id);
1455 5de5890b 2018-10-18 stsp return err;
1458 5de5890b 2018-10-18 stsp static const struct got_error *
1459 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1461 5de5890b 2018-10-18 stsp const struct got_error *error;
1462 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1463 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1464 7a2c19d6 2019-02-05 stsp const char *path;
1465 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1466 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1467 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1468 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1471 5de5890b 2018-10-18 stsp #ifndef PROFILE
1472 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1473 0f8d269b 2019-01-04 stsp NULL) == -1)
1474 5de5890b 2018-10-18 stsp err(1, "pledge");
1477 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1478 5de5890b 2018-10-18 stsp switch (ch) {
1480 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1483 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1484 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1485 5de5890b 2018-10-18 stsp err(1, "-r option");
1488 5de5890b 2018-10-18 stsp show_ids = 1;
1491 c1669e2e 2019-01-09 stsp recurse = 1;
1494 2deda0b9 2019-03-07 stsp usage_tree();
1495 5de5890b 2018-10-18 stsp /* NOTREACHED */
1499 5de5890b 2018-10-18 stsp argc -= optind;
1500 5de5890b 2018-10-18 stsp argv += optind;
1502 5de5890b 2018-10-18 stsp if (argc == 1)
1503 5de5890b 2018-10-18 stsp path = argv[0];
1504 5de5890b 2018-10-18 stsp else if (argc > 1)
1505 5de5890b 2018-10-18 stsp usage_tree();
1507 7a2c19d6 2019-02-05 stsp path = NULL;
1509 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1510 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1511 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1512 9bf7a39b 2019-02-05 stsp goto done;
1514 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1515 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1516 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1517 7a2c19d6 2019-02-05 stsp goto done;
1519 7a2c19d6 2019-02-05 stsp error = NULL;
1520 7a2c19d6 2019-02-05 stsp if (worktree) {
1521 7a2c19d6 2019-02-05 stsp repo_path =
1522 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1523 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1524 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1525 7a2c19d6 2019-02-05 stsp if (error)
1526 7a2c19d6 2019-02-05 stsp goto done;
1528 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1529 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1530 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1531 7a2c19d6 2019-02-05 stsp goto done;
1536 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1537 5de5890b 2018-10-18 stsp if (error != NULL)
1538 c02c541e 2019-03-29 stsp goto done;
1540 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
1541 c02c541e 2019-03-29 stsp if (error)
1542 5de5890b 2018-10-18 stsp goto done;
1544 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1545 9bf7a39b 2019-02-05 stsp if (worktree) {
1546 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1547 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1548 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1549 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1550 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1551 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1552 9bf7a39b 2019-02-05 stsp goto done;
1554 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1556 9bf7a39b 2019-02-05 stsp if (error)
1557 9bf7a39b 2019-02-05 stsp goto done;
1559 9bf7a39b 2019-02-05 stsp path = "/";
1561 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1562 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1563 9bf7a39b 2019-02-05 stsp if (error != NULL)
1564 9bf7a39b 2019-02-05 stsp goto done;
1567 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1568 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1569 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1570 5de5890b 2018-10-18 stsp if (error != NULL)
1571 5de5890b 2018-10-18 stsp goto done;
1572 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1573 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1574 5de5890b 2018-10-18 stsp if (error != NULL)
1575 5de5890b 2018-10-18 stsp goto done;
1577 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1578 15a94983 2018-12-23 stsp commit_id_str);
1579 5de5890b 2018-10-18 stsp if (error != NULL)
1580 5de5890b 2018-10-18 stsp goto done;
1583 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1584 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1586 5de5890b 2018-10-18 stsp free(in_repo_path);
1587 5de5890b 2018-10-18 stsp free(repo_path);
1588 5de5890b 2018-10-18 stsp free(cwd);
1589 5de5890b 2018-10-18 stsp free(commit_id);
1590 7a2c19d6 2019-02-05 stsp if (worktree)
1591 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1592 5de5890b 2018-10-18 stsp if (repo) {
1593 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1594 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1595 5de5890b 2018-10-18 stsp if (error == NULL)
1596 5de5890b 2018-10-18 stsp error = repo_error;
1598 5de5890b 2018-10-18 stsp return error;
1601 6bad629b 2019-02-04 stsp __dead static void
1602 6bad629b 2019-02-04 stsp usage_status(void)
1604 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1608 b72f483a 2019-02-05 stsp static const struct got_error *
1609 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1610 b72f483a 2019-02-05 stsp struct got_object_id *id)
1612 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1613 b72f483a 2019-02-05 stsp return NULL;
1616 6bad629b 2019-02-04 stsp static const struct got_error *
1617 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1619 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1620 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1621 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1622 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1625 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1626 6bad629b 2019-02-04 stsp switch (ch) {
1628 2deda0b9 2019-03-07 stsp usage_status();
1629 6bad629b 2019-02-04 stsp /* NOTREACHED */
1633 6bad629b 2019-02-04 stsp argc -= optind;
1634 6bad629b 2019-02-04 stsp argv += optind;
1636 6bad629b 2019-02-04 stsp #ifndef PROFILE
1637 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1638 6bad629b 2019-02-04 stsp NULL) == -1)
1639 6bad629b 2019-02-04 stsp err(1, "pledge");
1641 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1642 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1643 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1644 927df6b7 2019-02-10 stsp goto done;
1647 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1648 927df6b7 2019-02-10 stsp if (error != NULL)
1649 927df6b7 2019-02-10 stsp goto done;
1651 6bad629b 2019-02-04 stsp if (argc == 0) {
1652 927df6b7 2019-02-10 stsp path = strdup("");
1653 927df6b7 2019-02-10 stsp if (path == NULL) {
1654 6bad629b 2019-02-04 stsp error = got_error_from_errno();
1655 6bad629b 2019-02-04 stsp goto done;
1657 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1658 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1659 927df6b7 2019-02-10 stsp if (error)
1660 6bad629b 2019-02-04 stsp goto done;
1662 6bad629b 2019-02-04 stsp usage_status();
1664 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1665 6bad629b 2019-02-04 stsp if (error != NULL)
1666 6bad629b 2019-02-04 stsp goto done;
1668 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1669 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(worktree));
1670 6bad629b 2019-02-04 stsp if (error)
1671 6bad629b 2019-02-04 stsp goto done;
1673 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1674 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1676 927df6b7 2019-02-10 stsp free(cwd);
1677 927df6b7 2019-02-10 stsp free(path);
1678 d0eebce4 2019-03-11 stsp return error;
1681 d0eebce4 2019-03-11 stsp __dead static void
1682 d0eebce4 2019-03-11 stsp usage_ref(void)
1684 d0eebce4 2019-03-11 stsp fprintf(stderr,
1685 d0eebce4 2019-03-11 stsp "usage: %s ref [-r repository] -l | -d name | name object\n",
1686 d0eebce4 2019-03-11 stsp getprogname());
1690 d0eebce4 2019-03-11 stsp static const struct got_error *
1691 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1693 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1694 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1695 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1697 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1698 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1700 d0eebce4 2019-03-11 stsp return err;
1702 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1703 d0eebce4 2019-03-11 stsp char *refstr;
1704 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1705 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1706 d0eebce4 2019-03-11 stsp return got_error_from_errno();
1707 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1708 d0eebce4 2019-03-11 stsp free(refstr);
1711 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1712 d0eebce4 2019-03-11 stsp return NULL;
1715 d0eebce4 2019-03-11 stsp static const struct got_error *
1716 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1718 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1719 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1721 d0eebce4 2019-03-11 stsp err = got_ref_open(&ref, repo, refname);
1723 d0eebce4 2019-03-11 stsp return err;
1725 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1726 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1727 d0eebce4 2019-03-11 stsp return err;
1730 d0eebce4 2019-03-11 stsp static const struct got_error *
1731 d0eebce4 2019-03-11 stsp add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1733 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1734 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1735 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1737 d0eebce4 2019-03-11 stsp err = got_object_resolve_id_str(&id, repo, id_str);
1739 d0eebce4 2019-03-11 stsp return err;
1741 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1743 d0eebce4 2019-03-11 stsp goto done;
1745 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1748 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1750 d0eebce4 2019-03-11 stsp return err;
1753 d0eebce4 2019-03-11 stsp static const struct got_error *
1754 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1756 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1757 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1758 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1759 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1760 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1761 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1763 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1764 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1765 d0eebce4 2019-03-11 stsp switch (ch) {
1767 d0eebce4 2019-03-11 stsp delref = optarg;
1770 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1771 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1772 d0eebce4 2019-03-11 stsp err(1, "-r option");
1775 d0eebce4 2019-03-11 stsp do_list = 1;
1778 d0eebce4 2019-03-11 stsp usage_ref();
1779 d0eebce4 2019-03-11 stsp /* NOTREACHED */
1783 d0eebce4 2019-03-11 stsp if (do_list && delref)
1784 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
1786 d0eebce4 2019-03-11 stsp argc -= optind;
1787 d0eebce4 2019-03-11 stsp argv += optind;
1789 d0eebce4 2019-03-11 stsp if (do_list || delref) {
1790 d0eebce4 2019-03-11 stsp if (argc > 0)
1791 d0eebce4 2019-03-11 stsp usage_ref();
1792 d0eebce4 2019-03-11 stsp } else if (argc != 2)
1793 d0eebce4 2019-03-11 stsp usage_ref();
1795 d0eebce4 2019-03-11 stsp #ifndef PROFILE
1796 e0b57350 2019-03-12 stsp if (do_list) {
1797 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1798 e0b57350 2019-03-12 stsp NULL) == -1)
1799 e0b57350 2019-03-12 stsp err(1, "pledge");
1801 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1802 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
1803 e0b57350 2019-03-12 stsp err(1, "pledge");
1806 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
1807 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
1808 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1809 d0eebce4 2019-03-11 stsp goto done;
1812 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1813 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
1814 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1815 d0eebce4 2019-03-11 stsp goto done;
1817 d0eebce4 2019-03-11 stsp error = NULL;
1818 d0eebce4 2019-03-11 stsp if (worktree) {
1819 d0eebce4 2019-03-11 stsp repo_path =
1820 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
1821 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1822 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1823 d0eebce4 2019-03-11 stsp if (error)
1824 d0eebce4 2019-03-11 stsp goto done;
1826 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
1827 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1828 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1829 d0eebce4 2019-03-11 stsp goto done;
1834 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
1835 d0eebce4 2019-03-11 stsp if (error != NULL)
1836 d0eebce4 2019-03-11 stsp goto done;
1838 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
1839 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1840 c02c541e 2019-03-29 stsp if (error)
1841 c02c541e 2019-03-29 stsp goto done;
1843 d0eebce4 2019-03-11 stsp if (do_list)
1844 d0eebce4 2019-03-11 stsp error = list_refs(repo);
1845 d0eebce4 2019-03-11 stsp else if (delref)
1846 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
1848 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
1851 d0eebce4 2019-03-11 stsp got_repo_close(repo);
1852 d0eebce4 2019-03-11 stsp if (worktree)
1853 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
1854 d0eebce4 2019-03-11 stsp free(cwd);
1855 d0eebce4 2019-03-11 stsp free(repo_path);
1856 d00136be 2019-03-26 stsp return error;
1859 d00136be 2019-03-26 stsp __dead static void
1860 d00136be 2019-03-26 stsp usage_add(void)
1862 d00136be 2019-03-26 stsp fprintf(stderr, "usage: %s add file-path\n", getprogname());
1866 d00136be 2019-03-26 stsp static const struct got_error *
1867 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
1869 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
1870 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
1871 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
1872 d00136be 2019-03-26 stsp char *cwd = NULL, *path = NULL, *relpath = NULL;
1875 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1876 d00136be 2019-03-26 stsp switch (ch) {
1878 d00136be 2019-03-26 stsp usage_add();
1879 d00136be 2019-03-26 stsp /* NOTREACHED */
1883 d00136be 2019-03-26 stsp argc -= optind;
1884 d00136be 2019-03-26 stsp argv += optind;
1886 d00136be 2019-03-26 stsp if (argc != 1)
1887 d00136be 2019-03-26 stsp usage_add();
1889 d00136be 2019-03-26 stsp path = realpath(argv[0], NULL);
1890 d00136be 2019-03-26 stsp if (path == NULL) {
1891 d00136be 2019-03-26 stsp error = got_error_from_errno();
1892 d00136be 2019-03-26 stsp goto done;
1895 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
1896 d00136be 2019-03-26 stsp if (cwd == NULL) {
1897 d00136be 2019-03-26 stsp error = got_error_from_errno();
1898 d00136be 2019-03-26 stsp goto done;
1900 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1901 d00136be 2019-03-26 stsp if (error)
1902 d00136be 2019-03-26 stsp goto done;
1904 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1905 031a5338 2019-03-26 stsp if (error != NULL)
1906 031a5338 2019-03-26 stsp goto done;
1908 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1909 031a5338 2019-03-26 stsp got_worktree_get_root_path(worktree));
1910 d00136be 2019-03-26 stsp if (error)
1911 d00136be 2019-03-26 stsp goto done;
1913 031a5338 2019-03-26 stsp error = got_worktree_schedule_add(worktree, path, print_status, NULL,
1915 d00136be 2019-03-26 stsp if (error)
1916 d00136be 2019-03-26 stsp goto done;
1919 031a5338 2019-03-26 stsp got_repo_close(repo);
1920 d00136be 2019-03-26 stsp if (worktree)
1921 d00136be 2019-03-26 stsp got_worktree_close(worktree);
1922 d00136be 2019-03-26 stsp free(path);
1923 d00136be 2019-03-26 stsp free(relpath);
1924 2ec1f75b 2019-03-26 stsp free(cwd);
1925 2ec1f75b 2019-03-26 stsp return error;
1928 2ec1f75b 2019-03-26 stsp __dead static void
1929 2ec1f75b 2019-03-26 stsp usage_rm(void)
1931 2ec1f75b 2019-03-26 stsp fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
1935 2ec1f75b 2019-03-26 stsp static const struct got_error *
1936 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
1938 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
1939 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
1940 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
1941 2ec1f75b 2019-03-26 stsp char *cwd = NULL, *path = NULL;
1942 2ec1f75b 2019-03-26 stsp int ch, delete_local_mods = 0;
1944 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
1945 2ec1f75b 2019-03-26 stsp switch (ch) {
1947 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
1950 2ec1f75b 2019-03-26 stsp usage_add();
1951 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
1955 2ec1f75b 2019-03-26 stsp argc -= optind;
1956 2ec1f75b 2019-03-26 stsp argv += optind;
1958 2ec1f75b 2019-03-26 stsp if (argc != 1)
1959 2ec1f75b 2019-03-26 stsp usage_rm();
1961 2ec1f75b 2019-03-26 stsp path = realpath(argv[0], NULL);
1962 2ec1f75b 2019-03-26 stsp if (path == NULL) {
1963 2ec1f75b 2019-03-26 stsp error = got_error_from_errno();
1964 2ec1f75b 2019-03-26 stsp goto done;
1967 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
1968 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
1969 2ec1f75b 2019-03-26 stsp error = got_error_from_errno();
1970 2ec1f75b 2019-03-26 stsp goto done;
1972 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1973 2ec1f75b 2019-03-26 stsp if (error)
1974 2ec1f75b 2019-03-26 stsp goto done;
1976 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1977 2ec1f75b 2019-03-26 stsp if (error != NULL)
1978 2ec1f75b 2019-03-26 stsp goto done;
1980 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1981 c2253644 2019-03-26 stsp got_worktree_get_root_path(worktree));
1982 2ec1f75b 2019-03-26 stsp if (error)
1983 2ec1f75b 2019-03-26 stsp goto done;
1985 2ec1f75b 2019-03-26 stsp error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
1986 2ec1f75b 2019-03-26 stsp print_status, NULL, repo);
1987 a129376b 2019-03-28 stsp if (error)
1988 a129376b 2019-03-28 stsp goto done;
1991 a129376b 2019-03-28 stsp got_repo_close(repo);
1992 a129376b 2019-03-28 stsp if (worktree)
1993 a129376b 2019-03-28 stsp got_worktree_close(worktree);
1994 a129376b 2019-03-28 stsp free(path);
1995 a129376b 2019-03-28 stsp free(cwd);
1996 a129376b 2019-03-28 stsp return error;
1999 a129376b 2019-03-28 stsp __dead static void
2000 a129376b 2019-03-28 stsp usage_revert(void)
2002 a129376b 2019-03-28 stsp fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2006 a129376b 2019-03-28 stsp static void
2007 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2009 a129376b 2019-03-28 stsp while (path[0] == '/')
2011 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2014 a129376b 2019-03-28 stsp static const struct got_error *
2015 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2017 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2018 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2019 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2020 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2023 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2024 a129376b 2019-03-28 stsp switch (ch) {
2026 a129376b 2019-03-28 stsp usage_revert();
2027 a129376b 2019-03-28 stsp /* NOTREACHED */
2031 a129376b 2019-03-28 stsp argc -= optind;
2032 a129376b 2019-03-28 stsp argv += optind;
2034 a129376b 2019-03-28 stsp if (argc != 1)
2035 a129376b 2019-03-28 stsp usage_revert();
2037 a129376b 2019-03-28 stsp path = realpath(argv[0], NULL);
2038 a129376b 2019-03-28 stsp if (path == NULL) {
2039 a129376b 2019-03-28 stsp error = got_error_from_errno();
2040 a129376b 2019-03-28 stsp goto done;
2043 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2044 a129376b 2019-03-28 stsp if (cwd == NULL) {
2045 a129376b 2019-03-28 stsp error = got_error_from_errno();
2046 a129376b 2019-03-28 stsp goto done;
2048 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2049 2ec1f75b 2019-03-26 stsp if (error)
2050 2ec1f75b 2019-03-26 stsp goto done;
2052 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2053 a129376b 2019-03-28 stsp if (error != NULL)
2054 a129376b 2019-03-28 stsp goto done;
2056 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2057 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree));
2058 a129376b 2019-03-28 stsp if (error)
2059 a129376b 2019-03-28 stsp goto done;
2061 a129376b 2019-03-28 stsp error = got_worktree_revert(worktree, path,
2062 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2063 a129376b 2019-03-28 stsp if (error)
2064 a129376b 2019-03-28 stsp goto done;
2067 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2068 2ec1f75b 2019-03-26 stsp if (worktree)
2069 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2070 2ec1f75b 2019-03-26 stsp free(path);
2071 d00136be 2019-03-26 stsp free(cwd);
2072 6bad629b 2019-02-04 stsp return error;
2075 c4296144 2019-05-09 stsp __dead static void
2076 c4296144 2019-05-09 stsp usage_commit(void)
2078 c4296144 2019-05-09 stsp fprintf(stderr, "usage: %s commit file-path\n", getprogname());
2082 c4296144 2019-05-09 stsp static const struct got_error *
2083 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2085 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2086 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2087 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2088 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2089 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2090 c4296144 2019-05-09 stsp const char *logmsg = "<no log message was specified>";
2093 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2094 c4296144 2019-05-09 stsp switch (ch) {
2096 c4296144 2019-05-09 stsp logmsg = optarg;
2099 c4296144 2019-05-09 stsp usage_commit();
2100 c4296144 2019-05-09 stsp /* NOTREACHED */
2104 c4296144 2019-05-09 stsp argc -= optind;
2105 c4296144 2019-05-09 stsp argv += optind;
2107 c4296144 2019-05-09 stsp if (argc == 1) {
2108 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2109 c4296144 2019-05-09 stsp if (path == NULL) {
2110 c4296144 2019-05-09 stsp error = got_error_from_errno();
2111 c4296144 2019-05-09 stsp goto done;
2113 c4296144 2019-05-09 stsp } else if (argc != 0)
2114 c4296144 2019-05-09 stsp usage_commit();
2117 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2118 c4296144 2019-05-09 stsp if (cwd == NULL) {
2119 c4296144 2019-05-09 stsp error = got_error_from_errno();
2120 c4296144 2019-05-09 stsp goto done;
2122 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2123 c4296144 2019-05-09 stsp if (error)
2124 c4296144 2019-05-09 stsp goto done;
2126 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2127 c4296144 2019-05-09 stsp if (error != NULL)
2128 c4296144 2019-05-09 stsp goto done;
2130 c4296144 2019-05-09 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2131 c4296144 2019-05-09 stsp got_worktree_get_root_path(worktree));
2132 c4296144 2019-05-09 stsp if (error)
2133 c4296144 2019-05-09 stsp goto done;
2135 c4296144 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, logmsg, repo);
2136 c4296144 2019-05-09 stsp if (error)
2137 c4296144 2019-05-09 stsp goto done;
2139 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2140 c4296144 2019-05-09 stsp if (error)
2141 c4296144 2019-05-09 stsp goto done;
2142 c4296144 2019-05-09 stsp printf("created commit %s\n", id_str);
2145 c4296144 2019-05-09 stsp got_repo_close(repo);
2146 c4296144 2019-05-09 stsp if (worktree)
2147 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2148 c4296144 2019-05-09 stsp free(path);
2149 c4296144 2019-05-09 stsp free(cwd);
2150 c4296144 2019-05-09 stsp free(id_str);
2151 c4296144 2019-05-09 stsp return error;
