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;
230 a0937847 2019-05-11 stsp if (create_worktree) {
231 a0937847 2019-05-11 stsp /* Pre-create work tree path to avoid unveiling its parents. */
232 163ce85a 2019-05-13 stsp err = got_path_mkdir(worktree_path);
234 3c45a30a 2019-05-12 jcs if (errno == EEXIST) {
235 280f921b 2019-05-12 stsp if (got_path_dir_is_empty(worktree_path)) {
237 163ce85a 2019-05-13 stsp err = NULL;
239 df056ada 2019-05-15 stsp err = got_error_path(worktree_path,
240 df056ada 2019-05-15 stsp GOT_ERR_DIR_NOT_EMPTY);
244 163ce85a 2019-05-13 stsp if (err && (err->code != GOT_ERR_ERRNO || errno != EISDIR))
245 163ce85a 2019-05-13 stsp return err;
248 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
249 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
251 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
252 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
254 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
255 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
257 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
258 163ce85a 2019-05-13 stsp if (err != NULL)
259 163ce85a 2019-05-13 stsp return err;
261 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
262 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
264 0266afb7 2019-01-04 stsp return NULL;
267 4ed7e80c 2018-05-20 stsp __dead static void
268 c09a553d 2018-03-12 stsp usage_checkout(void)
270 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
271 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
275 92a684f4 2018-03-12 stsp static void
276 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
278 92a684f4 2018-03-12 stsp char *worktree_path = arg;
280 92a684f4 2018-03-12 stsp while (path[0] == '/')
283 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
286 99437157 2018-11-11 stsp static const struct got_error *
287 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
289 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
290 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
291 99437157 2018-11-11 stsp return NULL;
294 8069f636 2019-01-12 stsp static const struct got_error *
295 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
296 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
298 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
299 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
301 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
302 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
304 36a38700 2019-05-10 stsp return err;
306 d5bea539 2019-05-13 stsp if (yca_id == NULL)
307 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
310 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
311 d5bea539 2019-05-13 stsp * and the work tree's base commit.
313 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
315 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
323 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
324 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
325 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
327 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
328 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
329 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
331 d5bea539 2019-05-13 stsp free(yca_id);
332 d5bea539 2019-05-13 stsp return NULL;
335 a367ff0f 2019-05-14 stsp static const struct got_error *
336 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
337 a367ff0f 2019-05-14 stsp struct got_reference *head_ref, struct got_repository *repo)
339 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
340 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
341 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
342 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
344 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
348 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
352 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
357 a367ff0f 2019-05-14 stsp struct got_object_id *id;
358 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
360 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
361 a367ff0f 2019-05-14 stsp err = NULL;
364 a367ff0f 2019-05-14 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
366 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
373 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
374 a367ff0f 2019-05-14 stsp is_same_branch = 1;
381 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
382 a367ff0f 2019-05-14 stsp free(head_commit_id);
383 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
384 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
385 a367ff0f 2019-05-14 stsp return err;
388 4ed7e80c 2018-05-20 stsp static const struct got_error *
389 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
391 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
392 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
393 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
394 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
395 c09a553d 2018-03-12 stsp char *repo_path = NULL;
396 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
397 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
398 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
399 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
400 72151b04 2019-05-11 stsp int ch, same_path_prefix;
402 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
403 0bb8a95e 2018-03-12 stsp switch (ch) {
405 08573d5b 2019-05-14 stsp branch_name = optarg;
408 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
409 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
410 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
413 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
416 2deda0b9 2019-03-07 stsp usage_checkout();
417 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
421 0bb8a95e 2018-03-12 stsp argc -= optind;
422 0bb8a95e 2018-03-12 stsp argv += optind;
424 6715a751 2018-03-16 stsp #ifndef PROFILE
425 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
426 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
427 c09a553d 2018-03-12 stsp err(1, "pledge");
429 0bb8a95e 2018-03-12 stsp if (argc == 1) {
430 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
431 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
432 76089277 2018-04-01 stsp if (repo_path == NULL)
433 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
434 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
435 76089277 2018-04-01 stsp if (cwd == NULL) {
436 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
439 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
440 230a42bd 2019-05-11 jcs base = basename(path_prefix);
441 230a42bd 2019-05-11 jcs if (base == NULL) {
442 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
443 230a42bd 2019-05-11 jcs path_prefix);
447 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
448 230a42bd 2019-05-11 jcs if (base == NULL) {
449 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
454 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
455 c09a553d 2018-03-12 stsp if (dotgit)
456 c09a553d 2018-03-12 stsp *dotgit = '\0';
457 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
458 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
463 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
464 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
465 76089277 2018-04-01 stsp if (repo_path == NULL) {
466 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
469 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
470 76089277 2018-04-01 stsp if (worktree_path == NULL) {
471 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
475 c09a553d 2018-03-12 stsp usage_checkout();
477 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
478 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
480 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
481 c09a553d 2018-03-12 stsp if (error != NULL)
484 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
488 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
489 c09a553d 2018-03-12 stsp if (error != NULL)
492 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
493 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
496 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
497 c09a553d 2018-03-12 stsp if (error != NULL)
500 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
501 e5dc7198 2018-12-29 stsp path_prefix);
502 e5dc7198 2018-12-29 stsp if (error != NULL)
504 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
505 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
509 8069f636 2019-01-12 stsp if (commit_id_str) {
510 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
511 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
512 8069f636 2019-01-12 stsp commit_id_str);
513 8069f636 2019-01-12 stsp if (error != NULL)
515 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
516 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
517 8069f636 2019-01-12 stsp if (error != NULL) {
518 8069f636 2019-01-12 stsp free(commit_id);
521 45d344f6 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
524 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
525 8069f636 2019-01-12 stsp commit_id);
526 8069f636 2019-01-12 stsp free(commit_id);
531 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
532 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
533 c09a553d 2018-03-12 stsp if (error != NULL)
536 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
539 8069f636 2019-01-12 stsp free(commit_id_str);
540 76089277 2018-04-01 stsp free(repo_path);
541 507dc3bb 2018-12-29 stsp free(worktree_path);
542 507dc3bb 2018-12-29 stsp return error;
545 507dc3bb 2018-12-29 stsp __dead static void
546 507dc3bb 2018-12-29 stsp usage_update(void)
548 024e9686 2019-05-14 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path]\n",
549 507dc3bb 2018-12-29 stsp getprogname());
553 507dc3bb 2018-12-29 stsp static void
554 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
556 784955db 2019-01-12 stsp int *did_something = arg;
558 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
561 1545c615 2019-02-10 stsp *did_something = 1;
562 507dc3bb 2018-12-29 stsp while (path[0] == '/')
564 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
567 be7061eb 2018-12-30 stsp static const struct got_error *
568 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
569 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
570 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
572 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
573 a1fb16d8 2019-05-24 stsp char *base_id_str;
574 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
576 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
577 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
578 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
579 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
580 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
581 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
582 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
585 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
586 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
588 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
589 a1fb16d8 2019-05-24 stsp return err;
590 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
592 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
593 a1fb16d8 2019-05-24 stsp return NULL;
595 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
596 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
597 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
599 a1fb16d8 2019-05-24 stsp return err;
600 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
601 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
602 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
603 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
604 a1fb16d8 2019-05-24 stsp return NULL;
607 a1fb16d8 2019-05-24 stsp static const struct got_error *
608 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
610 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
611 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
612 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
613 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
614 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
615 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
616 024e9686 2019-05-14 stsp const char *branch_name = NULL;
617 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
618 784955db 2019-01-12 stsp int ch, did_something = 0;
620 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
621 507dc3bb 2018-12-29 stsp switch (ch) {
623 024e9686 2019-05-14 stsp branch_name = optarg;
626 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
627 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
628 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
631 2deda0b9 2019-03-07 stsp usage_update();
632 507dc3bb 2018-12-29 stsp /* NOTREACHED */
636 507dc3bb 2018-12-29 stsp argc -= optind;
637 507dc3bb 2018-12-29 stsp argv += optind;
639 507dc3bb 2018-12-29 stsp #ifndef PROFILE
640 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
641 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
642 507dc3bb 2018-12-29 stsp err(1, "pledge");
644 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
645 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
646 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
649 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
653 507dc3bb 2018-12-29 stsp if (argc == 0) {
654 c4cdcb68 2019-04-03 stsp path = strdup("");
655 c4cdcb68 2019-04-03 stsp if (path == NULL) {
656 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
659 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
660 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
664 507dc3bb 2018-12-29 stsp usage_update();
666 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
667 507dc3bb 2018-12-29 stsp if (error != NULL)
670 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
671 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
675 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
676 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
677 024e9686 2019-05-14 stsp if (error != NULL)
679 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
680 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
681 9c4b8182 2019-01-02 stsp if (error != NULL)
683 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
684 507dc3bb 2018-12-29 stsp if (error != NULL)
687 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
688 507dc3bb 2018-12-29 stsp commit_id_str);
689 507dc3bb 2018-12-29 stsp if (error != NULL)
693 a1fb16d8 2019-05-24 stsp if (branch_name) {
694 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
695 024e9686 2019-05-14 stsp if (strlen(path) != 0) {
696 a1fb16d8 2019-05-24 stsp fprintf(stderr, "%s: switching between branches "
697 a1fb16d8 2019-05-24 stsp "requires that the entire work tree "
698 024e9686 2019-05-14 stsp "gets updated, not just '%s'\n",
699 024e9686 2019-05-14 stsp getprogname(), path);
700 024e9686 2019-05-14 stsp error = got_error(GOT_ERR_BAD_PATH);
703 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
706 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
707 a367ff0f 2019-05-14 stsp free(head_commit_id);
708 024e9686 2019-05-14 stsp if (error != NULL)
710 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
713 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
717 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
718 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
719 a367ff0f 2019-05-14 stsp if (error != NULL) {
720 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
721 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
724 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
729 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
730 507dc3bb 2018-12-29 stsp commit_id) != 0) {
731 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
732 507dc3bb 2018-12-29 stsp commit_id);
737 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
738 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
739 507dc3bb 2018-12-29 stsp if (error != NULL)
742 784955db 2019-01-12 stsp if (did_something)
743 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
745 784955db 2019-01-12 stsp printf("Already up-to-date\n");
747 c09a553d 2018-03-12 stsp free(worktree_path);
748 c4cdcb68 2019-04-03 stsp free(path);
749 507dc3bb 2018-12-29 stsp free(commit_id);
750 9c4b8182 2019-01-02 stsp free(commit_id_str);
751 c09a553d 2018-03-12 stsp return error;
754 f42b1b34 2018-03-12 stsp static const struct got_error *
755 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
756 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
758 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
759 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
760 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
761 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
763 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
764 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
766 79109fed 2018-03-27 stsp return err;
768 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
769 79f35eb3 2018-06-11 stsp if (qid != NULL) {
770 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
772 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
774 79109fed 2018-03-27 stsp return err;
776 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
777 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
778 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
780 0f2b3dca 2018-12-22 stsp return err;
782 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
784 79109fed 2018-03-27 stsp return err;
787 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
791 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
792 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
795 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
796 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
797 0f2b3dca 2018-12-22 stsp free(id_str1);
798 0f2b3dca 2018-12-22 stsp free(id_str2);
799 79109fed 2018-03-27 stsp return err;
802 4bb494d5 2018-06-16 stsp static char *
803 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
805 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
806 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
812 79109fed 2018-03-27 stsp static const struct got_error *
813 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
814 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
815 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
817 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
818 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
819 6c281f94 2018-06-11 stsp char datebuf[26];
820 45d799e2 2018-12-23 stsp time_t committer_time;
821 45d799e2 2018-12-23 stsp const char *author, *committer;
822 199a4027 2019-02-02 stsp char *refs_str = NULL;
823 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
825 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
827 199a4027 2019-02-02 stsp const char *name;
828 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
830 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
831 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
833 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
835 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
837 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
839 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
841 199a4027 2019-02-02 stsp s = refs_str;
842 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
843 199a4027 2019-02-02 stsp name) == -1) {
844 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
850 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
852 8bf5b3c9 2018-03-17 stsp return err;
854 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
855 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
856 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
857 832c249c 2018-06-10 stsp free(id_str);
858 d3d493d7 2019-02-21 stsp id_str = NULL;
859 d3d493d7 2019-02-21 stsp free(refs_str);
860 d3d493d7 2019-02-21 stsp refs_str = NULL;
861 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
862 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
863 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
864 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
865 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
866 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
867 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
868 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
869 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
870 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
871 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
873 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
874 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
875 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
877 a0603db2 2018-06-10 stsp return err;
878 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
879 a0603db2 2018-06-10 stsp free(id_str);
883 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
884 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
885 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
887 621015ac 2018-07-23 stsp logmsg = logmsg0;
889 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
891 832c249c 2018-06-10 stsp printf(" %s\n", line);
892 832c249c 2018-06-10 stsp } while (line);
893 621015ac 2018-07-23 stsp free(logmsg0);
895 971751ac 2018-03-27 stsp if (show_patch) {
896 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
897 971751ac 2018-03-27 stsp if (err == 0)
898 971751ac 2018-03-27 stsp printf("\n");
901 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
902 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
903 07862c20 2018-09-15 stsp return err;
906 f42b1b34 2018-03-12 stsp static const struct got_error *
907 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
908 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
909 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
911 f42b1b34 2018-03-12 stsp const struct got_error *err;
912 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
914 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
915 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
917 f42b1b34 2018-03-12 stsp return err;
918 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
922 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
923 372ccdbb 2018-06-10 stsp struct got_object_id *id;
925 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
928 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
930 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
931 9ba79e04 2018-06-11 stsp err = NULL;
934 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
936 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
942 b43fbaa0 2018-06-11 stsp if (id == NULL)
945 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
948 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
950 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
951 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
955 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
956 f42b1b34 2018-03-12 stsp return err;
959 4ed7e80c 2018-05-20 stsp __dead static void
960 6f3d1eb0 2018-03-12 stsp usage_log(void)
962 499d7ecc 2019-05-22 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
963 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
967 4ed7e80c 2018-05-20 stsp static const struct got_error *
968 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
970 f42b1b34 2018-03-12 stsp const struct got_error *error;
971 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
972 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
973 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
974 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
975 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
976 d142fc45 2018-04-01 stsp char *start_commit = NULL;
977 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
978 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
979 64a96a6d 2018-04-01 stsp const char *errstr;
980 199a4027 2019-02-02 stsp struct got_reflist_head refs;
982 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
984 6715a751 2018-03-16 stsp #ifndef PROFILE
985 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
988 f42b1b34 2018-03-12 stsp err(1, "pledge");
991 499d7ecc 2019-05-22 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:")) != -1) {
992 79109fed 2018-03-27 stsp switch (ch) {
994 499d7ecc 2019-05-22 stsp first_parent_traversal = 1;
997 79109fed 2018-03-27 stsp show_patch = 1;
1000 d142fc45 2018-04-01 stsp start_commit = optarg;
1003 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1005 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1006 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1009 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1010 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1011 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1014 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1015 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1016 04ca23f4 2018-07-16 stsp err(1, "-r option");
1017 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1020 2deda0b9 2019-03-07 stsp usage_log();
1021 79109fed 2018-03-27 stsp /* NOTREACHED */
1025 79109fed 2018-03-27 stsp argc -= optind;
1026 79109fed 2018-03-27 stsp argv += optind;
1028 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1029 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1030 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1031 04ca23f4 2018-07-16 stsp goto done;
1034 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1035 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1036 cffc0aa4 2019-02-05 stsp goto done;
1037 cffc0aa4 2019-02-05 stsp error = NULL;
1039 e7301579 2019-03-18 stsp if (argc == 0) {
1040 cbd1af7a 2019-03-18 stsp path = strdup("");
1041 e7301579 2019-03-18 stsp if (path == NULL) {
1042 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1043 cbd1af7a 2019-03-18 stsp goto done;
1045 e7301579 2019-03-18 stsp } else if (argc == 1) {
1046 e7301579 2019-03-18 stsp if (worktree) {
1047 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1049 e7301579 2019-03-18 stsp if (error)
1050 e7301579 2019-03-18 stsp goto done;
1052 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1053 e7301579 2019-03-18 stsp if (path == NULL) {
1054 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1055 e7301579 2019-03-18 stsp goto done;
1059 cbd1af7a 2019-03-18 stsp usage_log();
1061 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1062 5486daa2 2019-05-11 stsp repo_path = worktree ?
1063 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1065 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1066 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1067 cffc0aa4 2019-02-05 stsp goto done;
1070 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1071 d7d4f210 2018-03-12 stsp if (error != NULL)
1072 04ca23f4 2018-07-16 stsp goto done;
1074 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1075 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1076 c02c541e 2019-03-29 stsp if (error)
1077 c02c541e 2019-03-29 stsp goto done;
1079 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1080 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1081 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1082 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1083 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1084 3235492e 2018-04-01 stsp if (error != NULL)
1085 3235492e 2018-04-01 stsp return error;
1086 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1087 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1088 3235492e 2018-04-01 stsp if (error != NULL)
1089 3235492e 2018-04-01 stsp return error;
1090 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1092 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1093 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1094 3235492e 2018-04-01 stsp if (error == NULL) {
1095 1caad61b 2019-02-01 stsp int obj_type;
1096 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1097 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1098 d1f2edc9 2018-06-13 stsp if (error != NULL)
1099 1caad61b 2019-02-01 stsp goto done;
1100 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1101 1caad61b 2019-02-01 stsp if (error != NULL)
1102 1caad61b 2019-02-01 stsp goto done;
1103 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1104 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1105 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1106 1caad61b 2019-02-01 stsp if (error != NULL)
1107 1caad61b 2019-02-01 stsp goto done;
1108 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1109 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1110 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1111 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1112 1caad61b 2019-02-01 stsp goto done;
1115 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1116 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1117 1caad61b 2019-02-01 stsp if (id == NULL)
1118 638f9024 2019-05-13 stsp error = got_error_from_errno(
1119 230a42bd 2019-05-11 jcs "got_object_id_dup");
1120 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1121 1caad61b 2019-02-01 stsp if (error)
1122 1caad61b 2019-02-01 stsp goto done;
1123 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1124 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1125 1caad61b 2019-02-01 stsp goto done;
1127 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1128 d1f2edc9 2018-06-13 stsp if (error != NULL)
1129 1caad61b 2019-02-01 stsp goto done;
1131 15a94983 2018-12-23 stsp if (commit == NULL) {
1132 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
1133 d1f2edc9 2018-06-13 stsp start_commit);
1134 d1f2edc9 2018-06-13 stsp if (error != NULL)
1135 d1f2edc9 2018-06-13 stsp return error;
1138 d7d4f210 2018-03-12 stsp if (error != NULL)
1139 04ca23f4 2018-07-16 stsp goto done;
1141 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1142 04ca23f4 2018-07-16 stsp if (error != NULL)
1143 04ca23f4 2018-07-16 stsp goto done;
1144 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1145 04ca23f4 2018-07-16 stsp free(path);
1146 04ca23f4 2018-07-16 stsp path = in_repo_path;
1149 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1150 199a4027 2019-02-02 stsp if (error)
1151 199a4027 2019-02-02 stsp goto done;
1153 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1154 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1156 04ca23f4 2018-07-16 stsp free(path);
1157 04ca23f4 2018-07-16 stsp free(repo_path);
1158 04ca23f4 2018-07-16 stsp free(cwd);
1160 cffc0aa4 2019-02-05 stsp if (worktree)
1161 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1162 ad242220 2018-09-08 stsp if (repo) {
1163 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1164 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1165 ad242220 2018-09-08 stsp if (error == NULL)
1166 ad242220 2018-09-08 stsp error = repo_error;
1168 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1169 8bf5b3c9 2018-03-17 stsp return error;
1172 4ed7e80c 2018-05-20 stsp __dead static void
1173 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1175 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1176 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1180 b72f483a 2019-02-05 stsp struct print_diff_arg {
1181 b72f483a 2019-02-05 stsp struct got_repository *repo;
1182 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1183 b72f483a 2019-02-05 stsp int diff_context;
1184 3fc0c068 2019-02-10 stsp const char *id_str;
1185 3fc0c068 2019-02-10 stsp int header_shown;
1188 4ed7e80c 2018-05-20 stsp static const struct got_error *
1189 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1190 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1192 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1193 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1194 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1195 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1196 b72f483a 2019-02-05 stsp char *abspath = NULL;
1197 b72f483a 2019-02-05 stsp struct stat sb;
1199 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1200 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1201 b72f483a 2019-02-05 stsp return NULL;
1203 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1204 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1205 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1206 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1209 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1210 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1212 d00136be 2019-03-26 stsp goto done;
1216 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1217 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1218 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1219 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1220 2ec1f75b 2019-03-26 stsp goto done;
1223 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1224 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1225 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1226 2ec1f75b 2019-03-26 stsp goto done;
1228 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1229 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1230 2ec1f75b 2019-03-26 stsp goto done;
1233 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1235 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1238 b72f483a 2019-02-05 stsp if (blob1)
1239 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1240 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1241 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1242 b72f483a 2019-02-05 stsp free(abspath);
1243 927df6b7 2019-02-10 stsp return err;
1246 927df6b7 2019-02-10 stsp static const struct got_error *
1247 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1249 b00d56cd 2018-04-01 stsp const struct got_error *error;
1250 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1251 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1252 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1253 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1254 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1255 15a94983 2018-12-23 stsp int type1, type2;
1256 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1257 c0cc5c62 2018-10-18 stsp const char *errstr;
1258 927df6b7 2019-02-10 stsp char *path = NULL;
1260 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1261 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1262 25eccc22 2019-01-04 stsp NULL) == -1)
1263 b00d56cd 2018-04-01 stsp err(1, "pledge");
1266 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1267 b00d56cd 2018-04-01 stsp switch (ch) {
1269 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1270 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1271 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1274 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1275 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1276 b72f483a 2019-02-05 stsp err(1, "-r option");
1277 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1280 2deda0b9 2019-03-07 stsp usage_diff();
1281 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1285 b00d56cd 2018-04-01 stsp argc -= optind;
1286 b00d56cd 2018-04-01 stsp argv += optind;
1288 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1289 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1290 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1291 b72f483a 2019-02-05 stsp goto done;
1293 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1294 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1295 927df6b7 2019-02-10 stsp goto done;
1296 927df6b7 2019-02-10 stsp if (argc <= 1) {
1297 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1298 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1299 927df6b7 2019-02-10 stsp goto done;
1301 b72f483a 2019-02-05 stsp if (repo_path)
1303 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1304 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1305 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1306 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1307 927df6b7 2019-02-10 stsp goto done;
1309 927df6b7 2019-02-10 stsp if (argc == 1) {
1310 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1312 927df6b7 2019-02-10 stsp if (error)
1313 927df6b7 2019-02-10 stsp goto done;
1315 927df6b7 2019-02-10 stsp path = strdup("");
1316 927df6b7 2019-02-10 stsp if (path == NULL) {
1317 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1318 927df6b7 2019-02-10 stsp goto done;
1321 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1322 15a94983 2018-12-23 stsp id_str1 = argv[0];
1323 15a94983 2018-12-23 stsp id_str2 = argv[1];
1325 b00d56cd 2018-04-01 stsp usage_diff();
1327 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1328 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1329 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1330 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1333 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1334 76089277 2018-04-01 stsp free(repo_path);
1335 b00d56cd 2018-04-01 stsp if (error != NULL)
1336 b00d56cd 2018-04-01 stsp goto done;
1338 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1339 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1340 c02c541e 2019-03-29 stsp if (error)
1341 c02c541e 2019-03-29 stsp goto done;
1343 b72f483a 2019-02-05 stsp if (worktree) {
1344 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1345 b72f483a 2019-02-05 stsp char *id_str;
1346 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1347 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1348 b72f483a 2019-02-05 stsp if (error)
1349 b72f483a 2019-02-05 stsp goto done;
1350 b72f483a 2019-02-05 stsp arg.repo = repo;
1351 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1352 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1353 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1354 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1356 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1357 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1358 b72f483a 2019-02-05 stsp free(id_str);
1359 b72f483a 2019-02-05 stsp goto done;
1362 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1363 e02e74af 2019-05-28 stsp if (error) {
1364 e02e74af 2019-05-28 stsp struct got_reference *ref;
1365 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1366 e02e74af 2019-05-28 stsp goto done;
1367 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1368 e02e74af 2019-05-28 stsp if (error != NULL)
1369 e02e74af 2019-05-28 stsp goto done;
1370 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1371 e02e74af 2019-05-28 stsp got_ref_close(ref);
1372 e02e74af 2019-05-28 stsp if (error != NULL)
1373 e02e74af 2019-05-28 stsp goto done;
1376 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1377 e02e74af 2019-05-28 stsp if (error) {
1378 e02e74af 2019-05-28 stsp struct got_reference *ref;
1379 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1380 e02e74af 2019-05-28 stsp goto done;
1381 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1382 e02e74af 2019-05-28 stsp if (error != NULL)
1383 e02e74af 2019-05-28 stsp goto done;
1384 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1385 e02e74af 2019-05-28 stsp got_ref_close(ref);
1386 e02e74af 2019-05-28 stsp if (error != NULL)
1387 e02e74af 2019-05-28 stsp goto done;
1390 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1391 15a94983 2018-12-23 stsp if (error)
1392 15a94983 2018-12-23 stsp goto done;
1394 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1395 15a94983 2018-12-23 stsp if (error)
1396 15a94983 2018-12-23 stsp goto done;
1398 15a94983 2018-12-23 stsp if (type1 != type2) {
1399 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1400 b00d56cd 2018-04-01 stsp goto done;
1403 15a94983 2018-12-23 stsp switch (type1) {
1404 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1405 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1406 54156555 2018-12-24 stsp diff_context, repo, stdout);
1408 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1409 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1410 54156555 2018-12-24 stsp diff_context, repo, stdout);
1412 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1413 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1415 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1416 c0cc5c62 2018-10-18 stsp repo, stdout);
1419 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1423 15a94983 2018-12-23 stsp free(id1);
1424 15a94983 2018-12-23 stsp free(id2);
1425 927df6b7 2019-02-10 stsp free(path);
1426 b72f483a 2019-02-05 stsp if (worktree)
1427 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1428 ad242220 2018-09-08 stsp if (repo) {
1429 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1430 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1431 ad242220 2018-09-08 stsp if (error == NULL)
1432 ad242220 2018-09-08 stsp error = repo_error;
1434 b00d56cd 2018-04-01 stsp return error;
1437 404c43c4 2018-06-21 stsp __dead static void
1438 404c43c4 2018-06-21 stsp usage_blame(void)
1440 9270e621 2019-02-05 stsp fprintf(stderr,
1441 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1442 404c43c4 2018-06-21 stsp getprogname());
1446 404c43c4 2018-06-21 stsp static const struct got_error *
1447 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1449 404c43c4 2018-06-21 stsp const struct got_error *error;
1450 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1451 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1452 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1453 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1454 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1457 404c43c4 2018-06-21 stsp #ifndef PROFILE
1458 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1459 36e2fb66 2019-01-04 stsp NULL) == -1)
1460 404c43c4 2018-06-21 stsp err(1, "pledge");
1463 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1464 404c43c4 2018-06-21 stsp switch (ch) {
1466 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1469 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1470 66bea077 2018-08-02 stsp if (repo_path == NULL)
1471 66bea077 2018-08-02 stsp err(1, "-r option");
1472 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1475 2deda0b9 2019-03-07 stsp usage_blame();
1476 404c43c4 2018-06-21 stsp /* NOTREACHED */
1480 404c43c4 2018-06-21 stsp argc -= optind;
1481 404c43c4 2018-06-21 stsp argv += optind;
1483 a39318fd 2018-08-02 stsp if (argc == 1)
1484 404c43c4 2018-06-21 stsp path = argv[0];
1486 404c43c4 2018-06-21 stsp usage_blame();
1488 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1489 66bea077 2018-08-02 stsp if (cwd == NULL) {
1490 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1491 66bea077 2018-08-02 stsp goto done;
1493 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1494 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1495 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1496 66bea077 2018-08-02 stsp goto done;
1498 0c06baac 2019-02-05 stsp error = NULL;
1499 0c06baac 2019-02-05 stsp if (worktree) {
1500 0c06baac 2019-02-05 stsp repo_path =
1501 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1502 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1503 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1504 0c06baac 2019-02-05 stsp if (error)
1505 0c06baac 2019-02-05 stsp goto done;
1507 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1508 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1509 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1510 0c06baac 2019-02-05 stsp goto done;
1515 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1516 c02c541e 2019-03-29 stsp if (error != NULL)
1517 36e2fb66 2019-01-04 stsp goto done;
1519 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1520 c02c541e 2019-03-29 stsp if (error)
1521 404c43c4 2018-06-21 stsp goto done;
1523 0c06baac 2019-02-05 stsp if (worktree) {
1524 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1525 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1526 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1527 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1528 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1529 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1530 6efaaa2d 2019-02-05 stsp path) == -1) {
1531 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1532 0c06baac 2019-02-05 stsp goto done;
1534 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1537 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1539 0c06baac 2019-02-05 stsp if (error)
1540 66bea077 2018-08-02 stsp goto done;
1542 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1543 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1544 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1545 404c43c4 2018-06-21 stsp if (error != NULL)
1546 66bea077 2018-08-02 stsp goto done;
1547 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1548 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1549 404c43c4 2018-06-21 stsp if (error != NULL)
1550 66bea077 2018-08-02 stsp goto done;
1552 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1553 15a94983 2018-12-23 stsp commit_id_str);
1554 404c43c4 2018-06-21 stsp if (error != NULL)
1555 66bea077 2018-08-02 stsp goto done;
1558 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1560 66bea077 2018-08-02 stsp free(in_repo_path);
1561 66bea077 2018-08-02 stsp free(repo_path);
1562 66bea077 2018-08-02 stsp free(cwd);
1563 404c43c4 2018-06-21 stsp free(commit_id);
1564 0c06baac 2019-02-05 stsp if (worktree)
1565 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1566 ad242220 2018-09-08 stsp if (repo) {
1567 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1568 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1569 ad242220 2018-09-08 stsp if (error == NULL)
1570 ad242220 2018-09-08 stsp error = repo_error;
1572 404c43c4 2018-06-21 stsp return error;
1575 5de5890b 2018-10-18 stsp __dead static void
1576 5de5890b 2018-10-18 stsp usage_tree(void)
1578 c1669e2e 2019-01-09 stsp fprintf(stderr,
1579 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1580 5de5890b 2018-10-18 stsp getprogname());
1584 c1669e2e 2019-01-09 stsp static void
1585 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1586 c1669e2e 2019-01-09 stsp const char *root_path)
1588 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1590 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1591 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1594 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1595 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1596 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1599 5de5890b 2018-10-18 stsp static const struct got_error *
1600 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1601 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1602 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1604 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1605 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1606 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1607 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1608 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1610 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1612 5de5890b 2018-10-18 stsp goto done;
1614 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1616 5de5890b 2018-10-18 stsp goto done;
1617 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1618 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1619 5de5890b 2018-10-18 stsp while (te) {
1620 5de5890b 2018-10-18 stsp char *id = NULL;
1622 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1625 5de5890b 2018-10-18 stsp if (show_ids) {
1626 5de5890b 2018-10-18 stsp char *id_str;
1627 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1629 5de5890b 2018-10-18 stsp goto done;
1630 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1631 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1632 5de5890b 2018-10-18 stsp free(id_str);
1633 5de5890b 2018-10-18 stsp goto done;
1635 5de5890b 2018-10-18 stsp free(id_str);
1637 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1640 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1641 c1669e2e 2019-01-09 stsp char *child_path;
1642 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1643 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1644 c1669e2e 2019-01-09 stsp te->name) == -1) {
1645 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1646 c1669e2e 2019-01-09 stsp goto done;
1648 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1649 c1669e2e 2019-01-09 stsp root_path, repo);
1650 c1669e2e 2019-01-09 stsp free(child_path);
1652 c1669e2e 2019-01-09 stsp goto done;
1655 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1659 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1660 5de5890b 2018-10-18 stsp free(tree_id);
1661 5de5890b 2018-10-18 stsp return err;
1664 5de5890b 2018-10-18 stsp static const struct got_error *
1665 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1667 5de5890b 2018-10-18 stsp const struct got_error *error;
1668 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1669 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1670 7a2c19d6 2019-02-05 stsp const char *path;
1671 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1672 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1673 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1674 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1677 5de5890b 2018-10-18 stsp #ifndef PROFILE
1678 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1679 0f8d269b 2019-01-04 stsp NULL) == -1)
1680 5de5890b 2018-10-18 stsp err(1, "pledge");
1683 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1684 5de5890b 2018-10-18 stsp switch (ch) {
1686 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1689 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1690 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1691 5de5890b 2018-10-18 stsp err(1, "-r option");
1692 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1695 5de5890b 2018-10-18 stsp show_ids = 1;
1698 c1669e2e 2019-01-09 stsp recurse = 1;
1701 2deda0b9 2019-03-07 stsp usage_tree();
1702 5de5890b 2018-10-18 stsp /* NOTREACHED */
1706 5de5890b 2018-10-18 stsp argc -= optind;
1707 5de5890b 2018-10-18 stsp argv += optind;
1709 5de5890b 2018-10-18 stsp if (argc == 1)
1710 5de5890b 2018-10-18 stsp path = argv[0];
1711 5de5890b 2018-10-18 stsp else if (argc > 1)
1712 5de5890b 2018-10-18 stsp usage_tree();
1714 7a2c19d6 2019-02-05 stsp path = NULL;
1716 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1717 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1718 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1719 9bf7a39b 2019-02-05 stsp goto done;
1721 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1722 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1723 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1724 7a2c19d6 2019-02-05 stsp goto done;
1726 7a2c19d6 2019-02-05 stsp error = NULL;
1727 7a2c19d6 2019-02-05 stsp if (worktree) {
1728 7a2c19d6 2019-02-05 stsp repo_path =
1729 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1730 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1731 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1732 7a2c19d6 2019-02-05 stsp if (error)
1733 7a2c19d6 2019-02-05 stsp goto done;
1735 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1736 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1737 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1738 7a2c19d6 2019-02-05 stsp goto done;
1743 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1744 5de5890b 2018-10-18 stsp if (error != NULL)
1745 c02c541e 2019-03-29 stsp goto done;
1747 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1748 c02c541e 2019-03-29 stsp if (error)
1749 5de5890b 2018-10-18 stsp goto done;
1751 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1752 9bf7a39b 2019-02-05 stsp if (worktree) {
1753 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1754 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1755 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1756 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1757 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1758 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1759 9bf7a39b 2019-02-05 stsp goto done;
1761 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1763 9bf7a39b 2019-02-05 stsp if (error)
1764 9bf7a39b 2019-02-05 stsp goto done;
1766 9bf7a39b 2019-02-05 stsp path = "/";
1768 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1769 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1770 9bf7a39b 2019-02-05 stsp if (error != NULL)
1771 9bf7a39b 2019-02-05 stsp goto done;
1774 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1775 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1776 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1777 5de5890b 2018-10-18 stsp if (error != NULL)
1778 5de5890b 2018-10-18 stsp goto done;
1779 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1780 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1781 5de5890b 2018-10-18 stsp if (error != NULL)
1782 5de5890b 2018-10-18 stsp goto done;
1784 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1785 15a94983 2018-12-23 stsp commit_id_str);
1786 5de5890b 2018-10-18 stsp if (error != NULL)
1787 5de5890b 2018-10-18 stsp goto done;
1790 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1791 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1793 5de5890b 2018-10-18 stsp free(in_repo_path);
1794 5de5890b 2018-10-18 stsp free(repo_path);
1795 5de5890b 2018-10-18 stsp free(cwd);
1796 5de5890b 2018-10-18 stsp free(commit_id);
1797 7a2c19d6 2019-02-05 stsp if (worktree)
1798 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1799 5de5890b 2018-10-18 stsp if (repo) {
1800 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1801 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1802 5de5890b 2018-10-18 stsp if (error == NULL)
1803 5de5890b 2018-10-18 stsp error = repo_error;
1805 5de5890b 2018-10-18 stsp return error;
1808 6bad629b 2019-02-04 stsp __dead static void
1809 6bad629b 2019-02-04 stsp usage_status(void)
1811 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1815 b72f483a 2019-02-05 stsp static const struct got_error *
1816 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1817 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1819 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1820 b72f483a 2019-02-05 stsp return NULL;
1823 6bad629b 2019-02-04 stsp static const struct got_error *
1824 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1826 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1827 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1828 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1829 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1832 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1833 6bad629b 2019-02-04 stsp switch (ch) {
1835 2deda0b9 2019-03-07 stsp usage_status();
1836 6bad629b 2019-02-04 stsp /* NOTREACHED */
1840 6bad629b 2019-02-04 stsp argc -= optind;
1841 6bad629b 2019-02-04 stsp argv += optind;
1843 6bad629b 2019-02-04 stsp #ifndef PROFILE
1844 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1845 6bad629b 2019-02-04 stsp NULL) == -1)
1846 6bad629b 2019-02-04 stsp err(1, "pledge");
1848 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1849 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1850 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1851 927df6b7 2019-02-10 stsp goto done;
1854 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1855 927df6b7 2019-02-10 stsp if (error != NULL)
1856 927df6b7 2019-02-10 stsp goto done;
1858 6bad629b 2019-02-04 stsp if (argc == 0) {
1859 927df6b7 2019-02-10 stsp path = strdup("");
1860 927df6b7 2019-02-10 stsp if (path == NULL) {
1861 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1862 6bad629b 2019-02-04 stsp goto done;
1864 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1865 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1866 927df6b7 2019-02-10 stsp if (error)
1867 6bad629b 2019-02-04 stsp goto done;
1869 6bad629b 2019-02-04 stsp usage_status();
1871 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1872 6bad629b 2019-02-04 stsp if (error != NULL)
1873 6bad629b 2019-02-04 stsp goto done;
1875 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1876 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1877 6bad629b 2019-02-04 stsp if (error)
1878 6bad629b 2019-02-04 stsp goto done;
1880 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1881 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1883 927df6b7 2019-02-10 stsp free(cwd);
1884 927df6b7 2019-02-10 stsp free(path);
1885 d0eebce4 2019-03-11 stsp return error;
1888 d0eebce4 2019-03-11 stsp __dead static void
1889 d0eebce4 2019-03-11 stsp usage_ref(void)
1891 d0eebce4 2019-03-11 stsp fprintf(stderr,
1892 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
1893 d0eebce4 2019-03-11 stsp getprogname());
1897 d0eebce4 2019-03-11 stsp static const struct got_error *
1898 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1900 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1901 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1902 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1904 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1905 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1907 d0eebce4 2019-03-11 stsp return err;
1909 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1910 d0eebce4 2019-03-11 stsp char *refstr;
1911 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1912 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1913 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
1914 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1915 d0eebce4 2019-03-11 stsp free(refstr);
1918 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1919 d0eebce4 2019-03-11 stsp return NULL;
1922 d0eebce4 2019-03-11 stsp static const struct got_error *
1923 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1925 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1926 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1928 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
1930 d0eebce4 2019-03-11 stsp return err;
1932 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1933 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1934 d0eebce4 2019-03-11 stsp return err;
1937 d0eebce4 2019-03-11 stsp static const struct got_error *
1938 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
1940 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1941 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1942 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1944 d83d9d5c 2019-05-13 stsp err = got_object_resolve_id_str(&id, repo, target);
1945 d83d9d5c 2019-05-13 stsp if (err) {
1946 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
1948 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1949 d83d9d5c 2019-05-13 stsp return err;
1950 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
1952 d83d9d5c 2019-05-13 stsp return err;
1953 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
1954 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
1956 d83d9d5c 2019-05-13 stsp return err;
1959 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1961 d0eebce4 2019-03-11 stsp goto done;
1963 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1966 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1968 d0eebce4 2019-03-11 stsp return err;
1971 d0eebce4 2019-03-11 stsp static const struct got_error *
1972 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1974 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1975 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1976 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1977 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1978 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1979 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1981 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1982 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1983 d0eebce4 2019-03-11 stsp switch (ch) {
1985 d0eebce4 2019-03-11 stsp delref = optarg;
1988 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1989 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1990 d0eebce4 2019-03-11 stsp err(1, "-r option");
1991 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1994 d0eebce4 2019-03-11 stsp do_list = 1;
1997 d0eebce4 2019-03-11 stsp usage_ref();
1998 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2002 d0eebce4 2019-03-11 stsp if (do_list && delref)
2003 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2005 d0eebce4 2019-03-11 stsp argc -= optind;
2006 d0eebce4 2019-03-11 stsp argv += optind;
2008 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2009 d0eebce4 2019-03-11 stsp if (argc > 0)
2010 d0eebce4 2019-03-11 stsp usage_ref();
2011 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2012 d0eebce4 2019-03-11 stsp usage_ref();
2014 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2015 e0b57350 2019-03-12 stsp if (do_list) {
2016 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2017 e0b57350 2019-03-12 stsp NULL) == -1)
2018 e0b57350 2019-03-12 stsp err(1, "pledge");
2020 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2021 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2022 e0b57350 2019-03-12 stsp err(1, "pledge");
2025 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2026 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2027 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2028 d0eebce4 2019-03-11 stsp goto done;
2031 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2032 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2033 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2034 d0eebce4 2019-03-11 stsp goto done;
2036 d0eebce4 2019-03-11 stsp error = NULL;
2037 d0eebce4 2019-03-11 stsp if (worktree) {
2038 d0eebce4 2019-03-11 stsp repo_path =
2039 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2040 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2041 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2042 d0eebce4 2019-03-11 stsp if (error)
2043 d0eebce4 2019-03-11 stsp goto done;
2045 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2046 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2047 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2048 d0eebce4 2019-03-11 stsp goto done;
2053 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2054 d0eebce4 2019-03-11 stsp if (error != NULL)
2055 d0eebce4 2019-03-11 stsp goto done;
2057 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2058 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2059 c02c541e 2019-03-29 stsp if (error)
2060 c02c541e 2019-03-29 stsp goto done;
2062 d0eebce4 2019-03-11 stsp if (do_list)
2063 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2064 d0eebce4 2019-03-11 stsp else if (delref)
2065 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2067 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2070 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2071 d0eebce4 2019-03-11 stsp if (worktree)
2072 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2073 d0eebce4 2019-03-11 stsp free(cwd);
2074 d0eebce4 2019-03-11 stsp free(repo_path);
2075 d00136be 2019-03-26 stsp return error;
2078 d00136be 2019-03-26 stsp __dead static void
2079 d00136be 2019-03-26 stsp usage_add(void)
2081 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2085 d00136be 2019-03-26 stsp static const struct got_error *
2086 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2088 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2089 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2090 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2091 1dd54920 2019-05-11 stsp char *cwd = NULL;
2092 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2093 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2096 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2098 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2099 d00136be 2019-03-26 stsp switch (ch) {
2101 d00136be 2019-03-26 stsp usage_add();
2102 d00136be 2019-03-26 stsp /* NOTREACHED */
2106 d00136be 2019-03-26 stsp argc -= optind;
2107 d00136be 2019-03-26 stsp argv += optind;
2109 723c305c 2019-05-11 jcs if (argc < 1)
2110 d00136be 2019-03-26 stsp usage_add();
2112 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
2113 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2114 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2115 723c305c 2019-05-11 jcs if (path == NULL) {
2116 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2119 1dd54920 2019-05-11 stsp free(path);
2122 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2123 d00136be 2019-03-26 stsp if (cwd == NULL) {
2124 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2125 d00136be 2019-03-26 stsp goto done;
2128 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2129 d00136be 2019-03-26 stsp if (error)
2130 d00136be 2019-03-26 stsp goto done;
2132 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2133 031a5338 2019-03-26 stsp if (error != NULL)
2134 031a5338 2019-03-26 stsp goto done;
2136 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2137 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2138 d00136be 2019-03-26 stsp if (error)
2139 d00136be 2019-03-26 stsp goto done;
2141 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2142 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2143 723c305c 2019-05-11 jcs if (path == NULL) {
2144 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2148 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2149 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2150 1dd54920 2019-05-11 stsp if (error) {
2151 1dd54920 2019-05-11 stsp free(path);
2155 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2156 1dd54920 2019-05-11 stsp NULL, repo);
2159 031a5338 2019-03-26 stsp got_repo_close(repo);
2160 d00136be 2019-03-26 stsp if (worktree)
2161 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2162 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2163 1dd54920 2019-05-11 stsp free((char *)pe->path);
2164 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2165 2ec1f75b 2019-03-26 stsp free(cwd);
2166 2ec1f75b 2019-03-26 stsp return error;
2169 2ec1f75b 2019-03-26 stsp __dead static void
2170 2ec1f75b 2019-03-26 stsp usage_rm(void)
2172 2ec1f75b 2019-03-26 stsp fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
2176 2ec1f75b 2019-03-26 stsp static const struct got_error *
2177 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
2179 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2180 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2181 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2182 2ec1f75b 2019-03-26 stsp char *cwd = NULL, *path = NULL;
2183 2ec1f75b 2019-03-26 stsp int ch, delete_local_mods = 0;
2185 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2186 2ec1f75b 2019-03-26 stsp switch (ch) {
2188 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2191 2ec1f75b 2019-03-26 stsp usage_add();
2192 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2196 2ec1f75b 2019-03-26 stsp argc -= optind;
2197 2ec1f75b 2019-03-26 stsp argv += optind;
2199 2ec1f75b 2019-03-26 stsp if (argc != 1)
2200 2ec1f75b 2019-03-26 stsp usage_rm();
2202 2ec1f75b 2019-03-26 stsp path = realpath(argv[0], NULL);
2203 2ec1f75b 2019-03-26 stsp if (path == NULL) {
2204 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2205 2ec1f75b 2019-03-26 stsp goto done;
2207 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2209 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2210 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2211 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2212 2ec1f75b 2019-03-26 stsp goto done;
2214 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2215 2ec1f75b 2019-03-26 stsp if (error)
2216 2ec1f75b 2019-03-26 stsp goto done;
2218 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2220 2ec1f75b 2019-03-26 stsp goto done;
2222 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2223 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2224 2ec1f75b 2019-03-26 stsp if (error)
2225 2ec1f75b 2019-03-26 stsp goto done;
2227 2ec1f75b 2019-03-26 stsp error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
2228 2ec1f75b 2019-03-26 stsp print_status, NULL, repo);
2229 a129376b 2019-03-28 stsp if (error)
2230 a129376b 2019-03-28 stsp goto done;
2233 a129376b 2019-03-28 stsp got_repo_close(repo);
2234 a129376b 2019-03-28 stsp if (worktree)
2235 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2236 a129376b 2019-03-28 stsp free(path);
2237 a129376b 2019-03-28 stsp free(cwd);
2238 a129376b 2019-03-28 stsp return error;
2241 a129376b 2019-03-28 stsp __dead static void
2242 a129376b 2019-03-28 stsp usage_revert(void)
2244 a129376b 2019-03-28 stsp fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2248 a129376b 2019-03-28 stsp static void
2249 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2251 a129376b 2019-03-28 stsp while (path[0] == '/')
2253 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2256 a129376b 2019-03-28 stsp static const struct got_error *
2257 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2259 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2260 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2261 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2262 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2265 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2266 a129376b 2019-03-28 stsp switch (ch) {
2268 a129376b 2019-03-28 stsp usage_revert();
2269 a129376b 2019-03-28 stsp /* NOTREACHED */
2273 a129376b 2019-03-28 stsp argc -= optind;
2274 a129376b 2019-03-28 stsp argv += optind;
2276 a129376b 2019-03-28 stsp if (argc != 1)
2277 a129376b 2019-03-28 stsp usage_revert();
2279 a129376b 2019-03-28 stsp path = realpath(argv[0], NULL);
2280 a129376b 2019-03-28 stsp if (path == NULL) {
2281 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2282 a129376b 2019-03-28 stsp goto done;
2284 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2286 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2287 a129376b 2019-03-28 stsp if (cwd == NULL) {
2288 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2289 a129376b 2019-03-28 stsp goto done;
2291 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2292 2ec1f75b 2019-03-26 stsp if (error)
2293 2ec1f75b 2019-03-26 stsp goto done;
2295 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2296 a129376b 2019-03-28 stsp if (error != NULL)
2297 a129376b 2019-03-28 stsp goto done;
2299 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2300 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2301 a129376b 2019-03-28 stsp if (error)
2302 a129376b 2019-03-28 stsp goto done;
2304 a129376b 2019-03-28 stsp error = got_worktree_revert(worktree, path,
2305 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2306 a129376b 2019-03-28 stsp if (error)
2307 a129376b 2019-03-28 stsp goto done;
2310 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2311 2ec1f75b 2019-03-26 stsp if (worktree)
2312 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2313 2ec1f75b 2019-03-26 stsp free(path);
2314 d00136be 2019-03-26 stsp free(cwd);
2315 6bad629b 2019-02-04 stsp return error;
2318 c4296144 2019-05-09 stsp __dead static void
2319 c4296144 2019-05-09 stsp usage_commit(void)
2321 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2326 e2ba3d07 2019-05-13 stsp spawn_editor(const char *editor, const char *file)
2329 33ad4cbe 2019-05-12 jcs sig_t sighup, sigint, sigquit;
2330 33ad4cbe 2019-05-12 jcs int st = -1;
2332 33ad4cbe 2019-05-12 jcs sighup = signal(SIGHUP, SIG_IGN);
2333 33ad4cbe 2019-05-12 jcs sigint = signal(SIGINT, SIG_IGN);
2334 33ad4cbe 2019-05-12 jcs sigquit = signal(SIGQUIT, SIG_IGN);
2336 33ad4cbe 2019-05-12 jcs switch (pid = fork()) {
2338 33ad4cbe 2019-05-12 jcs goto doneediting;
2340 e2ba3d07 2019-05-13 stsp execl(editor, editor, file, (char *)NULL);
2341 33ad4cbe 2019-05-12 jcs _exit(127);
2344 33ad4cbe 2019-05-12 jcs while (waitpid(pid, &st, 0) == -1)
2345 33ad4cbe 2019-05-12 jcs if (errno != EINTR)
2348 33ad4cbe 2019-05-12 jcs doneediting:
2349 33ad4cbe 2019-05-12 jcs (void)signal(SIGHUP, sighup);
2350 33ad4cbe 2019-05-12 jcs (void)signal(SIGINT, sigint);
2351 33ad4cbe 2019-05-12 jcs (void)signal(SIGQUIT, sigquit);
2353 33ad4cbe 2019-05-12 jcs if (!WIFEXITED(st)) {
2354 33ad4cbe 2019-05-12 jcs errno = EINTR;
2358 33ad4cbe 2019-05-12 jcs return WEXITSTATUS(st);
2361 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
2362 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
2363 e2ba3d07 2019-05-13 stsp const char *editor;
2364 e0870e44 2019-05-13 stsp const char *worktree_path;
2365 314a6357 2019-05-13 stsp const char *repo_path;
2366 e0870e44 2019-05-13 stsp char *logmsg_path;
2370 33ad4cbe 2019-05-12 jcs static const struct got_error *
2371 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2374 e0870e44 2019-05-13 stsp const char *initial_content = "\n# changes to be committed:\n";
2375 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
2376 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
2377 e0870e44 2019-05-13 stsp char *template = NULL;
2378 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
2379 33ad4cbe 2019-05-12 jcs char buf[1024];
2380 33ad4cbe 2019-05-12 jcs struct stat st, st2;
2382 33ad4cbe 2019-05-12 jcs size_t len;
2383 e0870e44 2019-05-13 stsp int fd, content_changed = 0;
2385 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
2386 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2387 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
2388 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
2389 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
2390 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
2391 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
2392 33ad4cbe 2019-05-12 jcs return NULL;
2395 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2396 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2398 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2400 e0870e44 2019-05-13 stsp goto done;
2402 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
2404 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
2405 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2406 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
2407 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
2408 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
2412 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st) == -1) {
2413 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", a->logmsg_path);
2417 e0870e44 2019-05-13 stsp if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2418 638f9024 2019-05-13 stsp err = got_error_from_errno("failed spawning editor");
2422 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st2) == -1) {
2423 638f9024 2019-05-13 stsp err = got_error_from_errno("stat");
2427 33ad4cbe 2019-05-12 jcs if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2428 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2429 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2430 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2431 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2432 33ad4cbe 2019-05-12 jcs "no changes made to commit message, aborting");
2436 33ad4cbe 2019-05-12 jcs *logmsg = malloc(st2.st_size + 1);
2437 fcde04d9 2019-05-13 stsp if (*logmsg == NULL) {
2438 638f9024 2019-05-13 stsp err = got_error_from_errno("malloc");
2439 fcde04d9 2019-05-13 stsp goto done;
2441 cc79381d 2019-05-22 stsp (*logmsg)[0] = '\0';
2444 e0870e44 2019-05-13 stsp fp = fopen(a->logmsg_path, "r");
2445 d4592c7c 2019-05-22 stsp if (fp == NULL) {
2446 d4592c7c 2019-05-22 stsp err = got_error_from_errno("fopen");
2447 d4592c7c 2019-05-22 stsp goto done;
2449 33ad4cbe 2019-05-12 jcs while (fgets(buf, sizeof(buf), fp) != NULL) {
2450 e0870e44 2019-05-13 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
2451 e0870e44 2019-05-13 stsp content_changed = 1;
2452 33ad4cbe 2019-05-12 jcs if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2453 78527a0a 2019-05-22 stsp continue; /* remove comments and leading empty lines */
2454 33ad4cbe 2019-05-12 jcs len = strlcat(*logmsg, buf, st2.st_size);
2456 33ad4cbe 2019-05-12 jcs fclose(fp);
2458 33ad4cbe 2019-05-12 jcs while (len > 0 && (*logmsg)[len - 1] == '\n') {
2459 33ad4cbe 2019-05-12 jcs (*logmsg)[len - 1] = '\0';
2463 e0870e44 2019-05-13 stsp if (len == 0 || !content_changed) {
2464 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2465 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2466 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2467 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2468 33ad4cbe 2019-05-12 jcs "commit message cannot be empty, aborting");
2472 e0870e44 2019-05-13 stsp free(template);
2474 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
2475 314a6357 2019-05-13 stsp if (err == NULL)
2476 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2477 33ad4cbe 2019-05-12 jcs return err;
2480 c4296144 2019-05-09 stsp static const struct got_error *
2481 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2483 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2484 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2485 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2486 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2487 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2488 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
2489 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2490 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
2491 e2ba3d07 2019-05-13 stsp char *editor = NULL;
2494 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2495 c4296144 2019-05-09 stsp switch (ch) {
2497 c4296144 2019-05-09 stsp logmsg = optarg;
2500 c4296144 2019-05-09 stsp usage_commit();
2501 c4296144 2019-05-09 stsp /* NOTREACHED */
2505 c4296144 2019-05-09 stsp argc -= optind;
2506 c4296144 2019-05-09 stsp argv += optind;
2508 c4296144 2019-05-09 stsp if (argc == 1) {
2509 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2510 c4296144 2019-05-09 stsp if (path == NULL) {
2511 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2512 c4296144 2019-05-09 stsp goto done;
2514 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2515 c4296144 2019-05-09 stsp } else if (argc != 0)
2516 c4296144 2019-05-09 stsp usage_commit();
2518 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2519 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2520 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2521 35bd8fed 2019-05-09 stsp goto done;
2524 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2525 c4296144 2019-05-09 stsp if (cwd == NULL) {
2526 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2527 c4296144 2019-05-09 stsp goto done;
2529 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2530 c4296144 2019-05-09 stsp if (error)
2531 c4296144 2019-05-09 stsp goto done;
2533 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2534 c4296144 2019-05-09 stsp if (error != NULL)
2535 c4296144 2019-05-09 stsp goto done;
2538 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
2539 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
2541 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
2542 314a6357 2019-05-13 stsp error = get_editor(&editor);
2544 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2545 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2546 c4296144 2019-05-09 stsp if (error)
2547 c4296144 2019-05-09 stsp goto done;
2549 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
2550 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
2551 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2552 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
2553 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
2554 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2555 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2556 e0870e44 2019-05-13 stsp if (error) {
2557 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2558 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
2559 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
2560 c4296144 2019-05-09 stsp goto done;
2563 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2564 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
2566 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2567 c4296144 2019-05-09 stsp if (error)
2568 c4296144 2019-05-09 stsp goto done;
2569 c4296144 2019-05-09 stsp printf("created commit %s\n", id_str);
2572 c4296144 2019-05-09 stsp got_repo_close(repo);
2573 c4296144 2019-05-09 stsp if (worktree)
2574 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2575 c4296144 2019-05-09 stsp free(path);
2576 c4296144 2019-05-09 stsp free(cwd);
2577 c4296144 2019-05-09 stsp free(id_str);
2578 e2ba3d07 2019-05-13 stsp free(editor);
2579 c4296144 2019-05-09 stsp return error;
