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 5501382f 2019-05-10 stsp "write changes from work tree to repository" },
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 36a38700 2019-05-10 stsp err = got_ref_open(&head_ref, repo,
256 36a38700 2019-05-10 stsp got_worktree_get_head_ref_name(worktree));
258 36a38700 2019-05-10 stsp return err;
260 8069f636 2019-01-12 stsp /* TODO: Check the reflog. The head ref may have been rebased. */
261 8069f636 2019-01-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
265 8069f636 2019-01-12 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
269 8069f636 2019-01-12 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
272 8069f636 2019-01-12 stsp while (1) {
273 8069f636 2019-01-12 stsp struct got_object_id *id;
275 8069f636 2019-01-12 stsp if (sigint_received || sigpipe_received)
278 8069f636 2019-01-12 stsp err = got_commit_graph_iter_next(&id, graph);
280 8069f636 2019-01-12 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
281 8069f636 2019-01-12 stsp err = got_error(GOT_ERR_ANCESTRY);
284 8069f636 2019-01-12 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
286 8069f636 2019-01-12 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
292 8069f636 2019-01-12 stsp if (id == NULL)
294 8069f636 2019-01-12 stsp if (got_object_id_cmp(id, commit_id) == 0)
298 8069f636 2019-01-12 stsp if (head_ref)
299 8069f636 2019-01-12 stsp got_ref_close(head_ref);
301 8069f636 2019-01-12 stsp got_commit_graph_close(graph);
302 8069f636 2019-01-12 stsp return err;
306 4ed7e80c 2018-05-20 stsp static const struct got_error *
307 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
309 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
310 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
311 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
312 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
313 c09a553d 2018-03-12 stsp char *repo_path = NULL;
314 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
315 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
316 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
317 13bfb272 2019-05-10 jcs int ch, same_path_prefix, x;
319 8069f636 2019-01-12 stsp while ((ch = getopt(argc, argv, "c:p:")) != -1) {
320 0bb8a95e 2018-03-12 stsp switch (ch) {
322 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
323 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
324 8069f636 2019-01-12 stsp return got_error_from_errno();
327 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
330 2deda0b9 2019-03-07 stsp usage_checkout();
331 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
335 0bb8a95e 2018-03-12 stsp argc -= optind;
336 0bb8a95e 2018-03-12 stsp argv += optind;
338 6715a751 2018-03-16 stsp #ifndef PROFILE
339 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
340 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
341 c09a553d 2018-03-12 stsp err(1, "pledge");
343 0bb8a95e 2018-03-12 stsp if (argc == 1) {
344 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
345 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
346 76089277 2018-04-01 stsp if (repo_path == NULL)
347 76089277 2018-04-01 stsp return got_error_from_errno();
348 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
349 76089277 2018-04-01 stsp if (cwd == NULL) {
350 76089277 2018-04-01 stsp error = got_error_from_errno();
353 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
354 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
356 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
357 76089277 2018-04-01 stsp if (base == NULL) {
358 76089277 2018-04-01 stsp error = got_error_from_errno();
361 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
362 c09a553d 2018-03-12 stsp if (dotgit)
363 c09a553d 2018-03-12 stsp *dotgit = '\0';
364 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
365 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
370 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
371 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
372 76089277 2018-04-01 stsp if (repo_path == NULL) {
373 76089277 2018-04-01 stsp error = got_error_from_errno();
376 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
377 76089277 2018-04-01 stsp if (worktree_path == NULL) {
378 76089277 2018-04-01 stsp error = got_error_from_errno();
382 c09a553d 2018-03-12 stsp usage_checkout();
384 13bfb272 2019-05-10 jcs if (worktree_path[x = strlen(worktree_path) - 1] == '/')
385 13bfb272 2019-05-10 jcs worktree_path[x] = '\0';
387 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
388 c09a553d 2018-03-12 stsp if (error != NULL)
391 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
395 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
396 c09a553d 2018-03-12 stsp if (error != NULL)
399 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
400 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
403 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
404 c09a553d 2018-03-12 stsp if (error != NULL)
407 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
408 e5dc7198 2018-12-29 stsp path_prefix);
409 e5dc7198 2018-12-29 stsp if (error != NULL)
411 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
412 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
416 8069f636 2019-01-12 stsp if (commit_id_str) {
417 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
418 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
419 8069f636 2019-01-12 stsp commit_id_str);
420 8069f636 2019-01-12 stsp if (error != NULL)
422 8069f636 2019-01-12 stsp error = check_ancestry(worktree, commit_id, repo);
423 8069f636 2019-01-12 stsp if (error != NULL) {
424 8069f636 2019-01-12 stsp free(commit_id);
427 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
428 8069f636 2019-01-12 stsp commit_id);
429 8069f636 2019-01-12 stsp free(commit_id);
434 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
435 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
436 c09a553d 2018-03-12 stsp if (error != NULL)
439 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
442 8069f636 2019-01-12 stsp free(commit_id_str);
443 76089277 2018-04-01 stsp free(repo_path);
444 507dc3bb 2018-12-29 stsp free(worktree_path);
445 507dc3bb 2018-12-29 stsp return error;
448 507dc3bb 2018-12-29 stsp __dead static void
449 507dc3bb 2018-12-29 stsp usage_update(void)
451 c4cdcb68 2019-04-03 stsp fprintf(stderr, "usage: %s update [-c commit] [path]\n",
452 507dc3bb 2018-12-29 stsp getprogname());
456 507dc3bb 2018-12-29 stsp static void
457 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
459 784955db 2019-01-12 stsp int *did_something = arg;
461 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
464 1545c615 2019-02-10 stsp *did_something = 1;
465 507dc3bb 2018-12-29 stsp while (path[0] == '/')
467 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
470 be7061eb 2018-12-30 stsp static const struct got_error *
471 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
473 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
474 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
475 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
476 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
477 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
478 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
479 784955db 2019-01-12 stsp int ch, did_something = 0;
481 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
482 507dc3bb 2018-12-29 stsp switch (ch) {
484 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
485 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
486 9c4b8182 2019-01-02 stsp return got_error_from_errno();
489 2deda0b9 2019-03-07 stsp usage_update();
490 507dc3bb 2018-12-29 stsp /* NOTREACHED */
494 507dc3bb 2018-12-29 stsp argc -= optind;
495 507dc3bb 2018-12-29 stsp argv += optind;
497 507dc3bb 2018-12-29 stsp #ifndef PROFILE
498 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
499 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
500 507dc3bb 2018-12-29 stsp err(1, "pledge");
502 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
503 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
504 c4cdcb68 2019-04-03 stsp error = got_error_from_errno();
507 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
511 507dc3bb 2018-12-29 stsp if (argc == 0) {
512 c4cdcb68 2019-04-03 stsp path = strdup("");
513 c4cdcb68 2019-04-03 stsp if (path == NULL) {
514 507dc3bb 2018-12-29 stsp error = got_error_from_errno();
517 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
518 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
522 507dc3bb 2018-12-29 stsp usage_update();
524 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
525 507dc3bb 2018-12-29 stsp if (error != NULL)
528 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
529 8c02d095 2019-02-05 stsp got_worktree_get_root_path(worktree));
533 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
534 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
535 507dc3bb 2018-12-29 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
536 507dc3bb 2018-12-29 stsp if (error != NULL)
538 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
539 9c4b8182 2019-01-02 stsp if (error != NULL)
541 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
542 507dc3bb 2018-12-29 stsp if (error != NULL)
545 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
546 507dc3bb 2018-12-29 stsp commit_id_str);
547 507dc3bb 2018-12-29 stsp if (error != NULL)
551 be7061eb 2018-12-30 stsp error = check_ancestry(worktree, commit_id, repo);
552 be7061eb 2018-12-30 stsp if (error != NULL)
555 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
556 507dc3bb 2018-12-29 stsp commit_id) != 0) {
557 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
558 507dc3bb 2018-12-29 stsp commit_id);
563 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
564 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
565 507dc3bb 2018-12-29 stsp if (error != NULL)
568 784955db 2019-01-12 stsp if (did_something)
569 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
571 784955db 2019-01-12 stsp printf("Already up-to-date\n");
573 c09a553d 2018-03-12 stsp free(worktree_path);
574 c4cdcb68 2019-04-03 stsp free(path);
575 507dc3bb 2018-12-29 stsp free(commit_id);
576 9c4b8182 2019-01-02 stsp free(commit_id_str);
577 c09a553d 2018-03-12 stsp return error;
580 f42b1b34 2018-03-12 stsp static const struct got_error *
581 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
582 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
584 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
585 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
586 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
587 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
589 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
590 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
592 79109fed 2018-03-27 stsp return err;
594 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
595 79f35eb3 2018-06-11 stsp if (qid != NULL) {
596 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
598 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
600 79109fed 2018-03-27 stsp return err;
602 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
603 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
604 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
606 0f2b3dca 2018-12-22 stsp return err;
608 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
610 79109fed 2018-03-27 stsp return err;
613 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
617 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
618 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
621 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
622 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
623 0f2b3dca 2018-12-22 stsp free(id_str1);
624 0f2b3dca 2018-12-22 stsp free(id_str2);
625 79109fed 2018-03-27 stsp return err;
628 4bb494d5 2018-06-16 stsp static char *
629 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
631 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
632 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
638 79109fed 2018-03-27 stsp static const struct got_error *
639 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
640 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
641 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
643 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
644 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
645 6c281f94 2018-06-11 stsp char datebuf[26];
646 45d799e2 2018-12-23 stsp time_t committer_time;
647 45d799e2 2018-12-23 stsp const char *author, *committer;
648 199a4027 2019-02-02 stsp char *refs_str = NULL;
649 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
651 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
653 199a4027 2019-02-02 stsp const char *name;
654 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
656 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
657 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
659 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
661 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
663 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
665 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
667 199a4027 2019-02-02 stsp s = refs_str;
668 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
669 199a4027 2019-02-02 stsp name) == -1) {
670 199a4027 2019-02-02 stsp err = got_error_from_errno();
676 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
678 8bf5b3c9 2018-03-17 stsp return err;
680 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
681 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
682 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
683 832c249c 2018-06-10 stsp free(id_str);
684 d3d493d7 2019-02-21 stsp id_str = NULL;
685 d3d493d7 2019-02-21 stsp free(refs_str);
686 d3d493d7 2019-02-21 stsp refs_str = NULL;
687 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
688 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
689 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
690 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
691 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
692 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
693 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
694 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
695 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
696 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
697 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
699 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
700 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
701 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
703 a0603db2 2018-06-10 stsp return err;
704 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
705 a0603db2 2018-06-10 stsp free(id_str);
709 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
710 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
711 832c249c 2018-06-10 stsp return got_error_from_errno();
713 621015ac 2018-07-23 stsp logmsg = logmsg0;
715 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
717 832c249c 2018-06-10 stsp printf(" %s\n", line);
718 832c249c 2018-06-10 stsp } while (line);
719 621015ac 2018-07-23 stsp free(logmsg0);
721 971751ac 2018-03-27 stsp if (show_patch) {
722 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
723 971751ac 2018-03-27 stsp if (err == 0)
724 971751ac 2018-03-27 stsp printf("\n");
727 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
728 cbe7f848 2019-02-11 stsp err = got_error_from_errno();
729 07862c20 2018-09-15 stsp return err;
732 f42b1b34 2018-03-12 stsp static const struct got_error *
733 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
734 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
735 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
737 f42b1b34 2018-03-12 stsp const struct got_error *err;
738 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
740 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
741 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
743 f42b1b34 2018-03-12 stsp return err;
744 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
747 31cedeaf 2018-09-15 stsp while (1) {
748 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
749 372ccdbb 2018-06-10 stsp struct got_object_id *id;
751 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
754 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
756 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
757 9ba79e04 2018-06-11 stsp err = NULL;
760 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
762 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
768 b43fbaa0 2018-06-11 stsp if (id == NULL)
771 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
774 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
776 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
777 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
781 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
782 f42b1b34 2018-03-12 stsp return err;
785 4ed7e80c 2018-05-20 stsp __dead static void
786 6f3d1eb0 2018-03-12 stsp usage_log(void)
788 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
789 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
793 4ed7e80c 2018-05-20 stsp static const struct got_error *
794 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
796 f42b1b34 2018-03-12 stsp const struct got_error *error;
797 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
798 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
799 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
800 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
801 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
802 d142fc45 2018-04-01 stsp char *start_commit = NULL;
803 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
804 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
805 64a96a6d 2018-04-01 stsp const char *errstr;
806 199a4027 2019-02-02 stsp struct got_reflist_head refs;
808 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
810 6715a751 2018-03-16 stsp #ifndef PROFILE
811 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
814 f42b1b34 2018-03-12 stsp err(1, "pledge");
817 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
818 79109fed 2018-03-27 stsp switch (ch) {
820 79109fed 2018-03-27 stsp show_patch = 1;
823 d142fc45 2018-04-01 stsp start_commit = optarg;
826 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
828 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
829 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
832 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
833 64a96a6d 2018-04-01 stsp if (errstr != NULL)
834 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
837 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
840 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
841 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
842 04ca23f4 2018-07-16 stsp err(1, "-r option");
845 2deda0b9 2019-03-07 stsp usage_log();
846 79109fed 2018-03-27 stsp /* NOTREACHED */
850 79109fed 2018-03-27 stsp argc -= optind;
851 79109fed 2018-03-27 stsp argv += optind;
853 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
854 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
855 04ca23f4 2018-07-16 stsp error = got_error_from_errno();
859 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
860 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
862 cffc0aa4 2019-02-05 stsp error = NULL;
864 e7301579 2019-03-18 stsp if (argc == 0) {
865 cbd1af7a 2019-03-18 stsp path = strdup("");
866 e7301579 2019-03-18 stsp if (path == NULL) {
867 e7301579 2019-03-18 stsp error = got_error_from_errno();
870 e7301579 2019-03-18 stsp } else if (argc == 1) {
871 e7301579 2019-03-18 stsp if (worktree) {
872 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
877 e7301579 2019-03-18 stsp path = strdup(argv[0]);
878 e7301579 2019-03-18 stsp if (path == NULL) {
879 e7301579 2019-03-18 stsp error = got_error_from_errno();
884 cbd1af7a 2019-03-18 stsp usage_log();
886 cffc0aa4 2019-02-05 stsp repo_path = worktree ?
887 cffc0aa4 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
888 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
889 cffc0aa4 2019-02-05 stsp error = got_error_from_errno();
893 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
894 d7d4f210 2018-03-12 stsp if (error != NULL)
897 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
898 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
902 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
903 3235492e 2018-04-01 stsp struct got_reference *head_ref;
904 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
905 3235492e 2018-04-01 stsp if (error != NULL)
906 3235492e 2018-04-01 stsp return error;
907 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
908 3235492e 2018-04-01 stsp got_ref_close(head_ref);
909 3235492e 2018-04-01 stsp if (error != NULL)
910 3235492e 2018-04-01 stsp return error;
911 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
913 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
914 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
915 3235492e 2018-04-01 stsp if (error == NULL) {
916 1caad61b 2019-02-01 stsp int obj_type;
917 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
918 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
919 d1f2edc9 2018-06-13 stsp if (error != NULL)
921 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
922 1caad61b 2019-02-01 stsp if (error != NULL)
924 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
925 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
926 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
927 1caad61b 2019-02-01 stsp if (error != NULL)
929 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
930 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
931 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
932 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
936 1caad61b 2019-02-01 stsp id = got_object_id_dup(
937 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
938 1caad61b 2019-02-01 stsp if (id == NULL)
939 1caad61b 2019-02-01 stsp error = got_error_from_errno();
940 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
943 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
944 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
947 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
948 d1f2edc9 2018-06-13 stsp if (error != NULL)
951 15a94983 2018-12-23 stsp if (commit == NULL) {
952 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
953 d1f2edc9 2018-06-13 stsp start_commit);
954 d1f2edc9 2018-06-13 stsp if (error != NULL)
955 d1f2edc9 2018-06-13 stsp return error;
958 d7d4f210 2018-03-12 stsp if (error != NULL)
961 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
962 04ca23f4 2018-07-16 stsp if (error != NULL)
964 04ca23f4 2018-07-16 stsp if (in_repo_path) {
965 04ca23f4 2018-07-16 stsp free(path);
966 04ca23f4 2018-07-16 stsp path = in_repo_path;
969 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
973 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
974 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
976 04ca23f4 2018-07-16 stsp free(path);
977 04ca23f4 2018-07-16 stsp free(repo_path);
980 cffc0aa4 2019-02-05 stsp if (worktree)
981 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
982 ad242220 2018-09-08 stsp if (repo) {
983 ad242220 2018-09-08 stsp const struct got_error *repo_error;
984 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
985 ad242220 2018-09-08 stsp if (error == NULL)
986 ad242220 2018-09-08 stsp error = repo_error;
988 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
989 8bf5b3c9 2018-03-17 stsp return error;
992 4ed7e80c 2018-05-20 stsp __dead static void
993 3f8b7d6a 2018-04-01 stsp usage_diff(void)
995 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
996 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1000 b72f483a 2019-02-05 stsp struct print_diff_arg {
1001 b72f483a 2019-02-05 stsp struct got_repository *repo;
1002 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1003 b72f483a 2019-02-05 stsp int diff_context;
1004 3fc0c068 2019-02-10 stsp const char *id_str;
1005 3fc0c068 2019-02-10 stsp int header_shown;
1008 4ed7e80c 2018-05-20 stsp static const struct got_error *
1009 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1010 b72f483a 2019-02-05 stsp struct got_object_id *id)
1012 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1013 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1014 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1015 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1016 b72f483a 2019-02-05 stsp char *abspath = NULL;
1017 b72f483a 2019-02-05 stsp struct stat sb;
1019 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1020 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1021 b72f483a 2019-02-05 stsp return NULL;
1023 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1024 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1025 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1026 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1029 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1030 d00136be 2019-03-26 stsp err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1032 d00136be 2019-03-26 stsp goto done;
1036 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1037 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1038 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1039 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1040 2ec1f75b 2019-03-26 stsp goto done;
1043 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1044 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1045 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1046 2ec1f75b 2019-03-26 stsp goto done;
1048 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1049 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1050 2ec1f75b 2019-03-26 stsp goto done;
1053 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1055 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1058 b72f483a 2019-02-05 stsp if (blob1)
1059 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1060 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1061 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
1062 b72f483a 2019-02-05 stsp free(abspath);
1063 927df6b7 2019-02-10 stsp return err;
1066 927df6b7 2019-02-10 stsp static const struct got_error *
1067 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1069 b00d56cd 2018-04-01 stsp const struct got_error *error;
1070 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1071 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1072 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1073 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1074 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1075 15a94983 2018-12-23 stsp int type1, type2;
1076 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1077 c0cc5c62 2018-10-18 stsp const char *errstr;
1078 927df6b7 2019-02-10 stsp char *path = NULL;
1080 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1081 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1082 25eccc22 2019-01-04 stsp NULL) == -1)
1083 b00d56cd 2018-04-01 stsp err(1, "pledge");
1086 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1087 b00d56cd 2018-04-01 stsp switch (ch) {
1089 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1090 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1091 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1094 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1095 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1096 b72f483a 2019-02-05 stsp err(1, "-r option");
1099 2deda0b9 2019-03-07 stsp usage_diff();
1100 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1104 b00d56cd 2018-04-01 stsp argc -= optind;
1105 b00d56cd 2018-04-01 stsp argv += optind;
1107 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1108 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1109 b72f483a 2019-02-05 stsp error = got_error_from_errno();
1110 b72f483a 2019-02-05 stsp goto done;
1112 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1113 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1114 927df6b7 2019-02-10 stsp goto done;
1115 927df6b7 2019-02-10 stsp if (argc <= 1) {
1116 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1117 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1118 927df6b7 2019-02-10 stsp goto done;
1120 b72f483a 2019-02-05 stsp if (repo_path)
1122 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1123 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1124 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1125 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1126 927df6b7 2019-02-10 stsp goto done;
1128 927df6b7 2019-02-10 stsp if (argc == 1) {
1129 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1131 927df6b7 2019-02-10 stsp if (error)
1132 927df6b7 2019-02-10 stsp goto done;
1134 927df6b7 2019-02-10 stsp path = strdup("");
1135 927df6b7 2019-02-10 stsp if (path == NULL) {
1136 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1137 927df6b7 2019-02-10 stsp goto done;
1140 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1141 15a94983 2018-12-23 stsp id_str1 = argv[0];
1142 15a94983 2018-12-23 stsp id_str2 = argv[1];
1144 b00d56cd 2018-04-01 stsp usage_diff();
1146 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1147 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1148 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1149 b72f483a 2019-02-05 stsp return got_error_from_errno();
1152 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1153 76089277 2018-04-01 stsp free(repo_path);
1154 b00d56cd 2018-04-01 stsp if (error != NULL)
1155 b00d56cd 2018-04-01 stsp goto done;
1157 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1158 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1159 c02c541e 2019-03-29 stsp if (error)
1160 c02c541e 2019-03-29 stsp goto done;
1162 b72f483a 2019-02-05 stsp if (worktree) {
1163 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1164 b72f483a 2019-02-05 stsp char *id_str;
1165 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1166 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1167 b72f483a 2019-02-05 stsp if (error)
1168 b72f483a 2019-02-05 stsp goto done;
1169 b72f483a 2019-02-05 stsp arg.repo = repo;
1170 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1171 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1172 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1173 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1175 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1176 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1177 b72f483a 2019-02-05 stsp free(id_str);
1178 b72f483a 2019-02-05 stsp goto done;
1181 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
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_resolve_id_str(&id2, repo, id_str2);
1186 6402fb3c 2018-09-15 stsp if (error)
1187 b00d56cd 2018-04-01 stsp goto done;
1189 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1190 15a94983 2018-12-23 stsp if (error)
1191 15a94983 2018-12-23 stsp goto done;
1193 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1194 15a94983 2018-12-23 stsp if (error)
1195 15a94983 2018-12-23 stsp goto done;
1197 15a94983 2018-12-23 stsp if (type1 != type2) {
1198 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1199 b00d56cd 2018-04-01 stsp goto done;
1202 15a94983 2018-12-23 stsp switch (type1) {
1203 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1204 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1205 54156555 2018-12-24 stsp diff_context, repo, stdout);
1207 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1208 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1209 54156555 2018-12-24 stsp diff_context, repo, stdout);
1211 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1212 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1214 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1215 c0cc5c62 2018-10-18 stsp repo, stdout);
1218 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1222 15a94983 2018-12-23 stsp free(id1);
1223 15a94983 2018-12-23 stsp free(id2);
1224 927df6b7 2019-02-10 stsp free(path);
1225 b72f483a 2019-02-05 stsp if (worktree)
1226 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1227 ad242220 2018-09-08 stsp if (repo) {
1228 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1229 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1230 ad242220 2018-09-08 stsp if (error == NULL)
1231 ad242220 2018-09-08 stsp error = repo_error;
1233 b00d56cd 2018-04-01 stsp return error;
1236 404c43c4 2018-06-21 stsp __dead static void
1237 404c43c4 2018-06-21 stsp usage_blame(void)
1239 9270e621 2019-02-05 stsp fprintf(stderr,
1240 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1241 404c43c4 2018-06-21 stsp getprogname());
1245 404c43c4 2018-06-21 stsp static const struct got_error *
1246 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1248 404c43c4 2018-06-21 stsp const struct got_error *error;
1249 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1250 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1251 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1252 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1253 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1256 404c43c4 2018-06-21 stsp #ifndef PROFILE
1257 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1258 36e2fb66 2019-01-04 stsp NULL) == -1)
1259 404c43c4 2018-06-21 stsp err(1, "pledge");
1262 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1263 404c43c4 2018-06-21 stsp switch (ch) {
1265 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1268 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1269 66bea077 2018-08-02 stsp if (repo_path == NULL)
1270 66bea077 2018-08-02 stsp err(1, "-r option");
1273 2deda0b9 2019-03-07 stsp usage_blame();
1274 404c43c4 2018-06-21 stsp /* NOTREACHED */
1278 404c43c4 2018-06-21 stsp argc -= optind;
1279 404c43c4 2018-06-21 stsp argv += optind;
1281 a39318fd 2018-08-02 stsp if (argc == 1)
1282 404c43c4 2018-06-21 stsp path = argv[0];
1284 404c43c4 2018-06-21 stsp usage_blame();
1286 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1287 66bea077 2018-08-02 stsp if (cwd == NULL) {
1288 66bea077 2018-08-02 stsp error = got_error_from_errno();
1289 66bea077 2018-08-02 stsp goto done;
1291 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1292 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1293 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1294 66bea077 2018-08-02 stsp goto done;
1296 0c06baac 2019-02-05 stsp error = NULL;
1297 0c06baac 2019-02-05 stsp if (worktree) {
1298 0c06baac 2019-02-05 stsp repo_path =
1299 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1300 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1301 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1302 0c06baac 2019-02-05 stsp if (error)
1303 0c06baac 2019-02-05 stsp goto done;
1305 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1306 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1307 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1308 0c06baac 2019-02-05 stsp goto done;
1313 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1314 c02c541e 2019-03-29 stsp if (error != NULL)
1315 36e2fb66 2019-01-04 stsp goto done;
1317 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
1318 c02c541e 2019-03-29 stsp if (error)
1319 404c43c4 2018-06-21 stsp goto done;
1321 0c06baac 2019-02-05 stsp if (worktree) {
1322 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1323 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1324 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1325 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1326 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1327 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1328 6efaaa2d 2019-02-05 stsp path) == -1) {
1329 0c06baac 2019-02-05 stsp error = got_error_from_errno();
1330 0c06baac 2019-02-05 stsp goto done;
1332 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1335 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1337 0c06baac 2019-02-05 stsp if (error)
1338 66bea077 2018-08-02 stsp goto done;
1340 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1341 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1342 404c43c4 2018-06-21 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1343 404c43c4 2018-06-21 stsp if (error != NULL)
1344 66bea077 2018-08-02 stsp goto done;
1345 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1346 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1347 404c43c4 2018-06-21 stsp if (error != NULL)
1348 66bea077 2018-08-02 stsp goto done;
1350 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1351 15a94983 2018-12-23 stsp commit_id_str);
1352 404c43c4 2018-06-21 stsp if (error != NULL)
1353 66bea077 2018-08-02 stsp goto done;
1356 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1358 66bea077 2018-08-02 stsp free(in_repo_path);
1359 66bea077 2018-08-02 stsp free(repo_path);
1360 66bea077 2018-08-02 stsp free(cwd);
1361 404c43c4 2018-06-21 stsp free(commit_id);
1362 0c06baac 2019-02-05 stsp if (worktree)
1363 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1364 ad242220 2018-09-08 stsp if (repo) {
1365 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1366 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1367 ad242220 2018-09-08 stsp if (error == NULL)
1368 ad242220 2018-09-08 stsp error = repo_error;
1370 404c43c4 2018-06-21 stsp return error;
1373 5de5890b 2018-10-18 stsp __dead static void
1374 5de5890b 2018-10-18 stsp usage_tree(void)
1376 c1669e2e 2019-01-09 stsp fprintf(stderr,
1377 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1378 5de5890b 2018-10-18 stsp getprogname());
1382 c1669e2e 2019-01-09 stsp static void
1383 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1384 c1669e2e 2019-01-09 stsp const char *root_path)
1386 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1388 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1389 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1392 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1393 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1394 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1397 5de5890b 2018-10-18 stsp static const struct got_error *
1398 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1399 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1400 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1402 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1403 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1404 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1405 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1406 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1408 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1410 5de5890b 2018-10-18 stsp goto done;
1412 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1414 5de5890b 2018-10-18 stsp goto done;
1415 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1416 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1417 5de5890b 2018-10-18 stsp while (te) {
1418 5de5890b 2018-10-18 stsp char *id = NULL;
1420 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1423 5de5890b 2018-10-18 stsp if (show_ids) {
1424 5de5890b 2018-10-18 stsp char *id_str;
1425 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1427 5de5890b 2018-10-18 stsp goto done;
1428 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1429 5de5890b 2018-10-18 stsp err = got_error_from_errno();
1430 5de5890b 2018-10-18 stsp free(id_str);
1431 5de5890b 2018-10-18 stsp goto done;
1433 5de5890b 2018-10-18 stsp free(id_str);
1435 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1438 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1439 c1669e2e 2019-01-09 stsp char *child_path;
1440 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1441 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1442 c1669e2e 2019-01-09 stsp te->name) == -1) {
1443 c1669e2e 2019-01-09 stsp err = got_error_from_errno();
1444 c1669e2e 2019-01-09 stsp goto done;
1446 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1447 c1669e2e 2019-01-09 stsp root_path, repo);
1448 c1669e2e 2019-01-09 stsp free(child_path);
1450 c1669e2e 2019-01-09 stsp goto done;
1453 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1457 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1458 5de5890b 2018-10-18 stsp free(tree_id);
1459 5de5890b 2018-10-18 stsp return err;
1462 5de5890b 2018-10-18 stsp static const struct got_error *
1463 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1465 5de5890b 2018-10-18 stsp const struct got_error *error;
1466 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1467 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1468 7a2c19d6 2019-02-05 stsp const char *path;
1469 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1470 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1471 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1472 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1475 5de5890b 2018-10-18 stsp #ifndef PROFILE
1476 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1477 0f8d269b 2019-01-04 stsp NULL) == -1)
1478 5de5890b 2018-10-18 stsp err(1, "pledge");
1481 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1482 5de5890b 2018-10-18 stsp switch (ch) {
1484 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1487 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1488 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1489 5de5890b 2018-10-18 stsp err(1, "-r option");
1492 5de5890b 2018-10-18 stsp show_ids = 1;
1495 c1669e2e 2019-01-09 stsp recurse = 1;
1498 2deda0b9 2019-03-07 stsp usage_tree();
1499 5de5890b 2018-10-18 stsp /* NOTREACHED */
1503 5de5890b 2018-10-18 stsp argc -= optind;
1504 5de5890b 2018-10-18 stsp argv += optind;
1506 5de5890b 2018-10-18 stsp if (argc == 1)
1507 5de5890b 2018-10-18 stsp path = argv[0];
1508 5de5890b 2018-10-18 stsp else if (argc > 1)
1509 5de5890b 2018-10-18 stsp usage_tree();
1511 7a2c19d6 2019-02-05 stsp path = NULL;
1513 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1514 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1515 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1516 9bf7a39b 2019-02-05 stsp goto done;
1518 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1519 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1520 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1521 7a2c19d6 2019-02-05 stsp goto done;
1523 7a2c19d6 2019-02-05 stsp error = NULL;
1524 7a2c19d6 2019-02-05 stsp if (worktree) {
1525 7a2c19d6 2019-02-05 stsp repo_path =
1526 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1527 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1528 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1529 7a2c19d6 2019-02-05 stsp if (error)
1530 7a2c19d6 2019-02-05 stsp goto done;
1532 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1533 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1534 7a2c19d6 2019-02-05 stsp error = got_error_from_errno();
1535 7a2c19d6 2019-02-05 stsp goto done;
1540 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1541 5de5890b 2018-10-18 stsp if (error != NULL)
1542 c02c541e 2019-03-29 stsp goto done;
1544 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
1545 c02c541e 2019-03-29 stsp if (error)
1546 5de5890b 2018-10-18 stsp goto done;
1548 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1549 9bf7a39b 2019-02-05 stsp if (worktree) {
1550 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1551 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1552 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1553 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1554 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1555 9bf7a39b 2019-02-05 stsp error = got_error_from_errno();
1556 9bf7a39b 2019-02-05 stsp goto done;
1558 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1560 9bf7a39b 2019-02-05 stsp if (error)
1561 9bf7a39b 2019-02-05 stsp goto done;
1563 9bf7a39b 2019-02-05 stsp path = "/";
1565 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1566 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1567 9bf7a39b 2019-02-05 stsp if (error != NULL)
1568 9bf7a39b 2019-02-05 stsp goto done;
1571 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1572 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1573 5de5890b 2018-10-18 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1574 5de5890b 2018-10-18 stsp if (error != NULL)
1575 5de5890b 2018-10-18 stsp goto done;
1576 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1577 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1578 5de5890b 2018-10-18 stsp if (error != NULL)
1579 5de5890b 2018-10-18 stsp goto done;
1581 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1582 15a94983 2018-12-23 stsp commit_id_str);
1583 5de5890b 2018-10-18 stsp if (error != NULL)
1584 5de5890b 2018-10-18 stsp goto done;
1587 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1588 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1590 5de5890b 2018-10-18 stsp free(in_repo_path);
1591 5de5890b 2018-10-18 stsp free(repo_path);
1592 5de5890b 2018-10-18 stsp free(cwd);
1593 5de5890b 2018-10-18 stsp free(commit_id);
1594 7a2c19d6 2019-02-05 stsp if (worktree)
1595 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1596 5de5890b 2018-10-18 stsp if (repo) {
1597 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1598 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1599 5de5890b 2018-10-18 stsp if (error == NULL)
1600 5de5890b 2018-10-18 stsp error = repo_error;
1602 5de5890b 2018-10-18 stsp return error;
1605 6bad629b 2019-02-04 stsp __dead static void
1606 6bad629b 2019-02-04 stsp usage_status(void)
1608 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1612 b72f483a 2019-02-05 stsp static const struct got_error *
1613 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1614 b72f483a 2019-02-05 stsp struct got_object_id *id)
1616 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1617 b72f483a 2019-02-05 stsp return NULL;
1620 6bad629b 2019-02-04 stsp static const struct got_error *
1621 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1623 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1624 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1625 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1626 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1629 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1630 6bad629b 2019-02-04 stsp switch (ch) {
1632 2deda0b9 2019-03-07 stsp usage_status();
1633 6bad629b 2019-02-04 stsp /* NOTREACHED */
1637 6bad629b 2019-02-04 stsp argc -= optind;
1638 6bad629b 2019-02-04 stsp argv += optind;
1640 6bad629b 2019-02-04 stsp #ifndef PROFILE
1641 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1642 6bad629b 2019-02-04 stsp NULL) == -1)
1643 6bad629b 2019-02-04 stsp err(1, "pledge");
1645 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1646 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1647 927df6b7 2019-02-10 stsp error = got_error_from_errno();
1648 927df6b7 2019-02-10 stsp goto done;
1651 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1652 927df6b7 2019-02-10 stsp if (error != NULL)
1653 927df6b7 2019-02-10 stsp goto done;
1655 6bad629b 2019-02-04 stsp if (argc == 0) {
1656 927df6b7 2019-02-10 stsp path = strdup("");
1657 927df6b7 2019-02-10 stsp if (path == NULL) {
1658 6bad629b 2019-02-04 stsp error = got_error_from_errno();
1659 6bad629b 2019-02-04 stsp goto done;
1661 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1662 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1663 927df6b7 2019-02-10 stsp if (error)
1664 6bad629b 2019-02-04 stsp goto done;
1666 6bad629b 2019-02-04 stsp usage_status();
1668 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1669 6bad629b 2019-02-04 stsp if (error != NULL)
1670 6bad629b 2019-02-04 stsp goto done;
1672 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1673 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(worktree));
1674 6bad629b 2019-02-04 stsp if (error)
1675 6bad629b 2019-02-04 stsp goto done;
1677 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1678 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1680 927df6b7 2019-02-10 stsp free(cwd);
1681 927df6b7 2019-02-10 stsp free(path);
1682 d0eebce4 2019-03-11 stsp return error;
1685 d0eebce4 2019-03-11 stsp __dead static void
1686 d0eebce4 2019-03-11 stsp usage_ref(void)
1688 d0eebce4 2019-03-11 stsp fprintf(stderr,
1689 d0eebce4 2019-03-11 stsp "usage: %s ref [-r repository] -l | -d name | name object\n",
1690 d0eebce4 2019-03-11 stsp getprogname());
1694 d0eebce4 2019-03-11 stsp static const struct got_error *
1695 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1697 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1698 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1699 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1701 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1702 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1704 d0eebce4 2019-03-11 stsp return err;
1706 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1707 d0eebce4 2019-03-11 stsp char *refstr;
1708 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1709 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1710 d0eebce4 2019-03-11 stsp return got_error_from_errno();
1711 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1712 d0eebce4 2019-03-11 stsp free(refstr);
1715 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1716 d0eebce4 2019-03-11 stsp return NULL;
1719 d0eebce4 2019-03-11 stsp static const struct got_error *
1720 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1722 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1723 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1725 d0eebce4 2019-03-11 stsp err = got_ref_open(&ref, repo, refname);
1727 d0eebce4 2019-03-11 stsp return err;
1729 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1730 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1731 d0eebce4 2019-03-11 stsp return err;
1734 d0eebce4 2019-03-11 stsp static const struct got_error *
1735 d0eebce4 2019-03-11 stsp add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1737 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1738 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1739 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1741 d0eebce4 2019-03-11 stsp err = got_object_resolve_id_str(&id, repo, id_str);
1743 d0eebce4 2019-03-11 stsp return err;
1745 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1747 d0eebce4 2019-03-11 stsp goto done;
1749 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1752 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1754 d0eebce4 2019-03-11 stsp return err;
1757 d0eebce4 2019-03-11 stsp static const struct got_error *
1758 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1760 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1761 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1762 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1763 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1764 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1765 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1767 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1768 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1769 d0eebce4 2019-03-11 stsp switch (ch) {
1771 d0eebce4 2019-03-11 stsp delref = optarg;
1774 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1775 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1776 d0eebce4 2019-03-11 stsp err(1, "-r option");
1779 d0eebce4 2019-03-11 stsp do_list = 1;
1782 d0eebce4 2019-03-11 stsp usage_ref();
1783 d0eebce4 2019-03-11 stsp /* NOTREACHED */
1787 d0eebce4 2019-03-11 stsp if (do_list && delref)
1788 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
1790 d0eebce4 2019-03-11 stsp argc -= optind;
1791 d0eebce4 2019-03-11 stsp argv += optind;
1793 d0eebce4 2019-03-11 stsp if (do_list || delref) {
1794 d0eebce4 2019-03-11 stsp if (argc > 0)
1795 d0eebce4 2019-03-11 stsp usage_ref();
1796 d0eebce4 2019-03-11 stsp } else if (argc != 2)
1797 d0eebce4 2019-03-11 stsp usage_ref();
1799 d0eebce4 2019-03-11 stsp #ifndef PROFILE
1800 e0b57350 2019-03-12 stsp if (do_list) {
1801 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1802 e0b57350 2019-03-12 stsp NULL) == -1)
1803 e0b57350 2019-03-12 stsp err(1, "pledge");
1805 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1806 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
1807 e0b57350 2019-03-12 stsp err(1, "pledge");
1810 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
1811 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
1812 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1813 d0eebce4 2019-03-11 stsp goto done;
1816 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1817 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
1818 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1819 d0eebce4 2019-03-11 stsp goto done;
1821 d0eebce4 2019-03-11 stsp error = NULL;
1822 d0eebce4 2019-03-11 stsp if (worktree) {
1823 d0eebce4 2019-03-11 stsp repo_path =
1824 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
1825 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1826 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1827 d0eebce4 2019-03-11 stsp if (error)
1828 d0eebce4 2019-03-11 stsp goto done;
1830 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
1831 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1832 d0eebce4 2019-03-11 stsp error = got_error_from_errno();
1833 d0eebce4 2019-03-11 stsp goto done;
1838 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
1839 d0eebce4 2019-03-11 stsp if (error != NULL)
1840 d0eebce4 2019-03-11 stsp goto done;
1842 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
1843 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1844 c02c541e 2019-03-29 stsp if (error)
1845 c02c541e 2019-03-29 stsp goto done;
1847 d0eebce4 2019-03-11 stsp if (do_list)
1848 d0eebce4 2019-03-11 stsp error = list_refs(repo);
1849 d0eebce4 2019-03-11 stsp else if (delref)
1850 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
1852 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
1855 d0eebce4 2019-03-11 stsp got_repo_close(repo);
1856 d0eebce4 2019-03-11 stsp if (worktree)
1857 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
1858 d0eebce4 2019-03-11 stsp free(cwd);
1859 d0eebce4 2019-03-11 stsp free(repo_path);
1860 d00136be 2019-03-26 stsp return error;
1863 d00136be 2019-03-26 stsp __dead static void
1864 d00136be 2019-03-26 stsp usage_add(void)
1866 d00136be 2019-03-26 stsp fprintf(stderr, "usage: %s add file-path\n", getprogname());
1870 d00136be 2019-03-26 stsp static const struct got_error *
1871 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
1873 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
1874 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
1875 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
1876 d00136be 2019-03-26 stsp char *cwd = NULL, *path = NULL, *relpath = NULL;
1879 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1880 d00136be 2019-03-26 stsp switch (ch) {
1882 d00136be 2019-03-26 stsp usage_add();
1883 d00136be 2019-03-26 stsp /* NOTREACHED */
1887 d00136be 2019-03-26 stsp argc -= optind;
1888 d00136be 2019-03-26 stsp argv += optind;
1890 d00136be 2019-03-26 stsp if (argc != 1)
1891 d00136be 2019-03-26 stsp usage_add();
1893 d00136be 2019-03-26 stsp path = realpath(argv[0], NULL);
1894 d00136be 2019-03-26 stsp if (path == NULL) {
1895 d00136be 2019-03-26 stsp error = got_error_from_errno();
1896 d00136be 2019-03-26 stsp goto done;
1899 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
1900 d00136be 2019-03-26 stsp if (cwd == NULL) {
1901 d00136be 2019-03-26 stsp error = got_error_from_errno();
1902 d00136be 2019-03-26 stsp goto done;
1904 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1905 d00136be 2019-03-26 stsp if (error)
1906 d00136be 2019-03-26 stsp goto done;
1908 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1909 031a5338 2019-03-26 stsp if (error != NULL)
1910 031a5338 2019-03-26 stsp goto done;
1912 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1913 031a5338 2019-03-26 stsp got_worktree_get_root_path(worktree));
1914 d00136be 2019-03-26 stsp if (error)
1915 d00136be 2019-03-26 stsp goto done;
1917 031a5338 2019-03-26 stsp error = got_worktree_schedule_add(worktree, path, print_status, NULL,
1919 d00136be 2019-03-26 stsp if (error)
1920 d00136be 2019-03-26 stsp goto done;
1923 031a5338 2019-03-26 stsp got_repo_close(repo);
1924 d00136be 2019-03-26 stsp if (worktree)
1925 d00136be 2019-03-26 stsp got_worktree_close(worktree);
1926 d00136be 2019-03-26 stsp free(path);
1927 d00136be 2019-03-26 stsp free(relpath);
1928 2ec1f75b 2019-03-26 stsp free(cwd);
1929 2ec1f75b 2019-03-26 stsp return error;
1932 2ec1f75b 2019-03-26 stsp __dead static void
1933 2ec1f75b 2019-03-26 stsp usage_rm(void)
1935 2ec1f75b 2019-03-26 stsp fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
1939 2ec1f75b 2019-03-26 stsp static const struct got_error *
1940 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
1942 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
1943 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
1944 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
1945 2ec1f75b 2019-03-26 stsp char *cwd = NULL, *path = NULL;
1946 2ec1f75b 2019-03-26 stsp int ch, delete_local_mods = 0;
1948 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
1949 2ec1f75b 2019-03-26 stsp switch (ch) {
1951 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
1954 2ec1f75b 2019-03-26 stsp usage_add();
1955 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
1959 2ec1f75b 2019-03-26 stsp argc -= optind;
1960 2ec1f75b 2019-03-26 stsp argv += optind;
1962 2ec1f75b 2019-03-26 stsp if (argc != 1)
1963 2ec1f75b 2019-03-26 stsp usage_rm();
1965 2ec1f75b 2019-03-26 stsp path = realpath(argv[0], NULL);
1966 2ec1f75b 2019-03-26 stsp if (path == NULL) {
1967 2ec1f75b 2019-03-26 stsp error = got_error_from_errno();
1968 2ec1f75b 2019-03-26 stsp goto done;
1971 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
1972 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
1973 2ec1f75b 2019-03-26 stsp error = got_error_from_errno();
1974 2ec1f75b 2019-03-26 stsp goto done;
1976 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1977 2ec1f75b 2019-03-26 stsp if (error)
1978 2ec1f75b 2019-03-26 stsp goto done;
1980 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1981 2ec1f75b 2019-03-26 stsp if (error != NULL)
1982 2ec1f75b 2019-03-26 stsp goto done;
1984 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1985 c2253644 2019-03-26 stsp got_worktree_get_root_path(worktree));
1986 2ec1f75b 2019-03-26 stsp if (error)
1987 2ec1f75b 2019-03-26 stsp goto done;
1989 2ec1f75b 2019-03-26 stsp error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
1990 2ec1f75b 2019-03-26 stsp print_status, NULL, repo);
1991 a129376b 2019-03-28 stsp if (error)
1992 a129376b 2019-03-28 stsp goto done;
1995 a129376b 2019-03-28 stsp got_repo_close(repo);
1996 a129376b 2019-03-28 stsp if (worktree)
1997 a129376b 2019-03-28 stsp got_worktree_close(worktree);
1998 a129376b 2019-03-28 stsp free(path);
1999 a129376b 2019-03-28 stsp free(cwd);
2000 a129376b 2019-03-28 stsp return error;
2003 a129376b 2019-03-28 stsp __dead static void
2004 a129376b 2019-03-28 stsp usage_revert(void)
2006 a129376b 2019-03-28 stsp fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2010 a129376b 2019-03-28 stsp static void
2011 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2013 a129376b 2019-03-28 stsp while (path[0] == '/')
2015 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2018 a129376b 2019-03-28 stsp static const struct got_error *
2019 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2021 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2022 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2023 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2024 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2027 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2028 a129376b 2019-03-28 stsp switch (ch) {
2030 a129376b 2019-03-28 stsp usage_revert();
2031 a129376b 2019-03-28 stsp /* NOTREACHED */
2035 a129376b 2019-03-28 stsp argc -= optind;
2036 a129376b 2019-03-28 stsp argv += optind;
2038 a129376b 2019-03-28 stsp if (argc != 1)
2039 a129376b 2019-03-28 stsp usage_revert();
2041 a129376b 2019-03-28 stsp path = realpath(argv[0], NULL);
2042 a129376b 2019-03-28 stsp if (path == NULL) {
2043 a129376b 2019-03-28 stsp error = got_error_from_errno();
2044 a129376b 2019-03-28 stsp goto done;
2047 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2048 a129376b 2019-03-28 stsp if (cwd == NULL) {
2049 a129376b 2019-03-28 stsp error = got_error_from_errno();
2050 a129376b 2019-03-28 stsp goto done;
2052 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2053 2ec1f75b 2019-03-26 stsp if (error)
2054 2ec1f75b 2019-03-26 stsp goto done;
2056 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2057 a129376b 2019-03-28 stsp if (error != NULL)
2058 a129376b 2019-03-28 stsp goto done;
2060 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2061 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree));
2062 a129376b 2019-03-28 stsp if (error)
2063 a129376b 2019-03-28 stsp goto done;
2065 a129376b 2019-03-28 stsp error = got_worktree_revert(worktree, path,
2066 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2067 a129376b 2019-03-28 stsp if (error)
2068 a129376b 2019-03-28 stsp goto done;
2071 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2072 2ec1f75b 2019-03-26 stsp if (worktree)
2073 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2074 2ec1f75b 2019-03-26 stsp free(path);
2075 d00136be 2019-03-26 stsp free(cwd);
2076 6bad629b 2019-02-04 stsp return error;
2079 c4296144 2019-05-09 stsp __dead static void
2080 c4296144 2019-05-09 stsp usage_commit(void)
2082 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2086 c4296144 2019-05-09 stsp static const struct got_error *
2087 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2089 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2090 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2091 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2092 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2093 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2094 c4296144 2019-05-09 stsp const char *logmsg = "<no log message was specified>";
2095 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2098 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2099 c4296144 2019-05-09 stsp switch (ch) {
2101 c4296144 2019-05-09 stsp logmsg = optarg;
2104 c4296144 2019-05-09 stsp usage_commit();
2105 c4296144 2019-05-09 stsp /* NOTREACHED */
2109 c4296144 2019-05-09 stsp argc -= optind;
2110 c4296144 2019-05-09 stsp argv += optind;
2112 c4296144 2019-05-09 stsp if (argc == 1) {
2113 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2114 c4296144 2019-05-09 stsp if (path == NULL) {
2115 c4296144 2019-05-09 stsp error = got_error_from_errno();
2116 c4296144 2019-05-09 stsp goto done;
2118 c4296144 2019-05-09 stsp } else if (argc != 0)
2119 c4296144 2019-05-09 stsp usage_commit();
2121 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2122 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2123 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2124 35bd8fed 2019-05-09 stsp goto done;
2127 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2128 c4296144 2019-05-09 stsp if (cwd == NULL) {
2129 c4296144 2019-05-09 stsp error = got_error_from_errno();
2130 c4296144 2019-05-09 stsp goto done;
2132 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2133 c4296144 2019-05-09 stsp if (error)
2134 c4296144 2019-05-09 stsp goto done;
2136 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2137 c4296144 2019-05-09 stsp if (error != NULL)
2138 c4296144 2019-05-09 stsp goto done;
2140 c4296144 2019-05-09 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2141 c4296144 2019-05-09 stsp got_worktree_get_root_path(worktree));
2142 c4296144 2019-05-09 stsp if (error)
2143 c4296144 2019-05-09 stsp goto done;
2145 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2146 35bd8fed 2019-05-09 stsp logmsg, print_status, NULL, repo);
2147 c4296144 2019-05-09 stsp if (error)
2148 c4296144 2019-05-09 stsp goto done;
2150 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2151 c4296144 2019-05-09 stsp if (error)
2152 c4296144 2019-05-09 stsp goto done;
2153 c4296144 2019-05-09 stsp printf("created commit %s\n", id_str);
2156 c4296144 2019-05-09 stsp got_repo_close(repo);
2157 c4296144 2019-05-09 stsp if (worktree)
2158 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2159 c4296144 2019-05-09 stsp free(path);
2160 c4296144 2019-05-09 stsp free(cwd);
2161 c4296144 2019-05-09 stsp free(id_str);
2162 c4296144 2019-05-09 stsp return error;
