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>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 5c860e29 2018-03-12 stsp #include <locale.h>
28 99437157 2018-11-11 stsp #include <signal.h>
29 5c860e29 2018-03-12 stsp #include <stdio.h>
30 5c860e29 2018-03-12 stsp #include <stdlib.h>
31 5c860e29 2018-03-12 stsp #include <string.h>
32 5c860e29 2018-03-12 stsp #include <unistd.h>
33 c09a553d 2018-03-12 stsp #include <libgen.h>
34 c0768b0f 2018-06-10 stsp #include <time.h>
35 33ad4cbe 2019-05-12 jcs #include <paths.h>
37 f42b1b34 2018-03-12 stsp #include "got_error.h"
38 f42b1b34 2018-03-12 stsp #include "got_object.h"
39 5261c201 2018-04-01 stsp #include "got_reference.h"
40 f42b1b34 2018-03-12 stsp #include "got_repository.h"
41 1dd54920 2019-05-11 stsp #include "got_path.h"
42 c09a553d 2018-03-12 stsp #include "got_worktree.h"
43 79109fed 2018-03-27 stsp #include "got_diff.h"
44 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
45 404c43c4 2018-06-21 stsp #include "got_blame.h"
46 63219cd2 2019-01-04 stsp #include "got_privsep.h"
47 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
49 5c860e29 2018-03-12 stsp #ifndef nitems
50 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
53 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
54 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
57 99437157 2018-11-11 stsp catch_sigint(int signo)
59 99437157 2018-11-11 stsp sigint_received = 1;
63 99437157 2018-11-11 stsp catch_sigpipe(int signo)
65 99437157 2018-11-11 stsp sigpipe_received = 1;
69 5c860e29 2018-03-12 stsp struct cmd {
70 5c860e29 2018-03-12 stsp const char *cmd_name;
71 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
72 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
73 46a0db7d 2018-03-12 stsp const char *cmd_descr;
76 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
77 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
78 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
79 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
81 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
82 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
83 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
84 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
85 d00136be 2019-03-26 stsp __dead static void usage_add(void);
86 2ec1f75b 2019-03-26 stsp __dead static void usage_rm(void);
87 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
88 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
90 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
91 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
92 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
93 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
94 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
95 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
96 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
97 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
98 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
99 2ec1f75b 2019-03-26 stsp static const struct got_error* cmd_rm(int, char *[]);
100 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
101 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
103 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
104 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
105 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
106 507dc3bb 2018-12-29 stsp { "update", cmd_update, usage_update,
107 507dc3bb 2018-12-29 stsp "update a work tree to a different commit" },
108 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
109 1b6b95a8 2018-03-12 stsp "show repository history" },
110 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
111 b00d56cd 2018-04-01 stsp "compare files and directories" },
112 404c43c4 2018-06-21 stsp { "blame", cmd_blame, usage_blame,
113 a67e2392 2019-03-26 stsp "show when lines in a file were changed" },
114 5de5890b 2018-10-18 stsp { "tree", cmd_tree, usage_tree,
115 a67e2392 2019-03-26 stsp "list files and directories in repository" },
116 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
117 1b6b95a8 2018-03-12 stsp "show modification status of files" },
118 d0eebce4 2019-03-11 stsp { "ref", cmd_ref, usage_ref,
119 d0eebce4 2019-03-11 stsp "manage references in repository" },
120 d00136be 2019-03-26 stsp { "add", cmd_add, usage_add,
121 bd14628f 2019-05-12 stsp "add new files to version control" },
122 2ec1f75b 2019-03-26 stsp { "rm", cmd_rm, usage_rm,
123 2ec1f75b 2019-03-26 stsp "remove a versioned file" },
124 a129376b 2019-03-28 stsp { "revert", cmd_revert, usage_revert,
125 a129376b 2019-03-28 stsp "revert uncommitted changes" },
126 c4296144 2019-05-09 stsp { "commit", cmd_commit, usage_commit,
127 5501382f 2019-05-10 stsp "write changes from work tree to repository" },
131 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
133 5c860e29 2018-03-12 stsp struct cmd *cmd;
134 5c860e29 2018-03-12 stsp unsigned int i;
136 1b6b95a8 2018-03-12 stsp int hflag = 0;
138 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
140 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
141 5c860e29 2018-03-12 stsp switch (ch) {
147 5c860e29 2018-03-12 stsp /* NOTREACHED */
151 5c860e29 2018-03-12 stsp argc -= optind;
152 5c860e29 2018-03-12 stsp argv += optind;
153 1e70621d 2018-03-27 stsp optind = 0;
155 5c860e29 2018-03-12 stsp if (argc <= 0)
158 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
159 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
161 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
162 d7d4f210 2018-03-12 stsp const struct got_error *error;
164 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
166 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
170 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
172 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
173 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
174 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
181 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
185 4ed7e80c 2018-05-20 stsp __dead static void
186 5c860e29 2018-03-12 stsp usage(void)
190 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
191 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
192 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
193 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
194 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
199 0266afb7 2019-01-04 stsp static const struct got_error *
200 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
202 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
203 e2ba3d07 2019-05-13 stsp const char *editor;
205 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
206 e2ba3d07 2019-05-13 stsp if (editor == NULL)
207 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
209 0ee7065d 2019-05-13 stsp if (editor) {
210 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
212 0ee7065d 2019-05-13 stsp return err;
215 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
216 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
217 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
218 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
221 e2ba3d07 2019-05-13 stsp return NULL;
224 e2ba3d07 2019-05-13 stsp static const struct got_error *
225 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
226 314a6357 2019-05-13 stsp const char *worktree_path, int create_worktree)
228 163ce85a 2019-05-13 stsp const struct got_error *err;
229 3c45a30a 2019-05-12 jcs static char err_msg[MAXPATHLEN + 36];
231 a0937847 2019-05-11 stsp if (create_worktree) {
232 a0937847 2019-05-11 stsp /* Pre-create work tree path to avoid unveiling its parents. */
233 163ce85a 2019-05-13 stsp err = got_path_mkdir(worktree_path);
235 3c45a30a 2019-05-12 jcs if (errno == EEXIST) {
236 280f921b 2019-05-12 stsp if (got_path_dir_is_empty(worktree_path)) {
238 163ce85a 2019-05-13 stsp err = NULL;
240 3c45a30a 2019-05-12 jcs snprintf(err_msg, sizeof(err_msg),
241 3c45a30a 2019-05-12 jcs "%s: directory exists but is not empty",
242 3c45a30a 2019-05-12 jcs worktree_path);
243 163ce85a 2019-05-13 stsp err = got_error_msg(GOT_ERR_BAD_PATH,
248 163ce85a 2019-05-13 stsp if (err && (err->code != GOT_ERR_ERRNO || errno != EISDIR))
249 163ce85a 2019-05-13 stsp return err;
252 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
253 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
255 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
256 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
258 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
259 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
261 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
262 163ce85a 2019-05-13 stsp if (err != NULL)
263 163ce85a 2019-05-13 stsp return err;
265 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
266 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
268 0266afb7 2019-01-04 stsp return NULL;
271 4ed7e80c 2018-05-20 stsp __dead static void
272 c09a553d 2018-03-12 stsp usage_checkout(void)
274 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
275 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
279 92a684f4 2018-03-12 stsp static void
280 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
282 92a684f4 2018-03-12 stsp char *worktree_path = arg;
284 92a684f4 2018-03-12 stsp while (path[0] == '/')
287 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
290 99437157 2018-11-11 stsp static const struct got_error *
291 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
293 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
294 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
295 99437157 2018-11-11 stsp return NULL;
298 8069f636 2019-01-12 stsp static const struct got_error *
299 d5bea539 2019-05-13 stsp check_linear_ancestry(struct got_worktree *worktree,
300 d5bea539 2019-05-13 stsp struct got_object_id *commit_id, struct got_repository *repo)
302 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
303 d5bea539 2019-05-13 stsp struct got_object_id *yca_id, *base_commit_id;
305 d5bea539 2019-05-13 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
306 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
307 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
309 36a38700 2019-05-10 stsp return err;
311 d5bea539 2019-05-13 stsp if (yca_id == NULL)
312 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
315 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
316 d5bea539 2019-05-13 stsp * and the work tree's base commit.
318 d5bea539 2019-05-13 stsp * Non-linear situation such as the this require a rebase:
320 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
328 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
329 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
330 d5bea539 2019-05-13 stsp * Update backwards in time: D (base) - C - D - A (commit/yca)
332 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
333 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
334 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
336 d5bea539 2019-05-13 stsp free(yca_id);
337 d5bea539 2019-05-13 stsp return NULL;
341 4ed7e80c 2018-05-20 stsp static const struct got_error *
342 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
344 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
345 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
346 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
347 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
348 c09a553d 2018-03-12 stsp char *repo_path = NULL;
349 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
350 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
351 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
352 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
353 72151b04 2019-05-11 stsp int ch, same_path_prefix;
355 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
356 0bb8a95e 2018-03-12 stsp switch (ch) {
358 08573d5b 2019-05-14 stsp branch_name = optarg;
361 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
362 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
363 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
366 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
369 2deda0b9 2019-03-07 stsp usage_checkout();
370 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
374 0bb8a95e 2018-03-12 stsp argc -= optind;
375 0bb8a95e 2018-03-12 stsp argv += optind;
377 6715a751 2018-03-16 stsp #ifndef PROFILE
378 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
379 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
380 c09a553d 2018-03-12 stsp err(1, "pledge");
382 0bb8a95e 2018-03-12 stsp if (argc == 1) {
383 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
384 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
385 76089277 2018-04-01 stsp if (repo_path == NULL)
386 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
387 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
388 76089277 2018-04-01 stsp if (cwd == NULL) {
389 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
392 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
393 230a42bd 2019-05-11 jcs base = basename(path_prefix);
394 230a42bd 2019-05-11 jcs if (base == NULL) {
395 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
396 230a42bd 2019-05-11 jcs path_prefix);
400 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
401 230a42bd 2019-05-11 jcs if (base == NULL) {
402 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
407 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
408 c09a553d 2018-03-12 stsp if (dotgit)
409 c09a553d 2018-03-12 stsp *dotgit = '\0';
410 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
411 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
416 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
417 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
418 76089277 2018-04-01 stsp if (repo_path == NULL) {
419 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
422 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
423 76089277 2018-04-01 stsp if (worktree_path == NULL) {
424 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
428 c09a553d 2018-03-12 stsp usage_checkout();
430 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
431 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
433 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
434 c09a553d 2018-03-12 stsp if (error != NULL)
437 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
441 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
442 c09a553d 2018-03-12 stsp if (error != NULL)
445 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
446 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
449 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
450 c09a553d 2018-03-12 stsp if (error != NULL)
453 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
454 e5dc7198 2018-12-29 stsp path_prefix);
455 e5dc7198 2018-12-29 stsp if (error != NULL)
457 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
458 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
462 8069f636 2019-01-12 stsp if (commit_id_str) {
463 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
464 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
465 8069f636 2019-01-12 stsp commit_id_str);
466 8069f636 2019-01-12 stsp if (error != NULL)
468 d5bea539 2019-05-13 stsp error = check_linear_ancestry(worktree, commit_id, repo);
469 8069f636 2019-01-12 stsp if (error != NULL) {
470 8069f636 2019-01-12 stsp free(commit_id);
473 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
474 8069f636 2019-01-12 stsp commit_id);
475 8069f636 2019-01-12 stsp free(commit_id);
480 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
481 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
482 c09a553d 2018-03-12 stsp if (error != NULL)
485 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
488 8069f636 2019-01-12 stsp free(commit_id_str);
489 76089277 2018-04-01 stsp free(repo_path);
490 507dc3bb 2018-12-29 stsp free(worktree_path);
491 507dc3bb 2018-12-29 stsp return error;
494 507dc3bb 2018-12-29 stsp __dead static void
495 507dc3bb 2018-12-29 stsp usage_update(void)
497 c4cdcb68 2019-04-03 stsp fprintf(stderr, "usage: %s update [-c commit] [path]\n",
498 507dc3bb 2018-12-29 stsp getprogname());
502 507dc3bb 2018-12-29 stsp static void
503 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
505 784955db 2019-01-12 stsp int *did_something = arg;
507 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
510 1545c615 2019-02-10 stsp *did_something = 1;
511 507dc3bb 2018-12-29 stsp while (path[0] == '/')
513 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
516 be7061eb 2018-12-30 stsp static const struct got_error *
517 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
519 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
520 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
521 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
522 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
523 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
524 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
525 784955db 2019-01-12 stsp int ch, did_something = 0;
527 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
528 507dc3bb 2018-12-29 stsp switch (ch) {
530 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
531 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
532 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
535 2deda0b9 2019-03-07 stsp usage_update();
536 507dc3bb 2018-12-29 stsp /* NOTREACHED */
540 507dc3bb 2018-12-29 stsp argc -= optind;
541 507dc3bb 2018-12-29 stsp argv += optind;
543 507dc3bb 2018-12-29 stsp #ifndef PROFILE
544 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
545 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
546 507dc3bb 2018-12-29 stsp err(1, "pledge");
548 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
549 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
550 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
553 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
557 507dc3bb 2018-12-29 stsp if (argc == 0) {
558 c4cdcb68 2019-04-03 stsp path = strdup("");
559 c4cdcb68 2019-04-03 stsp if (path == NULL) {
560 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
563 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
564 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
568 507dc3bb 2018-12-29 stsp usage_update();
570 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
571 507dc3bb 2018-12-29 stsp if (error != NULL)
574 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
575 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
579 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
580 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
581 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
582 507dc3bb 2018-12-29 stsp if (error != NULL)
584 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
585 9c4b8182 2019-01-02 stsp if (error != NULL)
587 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
588 507dc3bb 2018-12-29 stsp if (error != NULL)
591 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
592 507dc3bb 2018-12-29 stsp commit_id_str);
593 507dc3bb 2018-12-29 stsp if (error != NULL)
597 d5bea539 2019-05-13 stsp error = check_linear_ancestry(worktree, commit_id, repo);
598 be7061eb 2018-12-30 stsp if (error != NULL)
601 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
602 507dc3bb 2018-12-29 stsp commit_id) != 0) {
603 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
604 507dc3bb 2018-12-29 stsp commit_id);
609 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
610 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
611 507dc3bb 2018-12-29 stsp if (error != NULL)
614 784955db 2019-01-12 stsp if (did_something)
615 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
617 784955db 2019-01-12 stsp printf("Already up-to-date\n");
619 c09a553d 2018-03-12 stsp free(worktree_path);
620 c4cdcb68 2019-04-03 stsp free(path);
621 507dc3bb 2018-12-29 stsp free(commit_id);
622 9c4b8182 2019-01-02 stsp free(commit_id_str);
623 c09a553d 2018-03-12 stsp return error;
626 f42b1b34 2018-03-12 stsp static const struct got_error *
627 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
628 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
630 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
631 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
632 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
633 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
635 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
636 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
638 79109fed 2018-03-27 stsp return err;
640 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
641 79f35eb3 2018-06-11 stsp if (qid != NULL) {
642 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
644 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
646 79109fed 2018-03-27 stsp return err;
648 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
649 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
650 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
652 0f2b3dca 2018-12-22 stsp return err;
654 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
656 79109fed 2018-03-27 stsp return err;
659 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
663 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
664 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
667 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
668 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
669 0f2b3dca 2018-12-22 stsp free(id_str1);
670 0f2b3dca 2018-12-22 stsp free(id_str2);
671 79109fed 2018-03-27 stsp return err;
674 4bb494d5 2018-06-16 stsp static char *
675 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
677 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
678 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
684 79109fed 2018-03-27 stsp static const struct got_error *
685 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
686 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
687 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
689 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
690 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
691 6c281f94 2018-06-11 stsp char datebuf[26];
692 45d799e2 2018-12-23 stsp time_t committer_time;
693 45d799e2 2018-12-23 stsp const char *author, *committer;
694 199a4027 2019-02-02 stsp char *refs_str = NULL;
695 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
697 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
699 199a4027 2019-02-02 stsp const char *name;
700 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
702 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
703 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
705 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
707 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
709 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
711 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
713 199a4027 2019-02-02 stsp s = refs_str;
714 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
715 199a4027 2019-02-02 stsp name) == -1) {
716 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
722 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
724 8bf5b3c9 2018-03-17 stsp return err;
726 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
727 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
728 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
729 832c249c 2018-06-10 stsp free(id_str);
730 d3d493d7 2019-02-21 stsp id_str = NULL;
731 d3d493d7 2019-02-21 stsp free(refs_str);
732 d3d493d7 2019-02-21 stsp refs_str = NULL;
733 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
734 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
735 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
736 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
737 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
738 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
739 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
740 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
741 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
742 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
743 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
745 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
746 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
747 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
749 a0603db2 2018-06-10 stsp return err;
750 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
751 a0603db2 2018-06-10 stsp free(id_str);
755 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
756 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
757 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
759 621015ac 2018-07-23 stsp logmsg = logmsg0;
761 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
763 832c249c 2018-06-10 stsp printf(" %s\n", line);
764 832c249c 2018-06-10 stsp } while (line);
765 621015ac 2018-07-23 stsp free(logmsg0);
767 971751ac 2018-03-27 stsp if (show_patch) {
768 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
769 971751ac 2018-03-27 stsp if (err == 0)
770 971751ac 2018-03-27 stsp printf("\n");
773 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
774 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
775 07862c20 2018-09-15 stsp return err;
778 f42b1b34 2018-03-12 stsp static const struct got_error *
779 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
780 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
781 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
783 f42b1b34 2018-03-12 stsp const struct got_error *err;
784 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
786 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
787 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
789 f42b1b34 2018-03-12 stsp return err;
790 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
794 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
795 372ccdbb 2018-06-10 stsp struct got_object_id *id;
797 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
800 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
802 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
803 9ba79e04 2018-06-11 stsp err = NULL;
806 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
808 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
814 b43fbaa0 2018-06-11 stsp if (id == NULL)
817 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
820 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
822 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
823 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
827 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
828 f42b1b34 2018-03-12 stsp return err;
831 4ed7e80c 2018-05-20 stsp __dead static void
832 6f3d1eb0 2018-03-12 stsp usage_log(void)
834 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
835 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
839 4ed7e80c 2018-05-20 stsp static const struct got_error *
840 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
842 f42b1b34 2018-03-12 stsp const struct got_error *error;
843 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
844 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
845 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
846 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
847 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
848 d142fc45 2018-04-01 stsp char *start_commit = NULL;
849 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
850 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
851 64a96a6d 2018-04-01 stsp const char *errstr;
852 199a4027 2019-02-02 stsp struct got_reflist_head refs;
854 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
856 6715a751 2018-03-16 stsp #ifndef PROFILE
857 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
860 f42b1b34 2018-03-12 stsp err(1, "pledge");
863 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
864 79109fed 2018-03-27 stsp switch (ch) {
866 79109fed 2018-03-27 stsp show_patch = 1;
869 d142fc45 2018-04-01 stsp start_commit = optarg;
872 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
874 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
875 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
878 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
879 64a96a6d 2018-04-01 stsp if (errstr != NULL)
880 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
883 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
886 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
887 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
888 04ca23f4 2018-07-16 stsp err(1, "-r option");
889 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
892 2deda0b9 2019-03-07 stsp usage_log();
893 79109fed 2018-03-27 stsp /* NOTREACHED */
897 79109fed 2018-03-27 stsp argc -= optind;
898 79109fed 2018-03-27 stsp argv += optind;
900 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
901 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
902 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
906 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
907 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
909 cffc0aa4 2019-02-05 stsp error = NULL;
911 e7301579 2019-03-18 stsp if (argc == 0) {
912 cbd1af7a 2019-03-18 stsp path = strdup("");
913 e7301579 2019-03-18 stsp if (path == NULL) {
914 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
917 e7301579 2019-03-18 stsp } else if (argc == 1) {
918 e7301579 2019-03-18 stsp if (worktree) {
919 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
924 e7301579 2019-03-18 stsp path = strdup(argv[0]);
925 e7301579 2019-03-18 stsp if (path == NULL) {
926 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
931 cbd1af7a 2019-03-18 stsp usage_log();
933 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
934 5486daa2 2019-05-11 stsp repo_path = worktree ?
935 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
937 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
938 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
942 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
943 d7d4f210 2018-03-12 stsp if (error != NULL)
946 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
947 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
951 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
952 3235492e 2018-04-01 stsp struct got_reference *head_ref;
953 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
954 3235492e 2018-04-01 stsp if (error != NULL)
955 3235492e 2018-04-01 stsp return error;
956 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
957 3235492e 2018-04-01 stsp got_ref_close(head_ref);
958 3235492e 2018-04-01 stsp if (error != NULL)
959 3235492e 2018-04-01 stsp return error;
960 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
962 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
963 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
964 3235492e 2018-04-01 stsp if (error == NULL) {
965 1caad61b 2019-02-01 stsp int obj_type;
966 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
967 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
968 d1f2edc9 2018-06-13 stsp if (error != NULL)
970 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
971 1caad61b 2019-02-01 stsp if (error != NULL)
973 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
974 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
975 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
976 1caad61b 2019-02-01 stsp if (error != NULL)
978 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
979 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
980 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
981 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
985 1caad61b 2019-02-01 stsp id = got_object_id_dup(
986 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
987 1caad61b 2019-02-01 stsp if (id == NULL)
988 638f9024 2019-05-13 stsp error = got_error_from_errno(
989 230a42bd 2019-05-11 jcs "got_object_id_dup");
990 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
993 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
994 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
997 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
998 d1f2edc9 2018-06-13 stsp if (error != NULL)
1001 15a94983 2018-12-23 stsp if (commit == NULL) {
1002 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
1003 d1f2edc9 2018-06-13 stsp start_commit);
1004 d1f2edc9 2018-06-13 stsp if (error != NULL)
1005 d1f2edc9 2018-06-13 stsp return error;
1008 d7d4f210 2018-03-12 stsp if (error != NULL)
1009 04ca23f4 2018-07-16 stsp goto done;
1011 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1012 04ca23f4 2018-07-16 stsp if (error != NULL)
1013 04ca23f4 2018-07-16 stsp goto done;
1014 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1015 04ca23f4 2018-07-16 stsp free(path);
1016 04ca23f4 2018-07-16 stsp path = in_repo_path;
1019 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1020 199a4027 2019-02-02 stsp if (error)
1021 199a4027 2019-02-02 stsp goto done;
1023 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1024 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1026 04ca23f4 2018-07-16 stsp free(path);
1027 04ca23f4 2018-07-16 stsp free(repo_path);
1028 04ca23f4 2018-07-16 stsp free(cwd);
1030 cffc0aa4 2019-02-05 stsp if (worktree)
1031 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1032 ad242220 2018-09-08 stsp if (repo) {
1033 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1034 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1035 ad242220 2018-09-08 stsp if (error == NULL)
1036 ad242220 2018-09-08 stsp error = repo_error;
1038 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1039 8bf5b3c9 2018-03-17 stsp return error;
1042 4ed7e80c 2018-05-20 stsp __dead static void
1043 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1045 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1046 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1050 b72f483a 2019-02-05 stsp struct print_diff_arg {
1051 b72f483a 2019-02-05 stsp struct got_repository *repo;
1052 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1053 b72f483a 2019-02-05 stsp int diff_context;
1054 3fc0c068 2019-02-10 stsp const char *id_str;
1055 3fc0c068 2019-02-10 stsp int header_shown;
1058 4ed7e80c 2018-05-20 stsp static const struct got_error *
1059 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1060 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1062 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1063 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1064 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1065 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1066 b72f483a 2019-02-05 stsp char *abspath = NULL;
1067 b72f483a 2019-02-05 stsp struct stat sb;
1069 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1070 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1071 b72f483a 2019-02-05 stsp return NULL;
1073 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1074 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1075 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1076 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1079 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1080 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1082 d00136be 2019-03-26 stsp goto done;
1086 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1087 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1088 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1089 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1090 2ec1f75b 2019-03-26 stsp goto done;
1093 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1094 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1095 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1096 2ec1f75b 2019-03-26 stsp goto done;
1098 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1099 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1100 2ec1f75b 2019-03-26 stsp goto done;
1103 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1105 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1108 b72f483a 2019-02-05 stsp if (blob1)
1109 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1110 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1111 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1112 b72f483a 2019-02-05 stsp free(abspath);
1113 927df6b7 2019-02-10 stsp return err;
1116 927df6b7 2019-02-10 stsp static const struct got_error *
1117 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1119 b00d56cd 2018-04-01 stsp const struct got_error *error;
1120 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1121 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1122 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1123 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1124 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1125 15a94983 2018-12-23 stsp int type1, type2;
1126 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1127 c0cc5c62 2018-10-18 stsp const char *errstr;
1128 927df6b7 2019-02-10 stsp char *path = NULL;
1130 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1131 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1132 25eccc22 2019-01-04 stsp NULL) == -1)
1133 b00d56cd 2018-04-01 stsp err(1, "pledge");
1136 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1137 b00d56cd 2018-04-01 stsp switch (ch) {
1139 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1140 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1141 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1144 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1145 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1146 b72f483a 2019-02-05 stsp err(1, "-r option");
1147 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1150 2deda0b9 2019-03-07 stsp usage_diff();
1151 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1155 b00d56cd 2018-04-01 stsp argc -= optind;
1156 b00d56cd 2018-04-01 stsp argv += optind;
1158 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1159 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1160 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1161 b72f483a 2019-02-05 stsp goto done;
1163 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1164 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1165 927df6b7 2019-02-10 stsp goto done;
1166 927df6b7 2019-02-10 stsp if (argc <= 1) {
1167 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1168 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1169 927df6b7 2019-02-10 stsp goto done;
1171 b72f483a 2019-02-05 stsp if (repo_path)
1173 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1174 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1175 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1176 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1177 927df6b7 2019-02-10 stsp goto done;
1179 927df6b7 2019-02-10 stsp if (argc == 1) {
1180 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1182 927df6b7 2019-02-10 stsp if (error)
1183 927df6b7 2019-02-10 stsp goto done;
1185 927df6b7 2019-02-10 stsp path = strdup("");
1186 927df6b7 2019-02-10 stsp if (path == NULL) {
1187 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1188 927df6b7 2019-02-10 stsp goto done;
1191 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1192 15a94983 2018-12-23 stsp id_str1 = argv[0];
1193 15a94983 2018-12-23 stsp id_str2 = argv[1];
1195 b00d56cd 2018-04-01 stsp usage_diff();
1197 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1198 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1199 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1200 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1203 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1204 76089277 2018-04-01 stsp free(repo_path);
1205 b00d56cd 2018-04-01 stsp if (error != NULL)
1206 b00d56cd 2018-04-01 stsp goto done;
1208 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1209 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1210 c02c541e 2019-03-29 stsp if (error)
1211 c02c541e 2019-03-29 stsp goto done;
1213 b72f483a 2019-02-05 stsp if (worktree) {
1214 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1215 b72f483a 2019-02-05 stsp char *id_str;
1216 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1217 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1218 b72f483a 2019-02-05 stsp if (error)
1219 b72f483a 2019-02-05 stsp goto done;
1220 b72f483a 2019-02-05 stsp arg.repo = repo;
1221 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1222 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1223 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1224 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1226 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1227 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1228 b72f483a 2019-02-05 stsp free(id_str);
1229 b72f483a 2019-02-05 stsp goto done;
1232 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1233 6402fb3c 2018-09-15 stsp if (error)
1234 b00d56cd 2018-04-01 stsp goto done;
1236 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1237 6402fb3c 2018-09-15 stsp if (error)
1238 b00d56cd 2018-04-01 stsp goto done;
1240 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1241 15a94983 2018-12-23 stsp if (error)
1242 15a94983 2018-12-23 stsp goto done;
1244 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1245 15a94983 2018-12-23 stsp if (error)
1246 15a94983 2018-12-23 stsp goto done;
1248 15a94983 2018-12-23 stsp if (type1 != type2) {
1249 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1250 b00d56cd 2018-04-01 stsp goto done;
1253 15a94983 2018-12-23 stsp switch (type1) {
1254 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1255 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1256 54156555 2018-12-24 stsp diff_context, repo, stdout);
1258 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1259 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1260 54156555 2018-12-24 stsp diff_context, repo, stdout);
1262 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1263 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1265 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1266 c0cc5c62 2018-10-18 stsp repo, stdout);
1269 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1273 15a94983 2018-12-23 stsp free(id1);
1274 15a94983 2018-12-23 stsp free(id2);
1275 927df6b7 2019-02-10 stsp free(path);
1276 b72f483a 2019-02-05 stsp if (worktree)
1277 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1278 ad242220 2018-09-08 stsp if (repo) {
1279 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1280 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1281 ad242220 2018-09-08 stsp if (error == NULL)
1282 ad242220 2018-09-08 stsp error = repo_error;
1284 b00d56cd 2018-04-01 stsp return error;
1287 404c43c4 2018-06-21 stsp __dead static void
1288 404c43c4 2018-06-21 stsp usage_blame(void)
1290 9270e621 2019-02-05 stsp fprintf(stderr,
1291 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1292 404c43c4 2018-06-21 stsp getprogname());
1296 404c43c4 2018-06-21 stsp static const struct got_error *
1297 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1299 404c43c4 2018-06-21 stsp const struct got_error *error;
1300 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1301 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1302 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1303 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1304 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1307 404c43c4 2018-06-21 stsp #ifndef PROFILE
1308 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1309 36e2fb66 2019-01-04 stsp NULL) == -1)
1310 404c43c4 2018-06-21 stsp err(1, "pledge");
1313 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1314 404c43c4 2018-06-21 stsp switch (ch) {
1316 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1319 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1320 66bea077 2018-08-02 stsp if (repo_path == NULL)
1321 66bea077 2018-08-02 stsp err(1, "-r option");
1322 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1325 2deda0b9 2019-03-07 stsp usage_blame();
1326 404c43c4 2018-06-21 stsp /* NOTREACHED */
1330 404c43c4 2018-06-21 stsp argc -= optind;
1331 404c43c4 2018-06-21 stsp argv += optind;
1333 a39318fd 2018-08-02 stsp if (argc == 1)
1334 404c43c4 2018-06-21 stsp path = argv[0];
1336 404c43c4 2018-06-21 stsp usage_blame();
1338 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1339 66bea077 2018-08-02 stsp if (cwd == NULL) {
1340 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1341 66bea077 2018-08-02 stsp goto done;
1343 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1344 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1345 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1346 66bea077 2018-08-02 stsp goto done;
1348 0c06baac 2019-02-05 stsp error = NULL;
1349 0c06baac 2019-02-05 stsp if (worktree) {
1350 0c06baac 2019-02-05 stsp repo_path =
1351 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1352 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1353 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1354 0c06baac 2019-02-05 stsp if (error)
1355 0c06baac 2019-02-05 stsp goto done;
1357 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1358 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1359 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1360 0c06baac 2019-02-05 stsp goto done;
1365 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1366 c02c541e 2019-03-29 stsp if (error != NULL)
1367 36e2fb66 2019-01-04 stsp goto done;
1369 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1370 c02c541e 2019-03-29 stsp if (error)
1371 404c43c4 2018-06-21 stsp goto done;
1373 0c06baac 2019-02-05 stsp if (worktree) {
1374 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1375 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1376 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1377 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1378 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1379 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1380 6efaaa2d 2019-02-05 stsp path) == -1) {
1381 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1382 0c06baac 2019-02-05 stsp goto done;
1384 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1387 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1389 0c06baac 2019-02-05 stsp if (error)
1390 66bea077 2018-08-02 stsp goto done;
1392 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1393 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1394 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1395 404c43c4 2018-06-21 stsp if (error != NULL)
1396 66bea077 2018-08-02 stsp goto done;
1397 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1398 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1399 404c43c4 2018-06-21 stsp if (error != NULL)
1400 66bea077 2018-08-02 stsp goto done;
1402 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1403 15a94983 2018-12-23 stsp commit_id_str);
1404 404c43c4 2018-06-21 stsp if (error != NULL)
1405 66bea077 2018-08-02 stsp goto done;
1408 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1410 66bea077 2018-08-02 stsp free(in_repo_path);
1411 66bea077 2018-08-02 stsp free(repo_path);
1412 66bea077 2018-08-02 stsp free(cwd);
1413 404c43c4 2018-06-21 stsp free(commit_id);
1414 0c06baac 2019-02-05 stsp if (worktree)
1415 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1416 ad242220 2018-09-08 stsp if (repo) {
1417 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1418 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1419 ad242220 2018-09-08 stsp if (error == NULL)
1420 ad242220 2018-09-08 stsp error = repo_error;
1422 404c43c4 2018-06-21 stsp return error;
1425 5de5890b 2018-10-18 stsp __dead static void
1426 5de5890b 2018-10-18 stsp usage_tree(void)
1428 c1669e2e 2019-01-09 stsp fprintf(stderr,
1429 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1430 5de5890b 2018-10-18 stsp getprogname());
1434 c1669e2e 2019-01-09 stsp static void
1435 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1436 c1669e2e 2019-01-09 stsp const char *root_path)
1438 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1440 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1441 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1444 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1445 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1446 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1449 5de5890b 2018-10-18 stsp static const struct got_error *
1450 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1451 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1452 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1454 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1455 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1456 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1457 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1458 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1460 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1462 5de5890b 2018-10-18 stsp goto done;
1464 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1466 5de5890b 2018-10-18 stsp goto done;
1467 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1468 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1469 5de5890b 2018-10-18 stsp while (te) {
1470 5de5890b 2018-10-18 stsp char *id = NULL;
1472 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1475 5de5890b 2018-10-18 stsp if (show_ids) {
1476 5de5890b 2018-10-18 stsp char *id_str;
1477 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1479 5de5890b 2018-10-18 stsp goto done;
1480 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1481 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1482 5de5890b 2018-10-18 stsp free(id_str);
1483 5de5890b 2018-10-18 stsp goto done;
1485 5de5890b 2018-10-18 stsp free(id_str);
1487 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1490 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1491 c1669e2e 2019-01-09 stsp char *child_path;
1492 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1493 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1494 c1669e2e 2019-01-09 stsp te->name) == -1) {
1495 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1496 c1669e2e 2019-01-09 stsp goto done;
1498 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1499 c1669e2e 2019-01-09 stsp root_path, repo);
1500 c1669e2e 2019-01-09 stsp free(child_path);
1502 c1669e2e 2019-01-09 stsp goto done;
1505 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1509 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1510 5de5890b 2018-10-18 stsp free(tree_id);
1511 5de5890b 2018-10-18 stsp return err;
1514 5de5890b 2018-10-18 stsp static const struct got_error *
1515 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1517 5de5890b 2018-10-18 stsp const struct got_error *error;
1518 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1519 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1520 7a2c19d6 2019-02-05 stsp const char *path;
1521 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1522 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1523 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1524 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1527 5de5890b 2018-10-18 stsp #ifndef PROFILE
1528 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1529 0f8d269b 2019-01-04 stsp NULL) == -1)
1530 5de5890b 2018-10-18 stsp err(1, "pledge");
1533 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1534 5de5890b 2018-10-18 stsp switch (ch) {
1536 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1539 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1540 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1541 5de5890b 2018-10-18 stsp err(1, "-r option");
1542 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1545 5de5890b 2018-10-18 stsp show_ids = 1;
1548 c1669e2e 2019-01-09 stsp recurse = 1;
1551 2deda0b9 2019-03-07 stsp usage_tree();
1552 5de5890b 2018-10-18 stsp /* NOTREACHED */
1556 5de5890b 2018-10-18 stsp argc -= optind;
1557 5de5890b 2018-10-18 stsp argv += optind;
1559 5de5890b 2018-10-18 stsp if (argc == 1)
1560 5de5890b 2018-10-18 stsp path = argv[0];
1561 5de5890b 2018-10-18 stsp else if (argc > 1)
1562 5de5890b 2018-10-18 stsp usage_tree();
1564 7a2c19d6 2019-02-05 stsp path = NULL;
1566 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1567 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1568 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1569 9bf7a39b 2019-02-05 stsp goto done;
1571 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1572 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1573 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1574 7a2c19d6 2019-02-05 stsp goto done;
1576 7a2c19d6 2019-02-05 stsp error = NULL;
1577 7a2c19d6 2019-02-05 stsp if (worktree) {
1578 7a2c19d6 2019-02-05 stsp repo_path =
1579 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1580 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1581 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1582 7a2c19d6 2019-02-05 stsp if (error)
1583 7a2c19d6 2019-02-05 stsp goto done;
1585 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1586 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1587 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1588 7a2c19d6 2019-02-05 stsp goto done;
1593 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1594 5de5890b 2018-10-18 stsp if (error != NULL)
1595 c02c541e 2019-03-29 stsp goto done;
1597 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1598 c02c541e 2019-03-29 stsp if (error)
1599 5de5890b 2018-10-18 stsp goto done;
1601 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1602 9bf7a39b 2019-02-05 stsp if (worktree) {
1603 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1604 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1605 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1606 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1607 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1608 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1609 9bf7a39b 2019-02-05 stsp goto done;
1611 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1613 9bf7a39b 2019-02-05 stsp if (error)
1614 9bf7a39b 2019-02-05 stsp goto done;
1616 9bf7a39b 2019-02-05 stsp path = "/";
1618 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1619 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1620 9bf7a39b 2019-02-05 stsp if (error != NULL)
1621 9bf7a39b 2019-02-05 stsp goto done;
1624 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1625 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1626 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1627 5de5890b 2018-10-18 stsp if (error != NULL)
1628 5de5890b 2018-10-18 stsp goto done;
1629 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1630 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1631 5de5890b 2018-10-18 stsp if (error != NULL)
1632 5de5890b 2018-10-18 stsp goto done;
1634 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1635 15a94983 2018-12-23 stsp commit_id_str);
1636 5de5890b 2018-10-18 stsp if (error != NULL)
1637 5de5890b 2018-10-18 stsp goto done;
1640 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1641 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1643 5de5890b 2018-10-18 stsp free(in_repo_path);
1644 5de5890b 2018-10-18 stsp free(repo_path);
1645 5de5890b 2018-10-18 stsp free(cwd);
1646 5de5890b 2018-10-18 stsp free(commit_id);
1647 7a2c19d6 2019-02-05 stsp if (worktree)
1648 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1649 5de5890b 2018-10-18 stsp if (repo) {
1650 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1651 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1652 5de5890b 2018-10-18 stsp if (error == NULL)
1653 5de5890b 2018-10-18 stsp error = repo_error;
1655 5de5890b 2018-10-18 stsp return error;
1658 6bad629b 2019-02-04 stsp __dead static void
1659 6bad629b 2019-02-04 stsp usage_status(void)
1661 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1665 b72f483a 2019-02-05 stsp static const struct got_error *
1666 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1667 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1669 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1670 b72f483a 2019-02-05 stsp return NULL;
1673 6bad629b 2019-02-04 stsp static const struct got_error *
1674 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1676 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1677 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1678 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1679 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1682 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1683 6bad629b 2019-02-04 stsp switch (ch) {
1685 2deda0b9 2019-03-07 stsp usage_status();
1686 6bad629b 2019-02-04 stsp /* NOTREACHED */
1690 6bad629b 2019-02-04 stsp argc -= optind;
1691 6bad629b 2019-02-04 stsp argv += optind;
1693 6bad629b 2019-02-04 stsp #ifndef PROFILE
1694 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1695 6bad629b 2019-02-04 stsp NULL) == -1)
1696 6bad629b 2019-02-04 stsp err(1, "pledge");
1698 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1699 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1700 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1701 927df6b7 2019-02-10 stsp goto done;
1704 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1705 927df6b7 2019-02-10 stsp if (error != NULL)
1706 927df6b7 2019-02-10 stsp goto done;
1708 6bad629b 2019-02-04 stsp if (argc == 0) {
1709 927df6b7 2019-02-10 stsp path = strdup("");
1710 927df6b7 2019-02-10 stsp if (path == NULL) {
1711 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1712 6bad629b 2019-02-04 stsp goto done;
1714 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1715 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1716 927df6b7 2019-02-10 stsp if (error)
1717 6bad629b 2019-02-04 stsp goto done;
1719 6bad629b 2019-02-04 stsp usage_status();
1721 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1722 6bad629b 2019-02-04 stsp if (error != NULL)
1723 6bad629b 2019-02-04 stsp goto done;
1725 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1726 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1727 6bad629b 2019-02-04 stsp if (error)
1728 6bad629b 2019-02-04 stsp goto done;
1730 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1731 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1733 927df6b7 2019-02-10 stsp free(cwd);
1734 927df6b7 2019-02-10 stsp free(path);
1735 d0eebce4 2019-03-11 stsp return error;
1738 d0eebce4 2019-03-11 stsp __dead static void
1739 d0eebce4 2019-03-11 stsp usage_ref(void)
1741 d0eebce4 2019-03-11 stsp fprintf(stderr,
1742 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
1743 d0eebce4 2019-03-11 stsp getprogname());
1747 d0eebce4 2019-03-11 stsp static const struct got_error *
1748 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1750 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1751 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1752 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1754 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1755 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1757 d0eebce4 2019-03-11 stsp return err;
1759 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1760 d0eebce4 2019-03-11 stsp char *refstr;
1761 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1762 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1763 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
1764 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1765 d0eebce4 2019-03-11 stsp free(refstr);
1768 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1769 d0eebce4 2019-03-11 stsp return NULL;
1772 d0eebce4 2019-03-11 stsp static const struct got_error *
1773 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1775 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1776 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1778 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
1780 d0eebce4 2019-03-11 stsp return err;
1782 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1783 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1784 d0eebce4 2019-03-11 stsp return err;
1787 d0eebce4 2019-03-11 stsp static const struct got_error *
1788 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
1790 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1791 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1792 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1794 d83d9d5c 2019-05-13 stsp err = got_object_resolve_id_str(&id, repo, target);
1795 d83d9d5c 2019-05-13 stsp if (err) {
1796 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
1798 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1799 d83d9d5c 2019-05-13 stsp return err;
1800 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
1802 d83d9d5c 2019-05-13 stsp return err;
1803 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
1804 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
1806 d83d9d5c 2019-05-13 stsp return err;
1809 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1811 d0eebce4 2019-03-11 stsp goto done;
1813 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1816 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1818 d0eebce4 2019-03-11 stsp return err;
1821 d0eebce4 2019-03-11 stsp static const struct got_error *
1822 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1824 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1825 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1826 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1827 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1828 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1829 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1831 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1832 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1833 d0eebce4 2019-03-11 stsp switch (ch) {
1835 d0eebce4 2019-03-11 stsp delref = optarg;
1838 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1839 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1840 d0eebce4 2019-03-11 stsp err(1, "-r option");
1841 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1844 d0eebce4 2019-03-11 stsp do_list = 1;
1847 d0eebce4 2019-03-11 stsp usage_ref();
1848 d0eebce4 2019-03-11 stsp /* NOTREACHED */
1852 d0eebce4 2019-03-11 stsp if (do_list && delref)
1853 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
1855 d0eebce4 2019-03-11 stsp argc -= optind;
1856 d0eebce4 2019-03-11 stsp argv += optind;
1858 d0eebce4 2019-03-11 stsp if (do_list || delref) {
1859 d0eebce4 2019-03-11 stsp if (argc > 0)
1860 d0eebce4 2019-03-11 stsp usage_ref();
1861 d0eebce4 2019-03-11 stsp } else if (argc != 2)
1862 d0eebce4 2019-03-11 stsp usage_ref();
1864 d0eebce4 2019-03-11 stsp #ifndef PROFILE
1865 e0b57350 2019-03-12 stsp if (do_list) {
1866 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1867 e0b57350 2019-03-12 stsp NULL) == -1)
1868 e0b57350 2019-03-12 stsp err(1, "pledge");
1870 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1871 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
1872 e0b57350 2019-03-12 stsp err(1, "pledge");
1875 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
1876 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
1877 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1878 d0eebce4 2019-03-11 stsp goto done;
1881 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1882 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
1883 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1884 d0eebce4 2019-03-11 stsp goto done;
1886 d0eebce4 2019-03-11 stsp error = NULL;
1887 d0eebce4 2019-03-11 stsp if (worktree) {
1888 d0eebce4 2019-03-11 stsp repo_path =
1889 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
1890 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1891 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1892 d0eebce4 2019-03-11 stsp if (error)
1893 d0eebce4 2019-03-11 stsp goto done;
1895 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
1896 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1897 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1898 d0eebce4 2019-03-11 stsp goto done;
1903 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
1904 d0eebce4 2019-03-11 stsp if (error != NULL)
1905 d0eebce4 2019-03-11 stsp goto done;
1907 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
1908 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1909 c02c541e 2019-03-29 stsp if (error)
1910 c02c541e 2019-03-29 stsp goto done;
1912 d0eebce4 2019-03-11 stsp if (do_list)
1913 d0eebce4 2019-03-11 stsp error = list_refs(repo);
1914 d0eebce4 2019-03-11 stsp else if (delref)
1915 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
1917 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
1920 d0eebce4 2019-03-11 stsp got_repo_close(repo);
1921 d0eebce4 2019-03-11 stsp if (worktree)
1922 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
1923 d0eebce4 2019-03-11 stsp free(cwd);
1924 d0eebce4 2019-03-11 stsp free(repo_path);
1925 d00136be 2019-03-26 stsp return error;
1928 d00136be 2019-03-26 stsp __dead static void
1929 d00136be 2019-03-26 stsp usage_add(void)
1931 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
1935 d00136be 2019-03-26 stsp static const struct got_error *
1936 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
1938 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
1939 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
1940 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
1941 1dd54920 2019-05-11 stsp char *cwd = NULL;
1942 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
1943 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
1946 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
1948 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1949 d00136be 2019-03-26 stsp switch (ch) {
1951 d00136be 2019-03-26 stsp usage_add();
1952 d00136be 2019-03-26 stsp /* NOTREACHED */
1956 d00136be 2019-03-26 stsp argc -= optind;
1957 d00136be 2019-03-26 stsp argv += optind;
1959 723c305c 2019-05-11 jcs if (argc < 1)
1960 d00136be 2019-03-26 stsp usage_add();
1962 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
1963 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
1964 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
1965 723c305c 2019-05-11 jcs if (path == NULL) {
1966 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
1969 1dd54920 2019-05-11 stsp free(path);
1972 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
1973 d00136be 2019-03-26 stsp if (cwd == NULL) {
1974 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1975 d00136be 2019-03-26 stsp goto done;
1978 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1979 d00136be 2019-03-26 stsp if (error)
1980 d00136be 2019-03-26 stsp goto done;
1982 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1983 031a5338 2019-03-26 stsp if (error != NULL)
1984 031a5338 2019-03-26 stsp goto done;
1986 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1987 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1988 d00136be 2019-03-26 stsp if (error)
1989 d00136be 2019-03-26 stsp goto done;
1991 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
1992 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
1993 723c305c 2019-05-11 jcs if (path == NULL) {
1994 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
1998 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
1999 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2000 1dd54920 2019-05-11 stsp if (error) {
2001 1dd54920 2019-05-11 stsp free(path);
2005 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2006 1dd54920 2019-05-11 stsp NULL, repo);
2009 031a5338 2019-03-26 stsp got_repo_close(repo);
2010 d00136be 2019-03-26 stsp if (worktree)
2011 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2012 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2013 1dd54920 2019-05-11 stsp free((char *)pe->path);
2014 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2015 2ec1f75b 2019-03-26 stsp free(cwd);
2016 2ec1f75b 2019-03-26 stsp return error;
2019 2ec1f75b 2019-03-26 stsp __dead static void
2020 2ec1f75b 2019-03-26 stsp usage_rm(void)
2022 2ec1f75b 2019-03-26 stsp fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
2026 2ec1f75b 2019-03-26 stsp static const struct got_error *
2027 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
2029 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2030 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2031 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2032 2ec1f75b 2019-03-26 stsp char *cwd = NULL, *path = NULL;
2033 2ec1f75b 2019-03-26 stsp int ch, delete_local_mods = 0;
2035 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2036 2ec1f75b 2019-03-26 stsp switch (ch) {
2038 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2041 2ec1f75b 2019-03-26 stsp usage_add();
2042 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2046 2ec1f75b 2019-03-26 stsp argc -= optind;
2047 2ec1f75b 2019-03-26 stsp argv += optind;
2049 2ec1f75b 2019-03-26 stsp if (argc != 1)
2050 2ec1f75b 2019-03-26 stsp usage_rm();
2052 2ec1f75b 2019-03-26 stsp path = realpath(argv[0], NULL);
2053 2ec1f75b 2019-03-26 stsp if (path == NULL) {
2054 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2055 2ec1f75b 2019-03-26 stsp goto done;
2057 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2059 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2060 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2061 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2062 2ec1f75b 2019-03-26 stsp goto done;
2064 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2065 2ec1f75b 2019-03-26 stsp if (error)
2066 2ec1f75b 2019-03-26 stsp goto done;
2068 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2070 2ec1f75b 2019-03-26 stsp goto done;
2072 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2073 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2074 2ec1f75b 2019-03-26 stsp if (error)
2075 2ec1f75b 2019-03-26 stsp goto done;
2077 2ec1f75b 2019-03-26 stsp error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
2078 2ec1f75b 2019-03-26 stsp print_status, NULL, repo);
2079 a129376b 2019-03-28 stsp if (error)
2080 a129376b 2019-03-28 stsp goto done;
2083 a129376b 2019-03-28 stsp got_repo_close(repo);
2084 a129376b 2019-03-28 stsp if (worktree)
2085 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2086 a129376b 2019-03-28 stsp free(path);
2087 a129376b 2019-03-28 stsp free(cwd);
2088 a129376b 2019-03-28 stsp return error;
2091 a129376b 2019-03-28 stsp __dead static void
2092 a129376b 2019-03-28 stsp usage_revert(void)
2094 a129376b 2019-03-28 stsp fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2098 a129376b 2019-03-28 stsp static void
2099 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2101 a129376b 2019-03-28 stsp while (path[0] == '/')
2103 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2106 a129376b 2019-03-28 stsp static const struct got_error *
2107 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2109 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2110 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2111 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2112 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2115 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2116 a129376b 2019-03-28 stsp switch (ch) {
2118 a129376b 2019-03-28 stsp usage_revert();
2119 a129376b 2019-03-28 stsp /* NOTREACHED */
2123 a129376b 2019-03-28 stsp argc -= optind;
2124 a129376b 2019-03-28 stsp argv += optind;
2126 a129376b 2019-03-28 stsp if (argc != 1)
2127 a129376b 2019-03-28 stsp usage_revert();
2129 a129376b 2019-03-28 stsp path = realpath(argv[0], NULL);
2130 a129376b 2019-03-28 stsp if (path == NULL) {
2131 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2132 a129376b 2019-03-28 stsp goto done;
2134 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2136 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2137 a129376b 2019-03-28 stsp if (cwd == NULL) {
2138 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2139 a129376b 2019-03-28 stsp goto done;
2141 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2142 2ec1f75b 2019-03-26 stsp if (error)
2143 2ec1f75b 2019-03-26 stsp goto done;
2145 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2146 a129376b 2019-03-28 stsp if (error != NULL)
2147 a129376b 2019-03-28 stsp goto done;
2149 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2150 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2151 a129376b 2019-03-28 stsp if (error)
2152 a129376b 2019-03-28 stsp goto done;
2154 a129376b 2019-03-28 stsp error = got_worktree_revert(worktree, path,
2155 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2156 a129376b 2019-03-28 stsp if (error)
2157 a129376b 2019-03-28 stsp goto done;
2160 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2161 2ec1f75b 2019-03-26 stsp if (worktree)
2162 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2163 2ec1f75b 2019-03-26 stsp free(path);
2164 d00136be 2019-03-26 stsp free(cwd);
2165 6bad629b 2019-02-04 stsp return error;
2168 c4296144 2019-05-09 stsp __dead static void
2169 c4296144 2019-05-09 stsp usage_commit(void)
2171 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2176 e2ba3d07 2019-05-13 stsp spawn_editor(const char *editor, const char *file)
2179 33ad4cbe 2019-05-12 jcs sig_t sighup, sigint, sigquit;
2180 33ad4cbe 2019-05-12 jcs int st = -1;
2182 33ad4cbe 2019-05-12 jcs sighup = signal(SIGHUP, SIG_IGN);
2183 33ad4cbe 2019-05-12 jcs sigint = signal(SIGINT, SIG_IGN);
2184 33ad4cbe 2019-05-12 jcs sigquit = signal(SIGQUIT, SIG_IGN);
2186 33ad4cbe 2019-05-12 jcs switch (pid = fork()) {
2188 33ad4cbe 2019-05-12 jcs goto doneediting;
2190 e2ba3d07 2019-05-13 stsp execl(editor, editor, file, (char *)NULL);
2191 33ad4cbe 2019-05-12 jcs _exit(127);
2194 33ad4cbe 2019-05-12 jcs while (waitpid(pid, &st, 0) == -1)
2195 33ad4cbe 2019-05-12 jcs if (errno != EINTR)
2198 33ad4cbe 2019-05-12 jcs doneediting:
2199 33ad4cbe 2019-05-12 jcs (void)signal(SIGHUP, sighup);
2200 33ad4cbe 2019-05-12 jcs (void)signal(SIGINT, sigint);
2201 33ad4cbe 2019-05-12 jcs (void)signal(SIGQUIT, sigquit);
2203 33ad4cbe 2019-05-12 jcs if (!WIFEXITED(st)) {
2204 33ad4cbe 2019-05-12 jcs errno = EINTR;
2208 33ad4cbe 2019-05-12 jcs return WEXITSTATUS(st);
2211 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
2212 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
2213 e2ba3d07 2019-05-13 stsp const char *editor;
2214 e0870e44 2019-05-13 stsp const char *worktree_path;
2215 314a6357 2019-05-13 stsp const char *repo_path;
2216 e0870e44 2019-05-13 stsp char *logmsg_path;
2220 33ad4cbe 2019-05-12 jcs static const struct got_error *
2221 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2224 e0870e44 2019-05-13 stsp const char *initial_content = "\n# changes to be committed:\n";
2225 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
2226 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
2227 e0870e44 2019-05-13 stsp char *template = NULL;
2228 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
2229 33ad4cbe 2019-05-12 jcs char buf[1024];
2230 33ad4cbe 2019-05-12 jcs struct stat st, st2;
2232 33ad4cbe 2019-05-12 jcs size_t len;
2233 e0870e44 2019-05-13 stsp int fd, content_changed = 0;
2235 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
2236 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2237 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
2238 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
2239 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
2240 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
2241 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
2242 33ad4cbe 2019-05-12 jcs return NULL;
2245 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2246 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2248 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2250 e0870e44 2019-05-13 stsp goto done;
2252 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
2254 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
2255 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2256 33ad4cbe 2019-05-12 jcs dprintf(fd, "# %c %s\n", ct->status, pe->path);
2260 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st) == -1) {
2261 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", a->logmsg_path);
2265 e0870e44 2019-05-13 stsp if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2266 638f9024 2019-05-13 stsp err = got_error_from_errno("failed spawning editor");
2270 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st2) == -1) {
2271 638f9024 2019-05-13 stsp err = got_error_from_errno("stat");
2275 33ad4cbe 2019-05-12 jcs if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2276 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2277 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2278 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2279 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2280 33ad4cbe 2019-05-12 jcs "no changes made to commit message, aborting");
2284 33ad4cbe 2019-05-12 jcs /* remove comments */
2285 33ad4cbe 2019-05-12 jcs *logmsg = malloc(st2.st_size + 1);
2286 fcde04d9 2019-05-13 stsp if (*logmsg == NULL) {
2287 638f9024 2019-05-13 stsp err = got_error_from_errno("malloc");
2288 fcde04d9 2019-05-13 stsp goto done;
2292 e0870e44 2019-05-13 stsp fp = fopen(a->logmsg_path, "r");
2293 33ad4cbe 2019-05-12 jcs while (fgets(buf, sizeof(buf), fp) != NULL) {
2294 e0870e44 2019-05-13 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
2295 e0870e44 2019-05-13 stsp content_changed = 1;
2296 33ad4cbe 2019-05-12 jcs if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2298 33ad4cbe 2019-05-12 jcs len = strlcat(*logmsg, buf, st2.st_size);
2300 33ad4cbe 2019-05-12 jcs fclose(fp);
2302 33ad4cbe 2019-05-12 jcs while (len > 0 && (*logmsg)[len - 1] == '\n') {
2303 33ad4cbe 2019-05-12 jcs (*logmsg)[len - 1] = '\0';
2307 e0870e44 2019-05-13 stsp if (len == 0 || !content_changed) {
2308 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2309 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2310 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2311 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2312 33ad4cbe 2019-05-12 jcs "commit message cannot be empty, aborting");
2316 e0870e44 2019-05-13 stsp free(template);
2318 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
2319 314a6357 2019-05-13 stsp if (err == NULL)
2320 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2321 33ad4cbe 2019-05-12 jcs return err;
2324 c4296144 2019-05-09 stsp static const struct got_error *
2325 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2327 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2328 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2329 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2330 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2331 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2332 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
2333 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2334 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
2335 e2ba3d07 2019-05-13 stsp char *editor = NULL;
2338 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2339 c4296144 2019-05-09 stsp switch (ch) {
2341 c4296144 2019-05-09 stsp logmsg = optarg;
2344 c4296144 2019-05-09 stsp usage_commit();
2345 c4296144 2019-05-09 stsp /* NOTREACHED */
2349 c4296144 2019-05-09 stsp argc -= optind;
2350 c4296144 2019-05-09 stsp argv += optind;
2352 c4296144 2019-05-09 stsp if (argc == 1) {
2353 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2354 c4296144 2019-05-09 stsp if (path == NULL) {
2355 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2356 c4296144 2019-05-09 stsp goto done;
2358 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2359 c4296144 2019-05-09 stsp } else if (argc != 0)
2360 c4296144 2019-05-09 stsp usage_commit();
2362 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2363 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2364 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2365 35bd8fed 2019-05-09 stsp goto done;
2368 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2369 c4296144 2019-05-09 stsp if (cwd == NULL) {
2370 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2371 c4296144 2019-05-09 stsp goto done;
2373 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2374 c4296144 2019-05-09 stsp if (error)
2375 c4296144 2019-05-09 stsp goto done;
2377 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2378 c4296144 2019-05-09 stsp if (error != NULL)
2379 c4296144 2019-05-09 stsp goto done;
2382 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
2383 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
2385 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
2386 314a6357 2019-05-13 stsp error = get_editor(&editor);
2388 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2389 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2390 c4296144 2019-05-09 stsp if (error)
2391 c4296144 2019-05-09 stsp goto done;
2393 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
2394 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
2395 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2396 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
2397 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
2398 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2399 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2400 e0870e44 2019-05-13 stsp if (error) {
2401 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2402 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
2403 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
2404 c4296144 2019-05-09 stsp goto done;
2407 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2408 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
2410 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2411 c4296144 2019-05-09 stsp if (error)
2412 c4296144 2019-05-09 stsp goto done;
2413 c4296144 2019-05-09 stsp printf("created commit %s\n", id_str);
2416 c4296144 2019-05-09 stsp got_repo_close(repo);
2417 c4296144 2019-05-09 stsp if (worktree)
2418 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2419 c4296144 2019-05-09 stsp free(path);
2420 c4296144 2019-05-09 stsp free(cwd);
2421 c4296144 2019-05-09 stsp free(id_str);
2422 e2ba3d07 2019-05-13 stsp free(editor);
2423 c4296144 2019-05-09 stsp return error;
