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 e2ba3d07 2019-05-13 stsp get_editor(char **editorp)
202 e2ba3d07 2019-05-13 stsp const char *editor;
204 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
205 e2ba3d07 2019-05-13 stsp if (editor == NULL)
206 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
207 e2ba3d07 2019-05-13 stsp if (editor == NULL)
208 e2ba3d07 2019-05-13 stsp editor = "/bin/ed";
210 e2ba3d07 2019-05-13 stsp *editorp = realpath(editor, NULL);
211 e2ba3d07 2019-05-13 stsp if (*editorp == NULL)
212 638f9024 2019-05-13 stsp return got_error_from_errno("relpath");
214 e2ba3d07 2019-05-13 stsp return NULL;
217 e2ba3d07 2019-05-13 stsp static const struct got_error *
218 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
219 e2ba3d07 2019-05-13 stsp const char *worktree_path, int create_worktree,
220 e2ba3d07 2019-05-13 stsp int unveil_editor)
222 0266afb7 2019-01-04 stsp const struct got_error *error;
223 3c45a30a 2019-05-12 jcs static char err_msg[MAXPATHLEN + 36];
225 a0937847 2019-05-11 stsp if (create_worktree) {
226 a0937847 2019-05-11 stsp /* Pre-create work tree path to avoid unveiling its parents. */
227 a0937847 2019-05-11 stsp error = got_path_mkdir(worktree_path);
229 3c45a30a 2019-05-12 jcs if (errno == EEXIST) {
230 280f921b 2019-05-12 stsp if (got_path_dir_is_empty(worktree_path)) {
232 3c45a30a 2019-05-12 jcs error = NULL;
234 3c45a30a 2019-05-12 jcs snprintf(err_msg, sizeof(err_msg),
235 3c45a30a 2019-05-12 jcs "%s: directory exists but is not empty",
236 3c45a30a 2019-05-12 jcs worktree_path);
237 3c45a30a 2019-05-12 jcs error = got_error_msg(GOT_ERR_BAD_PATH,
242 a0937847 2019-05-11 stsp if (error && (error->code != GOT_ERR_ERRNO || errno != EISDIR))
243 e2ba3d07 2019-05-13 stsp return error;
246 e2ba3d07 2019-05-13 stsp if (unveil_editor) {
247 e2ba3d07 2019-05-13 stsp char *editor;
248 e2ba3d07 2019-05-13 stsp error = get_editor(&editor);
250 a0937847 2019-05-11 stsp return error;
251 e2ba3d07 2019-05-13 stsp unveil(editor, "x");
252 e2ba3d07 2019-05-13 stsp free(editor);
255 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
256 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
258 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
259 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
261 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
262 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
264 0266afb7 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
265 0266afb7 2019-01-04 stsp if (error != NULL)
266 0266afb7 2019-01-04 stsp return error;
268 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
269 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
271 0266afb7 2019-01-04 stsp return NULL;
274 4ed7e80c 2018-05-20 stsp __dead static void
275 c09a553d 2018-03-12 stsp usage_checkout(void)
277 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
278 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
282 92a684f4 2018-03-12 stsp static void
283 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
285 92a684f4 2018-03-12 stsp char *worktree_path = arg;
287 92a684f4 2018-03-12 stsp while (path[0] == '/')
290 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
293 99437157 2018-11-11 stsp static const struct got_error *
294 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
296 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
297 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
298 99437157 2018-11-11 stsp return NULL;
301 8069f636 2019-01-12 stsp static const struct got_error *
302 d5bea539 2019-05-13 stsp check_linear_ancestry(struct got_worktree *worktree,
303 d5bea539 2019-05-13 stsp struct got_object_id *commit_id, struct got_repository *repo)
305 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
306 d5bea539 2019-05-13 stsp struct got_object_id *yca_id, *base_commit_id;
308 d5bea539 2019-05-13 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
309 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
310 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
312 36a38700 2019-05-10 stsp return err;
314 d5bea539 2019-05-13 stsp if (yca_id == NULL)
315 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
318 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
319 d5bea539 2019-05-13 stsp * and the work tree's base commit.
321 d5bea539 2019-05-13 stsp * Non-linear situation such as the this require a rebase:
323 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
331 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
332 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
333 d5bea539 2019-05-13 stsp * Update backwards in time: D (base) - C - D - A (commit/yca)
335 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
336 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
337 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
339 d5bea539 2019-05-13 stsp free(yca_id);
340 d5bea539 2019-05-13 stsp return NULL;
344 4ed7e80c 2018-05-20 stsp static const struct got_error *
345 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
347 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
348 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
349 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
350 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
351 c09a553d 2018-03-12 stsp char *repo_path = NULL;
352 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
353 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
354 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
355 72151b04 2019-05-11 stsp int ch, same_path_prefix;
357 8069f636 2019-01-12 stsp while ((ch = getopt(argc, argv, "c:p:")) != -1) {
358 0bb8a95e 2018-03-12 stsp switch (ch) {
360 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
361 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
362 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
365 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
368 2deda0b9 2019-03-07 stsp usage_checkout();
369 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
373 0bb8a95e 2018-03-12 stsp argc -= optind;
374 0bb8a95e 2018-03-12 stsp argv += optind;
376 6715a751 2018-03-16 stsp #ifndef PROFILE
377 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
378 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
379 c09a553d 2018-03-12 stsp err(1, "pledge");
381 0bb8a95e 2018-03-12 stsp if (argc == 1) {
382 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
383 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
384 76089277 2018-04-01 stsp if (repo_path == NULL)
385 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
386 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
387 76089277 2018-04-01 stsp if (cwd == NULL) {
388 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
391 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
392 230a42bd 2019-05-11 jcs base = basename(path_prefix);
393 230a42bd 2019-05-11 jcs if (base == NULL) {
394 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
395 230a42bd 2019-05-11 jcs path_prefix);
399 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
400 230a42bd 2019-05-11 jcs if (base == NULL) {
401 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
406 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
407 c09a553d 2018-03-12 stsp if (dotgit)
408 c09a553d 2018-03-12 stsp *dotgit = '\0';
409 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
410 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
415 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
416 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
417 76089277 2018-04-01 stsp if (repo_path == NULL) {
418 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
421 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
422 76089277 2018-04-01 stsp if (worktree_path == NULL) {
423 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
427 c09a553d 2018-03-12 stsp usage_checkout();
429 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
430 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
432 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
433 c09a553d 2018-03-12 stsp if (error != NULL)
436 e2ba3d07 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1, 0);
440 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
441 c09a553d 2018-03-12 stsp if (error != NULL)
444 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
445 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
448 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
449 c09a553d 2018-03-12 stsp if (error != NULL)
452 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
453 e5dc7198 2018-12-29 stsp path_prefix);
454 e5dc7198 2018-12-29 stsp if (error != NULL)
456 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
457 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
461 8069f636 2019-01-12 stsp if (commit_id_str) {
462 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
463 8069f636 2019-01-12 stsp error = got_object_resolve_id_str(&commit_id, repo,
464 8069f636 2019-01-12 stsp commit_id_str);
465 8069f636 2019-01-12 stsp if (error != NULL)
467 d5bea539 2019-05-13 stsp error = check_linear_ancestry(worktree, commit_id, repo);
468 8069f636 2019-01-12 stsp if (error != NULL) {
469 8069f636 2019-01-12 stsp free(commit_id);
472 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
473 8069f636 2019-01-12 stsp commit_id);
474 8069f636 2019-01-12 stsp free(commit_id);
479 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
480 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
481 c09a553d 2018-03-12 stsp if (error != NULL)
484 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
487 8069f636 2019-01-12 stsp free(commit_id_str);
488 76089277 2018-04-01 stsp free(repo_path);
489 507dc3bb 2018-12-29 stsp free(worktree_path);
490 507dc3bb 2018-12-29 stsp return error;
493 507dc3bb 2018-12-29 stsp __dead static void
494 507dc3bb 2018-12-29 stsp usage_update(void)
496 c4cdcb68 2019-04-03 stsp fprintf(stderr, "usage: %s update [-c commit] [path]\n",
497 507dc3bb 2018-12-29 stsp getprogname());
501 507dc3bb 2018-12-29 stsp static void
502 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
504 784955db 2019-01-12 stsp int *did_something = arg;
506 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
509 1545c615 2019-02-10 stsp *did_something = 1;
510 507dc3bb 2018-12-29 stsp while (path[0] == '/')
512 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
515 be7061eb 2018-12-30 stsp static const struct got_error *
516 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
518 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
519 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
520 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
521 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
522 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
523 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
524 784955db 2019-01-12 stsp int ch, did_something = 0;
526 507dc3bb 2018-12-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
527 507dc3bb 2018-12-29 stsp switch (ch) {
529 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
530 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
531 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
534 2deda0b9 2019-03-07 stsp usage_update();
535 507dc3bb 2018-12-29 stsp /* NOTREACHED */
539 507dc3bb 2018-12-29 stsp argc -= optind;
540 507dc3bb 2018-12-29 stsp argv += optind;
542 507dc3bb 2018-12-29 stsp #ifndef PROFILE
543 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
544 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
545 507dc3bb 2018-12-29 stsp err(1, "pledge");
547 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
548 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
549 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
552 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
556 507dc3bb 2018-12-29 stsp if (argc == 0) {
557 c4cdcb68 2019-04-03 stsp path = strdup("");
558 c4cdcb68 2019-04-03 stsp if (path == NULL) {
559 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
562 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
563 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
567 507dc3bb 2018-12-29 stsp usage_update();
569 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
570 507dc3bb 2018-12-29 stsp if (error != NULL)
573 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
574 e2ba3d07 2019-05-13 stsp got_worktree_get_root_path(worktree), 0, 0);
578 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
579 507dc3bb 2018-12-29 stsp struct got_reference *head_ref;
580 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
581 507dc3bb 2018-12-29 stsp if (error != NULL)
583 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
584 9c4b8182 2019-01-02 stsp if (error != NULL)
586 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
587 507dc3bb 2018-12-29 stsp if (error != NULL)
590 507dc3bb 2018-12-29 stsp error = got_object_resolve_id_str(&commit_id, repo,
591 507dc3bb 2018-12-29 stsp commit_id_str);
592 507dc3bb 2018-12-29 stsp if (error != NULL)
596 d5bea539 2019-05-13 stsp error = check_linear_ancestry(worktree, commit_id, repo);
597 be7061eb 2018-12-30 stsp if (error != NULL)
600 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
601 507dc3bb 2018-12-29 stsp commit_id) != 0) {
602 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
603 507dc3bb 2018-12-29 stsp commit_id);
608 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
609 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
610 507dc3bb 2018-12-29 stsp if (error != NULL)
613 784955db 2019-01-12 stsp if (did_something)
614 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
616 784955db 2019-01-12 stsp printf("Already up-to-date\n");
618 c09a553d 2018-03-12 stsp free(worktree_path);
619 c4cdcb68 2019-04-03 stsp free(path);
620 507dc3bb 2018-12-29 stsp free(commit_id);
621 9c4b8182 2019-01-02 stsp free(commit_id_str);
622 c09a553d 2018-03-12 stsp return error;
625 f42b1b34 2018-03-12 stsp static const struct got_error *
626 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
627 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
629 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
630 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
631 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
632 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
634 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
635 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
637 79109fed 2018-03-27 stsp return err;
639 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
640 79f35eb3 2018-06-11 stsp if (qid != NULL) {
641 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
643 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
645 79109fed 2018-03-27 stsp return err;
647 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
648 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
649 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
651 0f2b3dca 2018-12-22 stsp return err;
653 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
655 79109fed 2018-03-27 stsp return err;
658 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
662 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
663 54156555 2018-12-24 stsp err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
666 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
667 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
668 0f2b3dca 2018-12-22 stsp free(id_str1);
669 0f2b3dca 2018-12-22 stsp free(id_str2);
670 79109fed 2018-03-27 stsp return err;
673 4bb494d5 2018-06-16 stsp static char *
674 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
676 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
677 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
683 79109fed 2018-03-27 stsp static const struct got_error *
684 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
685 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
686 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
688 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
689 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
690 6c281f94 2018-06-11 stsp char datebuf[26];
691 45d799e2 2018-12-23 stsp time_t committer_time;
692 45d799e2 2018-12-23 stsp const char *author, *committer;
693 199a4027 2019-02-02 stsp char *refs_str = NULL;
694 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
696 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
698 199a4027 2019-02-02 stsp const char *name;
699 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
701 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
702 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
704 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
706 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
708 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
710 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
712 199a4027 2019-02-02 stsp s = refs_str;
713 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
714 199a4027 2019-02-02 stsp name) == -1) {
715 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
721 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
723 8bf5b3c9 2018-03-17 stsp return err;
725 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
726 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
727 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
728 832c249c 2018-06-10 stsp free(id_str);
729 d3d493d7 2019-02-21 stsp id_str = NULL;
730 d3d493d7 2019-02-21 stsp free(refs_str);
731 d3d493d7 2019-02-21 stsp refs_str = NULL;
732 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
733 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
734 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
735 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
736 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
737 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
738 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
739 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
740 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
741 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
742 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
744 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
745 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
746 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
748 a0603db2 2018-06-10 stsp return err;
749 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
750 a0603db2 2018-06-10 stsp free(id_str);
754 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
755 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
756 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
758 621015ac 2018-07-23 stsp logmsg = logmsg0;
760 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
762 832c249c 2018-06-10 stsp printf(" %s\n", line);
763 832c249c 2018-06-10 stsp } while (line);
764 621015ac 2018-07-23 stsp free(logmsg0);
766 971751ac 2018-03-27 stsp if (show_patch) {
767 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
768 971751ac 2018-03-27 stsp if (err == 0)
769 971751ac 2018-03-27 stsp printf("\n");
772 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
773 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
774 07862c20 2018-09-15 stsp return err;
777 f42b1b34 2018-03-12 stsp static const struct got_error *
778 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
779 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
780 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
782 f42b1b34 2018-03-12 stsp const struct got_error *err;
783 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
785 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
786 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
788 f42b1b34 2018-03-12 stsp return err;
789 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
793 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
794 372ccdbb 2018-06-10 stsp struct got_object_id *id;
796 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
799 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
801 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
802 9ba79e04 2018-06-11 stsp err = NULL;
805 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
807 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
813 b43fbaa0 2018-06-11 stsp if (id == NULL)
816 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
819 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
821 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
822 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
826 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
827 f42b1b34 2018-03-12 stsp return err;
830 4ed7e80c 2018-05-20 stsp __dead static void
831 6f3d1eb0 2018-03-12 stsp usage_log(void)
833 c0cc5c62 2018-10-18 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
834 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
838 4ed7e80c 2018-05-20 stsp static const struct got_error *
839 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
841 f42b1b34 2018-03-12 stsp const struct got_error *error;
842 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
843 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
844 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
845 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
846 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
847 d142fc45 2018-04-01 stsp char *start_commit = NULL;
848 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
849 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
850 64a96a6d 2018-04-01 stsp const char *errstr;
851 199a4027 2019-02-02 stsp struct got_reflist_head refs;
853 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
855 6715a751 2018-03-16 stsp #ifndef PROFILE
856 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
859 f42b1b34 2018-03-12 stsp err(1, "pledge");
862 c0cc5c62 2018-10-18 stsp while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
863 79109fed 2018-03-27 stsp switch (ch) {
865 79109fed 2018-03-27 stsp show_patch = 1;
868 d142fc45 2018-04-01 stsp start_commit = optarg;
871 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
873 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
874 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
877 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
878 64a96a6d 2018-04-01 stsp if (errstr != NULL)
879 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
882 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
885 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
886 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
887 04ca23f4 2018-07-16 stsp err(1, "-r option");
888 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
891 2deda0b9 2019-03-07 stsp usage_log();
892 79109fed 2018-03-27 stsp /* NOTREACHED */
896 79109fed 2018-03-27 stsp argc -= optind;
897 79109fed 2018-03-27 stsp argv += optind;
899 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
900 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
901 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
905 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
906 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
908 cffc0aa4 2019-02-05 stsp error = NULL;
910 e7301579 2019-03-18 stsp if (argc == 0) {
911 cbd1af7a 2019-03-18 stsp path = strdup("");
912 e7301579 2019-03-18 stsp if (path == NULL) {
913 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
916 e7301579 2019-03-18 stsp } else if (argc == 1) {
917 e7301579 2019-03-18 stsp if (worktree) {
918 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
923 e7301579 2019-03-18 stsp path = strdup(argv[0]);
924 e7301579 2019-03-18 stsp if (path == NULL) {
925 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
930 cbd1af7a 2019-03-18 stsp usage_log();
932 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
933 5486daa2 2019-05-11 stsp repo_path = worktree ?
934 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
936 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
937 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
941 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
942 d7d4f210 2018-03-12 stsp if (error != NULL)
945 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
946 e2ba3d07 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0, 0);
950 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
951 3235492e 2018-04-01 stsp struct got_reference *head_ref;
952 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
953 3235492e 2018-04-01 stsp if (error != NULL)
954 3235492e 2018-04-01 stsp return error;
955 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
956 3235492e 2018-04-01 stsp got_ref_close(head_ref);
957 3235492e 2018-04-01 stsp if (error != NULL)
958 3235492e 2018-04-01 stsp return error;
959 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
961 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
962 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
963 3235492e 2018-04-01 stsp if (error == NULL) {
964 1caad61b 2019-02-01 stsp int obj_type;
965 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
966 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
967 d1f2edc9 2018-06-13 stsp if (error != NULL)
969 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
970 1caad61b 2019-02-01 stsp if (error != NULL)
972 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
973 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
974 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
975 1caad61b 2019-02-01 stsp if (error != NULL)
977 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
978 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
979 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
980 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
984 1caad61b 2019-02-01 stsp id = got_object_id_dup(
985 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
986 1caad61b 2019-02-01 stsp if (id == NULL)
987 638f9024 2019-05-13 stsp error = got_error_from_errno(
988 230a42bd 2019-05-11 jcs "got_object_id_dup");
989 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
992 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
993 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
996 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
997 d1f2edc9 2018-06-13 stsp if (error != NULL)
1000 15a94983 2018-12-23 stsp if (commit == NULL) {
1001 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id, repo,
1002 d1f2edc9 2018-06-13 stsp start_commit);
1003 d1f2edc9 2018-06-13 stsp if (error != NULL)
1004 d1f2edc9 2018-06-13 stsp return error;
1007 d7d4f210 2018-03-12 stsp if (error != NULL)
1008 04ca23f4 2018-07-16 stsp goto done;
1010 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1011 04ca23f4 2018-07-16 stsp if (error != NULL)
1012 04ca23f4 2018-07-16 stsp goto done;
1013 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1014 04ca23f4 2018-07-16 stsp free(path);
1015 04ca23f4 2018-07-16 stsp path = in_repo_path;
1018 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1019 199a4027 2019-02-02 stsp if (error)
1020 199a4027 2019-02-02 stsp goto done;
1022 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1023 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1025 04ca23f4 2018-07-16 stsp free(path);
1026 04ca23f4 2018-07-16 stsp free(repo_path);
1027 04ca23f4 2018-07-16 stsp free(cwd);
1029 cffc0aa4 2019-02-05 stsp if (worktree)
1030 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1031 ad242220 2018-09-08 stsp if (repo) {
1032 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1033 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1034 ad242220 2018-09-08 stsp if (error == NULL)
1035 ad242220 2018-09-08 stsp error = repo_error;
1037 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1038 8bf5b3c9 2018-03-17 stsp return error;
1041 4ed7e80c 2018-05-20 stsp __dead static void
1042 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1044 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1045 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1049 b72f483a 2019-02-05 stsp struct print_diff_arg {
1050 b72f483a 2019-02-05 stsp struct got_repository *repo;
1051 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1052 b72f483a 2019-02-05 stsp int diff_context;
1053 3fc0c068 2019-02-10 stsp const char *id_str;
1054 3fc0c068 2019-02-10 stsp int header_shown;
1057 4ed7e80c 2018-05-20 stsp static const struct got_error *
1058 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1059 b72f483a 2019-02-05 stsp struct got_object_id *id)
1061 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1062 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1063 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1064 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1065 b72f483a 2019-02-05 stsp char *abspath = NULL;
1066 b72f483a 2019-02-05 stsp struct stat sb;
1068 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1069 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1070 b72f483a 2019-02-05 stsp return NULL;
1072 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1073 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1074 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1075 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1078 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1079 d00136be 2019-03-26 stsp err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1081 d00136be 2019-03-26 stsp goto done;
1085 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1086 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1087 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1088 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1089 2ec1f75b 2019-03-26 stsp goto done;
1092 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1093 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1094 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1095 2ec1f75b 2019-03-26 stsp goto done;
1097 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1098 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1099 2ec1f75b 2019-03-26 stsp goto done;
1102 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1104 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1107 b72f483a 2019-02-05 stsp if (blob1)
1108 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1109 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1110 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1111 b72f483a 2019-02-05 stsp free(abspath);
1112 927df6b7 2019-02-10 stsp return err;
1115 927df6b7 2019-02-10 stsp static const struct got_error *
1116 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1118 b00d56cd 2018-04-01 stsp const struct got_error *error;
1119 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1120 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1121 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1122 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1123 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
1124 15a94983 2018-12-23 stsp int type1, type2;
1125 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1126 c0cc5c62 2018-10-18 stsp const char *errstr;
1127 927df6b7 2019-02-10 stsp char *path = NULL;
1129 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1130 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1131 25eccc22 2019-01-04 stsp NULL) == -1)
1132 b00d56cd 2018-04-01 stsp err(1, "pledge");
1135 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1136 b00d56cd 2018-04-01 stsp switch (ch) {
1138 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1139 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1140 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1143 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1144 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1145 b72f483a 2019-02-05 stsp err(1, "-r option");
1146 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1149 2deda0b9 2019-03-07 stsp usage_diff();
1150 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1154 b00d56cd 2018-04-01 stsp argc -= optind;
1155 b00d56cd 2018-04-01 stsp argv += optind;
1157 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1158 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1159 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1160 b72f483a 2019-02-05 stsp goto done;
1162 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1163 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1164 927df6b7 2019-02-10 stsp goto done;
1165 927df6b7 2019-02-10 stsp if (argc <= 1) {
1166 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1167 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1168 927df6b7 2019-02-10 stsp goto done;
1170 b72f483a 2019-02-05 stsp if (repo_path)
1172 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1173 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1174 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1175 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1176 927df6b7 2019-02-10 stsp goto done;
1178 927df6b7 2019-02-10 stsp if (argc == 1) {
1179 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1181 927df6b7 2019-02-10 stsp if (error)
1182 927df6b7 2019-02-10 stsp goto done;
1184 927df6b7 2019-02-10 stsp path = strdup("");
1185 927df6b7 2019-02-10 stsp if (path == NULL) {
1186 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1187 927df6b7 2019-02-10 stsp goto done;
1190 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1191 15a94983 2018-12-23 stsp id_str1 = argv[0];
1192 15a94983 2018-12-23 stsp id_str2 = argv[1];
1194 b00d56cd 2018-04-01 stsp usage_diff();
1196 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1197 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1198 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1199 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1202 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1203 76089277 2018-04-01 stsp free(repo_path);
1204 b00d56cd 2018-04-01 stsp if (error != NULL)
1205 b00d56cd 2018-04-01 stsp goto done;
1207 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1208 e2ba3d07 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0, 0);
1209 c02c541e 2019-03-29 stsp if (error)
1210 c02c541e 2019-03-29 stsp goto done;
1212 b72f483a 2019-02-05 stsp if (worktree) {
1213 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1214 b72f483a 2019-02-05 stsp char *id_str;
1215 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1216 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1217 b72f483a 2019-02-05 stsp if (error)
1218 b72f483a 2019-02-05 stsp goto done;
1219 b72f483a 2019-02-05 stsp arg.repo = repo;
1220 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1221 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1222 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1223 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1225 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1226 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1227 b72f483a 2019-02-05 stsp free(id_str);
1228 b72f483a 2019-02-05 stsp goto done;
1231 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
1232 6402fb3c 2018-09-15 stsp if (error)
1233 b00d56cd 2018-04-01 stsp goto done;
1235 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
1236 6402fb3c 2018-09-15 stsp if (error)
1237 b00d56cd 2018-04-01 stsp goto done;
1239 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1240 15a94983 2018-12-23 stsp if (error)
1241 15a94983 2018-12-23 stsp goto done;
1243 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1244 15a94983 2018-12-23 stsp if (error)
1245 15a94983 2018-12-23 stsp goto done;
1247 15a94983 2018-12-23 stsp if (type1 != type2) {
1248 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1249 b00d56cd 2018-04-01 stsp goto done;
1252 15a94983 2018-12-23 stsp switch (type1) {
1253 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1254 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1255 54156555 2018-12-24 stsp diff_context, repo, stdout);
1257 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1258 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1259 54156555 2018-12-24 stsp diff_context, repo, stdout);
1261 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1262 15a94983 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1264 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1265 c0cc5c62 2018-10-18 stsp repo, stdout);
1268 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1272 15a94983 2018-12-23 stsp free(id1);
1273 15a94983 2018-12-23 stsp free(id2);
1274 927df6b7 2019-02-10 stsp free(path);
1275 b72f483a 2019-02-05 stsp if (worktree)
1276 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1277 ad242220 2018-09-08 stsp if (repo) {
1278 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1279 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1280 ad242220 2018-09-08 stsp if (error == NULL)
1281 ad242220 2018-09-08 stsp error = repo_error;
1283 b00d56cd 2018-04-01 stsp return error;
1286 404c43c4 2018-06-21 stsp __dead static void
1287 404c43c4 2018-06-21 stsp usage_blame(void)
1289 9270e621 2019-02-05 stsp fprintf(stderr,
1290 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1291 404c43c4 2018-06-21 stsp getprogname());
1295 404c43c4 2018-06-21 stsp static const struct got_error *
1296 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1298 404c43c4 2018-06-21 stsp const struct got_error *error;
1299 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1300 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1301 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1302 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1303 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1306 404c43c4 2018-06-21 stsp #ifndef PROFILE
1307 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1308 36e2fb66 2019-01-04 stsp NULL) == -1)
1309 404c43c4 2018-06-21 stsp err(1, "pledge");
1312 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1313 404c43c4 2018-06-21 stsp switch (ch) {
1315 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1318 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1319 66bea077 2018-08-02 stsp if (repo_path == NULL)
1320 66bea077 2018-08-02 stsp err(1, "-r option");
1321 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1324 2deda0b9 2019-03-07 stsp usage_blame();
1325 404c43c4 2018-06-21 stsp /* NOTREACHED */
1329 404c43c4 2018-06-21 stsp argc -= optind;
1330 404c43c4 2018-06-21 stsp argv += optind;
1332 a39318fd 2018-08-02 stsp if (argc == 1)
1333 404c43c4 2018-06-21 stsp path = argv[0];
1335 404c43c4 2018-06-21 stsp usage_blame();
1337 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1338 66bea077 2018-08-02 stsp if (cwd == NULL) {
1339 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1340 66bea077 2018-08-02 stsp goto done;
1342 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1343 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1344 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1345 66bea077 2018-08-02 stsp goto done;
1347 0c06baac 2019-02-05 stsp error = NULL;
1348 0c06baac 2019-02-05 stsp if (worktree) {
1349 0c06baac 2019-02-05 stsp repo_path =
1350 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1351 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1352 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1353 0c06baac 2019-02-05 stsp if (error)
1354 0c06baac 2019-02-05 stsp goto done;
1356 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1357 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1358 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1359 0c06baac 2019-02-05 stsp goto done;
1364 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1365 c02c541e 2019-03-29 stsp if (error != NULL)
1366 36e2fb66 2019-01-04 stsp goto done;
1368 e2ba3d07 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0, 0);
1369 c02c541e 2019-03-29 stsp if (error)
1370 404c43c4 2018-06-21 stsp goto done;
1372 0c06baac 2019-02-05 stsp if (worktree) {
1373 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1374 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1375 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1376 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1377 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1378 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1379 6efaaa2d 2019-02-05 stsp path) == -1) {
1380 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1381 0c06baac 2019-02-05 stsp goto done;
1383 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1386 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1388 0c06baac 2019-02-05 stsp if (error)
1389 66bea077 2018-08-02 stsp goto done;
1391 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1392 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1393 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1394 404c43c4 2018-06-21 stsp if (error != NULL)
1395 66bea077 2018-08-02 stsp goto done;
1396 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1397 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1398 404c43c4 2018-06-21 stsp if (error != NULL)
1399 66bea077 2018-08-02 stsp goto done;
1401 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1402 15a94983 2018-12-23 stsp commit_id_str);
1403 404c43c4 2018-06-21 stsp if (error != NULL)
1404 66bea077 2018-08-02 stsp goto done;
1407 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1409 66bea077 2018-08-02 stsp free(in_repo_path);
1410 66bea077 2018-08-02 stsp free(repo_path);
1411 66bea077 2018-08-02 stsp free(cwd);
1412 404c43c4 2018-06-21 stsp free(commit_id);
1413 0c06baac 2019-02-05 stsp if (worktree)
1414 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1415 ad242220 2018-09-08 stsp if (repo) {
1416 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1417 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1418 ad242220 2018-09-08 stsp if (error == NULL)
1419 ad242220 2018-09-08 stsp error = repo_error;
1421 404c43c4 2018-06-21 stsp return error;
1424 5de5890b 2018-10-18 stsp __dead static void
1425 5de5890b 2018-10-18 stsp usage_tree(void)
1427 c1669e2e 2019-01-09 stsp fprintf(stderr,
1428 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1429 5de5890b 2018-10-18 stsp getprogname());
1433 c1669e2e 2019-01-09 stsp static void
1434 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1435 c1669e2e 2019-01-09 stsp const char *root_path)
1437 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1439 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1440 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1443 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1444 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1445 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1448 5de5890b 2018-10-18 stsp static const struct got_error *
1449 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1450 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1451 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1453 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1454 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1455 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1456 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1457 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1459 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1461 5de5890b 2018-10-18 stsp goto done;
1463 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1465 5de5890b 2018-10-18 stsp goto done;
1466 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1467 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1468 5de5890b 2018-10-18 stsp while (te) {
1469 5de5890b 2018-10-18 stsp char *id = NULL;
1471 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1474 5de5890b 2018-10-18 stsp if (show_ids) {
1475 5de5890b 2018-10-18 stsp char *id_str;
1476 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1478 5de5890b 2018-10-18 stsp goto done;
1479 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1480 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1481 5de5890b 2018-10-18 stsp free(id_str);
1482 5de5890b 2018-10-18 stsp goto done;
1484 5de5890b 2018-10-18 stsp free(id_str);
1486 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1489 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1490 c1669e2e 2019-01-09 stsp char *child_path;
1491 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1492 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1493 c1669e2e 2019-01-09 stsp te->name) == -1) {
1494 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1495 c1669e2e 2019-01-09 stsp goto done;
1497 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1498 c1669e2e 2019-01-09 stsp root_path, repo);
1499 c1669e2e 2019-01-09 stsp free(child_path);
1501 c1669e2e 2019-01-09 stsp goto done;
1504 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1508 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1509 5de5890b 2018-10-18 stsp free(tree_id);
1510 5de5890b 2018-10-18 stsp return err;
1513 5de5890b 2018-10-18 stsp static const struct got_error *
1514 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1516 5de5890b 2018-10-18 stsp const struct got_error *error;
1517 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1518 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1519 7a2c19d6 2019-02-05 stsp const char *path;
1520 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1521 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1522 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1523 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1526 5de5890b 2018-10-18 stsp #ifndef PROFILE
1527 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1528 0f8d269b 2019-01-04 stsp NULL) == -1)
1529 5de5890b 2018-10-18 stsp err(1, "pledge");
1532 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1533 5de5890b 2018-10-18 stsp switch (ch) {
1535 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1538 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1539 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1540 5de5890b 2018-10-18 stsp err(1, "-r option");
1541 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1544 5de5890b 2018-10-18 stsp show_ids = 1;
1547 c1669e2e 2019-01-09 stsp recurse = 1;
1550 2deda0b9 2019-03-07 stsp usage_tree();
1551 5de5890b 2018-10-18 stsp /* NOTREACHED */
1555 5de5890b 2018-10-18 stsp argc -= optind;
1556 5de5890b 2018-10-18 stsp argv += optind;
1558 5de5890b 2018-10-18 stsp if (argc == 1)
1559 5de5890b 2018-10-18 stsp path = argv[0];
1560 5de5890b 2018-10-18 stsp else if (argc > 1)
1561 5de5890b 2018-10-18 stsp usage_tree();
1563 7a2c19d6 2019-02-05 stsp path = NULL;
1565 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1566 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1567 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1568 9bf7a39b 2019-02-05 stsp goto done;
1570 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1571 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1572 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1573 7a2c19d6 2019-02-05 stsp goto done;
1575 7a2c19d6 2019-02-05 stsp error = NULL;
1576 7a2c19d6 2019-02-05 stsp if (worktree) {
1577 7a2c19d6 2019-02-05 stsp repo_path =
1578 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1579 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1580 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1581 7a2c19d6 2019-02-05 stsp if (error)
1582 7a2c19d6 2019-02-05 stsp goto done;
1584 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1585 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1586 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1587 7a2c19d6 2019-02-05 stsp goto done;
1592 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1593 5de5890b 2018-10-18 stsp if (error != NULL)
1594 c02c541e 2019-03-29 stsp goto done;
1596 e2ba3d07 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0, 0);
1597 c02c541e 2019-03-29 stsp if (error)
1598 5de5890b 2018-10-18 stsp goto done;
1600 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1601 9bf7a39b 2019-02-05 stsp if (worktree) {
1602 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1603 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1604 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1605 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1606 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1607 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1608 9bf7a39b 2019-02-05 stsp goto done;
1610 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1612 9bf7a39b 2019-02-05 stsp if (error)
1613 9bf7a39b 2019-02-05 stsp goto done;
1615 9bf7a39b 2019-02-05 stsp path = "/";
1617 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1618 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1619 9bf7a39b 2019-02-05 stsp if (error != NULL)
1620 9bf7a39b 2019-02-05 stsp goto done;
1623 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1624 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1625 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1626 5de5890b 2018-10-18 stsp if (error != NULL)
1627 5de5890b 2018-10-18 stsp goto done;
1628 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1629 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1630 5de5890b 2018-10-18 stsp if (error != NULL)
1631 5de5890b 2018-10-18 stsp goto done;
1633 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
1634 15a94983 2018-12-23 stsp commit_id_str);
1635 5de5890b 2018-10-18 stsp if (error != NULL)
1636 5de5890b 2018-10-18 stsp goto done;
1639 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1640 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1642 5de5890b 2018-10-18 stsp free(in_repo_path);
1643 5de5890b 2018-10-18 stsp free(repo_path);
1644 5de5890b 2018-10-18 stsp free(cwd);
1645 5de5890b 2018-10-18 stsp free(commit_id);
1646 7a2c19d6 2019-02-05 stsp if (worktree)
1647 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1648 5de5890b 2018-10-18 stsp if (repo) {
1649 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1650 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1651 5de5890b 2018-10-18 stsp if (error == NULL)
1652 5de5890b 2018-10-18 stsp error = repo_error;
1654 5de5890b 2018-10-18 stsp return error;
1657 6bad629b 2019-02-04 stsp __dead static void
1658 6bad629b 2019-02-04 stsp usage_status(void)
1660 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1664 b72f483a 2019-02-05 stsp static const struct got_error *
1665 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1666 b72f483a 2019-02-05 stsp struct got_object_id *id)
1668 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1669 b72f483a 2019-02-05 stsp return NULL;
1672 6bad629b 2019-02-04 stsp static const struct got_error *
1673 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1675 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1676 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1677 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1678 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1681 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1682 6bad629b 2019-02-04 stsp switch (ch) {
1684 2deda0b9 2019-03-07 stsp usage_status();
1685 6bad629b 2019-02-04 stsp /* NOTREACHED */
1689 6bad629b 2019-02-04 stsp argc -= optind;
1690 6bad629b 2019-02-04 stsp argv += optind;
1692 6bad629b 2019-02-04 stsp #ifndef PROFILE
1693 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1694 6bad629b 2019-02-04 stsp NULL) == -1)
1695 6bad629b 2019-02-04 stsp err(1, "pledge");
1697 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1698 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1699 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1700 927df6b7 2019-02-10 stsp goto done;
1703 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1704 927df6b7 2019-02-10 stsp if (error != NULL)
1705 927df6b7 2019-02-10 stsp goto done;
1707 6bad629b 2019-02-04 stsp if (argc == 0) {
1708 927df6b7 2019-02-10 stsp path = strdup("");
1709 927df6b7 2019-02-10 stsp if (path == NULL) {
1710 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1711 6bad629b 2019-02-04 stsp goto done;
1713 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1714 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1715 927df6b7 2019-02-10 stsp if (error)
1716 6bad629b 2019-02-04 stsp goto done;
1718 6bad629b 2019-02-04 stsp usage_status();
1720 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1721 6bad629b 2019-02-04 stsp if (error != NULL)
1722 6bad629b 2019-02-04 stsp goto done;
1724 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1725 e2ba3d07 2019-05-13 stsp got_worktree_get_root_path(worktree), 0, 0);
1726 6bad629b 2019-02-04 stsp if (error)
1727 6bad629b 2019-02-04 stsp goto done;
1729 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1730 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1732 927df6b7 2019-02-10 stsp free(cwd);
1733 927df6b7 2019-02-10 stsp free(path);
1734 d0eebce4 2019-03-11 stsp return error;
1737 d0eebce4 2019-03-11 stsp __dead static void
1738 d0eebce4 2019-03-11 stsp usage_ref(void)
1740 d0eebce4 2019-03-11 stsp fprintf(stderr,
1741 d0eebce4 2019-03-11 stsp "usage: %s ref [-r repository] -l | -d name | name object\n",
1742 d0eebce4 2019-03-11 stsp getprogname());
1746 d0eebce4 2019-03-11 stsp static const struct got_error *
1747 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1749 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1750 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1751 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1753 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1754 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
1756 d0eebce4 2019-03-11 stsp return err;
1758 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
1759 d0eebce4 2019-03-11 stsp char *refstr;
1760 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
1761 d0eebce4 2019-03-11 stsp if (refstr == NULL)
1762 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
1763 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1764 d0eebce4 2019-03-11 stsp free(refstr);
1767 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1768 d0eebce4 2019-03-11 stsp return NULL;
1771 d0eebce4 2019-03-11 stsp static const struct got_error *
1772 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
1774 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1775 d0eebce4 2019-03-11 stsp struct got_reference *ref;
1777 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
1779 d0eebce4 2019-03-11 stsp return err;
1781 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
1782 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1783 d0eebce4 2019-03-11 stsp return err;
1786 d0eebce4 2019-03-11 stsp static const struct got_error *
1787 d0eebce4 2019-03-11 stsp add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1789 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
1790 d0eebce4 2019-03-11 stsp struct got_object_id *id;
1791 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
1793 d0eebce4 2019-03-11 stsp err = got_object_resolve_id_str(&id, repo, id_str);
1795 d0eebce4 2019-03-11 stsp return err;
1797 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
1799 d0eebce4 2019-03-11 stsp goto done;
1801 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
1804 d0eebce4 2019-03-11 stsp got_ref_close(ref);
1806 d0eebce4 2019-03-11 stsp return err;
1809 d0eebce4 2019-03-11 stsp static const struct got_error *
1810 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
1812 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
1813 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
1814 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
1815 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
1816 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
1817 d0eebce4 2019-03-11 stsp const char *delref = NULL;
1819 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
1820 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1821 d0eebce4 2019-03-11 stsp switch (ch) {
1823 d0eebce4 2019-03-11 stsp delref = optarg;
1826 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
1827 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1828 d0eebce4 2019-03-11 stsp err(1, "-r option");
1829 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1832 d0eebce4 2019-03-11 stsp do_list = 1;
1835 d0eebce4 2019-03-11 stsp usage_ref();
1836 d0eebce4 2019-03-11 stsp /* NOTREACHED */
1840 d0eebce4 2019-03-11 stsp if (do_list && delref)
1841 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
1843 d0eebce4 2019-03-11 stsp argc -= optind;
1844 d0eebce4 2019-03-11 stsp argv += optind;
1846 d0eebce4 2019-03-11 stsp if (do_list || delref) {
1847 d0eebce4 2019-03-11 stsp if (argc > 0)
1848 d0eebce4 2019-03-11 stsp usage_ref();
1849 d0eebce4 2019-03-11 stsp } else if (argc != 2)
1850 d0eebce4 2019-03-11 stsp usage_ref();
1852 d0eebce4 2019-03-11 stsp #ifndef PROFILE
1853 e0b57350 2019-03-12 stsp if (do_list) {
1854 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1855 e0b57350 2019-03-12 stsp NULL) == -1)
1856 e0b57350 2019-03-12 stsp err(1, "pledge");
1858 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1859 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
1860 e0b57350 2019-03-12 stsp err(1, "pledge");
1863 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
1864 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
1865 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1866 d0eebce4 2019-03-11 stsp goto done;
1869 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1870 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
1871 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1872 d0eebce4 2019-03-11 stsp goto done;
1874 d0eebce4 2019-03-11 stsp error = NULL;
1875 d0eebce4 2019-03-11 stsp if (worktree) {
1876 d0eebce4 2019-03-11 stsp repo_path =
1877 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
1878 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
1879 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1880 d0eebce4 2019-03-11 stsp if (error)
1881 d0eebce4 2019-03-11 stsp goto done;
1883 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
1884 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
1885 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1886 d0eebce4 2019-03-11 stsp goto done;
1891 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
1892 d0eebce4 2019-03-11 stsp if (error != NULL)
1893 d0eebce4 2019-03-11 stsp goto done;
1895 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
1896 e2ba3d07 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0, 0);
1897 c02c541e 2019-03-29 stsp if (error)
1898 c02c541e 2019-03-29 stsp goto done;
1900 d0eebce4 2019-03-11 stsp if (do_list)
1901 d0eebce4 2019-03-11 stsp error = list_refs(repo);
1902 d0eebce4 2019-03-11 stsp else if (delref)
1903 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
1905 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
1908 d0eebce4 2019-03-11 stsp got_repo_close(repo);
1909 d0eebce4 2019-03-11 stsp if (worktree)
1910 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
1911 d0eebce4 2019-03-11 stsp free(cwd);
1912 d0eebce4 2019-03-11 stsp free(repo_path);
1913 d00136be 2019-03-26 stsp return error;
1916 d00136be 2019-03-26 stsp __dead static void
1917 d00136be 2019-03-26 stsp usage_add(void)
1919 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
1923 d00136be 2019-03-26 stsp static const struct got_error *
1924 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
1926 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
1927 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
1928 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
1929 1dd54920 2019-05-11 stsp char *cwd = NULL;
1930 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
1931 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
1934 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
1936 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1937 d00136be 2019-03-26 stsp switch (ch) {
1939 d00136be 2019-03-26 stsp usage_add();
1940 d00136be 2019-03-26 stsp /* NOTREACHED */
1944 d00136be 2019-03-26 stsp argc -= optind;
1945 d00136be 2019-03-26 stsp argv += optind;
1947 723c305c 2019-05-11 jcs if (argc < 1)
1948 d00136be 2019-03-26 stsp usage_add();
1950 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
1951 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
1952 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
1953 723c305c 2019-05-11 jcs if (path == NULL) {
1954 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
1957 1dd54920 2019-05-11 stsp free(path);
1960 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
1961 d00136be 2019-03-26 stsp if (cwd == NULL) {
1962 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1963 d00136be 2019-03-26 stsp goto done;
1966 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
1967 d00136be 2019-03-26 stsp if (error)
1968 d00136be 2019-03-26 stsp goto done;
1970 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1971 031a5338 2019-03-26 stsp if (error != NULL)
1972 031a5338 2019-03-26 stsp goto done;
1974 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1975 e2ba3d07 2019-05-13 stsp got_worktree_get_root_path(worktree), 0, 0);
1976 d00136be 2019-03-26 stsp if (error)
1977 d00136be 2019-03-26 stsp goto done;
1979 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
1980 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
1981 723c305c 2019-05-11 jcs if (path == NULL) {
1982 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
1986 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
1987 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
1988 1dd54920 2019-05-11 stsp if (error) {
1989 1dd54920 2019-05-11 stsp free(path);
1993 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
1994 1dd54920 2019-05-11 stsp NULL, repo);
1997 031a5338 2019-03-26 stsp got_repo_close(repo);
1998 d00136be 2019-03-26 stsp if (worktree)
1999 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2000 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2001 1dd54920 2019-05-11 stsp free((char *)pe->path);
2002 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2003 2ec1f75b 2019-03-26 stsp free(cwd);
2004 2ec1f75b 2019-03-26 stsp return error;
2007 2ec1f75b 2019-03-26 stsp __dead static void
2008 2ec1f75b 2019-03-26 stsp usage_rm(void)
2010 2ec1f75b 2019-03-26 stsp fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
2014 2ec1f75b 2019-03-26 stsp static const struct got_error *
2015 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
2017 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2018 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2019 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2020 2ec1f75b 2019-03-26 stsp char *cwd = NULL, *path = NULL;
2021 2ec1f75b 2019-03-26 stsp int ch, delete_local_mods = 0;
2023 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2024 2ec1f75b 2019-03-26 stsp switch (ch) {
2026 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2029 2ec1f75b 2019-03-26 stsp usage_add();
2030 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2034 2ec1f75b 2019-03-26 stsp argc -= optind;
2035 2ec1f75b 2019-03-26 stsp argv += optind;
2037 2ec1f75b 2019-03-26 stsp if (argc != 1)
2038 2ec1f75b 2019-03-26 stsp usage_rm();
2040 2ec1f75b 2019-03-26 stsp path = realpath(argv[0], NULL);
2041 2ec1f75b 2019-03-26 stsp if (path == NULL) {
2042 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2043 2ec1f75b 2019-03-26 stsp goto done;
2045 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2047 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2048 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2049 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2050 2ec1f75b 2019-03-26 stsp goto done;
2052 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2053 2ec1f75b 2019-03-26 stsp if (error)
2054 2ec1f75b 2019-03-26 stsp goto done;
2056 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2058 2ec1f75b 2019-03-26 stsp goto done;
2060 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2061 e2ba3d07 2019-05-13 stsp got_worktree_get_root_path(worktree), 0, 0);
2062 2ec1f75b 2019-03-26 stsp if (error)
2063 2ec1f75b 2019-03-26 stsp goto done;
2065 2ec1f75b 2019-03-26 stsp error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
2066 2ec1f75b 2019-03-26 stsp print_status, NULL, repo);
2067 a129376b 2019-03-28 stsp if (error)
2068 a129376b 2019-03-28 stsp goto done;
2071 a129376b 2019-03-28 stsp got_repo_close(repo);
2072 a129376b 2019-03-28 stsp if (worktree)
2073 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2074 a129376b 2019-03-28 stsp free(path);
2075 a129376b 2019-03-28 stsp free(cwd);
2076 a129376b 2019-03-28 stsp return error;
2079 a129376b 2019-03-28 stsp __dead static void
2080 a129376b 2019-03-28 stsp usage_revert(void)
2082 a129376b 2019-03-28 stsp fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2086 a129376b 2019-03-28 stsp static void
2087 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2089 a129376b 2019-03-28 stsp while (path[0] == '/')
2091 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2094 a129376b 2019-03-28 stsp static const struct got_error *
2095 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2097 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2098 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2099 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2100 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2103 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2104 a129376b 2019-03-28 stsp switch (ch) {
2106 a129376b 2019-03-28 stsp usage_revert();
2107 a129376b 2019-03-28 stsp /* NOTREACHED */
2111 a129376b 2019-03-28 stsp argc -= optind;
2112 a129376b 2019-03-28 stsp argv += optind;
2114 a129376b 2019-03-28 stsp if (argc != 1)
2115 a129376b 2019-03-28 stsp usage_revert();
2117 a129376b 2019-03-28 stsp path = realpath(argv[0], NULL);
2118 a129376b 2019-03-28 stsp if (path == NULL) {
2119 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2120 a129376b 2019-03-28 stsp goto done;
2122 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2124 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2125 a129376b 2019-03-28 stsp if (cwd == NULL) {
2126 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2127 a129376b 2019-03-28 stsp goto done;
2129 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2130 2ec1f75b 2019-03-26 stsp if (error)
2131 2ec1f75b 2019-03-26 stsp goto done;
2133 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2134 a129376b 2019-03-28 stsp if (error != NULL)
2135 a129376b 2019-03-28 stsp goto done;
2137 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2138 e2ba3d07 2019-05-13 stsp got_worktree_get_root_path(worktree), 0, 0);
2139 a129376b 2019-03-28 stsp if (error)
2140 a129376b 2019-03-28 stsp goto done;
2142 a129376b 2019-03-28 stsp error = got_worktree_revert(worktree, path,
2143 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2144 a129376b 2019-03-28 stsp if (error)
2145 a129376b 2019-03-28 stsp goto done;
2148 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2149 2ec1f75b 2019-03-26 stsp if (worktree)
2150 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2151 2ec1f75b 2019-03-26 stsp free(path);
2152 d00136be 2019-03-26 stsp free(cwd);
2153 6bad629b 2019-02-04 stsp return error;
2156 c4296144 2019-05-09 stsp __dead static void
2157 c4296144 2019-05-09 stsp usage_commit(void)
2159 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2164 e2ba3d07 2019-05-13 stsp spawn_editor(const char *editor, const char *file)
2167 33ad4cbe 2019-05-12 jcs sig_t sighup, sigint, sigquit;
2168 33ad4cbe 2019-05-12 jcs int st = -1;
2170 33ad4cbe 2019-05-12 jcs sighup = signal(SIGHUP, SIG_IGN);
2171 33ad4cbe 2019-05-12 jcs sigint = signal(SIGINT, SIG_IGN);
2172 33ad4cbe 2019-05-12 jcs sigquit = signal(SIGQUIT, SIG_IGN);
2174 33ad4cbe 2019-05-12 jcs switch (pid = fork()) {
2176 33ad4cbe 2019-05-12 jcs goto doneediting;
2178 e2ba3d07 2019-05-13 stsp execl(editor, editor, file, (char *)NULL);
2179 33ad4cbe 2019-05-12 jcs _exit(127);
2182 33ad4cbe 2019-05-12 jcs while (waitpid(pid, &st, 0) == -1)
2183 33ad4cbe 2019-05-12 jcs if (errno != EINTR)
2186 33ad4cbe 2019-05-12 jcs doneediting:
2187 33ad4cbe 2019-05-12 jcs (void)signal(SIGHUP, sighup);
2188 33ad4cbe 2019-05-12 jcs (void)signal(SIGINT, sigint);
2189 33ad4cbe 2019-05-12 jcs (void)signal(SIGQUIT, sigquit);
2191 33ad4cbe 2019-05-12 jcs if (!WIFEXITED(st)) {
2192 33ad4cbe 2019-05-12 jcs errno = EINTR;
2196 33ad4cbe 2019-05-12 jcs return WEXITSTATUS(st);
2199 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
2200 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
2201 e2ba3d07 2019-05-13 stsp const char *editor;
2202 e0870e44 2019-05-13 stsp const char *worktree_path;
2203 e0870e44 2019-05-13 stsp char *logmsg_path;
2207 33ad4cbe 2019-05-12 jcs static const struct got_error *
2208 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2211 e0870e44 2019-05-13 stsp const char *initial_content = "\n# changes to be committed:\n";
2212 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
2213 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
2214 e0870e44 2019-05-13 stsp char *template = NULL;
2215 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
2216 33ad4cbe 2019-05-12 jcs char buf[1024];
2217 33ad4cbe 2019-05-12 jcs struct stat st, st2;
2219 33ad4cbe 2019-05-12 jcs size_t len;
2220 e0870e44 2019-05-13 stsp int fd, content_changed = 0;
2222 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
2223 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2224 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
2225 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
2226 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
2227 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
2228 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
2229 33ad4cbe 2019-05-12 jcs return NULL;
2232 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2233 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2235 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2237 e0870e44 2019-05-13 stsp goto done;
2239 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
2241 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
2242 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2243 33ad4cbe 2019-05-12 jcs dprintf(fd, "# %c %s\n", ct->status, pe->path);
2247 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st) == -1) {
2248 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", a->logmsg_path);
2252 e0870e44 2019-05-13 stsp if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2253 638f9024 2019-05-13 stsp err = got_error_from_errno("failed spawning editor");
2257 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st2) == -1) {
2258 638f9024 2019-05-13 stsp err = got_error_from_errno("stat");
2262 33ad4cbe 2019-05-12 jcs if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2263 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2264 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2265 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2266 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2267 33ad4cbe 2019-05-12 jcs "no changes made to commit message, aborting");
2271 33ad4cbe 2019-05-12 jcs /* remove comments */
2272 33ad4cbe 2019-05-12 jcs *logmsg = malloc(st2.st_size + 1);
2273 fcde04d9 2019-05-13 stsp if (*logmsg == NULL) {
2274 638f9024 2019-05-13 stsp err = got_error_from_errno("malloc");
2275 fcde04d9 2019-05-13 stsp goto done;
2279 e0870e44 2019-05-13 stsp fp = fopen(a->logmsg_path, "r");
2280 33ad4cbe 2019-05-12 jcs while (fgets(buf, sizeof(buf), fp) != NULL) {
2281 e0870e44 2019-05-13 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
2282 e0870e44 2019-05-13 stsp content_changed = 1;
2283 33ad4cbe 2019-05-12 jcs if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2285 33ad4cbe 2019-05-12 jcs len = strlcat(*logmsg, buf, st2.st_size);
2287 33ad4cbe 2019-05-12 jcs fclose(fp);
2289 33ad4cbe 2019-05-12 jcs while (len > 0 && (*logmsg)[len - 1] == '\n') {
2290 33ad4cbe 2019-05-12 jcs (*logmsg)[len - 1] = '\0';
2294 e0870e44 2019-05-13 stsp if (len == 0 || !content_changed) {
2295 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2296 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2297 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2298 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2299 33ad4cbe 2019-05-12 jcs "commit message cannot be empty, aborting");
2303 e0870e44 2019-05-13 stsp free(template);
2304 33ad4cbe 2019-05-12 jcs return err;
2307 c4296144 2019-05-09 stsp static const struct got_error *
2308 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2310 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2311 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2312 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2313 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2314 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2315 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
2316 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2317 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
2318 e2ba3d07 2019-05-13 stsp char *editor = NULL;
2321 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2322 c4296144 2019-05-09 stsp switch (ch) {
2324 c4296144 2019-05-09 stsp logmsg = optarg;
2327 c4296144 2019-05-09 stsp usage_commit();
2328 c4296144 2019-05-09 stsp /* NOTREACHED */
2332 c4296144 2019-05-09 stsp argc -= optind;
2333 c4296144 2019-05-09 stsp argv += optind;
2335 c4296144 2019-05-09 stsp if (argc == 1) {
2336 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2337 c4296144 2019-05-09 stsp if (path == NULL) {
2338 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2339 c4296144 2019-05-09 stsp goto done;
2341 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2342 c4296144 2019-05-09 stsp } else if (argc != 0)
2343 c4296144 2019-05-09 stsp usage_commit();
2345 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2346 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2347 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2348 35bd8fed 2019-05-09 stsp goto done;
2351 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2352 c4296144 2019-05-09 stsp if (cwd == NULL) {
2353 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2354 c4296144 2019-05-09 stsp goto done;
2356 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2357 c4296144 2019-05-09 stsp if (error)
2358 c4296144 2019-05-09 stsp goto done;
2360 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2361 c4296144 2019-05-09 stsp if (error != NULL)
2362 c4296144 2019-05-09 stsp goto done;
2364 c4296144 2019-05-09 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2365 e2ba3d07 2019-05-13 stsp got_worktree_get_root_path(worktree), 0, 1);
2366 c4296144 2019-05-09 stsp if (error)
2367 c4296144 2019-05-09 stsp goto done;
2369 e2ba3d07 2019-05-13 stsp error = get_editor(&editor);
2370 e2ba3d07 2019-05-13 stsp if (error)
2371 e2ba3d07 2019-05-13 stsp goto done;
2372 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
2373 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
2374 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2375 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
2376 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2377 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2378 e0870e44 2019-05-13 stsp if (error) {
2379 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2380 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
2381 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
2382 c4296144 2019-05-09 stsp goto done;
2385 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2386 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
2388 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2389 c4296144 2019-05-09 stsp if (error)
2390 c4296144 2019-05-09 stsp goto done;
2391 c4296144 2019-05-09 stsp printf("created commit %s\n", id_str);
2394 c4296144 2019-05-09 stsp got_repo_close(repo);
2395 c4296144 2019-05-09 stsp if (worktree)
2396 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2397 c4296144 2019-05-09 stsp free(path);
2398 c4296144 2019-05-09 stsp free(cwd);
2399 c4296144 2019-05-09 stsp free(id_str);
2400 e2ba3d07 2019-05-13 stsp free(editor);
2401 c4296144 2019-05-09 stsp return error;
