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 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
570 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
571 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
572 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
573 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
574 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
575 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
576 024e9686 2019-05-14 stsp const char *branch_name = NULL;
577 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
578 784955db 2019-01-12 stsp int ch, did_something = 0;
580 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
581 507dc3bb 2018-12-29 stsp switch (ch) {
583 024e9686 2019-05-14 stsp branch_name = optarg;
586 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
587 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
588 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
591 2deda0b9 2019-03-07 stsp usage_update();
592 507dc3bb 2018-12-29 stsp /* NOTREACHED */
596 507dc3bb 2018-12-29 stsp argc -= optind;
597 507dc3bb 2018-12-29 stsp argv += optind;
599 507dc3bb 2018-12-29 stsp #ifndef PROFILE
600 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
601 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
602 507dc3bb 2018-12-29 stsp err(1, "pledge");
604 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
605 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
606 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
609 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
613 507dc3bb 2018-12-29 stsp if (argc == 0) {
614 c4cdcb68 2019-04-03 stsp path = strdup("");
615 c4cdcb68 2019-04-03 stsp if (path == NULL) {
616 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
619 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
620 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
624 507dc3bb 2018-12-29 stsp usage_update();
626 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
627 507dc3bb 2018-12-29 stsp if (error != NULL)
630 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
631 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
635 024e9686 2019-05-14 stsp if (branch_name == NULL)
636 024e9686 2019-05-14 stsp branch_name = got_worktree_get_head_ref_name(worktree);
637 024e9686 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
638 024e9686 2019-05-14 stsp if (error != NULL)
640 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
641 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
642 9c4b8182 2019-01-02 stsp if (error != NULL)
644 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
645 507dc3bb 2018-12-29 stsp if (error != NULL)
648 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
649 507dc3bb 2018-12-29 stsp commit_id_str);
650 507dc3bb 2018-12-29 stsp if (error != NULL)
654 024e9686 2019-05-14 stsp if (strcmp(got_ref_get_name(head_ref),
655 024e9686 2019-05-14 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
656 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
657 024e9686 2019-05-14 stsp if (strlen(path) != 0) {
658 024e9686 2019-05-14 stsp fprintf(stderr, "%s: switching to a different "
659 024e9686 2019-05-14 stsp "branch requires that the entire work tree "
660 024e9686 2019-05-14 stsp "gets updated, not just '%s'\n",
661 024e9686 2019-05-14 stsp getprogname(), path);
662 024e9686 2019-05-14 stsp error = got_error(GOT_ERR_BAD_PATH);
665 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
668 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
669 a367ff0f 2019-05-14 stsp free(head_commit_id);
670 024e9686 2019-05-14 stsp if (error != NULL)
672 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
675 d969fa15 2019-05-22 stsp printf("Switching work tree from %s to %s\n",
676 d969fa15 2019-05-22 stsp got_worktree_get_head_ref_name(worktree),
677 d969fa15 2019-05-22 stsp got_ref_get_name(head_ref));
678 024e9686 2019-05-14 stsp error = got_worktree_set_head_ref(worktree, head_ref);
682 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
683 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
684 a367ff0f 2019-05-14 stsp if (error != NULL) {
685 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
686 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
689 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
694 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
695 507dc3bb 2018-12-29 stsp commit_id) != 0) {
696 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
697 507dc3bb 2018-12-29 stsp commit_id);
702 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
703 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
704 507dc3bb 2018-12-29 stsp if (error != NULL)
707 784955db 2019-01-12 stsp if (did_something)
708 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
710 784955db 2019-01-12 stsp printf("Already up-to-date\n");
712 c09a553d 2018-03-12 stsp free(worktree_path);
713 c4cdcb68 2019-04-03 stsp free(path);
714 507dc3bb 2018-12-29 stsp free(commit_id);
715 9c4b8182 2019-01-02 stsp free(commit_id_str);
716 c09a553d 2018-03-12 stsp return error;
719 f42b1b34 2018-03-12 stsp static const struct got_error *
720 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
721 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
723 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
724 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
725 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
726 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
728 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
729 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
731 79109fed 2018-03-27 stsp return err;
733 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
734 79f35eb3 2018-06-11 stsp if (qid != NULL) {
735 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
737 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
739 79109fed 2018-03-27 stsp return err;
741 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
742 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
743 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
745 0f2b3dca 2018-12-22 stsp return err;
747 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
749 79109fed 2018-03-27 stsp return err;
752 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
756 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
757 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
760 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
761 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
762 0f2b3dca 2018-12-22 stsp free(id_str1);
763 0f2b3dca 2018-12-22 stsp free(id_str2);
764 79109fed 2018-03-27 stsp return err;
767 4bb494d5 2018-06-16 stsp static char *
768 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
770 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
771 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
777 79109fed 2018-03-27 stsp static const struct got_error *
778 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
779 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
780 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
782 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
783 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
784 6c281f94 2018-06-11 stsp char datebuf[26];
785 45d799e2 2018-12-23 stsp time_t committer_time;
786 45d799e2 2018-12-23 stsp const char *author, *committer;
787 199a4027 2019-02-02 stsp char *refs_str = NULL;
788 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
790 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
792 199a4027 2019-02-02 stsp const char *name;
793 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
795 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
796 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
798 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
800 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
802 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
804 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
806 199a4027 2019-02-02 stsp s = refs_str;
807 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
808 199a4027 2019-02-02 stsp name) == -1) {
809 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
815 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
817 8bf5b3c9 2018-03-17 stsp return err;
819 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
820 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
821 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
822 832c249c 2018-06-10 stsp free(id_str);
823 d3d493d7 2019-02-21 stsp id_str = NULL;
824 d3d493d7 2019-02-21 stsp free(refs_str);
825 d3d493d7 2019-02-21 stsp refs_str = NULL;
826 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
827 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
828 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
829 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
830 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
831 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
832 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
833 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
834 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
835 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
836 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
838 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
839 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
840 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
842 a0603db2 2018-06-10 stsp return err;
843 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
844 a0603db2 2018-06-10 stsp free(id_str);
848 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
849 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
850 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
852 621015ac 2018-07-23 stsp logmsg = logmsg0;
854 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
856 832c249c 2018-06-10 stsp printf(" %s\n", line);
857 832c249c 2018-06-10 stsp } while (line);
858 621015ac 2018-07-23 stsp free(logmsg0);
860 971751ac 2018-03-27 stsp if (show_patch) {
861 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
862 971751ac 2018-03-27 stsp if (err == 0)
863 971751ac 2018-03-27 stsp printf("\n");
866 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
867 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
868 07862c20 2018-09-15 stsp return err;
871 f42b1b34 2018-03-12 stsp static const struct got_error *
872 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
873 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
874 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
876 f42b1b34 2018-03-12 stsp const struct got_error *err;
877 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
879 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
880 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
882 f42b1b34 2018-03-12 stsp return err;
883 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
887 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
888 372ccdbb 2018-06-10 stsp struct got_object_id *id;
890 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
893 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
895 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
896 9ba79e04 2018-06-11 stsp err = NULL;
899 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
901 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
907 b43fbaa0 2018-06-11 stsp if (id == NULL)
910 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
913 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
915 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
916 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
920 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
921 f42b1b34 2018-03-12 stsp return err;
924 4ed7e80c 2018-05-20 stsp __dead static void
925 6f3d1eb0 2018-03-12 stsp usage_log(void)
927 499d7ecc 2019-05-22 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
928 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
932 4ed7e80c 2018-05-20 stsp static const struct got_error *
933 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
935 f42b1b34 2018-03-12 stsp const struct got_error *error;
936 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
937 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
938 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
939 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
940 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
941 d142fc45 2018-04-01 stsp char *start_commit = NULL;
942 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
943 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
944 64a96a6d 2018-04-01 stsp const char *errstr;
945 199a4027 2019-02-02 stsp struct got_reflist_head refs;
947 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
949 6715a751 2018-03-16 stsp #ifndef PROFILE
950 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
953 f42b1b34 2018-03-12 stsp err(1, "pledge");
956 499d7ecc 2019-05-22 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:")) != -1) {
957 79109fed 2018-03-27 stsp switch (ch) {
959 499d7ecc 2019-05-22 stsp first_parent_traversal = 1;
962 79109fed 2018-03-27 stsp show_patch = 1;
965 d142fc45 2018-04-01 stsp start_commit = optarg;
968 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
970 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
971 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
974 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
975 64a96a6d 2018-04-01 stsp if (errstr != NULL)
976 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
979 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
980 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
981 04ca23f4 2018-07-16 stsp err(1, "-r option");
982 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
985 2deda0b9 2019-03-07 stsp usage_log();
986 79109fed 2018-03-27 stsp /* NOTREACHED */
990 79109fed 2018-03-27 stsp argc -= optind;
991 79109fed 2018-03-27 stsp argv += optind;
993 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
994 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
995 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
999 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1000 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1001 cffc0aa4 2019-02-05 stsp goto done;
1002 cffc0aa4 2019-02-05 stsp error = NULL;
1004 e7301579 2019-03-18 stsp if (argc == 0) {
1005 cbd1af7a 2019-03-18 stsp path = strdup("");
1006 e7301579 2019-03-18 stsp if (path == NULL) {
1007 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1008 cbd1af7a 2019-03-18 stsp goto done;
1010 e7301579 2019-03-18 stsp } else if (argc == 1) {
1011 e7301579 2019-03-18 stsp if (worktree) {
1012 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1014 e7301579 2019-03-18 stsp if (error)
1015 e7301579 2019-03-18 stsp goto done;
1017 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1018 e7301579 2019-03-18 stsp if (path == NULL) {
1019 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1020 e7301579 2019-03-18 stsp goto done;
1024 cbd1af7a 2019-03-18 stsp usage_log();
1026 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1027 5486daa2 2019-05-11 stsp repo_path = worktree ?
1028 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1030 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1031 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1032 cffc0aa4 2019-02-05 stsp goto done;
1035 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1036 d7d4f210 2018-03-12 stsp if (error != NULL)
1037 04ca23f4 2018-07-16 stsp goto done;
1039 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1040 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1041 c02c541e 2019-03-29 stsp if (error)
1042 c02c541e 2019-03-29 stsp goto done;
1044 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1045 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1046 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1047 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1048 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1049 3235492e 2018-04-01 stsp if (error != NULL)
1050 3235492e 2018-04-01 stsp return error;
1051 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1052 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1053 3235492e 2018-04-01 stsp if (error != NULL)
1054 3235492e 2018-04-01 stsp return error;
1055 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1057 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1058 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1059 3235492e 2018-04-01 stsp if (error == NULL) {
1060 1caad61b 2019-02-01 stsp int obj_type;
1061 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1062 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1063 d1f2edc9 2018-06-13 stsp if (error != NULL)
1064 1caad61b 2019-02-01 stsp goto done;
1065 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1066 1caad61b 2019-02-01 stsp if (error != NULL)
1067 1caad61b 2019-02-01 stsp goto done;
1068 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1069 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1070 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1071 1caad61b 2019-02-01 stsp if (error != NULL)
1072 1caad61b 2019-02-01 stsp goto done;
1073 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1074 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1075 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1076 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1077 1caad61b 2019-02-01 stsp goto done;
1080 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1081 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1082 1caad61b 2019-02-01 stsp if (id == NULL)
1083 638f9024 2019-05-13 stsp error = got_error_from_errno(
1084 230a42bd 2019-05-11 jcs "got_object_id_dup");
1085 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1086 1caad61b 2019-02-01 stsp if (error)
1087 1caad61b 2019-02-01 stsp goto done;
1088 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1089 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1090 1caad61b 2019-02-01 stsp goto done;
1092 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1093 d1f2edc9 2018-06-13 stsp if (error != NULL)
1094 1caad61b 2019-02-01 stsp goto done;
1096 15a94983 2018-12-23 stsp if (commit == NULL) {
1097 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
1098 d1f2edc9 2018-06-13 stsp start_commit);
1099 d1f2edc9 2018-06-13 stsp if (error != NULL)
1100 d1f2edc9 2018-06-13 stsp return error;
1103 d7d4f210 2018-03-12 stsp if (error != NULL)
1104 04ca23f4 2018-07-16 stsp goto done;
1106 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1107 04ca23f4 2018-07-16 stsp if (error != NULL)
1108 04ca23f4 2018-07-16 stsp goto done;
1109 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1110 04ca23f4 2018-07-16 stsp free(path);
1111 04ca23f4 2018-07-16 stsp path = in_repo_path;
1114 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1115 199a4027 2019-02-02 stsp if (error)
1116 199a4027 2019-02-02 stsp goto done;
1118 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1119 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1121 04ca23f4 2018-07-16 stsp free(path);
1122 04ca23f4 2018-07-16 stsp free(repo_path);
1123 04ca23f4 2018-07-16 stsp free(cwd);
1125 cffc0aa4 2019-02-05 stsp if (worktree)
1126 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1127 ad242220 2018-09-08 stsp if (repo) {
1128 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1129 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1130 ad242220 2018-09-08 stsp if (error == NULL)
1131 ad242220 2018-09-08 stsp error = repo_error;
1133 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1134 8bf5b3c9 2018-03-17 stsp return error;
1137 4ed7e80c 2018-05-20 stsp __dead static void
1138 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1140 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1141 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1145 b72f483a 2019-02-05 stsp struct print_diff_arg {
1146 b72f483a 2019-02-05 stsp struct got_repository *repo;
1147 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1148 b72f483a 2019-02-05 stsp int diff_context;
1149 3fc0c068 2019-02-10 stsp const char *id_str;
1150 3fc0c068 2019-02-10 stsp int header_shown;
1153 4ed7e80c 2018-05-20 stsp static const struct got_error *
1154 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1155 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1157 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1158 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1159 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1160 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1161 b72f483a 2019-02-05 stsp char *abspath = NULL;
1162 b72f483a 2019-02-05 stsp struct stat sb;
1164 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1165 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1166 b72f483a 2019-02-05 stsp return NULL;
1168 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1169 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1170 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1171 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1174 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1175 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1177 d00136be 2019-03-26 stsp goto done;
1181 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1182 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1183 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1184 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1185 2ec1f75b 2019-03-26 stsp goto done;
1188 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1189 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1190 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1191 2ec1f75b 2019-03-26 stsp goto done;
1193 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1194 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1195 2ec1f75b 2019-03-26 stsp goto done;
1198 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1200 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1203 b72f483a 2019-02-05 stsp if (blob1)
1204 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1205 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1206 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1207 b72f483a 2019-02-05 stsp free(abspath);
1208 927df6b7 2019-02-10 stsp return err;
1211 927df6b7 2019-02-10 stsp static const struct got_error *
1212 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1214 b00d56cd 2018-04-01 stsp const struct got_error *error;
1215 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1216 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1217 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1218 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1219 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1220 15a94983 2018-12-23 stsp int type1, type2;
1221 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1222 c0cc5c62 2018-10-18 stsp const char *errstr;
1223 927df6b7 2019-02-10 stsp char *path = NULL;
1225 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1226 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1227 25eccc22 2019-01-04 stsp NULL) == -1)
1228 b00d56cd 2018-04-01 stsp err(1, "pledge");
1231 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1232 b00d56cd 2018-04-01 stsp switch (ch) {
1234 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1235 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1236 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1239 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1240 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1241 b72f483a 2019-02-05 stsp err(1, "-r option");
1242 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1245 2deda0b9 2019-03-07 stsp usage_diff();
1246 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1250 b00d56cd 2018-04-01 stsp argc -= optind;
1251 b00d56cd 2018-04-01 stsp argv += optind;
1253 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1254 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1255 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1256 b72f483a 2019-02-05 stsp goto done;
1258 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1259 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1260 927df6b7 2019-02-10 stsp goto done;
1261 927df6b7 2019-02-10 stsp if (argc <= 1) {
1262 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1263 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1264 927df6b7 2019-02-10 stsp goto done;
1266 b72f483a 2019-02-05 stsp if (repo_path)
1268 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1269 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1270 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1271 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1272 927df6b7 2019-02-10 stsp goto done;
1274 927df6b7 2019-02-10 stsp if (argc == 1) {
1275 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1277 927df6b7 2019-02-10 stsp if (error)
1278 927df6b7 2019-02-10 stsp goto done;
1280 927df6b7 2019-02-10 stsp path = strdup("");
1281 927df6b7 2019-02-10 stsp if (path == NULL) {
1282 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1283 927df6b7 2019-02-10 stsp goto done;
1286 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1287 15a94983 2018-12-23 stsp id_str1 = argv[0];
1288 15a94983 2018-12-23 stsp id_str2 = argv[1];
1290 b00d56cd 2018-04-01 stsp usage_diff();
1292 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1293 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1294 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1295 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1298 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1299 76089277 2018-04-01 stsp free(repo_path);
1300 b00d56cd 2018-04-01 stsp if (error != NULL)
1301 b00d56cd 2018-04-01 stsp goto done;
1303 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1304 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1305 c02c541e 2019-03-29 stsp if (error)
1306 c02c541e 2019-03-29 stsp goto done;
1308 b72f483a 2019-02-05 stsp if (worktree) {
1309 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1310 b72f483a 2019-02-05 stsp char *id_str;
1311 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1312 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1313 b72f483a 2019-02-05 stsp if (error)
1314 b72f483a 2019-02-05 stsp goto done;
1315 b72f483a 2019-02-05 stsp arg.repo = repo;
1316 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1317 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1318 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1319 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1321 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1322 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1323 b72f483a 2019-02-05 stsp free(id_str);
1324 b72f483a 2019-02-05 stsp goto done;
1327 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1328 6402fb3c 2018-09-15 stsp if (error)
1329 b00d56cd 2018-04-01 stsp goto done;
1331 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1332 6402fb3c 2018-09-15 stsp if (error)
1333 b00d56cd 2018-04-01 stsp goto done;
1335 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1336 15a94983 2018-12-23 stsp if (error)
1337 15a94983 2018-12-23 stsp goto done;
1339 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1340 15a94983 2018-12-23 stsp if (error)
1341 15a94983 2018-12-23 stsp goto done;
1343 15a94983 2018-12-23 stsp if (type1 != type2) {
1344 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1345 b00d56cd 2018-04-01 stsp goto done;
1348 15a94983 2018-12-23 stsp switch (type1) {
1349 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1350 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1351 54156555 2018-12-24 stsp diff_context, repo, stdout);
1353 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1354 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1355 54156555 2018-12-24 stsp diff_context, repo, stdout);
1357 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1358 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1360 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1361 c0cc5c62 2018-10-18 stsp repo, stdout);
1364 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1368 15a94983 2018-12-23 stsp free(id1);
1369 15a94983 2018-12-23 stsp free(id2);
1370 927df6b7 2019-02-10 stsp free(path);
1371 b72f483a 2019-02-05 stsp if (worktree)
1372 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1373 ad242220 2018-09-08 stsp if (repo) {
1374 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1375 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1376 ad242220 2018-09-08 stsp if (error == NULL)
1377 ad242220 2018-09-08 stsp error = repo_error;
1379 b00d56cd 2018-04-01 stsp return error;
1382 404c43c4 2018-06-21 stsp __dead static void
1383 404c43c4 2018-06-21 stsp usage_blame(void)
1385 9270e621 2019-02-05 stsp fprintf(stderr,
1386 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1387 404c43c4 2018-06-21 stsp getprogname());
1391 404c43c4 2018-06-21 stsp static const struct got_error *
1392 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1394 404c43c4 2018-06-21 stsp const struct got_error *error;
1395 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1396 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1397 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1398 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1399 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1402 404c43c4 2018-06-21 stsp #ifndef PROFILE
1403 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1404 36e2fb66 2019-01-04 stsp NULL) == -1)
1405 404c43c4 2018-06-21 stsp err(1, "pledge");
1408 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1409 404c43c4 2018-06-21 stsp switch (ch) {
1411 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1414 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1415 66bea077 2018-08-02 stsp if (repo_path == NULL)
1416 66bea077 2018-08-02 stsp err(1, "-r option");
1417 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1420 2deda0b9 2019-03-07 stsp usage_blame();
1421 404c43c4 2018-06-21 stsp /* NOTREACHED */
1425 404c43c4 2018-06-21 stsp argc -= optind;
1426 404c43c4 2018-06-21 stsp argv += optind;
1428 a39318fd 2018-08-02 stsp if (argc == 1)
1429 404c43c4 2018-06-21 stsp path = argv[0];
1431 404c43c4 2018-06-21 stsp usage_blame();
1433 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1434 66bea077 2018-08-02 stsp if (cwd == NULL) {
1435 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1436 66bea077 2018-08-02 stsp goto done;
1438 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1439 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1440 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1441 66bea077 2018-08-02 stsp goto done;
1443 0c06baac 2019-02-05 stsp error = NULL;
1444 0c06baac 2019-02-05 stsp if (worktree) {
1445 0c06baac 2019-02-05 stsp repo_path =
1446 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1447 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1448 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1449 0c06baac 2019-02-05 stsp if (error)
1450 0c06baac 2019-02-05 stsp goto done;
1452 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1453 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1454 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1455 0c06baac 2019-02-05 stsp goto done;
1460 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1461 c02c541e 2019-03-29 stsp if (error != NULL)
1462 36e2fb66 2019-01-04 stsp goto done;
1464 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1465 c02c541e 2019-03-29 stsp if (error)
1466 404c43c4 2018-06-21 stsp goto done;
1468 0c06baac 2019-02-05 stsp if (worktree) {
1469 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1470 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1471 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1472 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1473 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1474 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1475 6efaaa2d 2019-02-05 stsp path) == -1) {
1476 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1477 0c06baac 2019-02-05 stsp goto done;
1479 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1482 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1484 0c06baac 2019-02-05 stsp if (error)
1485 66bea077 2018-08-02 stsp goto done;
1487 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1488 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1489 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1490 404c43c4 2018-06-21 stsp if (error != NULL)
1491 66bea077 2018-08-02 stsp goto done;
1492 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1493 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1494 404c43c4 2018-06-21 stsp if (error != NULL)
1495 66bea077 2018-08-02 stsp goto done;
1497 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1498 15a94983 2018-12-23 stsp commit_id_str);
1499 404c43c4 2018-06-21 stsp if (error != NULL)
1500 66bea077 2018-08-02 stsp goto done;
1503 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1505 66bea077 2018-08-02 stsp free(in_repo_path);
1506 66bea077 2018-08-02 stsp free(repo_path);
1507 66bea077 2018-08-02 stsp free(cwd);
1508 404c43c4 2018-06-21 stsp free(commit_id);
1509 0c06baac 2019-02-05 stsp if (worktree)
1510 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1511 ad242220 2018-09-08 stsp if (repo) {
1512 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1513 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1514 ad242220 2018-09-08 stsp if (error == NULL)
1515 ad242220 2018-09-08 stsp error = repo_error;
1517 404c43c4 2018-06-21 stsp return error;
1520 5de5890b 2018-10-18 stsp __dead static void
1521 5de5890b 2018-10-18 stsp usage_tree(void)
1523 c1669e2e 2019-01-09 stsp fprintf(stderr,
1524 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1525 5de5890b 2018-10-18 stsp getprogname());
1529 c1669e2e 2019-01-09 stsp static void
1530 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1531 c1669e2e 2019-01-09 stsp const char *root_path)
1533 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1535 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1536 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1539 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1540 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1541 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1544 5de5890b 2018-10-18 stsp static const struct got_error *
1545 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1546 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1547 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1549 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1550 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1551 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1552 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1553 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1555 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1557 5de5890b 2018-10-18 stsp goto done;
1559 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1561 5de5890b 2018-10-18 stsp goto done;
1562 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1563 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1564 5de5890b 2018-10-18 stsp while (te) {
1565 5de5890b 2018-10-18 stsp char *id = NULL;
1567 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1570 5de5890b 2018-10-18 stsp if (show_ids) {
1571 5de5890b 2018-10-18 stsp char *id_str;
1572 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1574 5de5890b 2018-10-18 stsp goto done;
1575 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1576 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1577 5de5890b 2018-10-18 stsp free(id_str);
1578 5de5890b 2018-10-18 stsp goto done;
1580 5de5890b 2018-10-18 stsp free(id_str);
1582 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1585 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1586 c1669e2e 2019-01-09 stsp char *child_path;
1587 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1588 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1589 c1669e2e 2019-01-09 stsp te->name) == -1) {
1590 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1591 c1669e2e 2019-01-09 stsp goto done;
1593 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1594 c1669e2e 2019-01-09 stsp root_path, repo);
1595 c1669e2e 2019-01-09 stsp free(child_path);
1597 c1669e2e 2019-01-09 stsp goto done;
1600 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1604 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1605 5de5890b 2018-10-18 stsp free(tree_id);
1606 5de5890b 2018-10-18 stsp return err;
1609 5de5890b 2018-10-18 stsp static const struct got_error *
1610 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1612 5de5890b 2018-10-18 stsp const struct got_error *error;
1613 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1614 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1615 7a2c19d6 2019-02-05 stsp const char *path;
1616 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1617 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1618 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1619 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1622 5de5890b 2018-10-18 stsp #ifndef PROFILE
1623 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1624 0f8d269b 2019-01-04 stsp NULL) == -1)
1625 5de5890b 2018-10-18 stsp err(1, "pledge");
1628 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1629 5de5890b 2018-10-18 stsp switch (ch) {
1631 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1634 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1635 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1636 5de5890b 2018-10-18 stsp err(1, "-r option");
1637 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1640 5de5890b 2018-10-18 stsp show_ids = 1;
1643 c1669e2e 2019-01-09 stsp recurse = 1;
1646 2deda0b9 2019-03-07 stsp usage_tree();
1647 5de5890b 2018-10-18 stsp /* NOTREACHED */
1651 5de5890b 2018-10-18 stsp argc -= optind;
1652 5de5890b 2018-10-18 stsp argv += optind;
1654 5de5890b 2018-10-18 stsp if (argc == 1)
1655 5de5890b 2018-10-18 stsp path = argv[0];
1656 5de5890b 2018-10-18 stsp else if (argc > 1)
1657 5de5890b 2018-10-18 stsp usage_tree();
1659 7a2c19d6 2019-02-05 stsp path = NULL;
1661 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1662 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1663 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1664 9bf7a39b 2019-02-05 stsp goto done;
1666 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1667 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1668 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1669 7a2c19d6 2019-02-05 stsp goto done;
1671 7a2c19d6 2019-02-05 stsp error = NULL;
1672 7a2c19d6 2019-02-05 stsp if (worktree) {
1673 7a2c19d6 2019-02-05 stsp repo_path =
1674 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1675 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1676 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1677 7a2c19d6 2019-02-05 stsp if (error)
1678 7a2c19d6 2019-02-05 stsp goto done;
1680 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1681 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1682 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1683 7a2c19d6 2019-02-05 stsp goto done;
1688 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1689 5de5890b 2018-10-18 stsp if (error != NULL)
1690 c02c541e 2019-03-29 stsp goto done;
1692 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1693 c02c541e 2019-03-29 stsp if (error)
1694 5de5890b 2018-10-18 stsp goto done;
1696 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1697 9bf7a39b 2019-02-05 stsp if (worktree) {
1698 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1699 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1700 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1701 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1702 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1703 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1704 9bf7a39b 2019-02-05 stsp goto done;
1706 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1708 9bf7a39b 2019-02-05 stsp if (error)
1709 9bf7a39b 2019-02-05 stsp goto done;
1711 9bf7a39b 2019-02-05 stsp path = "/";
1713 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1714 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1715 9bf7a39b 2019-02-05 stsp if (error != NULL)
1716 9bf7a39b 2019-02-05 stsp goto done;
1719 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1720 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1721 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1722 5de5890b 2018-10-18 stsp if (error != NULL)
1723 5de5890b 2018-10-18 stsp goto done;
1724 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1725 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1726 5de5890b 2018-10-18 stsp if (error != NULL)
1727 5de5890b 2018-10-18 stsp goto done;
1729 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1730 15a94983 2018-12-23 stsp commit_id_str);
1731 5de5890b 2018-10-18 stsp if (error != NULL)
1732 5de5890b 2018-10-18 stsp goto done;
1735 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1736 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1738 5de5890b 2018-10-18 stsp free(in_repo_path);
1739 5de5890b 2018-10-18 stsp free(repo_path);
1740 5de5890b 2018-10-18 stsp free(cwd);
1741 5de5890b 2018-10-18 stsp free(commit_id);
1742 7a2c19d6 2019-02-05 stsp if (worktree)
1743 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1744 5de5890b 2018-10-18 stsp if (repo) {
1745 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1746 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1747 5de5890b 2018-10-18 stsp if (error == NULL)
1748 5de5890b 2018-10-18 stsp error = repo_error;
1750 5de5890b 2018-10-18 stsp return error;
1753 6bad629b 2019-02-04 stsp __dead static void
1754 6bad629b 2019-02-04 stsp usage_status(void)
1756 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1760 b72f483a 2019-02-05 stsp static const struct got_error *
1761 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1762 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1764 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1765 b72f483a 2019-02-05 stsp return NULL;
1768 6bad629b 2019-02-04 stsp static const struct got_error *
1769 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1771 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1772 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1773 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1774 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1777 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1778 6bad629b 2019-02-04 stsp switch (ch) {
1780 2deda0b9 2019-03-07 stsp usage_status();
1781 6bad629b 2019-02-04 stsp /* NOTREACHED */
1785 6bad629b 2019-02-04 stsp argc -= optind;
1786 6bad629b 2019-02-04 stsp argv += optind;
1788 6bad629b 2019-02-04 stsp #ifndef PROFILE
1789 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1790 6bad629b 2019-02-04 stsp NULL) == -1)
1791 6bad629b 2019-02-04 stsp err(1, "pledge");
1793 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1794 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1795 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1796 927df6b7 2019-02-10 stsp goto done;
1799 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1800 927df6b7 2019-02-10 stsp if (error != NULL)
1801 927df6b7 2019-02-10 stsp goto done;
1803 6bad629b 2019-02-04 stsp if (argc == 0) {
1804 927df6b7 2019-02-10 stsp path = strdup("");
1805 927df6b7 2019-02-10 stsp if (path == NULL) {
1806 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1807 6bad629b 2019-02-04 stsp goto done;
1809 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1810 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1811 927df6b7 2019-02-10 stsp if (error)
1812 6bad629b 2019-02-04 stsp goto done;
1814 6bad629b 2019-02-04 stsp usage_status();
1816 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1817 6bad629b 2019-02-04 stsp if (error != NULL)
1818 6bad629b 2019-02-04 stsp goto done;
1820 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1821 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1822 6bad629b 2019-02-04 stsp if (error)
1823 6bad629b 2019-02-04 stsp goto done;
1825 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1826 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1828 927df6b7 2019-02-10 stsp free(cwd);
1829 927df6b7 2019-02-10 stsp free(path);
1830 d0eebce4 2019-03-11 stsp return error;
1833 d0eebce4 2019-03-11 stsp __dead static void
1834 d0eebce4 2019-03-11 stsp usage_ref(void)
1836 d0eebce4 2019-03-11 stsp fprintf(stderr,
1837 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
1838 d0eebce4 2019-03-11 stsp getprogname());
1842 d0eebce4 2019-03-11 stsp static const struct got_error *
1843 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1845 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1846 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1847 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1849 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1850 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1852 d0eebce4 2019-03-11 stsp return err;
1854 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1855 d0eebce4 2019-03-11 stsp char *refstr;
1856 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1857 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1858 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
1859 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1860 d0eebce4 2019-03-11 stsp free(refstr);
1863 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1864 d0eebce4 2019-03-11 stsp return NULL;
1867 d0eebce4 2019-03-11 stsp static const struct got_error *
1868 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1870 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1871 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1873 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
1875 d0eebce4 2019-03-11 stsp return err;
1877 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1878 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1879 d0eebce4 2019-03-11 stsp return err;
1882 d0eebce4 2019-03-11 stsp static const struct got_error *
1883 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
1885 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1886 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1887 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1889 d83d9d5c 2019-05-13 stsp err = got_object_resolve_id_str(&id, repo, target);
1890 d83d9d5c 2019-05-13 stsp if (err) {
1891 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
1893 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1894 d83d9d5c 2019-05-13 stsp return err;
1895 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
1897 d83d9d5c 2019-05-13 stsp return err;
1898 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
1899 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
1901 d83d9d5c 2019-05-13 stsp return err;
1904 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1906 d0eebce4 2019-03-11 stsp goto done;
1908 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1911 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1913 d0eebce4 2019-03-11 stsp return err;
1916 d0eebce4 2019-03-11 stsp static const struct got_error *
1917 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1919 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1920 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1921 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1922 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1923 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1924 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1926 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1927 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1928 d0eebce4 2019-03-11 stsp switch (ch) {
1930 d0eebce4 2019-03-11 stsp delref = optarg;
1933 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1934 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1935 d0eebce4 2019-03-11 stsp err(1, "-r option");
1936 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1939 d0eebce4 2019-03-11 stsp do_list = 1;
1942 d0eebce4 2019-03-11 stsp usage_ref();
1943 d0eebce4 2019-03-11 stsp /* NOTREACHED */
1947 d0eebce4 2019-03-11 stsp if (do_list && delref)
1948 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
1950 d0eebce4 2019-03-11 stsp argc -= optind;
1951 d0eebce4 2019-03-11 stsp argv += optind;
1953 d0eebce4 2019-03-11 stsp if (do_list || delref) {
1954 d0eebce4 2019-03-11 stsp if (argc > 0)
1955 d0eebce4 2019-03-11 stsp usage_ref();
1956 d0eebce4 2019-03-11 stsp } else if (argc != 2)
1957 d0eebce4 2019-03-11 stsp usage_ref();
1959 d0eebce4 2019-03-11 stsp #ifndef PROFILE
1960 e0b57350 2019-03-12 stsp if (do_list) {
1961 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1962 e0b57350 2019-03-12 stsp NULL) == -1)
1963 e0b57350 2019-03-12 stsp err(1, "pledge");
1965 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1966 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
1967 e0b57350 2019-03-12 stsp err(1, "pledge");
1970 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
1971 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
1972 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1973 d0eebce4 2019-03-11 stsp goto done;
1976 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1977 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
1978 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1979 d0eebce4 2019-03-11 stsp goto done;
1981 d0eebce4 2019-03-11 stsp error = NULL;
1982 d0eebce4 2019-03-11 stsp if (worktree) {
1983 d0eebce4 2019-03-11 stsp repo_path =
1984 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
1985 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1986 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1987 d0eebce4 2019-03-11 stsp if (error)
1988 d0eebce4 2019-03-11 stsp goto done;
1990 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
1991 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1992 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1993 d0eebce4 2019-03-11 stsp goto done;
1998 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
1999 d0eebce4 2019-03-11 stsp if (error != NULL)
2000 d0eebce4 2019-03-11 stsp goto done;
2002 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2003 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2004 c02c541e 2019-03-29 stsp if (error)
2005 c02c541e 2019-03-29 stsp goto done;
2007 d0eebce4 2019-03-11 stsp if (do_list)
2008 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2009 d0eebce4 2019-03-11 stsp else if (delref)
2010 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2012 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2015 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2016 d0eebce4 2019-03-11 stsp if (worktree)
2017 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2018 d0eebce4 2019-03-11 stsp free(cwd);
2019 d0eebce4 2019-03-11 stsp free(repo_path);
2020 d00136be 2019-03-26 stsp return error;
2023 d00136be 2019-03-26 stsp __dead static void
2024 d00136be 2019-03-26 stsp usage_add(void)
2026 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2030 d00136be 2019-03-26 stsp static const struct got_error *
2031 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2033 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2034 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2035 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2036 1dd54920 2019-05-11 stsp char *cwd = NULL;
2037 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2038 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2041 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2043 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2044 d00136be 2019-03-26 stsp switch (ch) {
2046 d00136be 2019-03-26 stsp usage_add();
2047 d00136be 2019-03-26 stsp /* NOTREACHED */
2051 d00136be 2019-03-26 stsp argc -= optind;
2052 d00136be 2019-03-26 stsp argv += optind;
2054 723c305c 2019-05-11 jcs if (argc < 1)
2055 d00136be 2019-03-26 stsp usage_add();
2057 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
2058 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2059 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2060 723c305c 2019-05-11 jcs if (path == NULL) {
2061 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2064 1dd54920 2019-05-11 stsp free(path);
2067 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2068 d00136be 2019-03-26 stsp if (cwd == NULL) {
2069 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2070 d00136be 2019-03-26 stsp goto done;
2073 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2074 d00136be 2019-03-26 stsp if (error)
2075 d00136be 2019-03-26 stsp goto done;
2077 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2078 031a5338 2019-03-26 stsp if (error != NULL)
2079 031a5338 2019-03-26 stsp goto done;
2081 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2082 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2083 d00136be 2019-03-26 stsp if (error)
2084 d00136be 2019-03-26 stsp goto done;
2086 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2087 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2088 723c305c 2019-05-11 jcs if (path == NULL) {
2089 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2093 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2094 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2095 1dd54920 2019-05-11 stsp if (error) {
2096 1dd54920 2019-05-11 stsp free(path);
2100 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2101 1dd54920 2019-05-11 stsp NULL, repo);
2104 031a5338 2019-03-26 stsp got_repo_close(repo);
2105 d00136be 2019-03-26 stsp if (worktree)
2106 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2107 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2108 1dd54920 2019-05-11 stsp free((char *)pe->path);
2109 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2110 2ec1f75b 2019-03-26 stsp free(cwd);
2111 2ec1f75b 2019-03-26 stsp return error;
2114 2ec1f75b 2019-03-26 stsp __dead static void
2115 2ec1f75b 2019-03-26 stsp usage_rm(void)
2117 2ec1f75b 2019-03-26 stsp fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
2121 2ec1f75b 2019-03-26 stsp static const struct got_error *
2122 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
2124 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2125 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2126 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2127 2ec1f75b 2019-03-26 stsp char *cwd = NULL, *path = NULL;
2128 2ec1f75b 2019-03-26 stsp int ch, delete_local_mods = 0;
2130 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2131 2ec1f75b 2019-03-26 stsp switch (ch) {
2133 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2136 2ec1f75b 2019-03-26 stsp usage_add();
2137 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2141 2ec1f75b 2019-03-26 stsp argc -= optind;
2142 2ec1f75b 2019-03-26 stsp argv += optind;
2144 2ec1f75b 2019-03-26 stsp if (argc != 1)
2145 2ec1f75b 2019-03-26 stsp usage_rm();
2147 2ec1f75b 2019-03-26 stsp path = realpath(argv[0], NULL);
2148 2ec1f75b 2019-03-26 stsp if (path == NULL) {
2149 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2150 2ec1f75b 2019-03-26 stsp goto done;
2152 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2154 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2155 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2156 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2157 2ec1f75b 2019-03-26 stsp goto done;
2159 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2160 2ec1f75b 2019-03-26 stsp if (error)
2161 2ec1f75b 2019-03-26 stsp goto done;
2163 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2165 2ec1f75b 2019-03-26 stsp goto done;
2167 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2168 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2169 2ec1f75b 2019-03-26 stsp if (error)
2170 2ec1f75b 2019-03-26 stsp goto done;
2172 2ec1f75b 2019-03-26 stsp error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
2173 2ec1f75b 2019-03-26 stsp print_status, NULL, repo);
2174 a129376b 2019-03-28 stsp if (error)
2175 a129376b 2019-03-28 stsp goto done;
2178 a129376b 2019-03-28 stsp got_repo_close(repo);
2179 a129376b 2019-03-28 stsp if (worktree)
2180 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2181 a129376b 2019-03-28 stsp free(path);
2182 a129376b 2019-03-28 stsp free(cwd);
2183 a129376b 2019-03-28 stsp return error;
2186 a129376b 2019-03-28 stsp __dead static void
2187 a129376b 2019-03-28 stsp usage_revert(void)
2189 a129376b 2019-03-28 stsp fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2193 a129376b 2019-03-28 stsp static void
2194 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2196 a129376b 2019-03-28 stsp while (path[0] == '/')
2198 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2201 a129376b 2019-03-28 stsp static const struct got_error *
2202 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2204 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2205 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2206 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2207 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2210 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2211 a129376b 2019-03-28 stsp switch (ch) {
2213 a129376b 2019-03-28 stsp usage_revert();
2214 a129376b 2019-03-28 stsp /* NOTREACHED */
2218 a129376b 2019-03-28 stsp argc -= optind;
2219 a129376b 2019-03-28 stsp argv += optind;
2221 a129376b 2019-03-28 stsp if (argc != 1)
2222 a129376b 2019-03-28 stsp usage_revert();
2224 a129376b 2019-03-28 stsp path = realpath(argv[0], NULL);
2225 a129376b 2019-03-28 stsp if (path == NULL) {
2226 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2227 a129376b 2019-03-28 stsp goto done;
2229 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2231 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2232 a129376b 2019-03-28 stsp if (cwd == NULL) {
2233 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2234 a129376b 2019-03-28 stsp goto done;
2236 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2237 2ec1f75b 2019-03-26 stsp if (error)
2238 2ec1f75b 2019-03-26 stsp goto done;
2240 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2241 a129376b 2019-03-28 stsp if (error != NULL)
2242 a129376b 2019-03-28 stsp goto done;
2244 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2245 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2246 a129376b 2019-03-28 stsp if (error)
2247 a129376b 2019-03-28 stsp goto done;
2249 a129376b 2019-03-28 stsp error = got_worktree_revert(worktree, path,
2250 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2251 a129376b 2019-03-28 stsp if (error)
2252 a129376b 2019-03-28 stsp goto done;
2255 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2256 2ec1f75b 2019-03-26 stsp if (worktree)
2257 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2258 2ec1f75b 2019-03-26 stsp free(path);
2259 d00136be 2019-03-26 stsp free(cwd);
2260 6bad629b 2019-02-04 stsp return error;
2263 c4296144 2019-05-09 stsp __dead static void
2264 c4296144 2019-05-09 stsp usage_commit(void)
2266 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2271 e2ba3d07 2019-05-13 stsp spawn_editor(const char *editor, const char *file)
2274 33ad4cbe 2019-05-12 jcs sig_t sighup, sigint, sigquit;
2275 33ad4cbe 2019-05-12 jcs int st = -1;
2277 33ad4cbe 2019-05-12 jcs sighup = signal(SIGHUP, SIG_IGN);
2278 33ad4cbe 2019-05-12 jcs sigint = signal(SIGINT, SIG_IGN);
2279 33ad4cbe 2019-05-12 jcs sigquit = signal(SIGQUIT, SIG_IGN);
2281 33ad4cbe 2019-05-12 jcs switch (pid = fork()) {
2283 33ad4cbe 2019-05-12 jcs goto doneediting;
2285 e2ba3d07 2019-05-13 stsp execl(editor, editor, file, (char *)NULL);
2286 33ad4cbe 2019-05-12 jcs _exit(127);
2289 33ad4cbe 2019-05-12 jcs while (waitpid(pid, &st, 0) == -1)
2290 33ad4cbe 2019-05-12 jcs if (errno != EINTR)
2293 33ad4cbe 2019-05-12 jcs doneediting:
2294 33ad4cbe 2019-05-12 jcs (void)signal(SIGHUP, sighup);
2295 33ad4cbe 2019-05-12 jcs (void)signal(SIGINT, sigint);
2296 33ad4cbe 2019-05-12 jcs (void)signal(SIGQUIT, sigquit);
2298 33ad4cbe 2019-05-12 jcs if (!WIFEXITED(st)) {
2299 33ad4cbe 2019-05-12 jcs errno = EINTR;
2303 33ad4cbe 2019-05-12 jcs return WEXITSTATUS(st);
2306 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
2307 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
2308 e2ba3d07 2019-05-13 stsp const char *editor;
2309 e0870e44 2019-05-13 stsp const char *worktree_path;
2310 314a6357 2019-05-13 stsp const char *repo_path;
2311 e0870e44 2019-05-13 stsp char *logmsg_path;
2315 33ad4cbe 2019-05-12 jcs static const struct got_error *
2316 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2319 e0870e44 2019-05-13 stsp const char *initial_content = "\n# changes to be committed:\n";
2320 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
2321 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
2322 e0870e44 2019-05-13 stsp char *template = NULL;
2323 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
2324 33ad4cbe 2019-05-12 jcs char buf[1024];
2325 33ad4cbe 2019-05-12 jcs struct stat st, st2;
2327 33ad4cbe 2019-05-12 jcs size_t len;
2328 e0870e44 2019-05-13 stsp int fd, content_changed = 0;
2330 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
2331 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2332 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
2333 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
2334 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
2335 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
2336 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
2337 33ad4cbe 2019-05-12 jcs return NULL;
2340 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2341 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2343 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2345 e0870e44 2019-05-13 stsp goto done;
2347 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
2349 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
2350 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2351 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
2352 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
2353 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
2357 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st) == -1) {
2358 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", a->logmsg_path);
2362 e0870e44 2019-05-13 stsp if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2363 638f9024 2019-05-13 stsp err = got_error_from_errno("failed spawning editor");
2367 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st2) == -1) {
2368 638f9024 2019-05-13 stsp err = got_error_from_errno("stat");
2372 33ad4cbe 2019-05-12 jcs if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2373 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2374 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2375 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2376 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2377 33ad4cbe 2019-05-12 jcs "no changes made to commit message, aborting");
2381 33ad4cbe 2019-05-12 jcs *logmsg = malloc(st2.st_size + 1);
2382 fcde04d9 2019-05-13 stsp if (*logmsg == NULL) {
2383 638f9024 2019-05-13 stsp err = got_error_from_errno("malloc");
2384 fcde04d9 2019-05-13 stsp goto done;
2386 cc79381d 2019-05-22 stsp (*logmsg)[0] = '\0';
2389 e0870e44 2019-05-13 stsp fp = fopen(a->logmsg_path, "r");
2390 d4592c7c 2019-05-22 stsp if (fp == NULL) {
2391 d4592c7c 2019-05-22 stsp err = got_error_from_errno("fopen");
2392 d4592c7c 2019-05-22 stsp goto done;
2394 33ad4cbe 2019-05-12 jcs while (fgets(buf, sizeof(buf), fp) != NULL) {
2395 e0870e44 2019-05-13 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
2396 e0870e44 2019-05-13 stsp content_changed = 1;
2397 33ad4cbe 2019-05-12 jcs if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2398 78527a0a 2019-05-22 stsp continue; /* remove comments and leading empty lines */
2399 33ad4cbe 2019-05-12 jcs len = strlcat(*logmsg, buf, st2.st_size);
2401 33ad4cbe 2019-05-12 jcs fclose(fp);
2403 33ad4cbe 2019-05-12 jcs while (len > 0 && (*logmsg)[len - 1] == '\n') {
2404 33ad4cbe 2019-05-12 jcs (*logmsg)[len - 1] = '\0';
2408 e0870e44 2019-05-13 stsp if (len == 0 || !content_changed) {
2409 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2410 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2411 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2412 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2413 33ad4cbe 2019-05-12 jcs "commit message cannot be empty, aborting");
2417 e0870e44 2019-05-13 stsp free(template);
2419 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
2420 314a6357 2019-05-13 stsp if (err == NULL)
2421 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2422 33ad4cbe 2019-05-12 jcs return err;
2425 c4296144 2019-05-09 stsp static const struct got_error *
2426 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2428 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2429 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2430 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2431 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2432 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2433 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
2434 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2435 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
2436 e2ba3d07 2019-05-13 stsp char *editor = NULL;
2439 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2440 c4296144 2019-05-09 stsp switch (ch) {
2442 c4296144 2019-05-09 stsp logmsg = optarg;
2445 c4296144 2019-05-09 stsp usage_commit();
2446 c4296144 2019-05-09 stsp /* NOTREACHED */
2450 c4296144 2019-05-09 stsp argc -= optind;
2451 c4296144 2019-05-09 stsp argv += optind;
2453 c4296144 2019-05-09 stsp if (argc == 1) {
2454 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2455 c4296144 2019-05-09 stsp if (path == NULL) {
2456 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2457 c4296144 2019-05-09 stsp goto done;
2459 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2460 c4296144 2019-05-09 stsp } else if (argc != 0)
2461 c4296144 2019-05-09 stsp usage_commit();
2463 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2464 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2465 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2466 35bd8fed 2019-05-09 stsp goto done;
2469 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2470 c4296144 2019-05-09 stsp if (cwd == NULL) {
2471 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2472 c4296144 2019-05-09 stsp goto done;
2474 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2475 c4296144 2019-05-09 stsp if (error)
2476 c4296144 2019-05-09 stsp goto done;
2478 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2479 c4296144 2019-05-09 stsp if (error != NULL)
2480 c4296144 2019-05-09 stsp goto done;
2483 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
2484 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
2486 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
2487 314a6357 2019-05-13 stsp error = get_editor(&editor);
2489 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2490 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2491 c4296144 2019-05-09 stsp if (error)
2492 c4296144 2019-05-09 stsp goto done;
2494 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
2495 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
2496 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2497 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
2498 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
2499 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2500 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2501 e0870e44 2019-05-13 stsp if (error) {
2502 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2503 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
2504 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
2505 c4296144 2019-05-09 stsp goto done;
2508 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2509 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
2511 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2512 c4296144 2019-05-09 stsp if (error)
2513 c4296144 2019-05-09 stsp goto done;
2514 c4296144 2019-05-09 stsp printf("created commit %s\n", id_str);
2517 c4296144 2019-05-09 stsp got_repo_close(repo);
2518 c4296144 2019-05-09 stsp if (worktree)
2519 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2520 c4296144 2019-05-09 stsp free(path);
2521 c4296144 2019-05-09 stsp free(cwd);
2522 c4296144 2019-05-09 stsp free(id_str);
2523 e2ba3d07 2019-05-13 stsp free(editor);
2524 c4296144 2019-05-09 stsp return error;
