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);
75 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
76 2c7829a4 2019-06-17 stsp __dead static void usage_init(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 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
86 d00136be 2019-03-26 stsp __dead static void usage_add(void);
87 2ec1f75b 2019-03-26 stsp __dead static void usage_rm(void);
88 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
89 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
90 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
91 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
93 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
94 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
95 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
96 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
97 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
98 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
99 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
100 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
101 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
102 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
103 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
104 2ec1f75b 2019-03-26 stsp static const struct got_error* cmd_rm(int, char *[]);
105 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
106 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
107 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
108 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
110 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
111 5e070240 2019-06-22 stsp { "init", cmd_init, usage_init },
112 5e070240 2019-06-22 stsp { "checkout", cmd_checkout, usage_checkout },
113 5e070240 2019-06-22 stsp { "update", cmd_update, usage_update },
114 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
115 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
116 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
117 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
118 5e070240 2019-06-22 stsp { "status", cmd_status, usage_status },
119 5e070240 2019-06-22 stsp { "ref", cmd_ref, usage_ref },
120 4e759de4 2019-06-26 stsp { "branch", cmd_branch, usage_branch },
121 5e070240 2019-06-22 stsp { "add", cmd_add, usage_add },
122 5e070240 2019-06-22 stsp { "rm", cmd_rm, usage_rm },
123 5e070240 2019-06-22 stsp { "revert", cmd_revert, usage_revert },
124 5e070240 2019-06-22 stsp { "commit", cmd_commit, usage_commit },
125 5e070240 2019-06-22 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick },
126 5e070240 2019-06-22 stsp { "backout", cmd_backout, usage_backout },
130 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
132 5c860e29 2018-03-12 stsp struct cmd *cmd;
133 5c860e29 2018-03-12 stsp unsigned int i;
135 1b6b95a8 2018-03-12 stsp int hflag = 0;
137 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
139 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
140 5c860e29 2018-03-12 stsp switch (ch) {
146 5c860e29 2018-03-12 stsp /* NOTREACHED */
150 5c860e29 2018-03-12 stsp argc -= optind;
151 5c860e29 2018-03-12 stsp argv += optind;
152 1e70621d 2018-03-27 stsp optind = 0;
154 5c860e29 2018-03-12 stsp if (argc <= 0)
157 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
158 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
160 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
161 d7d4f210 2018-03-12 stsp const struct got_error *error;
163 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
165 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
169 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
171 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
172 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
173 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
180 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
184 4ed7e80c 2018-05-20 stsp __dead static void
185 5c860e29 2018-03-12 stsp usage(void)
187 5e070240 2019-06-22 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n", getprogname());
191 0266afb7 2019-01-04 stsp static const struct got_error *
192 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
194 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
195 e2ba3d07 2019-05-13 stsp const char *editor;
197 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
198 e2ba3d07 2019-05-13 stsp if (editor == NULL)
199 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
201 0ee7065d 2019-05-13 stsp if (editor) {
202 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
204 0ee7065d 2019-05-13 stsp return err;
207 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
208 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
209 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
210 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
213 e2ba3d07 2019-05-13 stsp return NULL;
216 e2ba3d07 2019-05-13 stsp static const struct got_error *
217 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
218 314a6357 2019-05-13 stsp const char *worktree_path, int create_worktree)
220 163ce85a 2019-05-13 stsp const struct got_error *err;
222 a0937847 2019-05-11 stsp if (create_worktree) {
223 a0937847 2019-05-11 stsp /* Pre-create work tree path to avoid unveiling its parents. */
224 163ce85a 2019-05-13 stsp err = got_path_mkdir(worktree_path);
226 3c45a30a 2019-05-12 jcs if (errno == EEXIST) {
227 280f921b 2019-05-12 stsp if (got_path_dir_is_empty(worktree_path)) {
229 163ce85a 2019-05-13 stsp err = NULL;
231 df056ada 2019-05-15 stsp err = got_error_path(worktree_path,
232 df056ada 2019-05-15 stsp GOT_ERR_DIR_NOT_EMPTY);
236 163ce85a 2019-05-13 stsp if (err && (err->code != GOT_ERR_ERRNO || errno != EISDIR))
237 163ce85a 2019-05-13 stsp return err;
240 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
241 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
243 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
244 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
246 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
247 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
249 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
250 163ce85a 2019-05-13 stsp if (err != NULL)
251 163ce85a 2019-05-13 stsp return err;
253 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
254 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
256 0266afb7 2019-01-04 stsp return NULL;
259 2c7829a4 2019-06-17 stsp __dead static void
260 2c7829a4 2019-06-17 stsp usage_init(void)
262 2c7829a4 2019-06-17 stsp fprintf(stderr, "usage: %s init path\n", getprogname());
266 2c7829a4 2019-06-17 stsp static const struct got_error *
267 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
269 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
270 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
273 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
274 2c7829a4 2019-06-17 stsp switch (ch) {
276 2c7829a4 2019-06-17 stsp usage_init();
277 2c7829a4 2019-06-17 stsp /* NOTREACHED */
281 2c7829a4 2019-06-17 stsp argc -= optind;
282 2c7829a4 2019-06-17 stsp argv += optind;
284 2c7829a4 2019-06-17 stsp #ifndef PROFILE
285 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
286 2c7829a4 2019-06-17 stsp err(1, "pledge");
288 2c7829a4 2019-06-17 stsp if (argc != 1)
289 bc20e173 2019-06-17 stsp usage_init();
291 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
292 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
293 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
295 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
297 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
298 2c7829a4 2019-06-17 stsp if (error &&
299 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
302 2c7829a4 2019-06-17 stsp error = apply_unveil(repo_path, 0, NULL, 0);
306 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
307 2c7829a4 2019-06-17 stsp if (error != NULL)
311 2c7829a4 2019-06-17 stsp free(repo_path);
312 2c7829a4 2019-06-17 stsp return error;
315 4ed7e80c 2018-05-20 stsp __dead static void
316 c09a553d 2018-03-12 stsp usage_checkout(void)
318 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
319 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
323 92a684f4 2018-03-12 stsp static void
324 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
326 92a684f4 2018-03-12 stsp char *worktree_path = arg;
328 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
329 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
332 92a684f4 2018-03-12 stsp while (path[0] == '/')
335 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
338 99437157 2018-11-11 stsp static const struct got_error *
339 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
341 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
342 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
343 99437157 2018-11-11 stsp return NULL;
346 8069f636 2019-01-12 stsp static const struct got_error *
347 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
348 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
350 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
351 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
353 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
354 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
356 36a38700 2019-05-10 stsp return err;
358 d5bea539 2019-05-13 stsp if (yca_id == NULL)
359 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
362 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
363 d5bea539 2019-05-13 stsp * and the work tree's base commit.
365 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
367 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
375 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
376 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
377 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
379 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
380 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
381 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
383 d5bea539 2019-05-13 stsp free(yca_id);
384 d5bea539 2019-05-13 stsp return NULL;
387 a367ff0f 2019-05-14 stsp static const struct got_error *
388 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
389 a367ff0f 2019-05-14 stsp struct got_reference *head_ref, struct got_repository *repo)
391 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
392 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
393 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
394 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
396 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
400 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
404 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
409 a367ff0f 2019-05-14 stsp struct got_object_id *id;
410 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
412 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
413 a367ff0f 2019-05-14 stsp err = NULL;
416 a367ff0f 2019-05-14 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
418 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
425 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
426 a367ff0f 2019-05-14 stsp is_same_branch = 1;
433 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
434 a367ff0f 2019-05-14 stsp free(head_commit_id);
435 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
436 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
437 a367ff0f 2019-05-14 stsp return err;
440 4ed7e80c 2018-05-20 stsp static const struct got_error *
441 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
443 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
444 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
445 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
446 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
447 c09a553d 2018-03-12 stsp char *repo_path = NULL;
448 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
449 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
450 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
451 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
452 72151b04 2019-05-11 stsp int ch, same_path_prefix;
454 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
455 0bb8a95e 2018-03-12 stsp switch (ch) {
457 08573d5b 2019-05-14 stsp branch_name = optarg;
460 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
461 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
462 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
465 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
468 2deda0b9 2019-03-07 stsp usage_checkout();
469 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
473 0bb8a95e 2018-03-12 stsp argc -= optind;
474 0bb8a95e 2018-03-12 stsp argv += optind;
476 6715a751 2018-03-16 stsp #ifndef PROFILE
477 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
478 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
479 c09a553d 2018-03-12 stsp err(1, "pledge");
481 0bb8a95e 2018-03-12 stsp if (argc == 1) {
482 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
483 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
484 76089277 2018-04-01 stsp if (repo_path == NULL)
485 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
486 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
487 76089277 2018-04-01 stsp if (cwd == NULL) {
488 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
491 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
492 230a42bd 2019-05-11 jcs base = basename(path_prefix);
493 230a42bd 2019-05-11 jcs if (base == NULL) {
494 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
495 230a42bd 2019-05-11 jcs path_prefix);
499 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
500 230a42bd 2019-05-11 jcs if (base == NULL) {
501 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
506 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
507 c09a553d 2018-03-12 stsp if (dotgit)
508 c09a553d 2018-03-12 stsp *dotgit = '\0';
509 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
510 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
515 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
516 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
517 76089277 2018-04-01 stsp if (repo_path == NULL) {
518 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
521 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
522 76089277 2018-04-01 stsp if (worktree_path == NULL) {
523 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
527 c09a553d 2018-03-12 stsp usage_checkout();
529 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
530 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
532 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
533 c09a553d 2018-03-12 stsp if (error != NULL)
536 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
540 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
541 c09a553d 2018-03-12 stsp if (error != NULL)
544 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
545 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
548 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
549 c09a553d 2018-03-12 stsp if (error != NULL)
552 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
553 e5dc7198 2018-12-29 stsp path_prefix);
554 e5dc7198 2018-12-29 stsp if (error != NULL)
556 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
557 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
561 8069f636 2019-01-12 stsp if (commit_id_str) {
562 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
563 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
564 e09a504c 2019-06-28 stsp commit_id_str, repo);
565 8069f636 2019-01-12 stsp if (error != NULL)
567 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
568 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
569 8069f636 2019-01-12 stsp if (error != NULL) {
570 8069f636 2019-01-12 stsp free(commit_id);
573 45d344f6 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
576 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
577 8069f636 2019-01-12 stsp commit_id);
578 8069f636 2019-01-12 stsp free(commit_id);
583 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
584 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
585 c09a553d 2018-03-12 stsp if (error != NULL)
588 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
591 8069f636 2019-01-12 stsp free(commit_id_str);
592 76089277 2018-04-01 stsp free(repo_path);
593 507dc3bb 2018-12-29 stsp free(worktree_path);
594 507dc3bb 2018-12-29 stsp return error;
597 507dc3bb 2018-12-29 stsp __dead static void
598 507dc3bb 2018-12-29 stsp usage_update(void)
600 024e9686 2019-05-14 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path]\n",
601 507dc3bb 2018-12-29 stsp getprogname());
605 507dc3bb 2018-12-29 stsp static void
606 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
608 784955db 2019-01-12 stsp int *did_something = arg;
610 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
613 1545c615 2019-02-10 stsp *did_something = 1;
615 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
616 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
619 507dc3bb 2018-12-29 stsp while (path[0] == '/')
621 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
624 be7061eb 2018-12-30 stsp static const struct got_error *
625 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
626 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
627 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
629 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
630 a1fb16d8 2019-05-24 stsp char *base_id_str;
631 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
633 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
634 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
635 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
636 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
637 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
638 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
639 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
642 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
643 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
645 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
646 a1fb16d8 2019-05-24 stsp return err;
647 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
649 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
650 a1fb16d8 2019-05-24 stsp return NULL;
652 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
653 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
654 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
656 a1fb16d8 2019-05-24 stsp return err;
657 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
658 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
659 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
660 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
661 a1fb16d8 2019-05-24 stsp return NULL;
664 a1fb16d8 2019-05-24 stsp static const struct got_error *
665 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
667 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
668 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
669 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
670 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
671 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
672 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
673 024e9686 2019-05-14 stsp const char *branch_name = NULL;
674 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
675 784955db 2019-01-12 stsp int ch, did_something = 0;
677 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
678 507dc3bb 2018-12-29 stsp switch (ch) {
680 024e9686 2019-05-14 stsp branch_name = optarg;
683 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
684 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
685 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
688 2deda0b9 2019-03-07 stsp usage_update();
689 507dc3bb 2018-12-29 stsp /* NOTREACHED */
693 507dc3bb 2018-12-29 stsp argc -= optind;
694 507dc3bb 2018-12-29 stsp argv += optind;
696 507dc3bb 2018-12-29 stsp #ifndef PROFILE
697 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
698 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
699 507dc3bb 2018-12-29 stsp err(1, "pledge");
701 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
702 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
703 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
706 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
710 507dc3bb 2018-12-29 stsp if (argc == 0) {
711 c4cdcb68 2019-04-03 stsp path = strdup("");
712 c4cdcb68 2019-04-03 stsp if (path == NULL) {
713 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
716 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
717 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
721 507dc3bb 2018-12-29 stsp usage_update();
723 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
724 507dc3bb 2018-12-29 stsp if (error != NULL)
727 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
728 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
732 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
733 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
734 024e9686 2019-05-14 stsp if (error != NULL)
736 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
737 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
738 9c4b8182 2019-01-02 stsp if (error != NULL)
740 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
741 507dc3bb 2018-12-29 stsp if (error != NULL)
744 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
745 e09a504c 2019-06-28 stsp commit_id_str, repo);
746 507dc3bb 2018-12-29 stsp if (error != NULL)
750 a1fb16d8 2019-05-24 stsp if (branch_name) {
751 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
752 024e9686 2019-05-14 stsp if (strlen(path) != 0) {
753 a1fb16d8 2019-05-24 stsp fprintf(stderr, "%s: switching between branches "
754 a1fb16d8 2019-05-24 stsp "requires that the entire work tree "
755 024e9686 2019-05-14 stsp "gets updated, not just '%s'\n",
756 024e9686 2019-05-14 stsp getprogname(), path);
757 024e9686 2019-05-14 stsp error = got_error(GOT_ERR_BAD_PATH);
760 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
763 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
764 a367ff0f 2019-05-14 stsp free(head_commit_id);
765 024e9686 2019-05-14 stsp if (error != NULL)
767 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
770 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
774 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
775 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
776 a367ff0f 2019-05-14 stsp if (error != NULL) {
777 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
778 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
781 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
786 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
787 507dc3bb 2018-12-29 stsp commit_id) != 0) {
788 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
789 507dc3bb 2018-12-29 stsp commit_id);
794 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
795 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
796 507dc3bb 2018-12-29 stsp if (error != NULL)
799 784955db 2019-01-12 stsp if (did_something)
800 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
802 784955db 2019-01-12 stsp printf("Already up-to-date\n");
804 c09a553d 2018-03-12 stsp free(worktree_path);
805 c4cdcb68 2019-04-03 stsp free(path);
806 507dc3bb 2018-12-29 stsp free(commit_id);
807 9c4b8182 2019-01-02 stsp free(commit_id_str);
808 c09a553d 2018-03-12 stsp return error;
811 f42b1b34 2018-03-12 stsp static const struct got_error *
812 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
813 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
815 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
816 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
817 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
818 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
819 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
821 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
822 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
824 79109fed 2018-03-27 stsp return err;
826 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
827 79f35eb3 2018-06-11 stsp if (qid != NULL) {
828 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
830 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
832 79109fed 2018-03-27 stsp return err;
834 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
835 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
836 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
838 0f2b3dca 2018-12-22 stsp return err;
840 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
842 79109fed 2018-03-27 stsp return err;
845 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
849 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
850 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
851 aaa13589 2019-06-01 stsp arg.outfile = stdout;
852 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
853 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff, &arg);
856 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
857 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
858 0f2b3dca 2018-12-22 stsp free(id_str1);
859 0f2b3dca 2018-12-22 stsp free(id_str2);
860 79109fed 2018-03-27 stsp return err;
863 4bb494d5 2018-06-16 stsp static char *
864 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
866 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
867 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
873 79109fed 2018-03-27 stsp static const struct got_error *
874 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
875 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
876 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
878 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
879 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
880 6c281f94 2018-06-11 stsp char datebuf[26];
881 45d799e2 2018-12-23 stsp time_t committer_time;
882 45d799e2 2018-12-23 stsp const char *author, *committer;
883 199a4027 2019-02-02 stsp char *refs_str = NULL;
884 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
886 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
888 199a4027 2019-02-02 stsp const char *name;
889 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
891 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
892 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
894 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
896 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
898 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
900 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
902 199a4027 2019-02-02 stsp s = refs_str;
903 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
904 199a4027 2019-02-02 stsp name) == -1) {
905 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
911 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
913 8bf5b3c9 2018-03-17 stsp return err;
915 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
916 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
917 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
918 832c249c 2018-06-10 stsp free(id_str);
919 d3d493d7 2019-02-21 stsp id_str = NULL;
920 d3d493d7 2019-02-21 stsp free(refs_str);
921 d3d493d7 2019-02-21 stsp refs_str = NULL;
922 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
923 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
924 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
925 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
926 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
927 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
928 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
929 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
930 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
931 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
932 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
934 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
935 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
936 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
938 a0603db2 2018-06-10 stsp return err;
939 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
940 a0603db2 2018-06-10 stsp free(id_str);
944 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
945 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
946 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
948 621015ac 2018-07-23 stsp logmsg = logmsg0;
950 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
952 832c249c 2018-06-10 stsp printf(" %s\n", line);
953 832c249c 2018-06-10 stsp } while (line);
954 621015ac 2018-07-23 stsp free(logmsg0);
956 971751ac 2018-03-27 stsp if (show_patch) {
957 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
958 971751ac 2018-03-27 stsp if (err == 0)
959 971751ac 2018-03-27 stsp printf("\n");
962 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
963 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
964 07862c20 2018-09-15 stsp return err;
967 f42b1b34 2018-03-12 stsp static const struct got_error *
968 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
969 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
970 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
972 f42b1b34 2018-03-12 stsp const struct got_error *err;
973 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
975 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
976 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
978 f42b1b34 2018-03-12 stsp return err;
979 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
983 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
984 372ccdbb 2018-06-10 stsp struct got_object_id *id;
986 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
989 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
991 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
992 9ba79e04 2018-06-11 stsp err = NULL;
995 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
997 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1003 b43fbaa0 2018-06-11 stsp if (id == NULL)
1006 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1009 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1011 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1012 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1016 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1017 f42b1b34 2018-03-12 stsp return err;
1020 4ed7e80c 2018-05-20 stsp __dead static void
1021 6f3d1eb0 2018-03-12 stsp usage_log(void)
1023 499d7ecc 2019-05-22 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
1024 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1028 4ed7e80c 2018-05-20 stsp static const struct got_error *
1029 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1031 f42b1b34 2018-03-12 stsp const struct got_error *error;
1032 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1033 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1034 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1035 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1036 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1037 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1038 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1039 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1040 64a96a6d 2018-04-01 stsp const char *errstr;
1041 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1043 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1045 6715a751 2018-03-16 stsp #ifndef PROFILE
1046 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1049 f42b1b34 2018-03-12 stsp err(1, "pledge");
1052 499d7ecc 2019-05-22 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:")) != -1) {
1053 79109fed 2018-03-27 stsp switch (ch) {
1055 499d7ecc 2019-05-22 stsp first_parent_traversal = 1;
1058 79109fed 2018-03-27 stsp show_patch = 1;
1061 d142fc45 2018-04-01 stsp start_commit = optarg;
1064 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1066 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1067 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1070 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1071 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1072 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1075 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1076 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1077 04ca23f4 2018-07-16 stsp err(1, "-r option");
1078 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1081 2deda0b9 2019-03-07 stsp usage_log();
1082 79109fed 2018-03-27 stsp /* NOTREACHED */
1086 79109fed 2018-03-27 stsp argc -= optind;
1087 79109fed 2018-03-27 stsp argv += optind;
1089 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1090 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1091 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1092 04ca23f4 2018-07-16 stsp goto done;
1095 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1096 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1097 cffc0aa4 2019-02-05 stsp goto done;
1098 cffc0aa4 2019-02-05 stsp error = NULL;
1100 e7301579 2019-03-18 stsp if (argc == 0) {
1101 cbd1af7a 2019-03-18 stsp path = strdup("");
1102 e7301579 2019-03-18 stsp if (path == NULL) {
1103 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1104 cbd1af7a 2019-03-18 stsp goto done;
1106 e7301579 2019-03-18 stsp } else if (argc == 1) {
1107 e7301579 2019-03-18 stsp if (worktree) {
1108 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1110 e7301579 2019-03-18 stsp if (error)
1111 e7301579 2019-03-18 stsp goto done;
1113 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1114 e7301579 2019-03-18 stsp if (path == NULL) {
1115 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1116 e7301579 2019-03-18 stsp goto done;
1120 cbd1af7a 2019-03-18 stsp usage_log();
1122 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1123 5486daa2 2019-05-11 stsp repo_path = worktree ?
1124 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1126 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1127 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1128 cffc0aa4 2019-02-05 stsp goto done;
1131 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1132 d7d4f210 2018-03-12 stsp if (error != NULL)
1133 04ca23f4 2018-07-16 stsp goto done;
1135 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1136 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1137 c02c541e 2019-03-29 stsp if (error)
1138 c02c541e 2019-03-29 stsp goto done;
1140 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1141 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1142 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1143 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1144 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1145 3235492e 2018-04-01 stsp if (error != NULL)
1146 3235492e 2018-04-01 stsp return error;
1147 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1148 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1149 3235492e 2018-04-01 stsp if (error != NULL)
1150 3235492e 2018-04-01 stsp return error;
1151 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1153 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1154 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1155 3235492e 2018-04-01 stsp if (error == NULL) {
1156 1caad61b 2019-02-01 stsp int obj_type;
1157 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1158 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1159 d1f2edc9 2018-06-13 stsp if (error != NULL)
1160 1caad61b 2019-02-01 stsp goto done;
1161 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1162 1caad61b 2019-02-01 stsp if (error != NULL)
1163 1caad61b 2019-02-01 stsp goto done;
1164 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1165 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1166 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1167 1caad61b 2019-02-01 stsp if (error != NULL)
1168 1caad61b 2019-02-01 stsp goto done;
1169 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1170 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1171 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1172 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1173 1caad61b 2019-02-01 stsp goto done;
1176 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1177 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1178 1caad61b 2019-02-01 stsp if (id == NULL)
1179 638f9024 2019-05-13 stsp error = got_error_from_errno(
1180 230a42bd 2019-05-11 jcs "got_object_id_dup");
1181 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1182 1caad61b 2019-02-01 stsp if (error)
1183 1caad61b 2019-02-01 stsp goto done;
1184 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1185 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1186 1caad61b 2019-02-01 stsp goto done;
1188 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1189 d1f2edc9 2018-06-13 stsp if (error != NULL)
1190 1caad61b 2019-02-01 stsp goto done;
1192 15a94983 2018-12-23 stsp if (commit == NULL) {
1193 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1194 e09a504c 2019-06-28 stsp start_commit, repo);
1195 d1f2edc9 2018-06-13 stsp if (error != NULL)
1196 d1f2edc9 2018-06-13 stsp return error;
1199 d7d4f210 2018-03-12 stsp if (error != NULL)
1200 04ca23f4 2018-07-16 stsp goto done;
1202 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1203 04ca23f4 2018-07-16 stsp if (error != NULL)
1204 04ca23f4 2018-07-16 stsp goto done;
1205 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1206 04ca23f4 2018-07-16 stsp free(path);
1207 04ca23f4 2018-07-16 stsp path = in_repo_path;
1210 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1211 199a4027 2019-02-02 stsp if (error)
1212 199a4027 2019-02-02 stsp goto done;
1214 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1215 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1217 04ca23f4 2018-07-16 stsp free(path);
1218 04ca23f4 2018-07-16 stsp free(repo_path);
1219 04ca23f4 2018-07-16 stsp free(cwd);
1221 cffc0aa4 2019-02-05 stsp if (worktree)
1222 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1223 ad242220 2018-09-08 stsp if (repo) {
1224 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1225 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1226 ad242220 2018-09-08 stsp if (error == NULL)
1227 ad242220 2018-09-08 stsp error = repo_error;
1229 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1230 8bf5b3c9 2018-03-17 stsp return error;
1233 4ed7e80c 2018-05-20 stsp __dead static void
1234 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1236 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1237 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1241 b72f483a 2019-02-05 stsp struct print_diff_arg {
1242 b72f483a 2019-02-05 stsp struct got_repository *repo;
1243 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1244 b72f483a 2019-02-05 stsp int diff_context;
1245 3fc0c068 2019-02-10 stsp const char *id_str;
1246 3fc0c068 2019-02-10 stsp int header_shown;
1249 4ed7e80c 2018-05-20 stsp static const struct got_error *
1250 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1251 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1253 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1254 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1255 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1256 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1257 b72f483a 2019-02-05 stsp char *abspath = NULL;
1258 b72f483a 2019-02-05 stsp struct stat sb;
1260 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1261 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1262 b72f483a 2019-02-05 stsp return NULL;
1264 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1265 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1266 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1267 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1270 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1271 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1273 d00136be 2019-03-26 stsp goto done;
1277 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1278 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1279 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1280 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1281 2ec1f75b 2019-03-26 stsp goto done;
1284 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1285 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1286 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1287 2ec1f75b 2019-03-26 stsp goto done;
1289 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1290 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1291 2ec1f75b 2019-03-26 stsp goto done;
1294 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1296 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1299 b72f483a 2019-02-05 stsp if (blob1)
1300 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1301 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1302 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1303 b72f483a 2019-02-05 stsp free(abspath);
1304 927df6b7 2019-02-10 stsp return err;
1307 927df6b7 2019-02-10 stsp static const struct got_error *
1308 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1310 b00d56cd 2018-04-01 stsp const struct got_error *error;
1311 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1312 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1313 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1314 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1315 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1316 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1317 15a94983 2018-12-23 stsp int type1, type2;
1318 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1319 c0cc5c62 2018-10-18 stsp const char *errstr;
1320 927df6b7 2019-02-10 stsp char *path = NULL;
1322 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1323 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1324 25eccc22 2019-01-04 stsp NULL) == -1)
1325 b00d56cd 2018-04-01 stsp err(1, "pledge");
1328 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1329 b00d56cd 2018-04-01 stsp switch (ch) {
1331 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1332 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1333 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1336 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1337 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1338 b72f483a 2019-02-05 stsp err(1, "-r option");
1339 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1342 2deda0b9 2019-03-07 stsp usage_diff();
1343 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1347 b00d56cd 2018-04-01 stsp argc -= optind;
1348 b00d56cd 2018-04-01 stsp argv += optind;
1350 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1351 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1352 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1353 b72f483a 2019-02-05 stsp goto done;
1355 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1356 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1357 927df6b7 2019-02-10 stsp goto done;
1358 927df6b7 2019-02-10 stsp if (argc <= 1) {
1359 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1360 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1361 927df6b7 2019-02-10 stsp goto done;
1363 b72f483a 2019-02-05 stsp if (repo_path)
1365 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1366 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1367 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1368 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1369 927df6b7 2019-02-10 stsp goto done;
1371 927df6b7 2019-02-10 stsp if (argc == 1) {
1372 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1374 927df6b7 2019-02-10 stsp if (error)
1375 927df6b7 2019-02-10 stsp goto done;
1377 927df6b7 2019-02-10 stsp path = strdup("");
1378 927df6b7 2019-02-10 stsp if (path == NULL) {
1379 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1380 927df6b7 2019-02-10 stsp goto done;
1383 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1384 15a94983 2018-12-23 stsp id_str1 = argv[0];
1385 15a94983 2018-12-23 stsp id_str2 = argv[1];
1386 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1387 30db809c 2019-06-05 stsp repo_path =
1388 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1389 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1390 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1391 30db809c 2019-06-05 stsp goto done;
1395 b00d56cd 2018-04-01 stsp usage_diff();
1397 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1398 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1399 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1400 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1403 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1404 76089277 2018-04-01 stsp free(repo_path);
1405 b00d56cd 2018-04-01 stsp if (error != NULL)
1406 b00d56cd 2018-04-01 stsp goto done;
1408 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1409 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1410 c02c541e 2019-03-29 stsp if (error)
1411 c02c541e 2019-03-29 stsp goto done;
1413 30db809c 2019-06-05 stsp if (argc <= 1) {
1414 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1415 b72f483a 2019-02-05 stsp char *id_str;
1416 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1417 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1418 b72f483a 2019-02-05 stsp if (error)
1419 b72f483a 2019-02-05 stsp goto done;
1420 b72f483a 2019-02-05 stsp arg.repo = repo;
1421 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1422 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1423 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1424 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1426 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1427 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1428 b72f483a 2019-02-05 stsp free(id_str);
1429 b72f483a 2019-02-05 stsp goto done;
1432 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id1, id_str1, repo);
1433 e02e74af 2019-05-28 stsp if (error) {
1434 e02e74af 2019-05-28 stsp struct got_reference *ref;
1435 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1436 e02e74af 2019-05-28 stsp goto done;
1437 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1438 e02e74af 2019-05-28 stsp if (error != NULL)
1439 e02e74af 2019-05-28 stsp goto done;
1440 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
1441 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1442 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1443 5e70831e 2019-05-28 stsp goto done;
1445 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1446 e02e74af 2019-05-28 stsp got_ref_close(ref);
1447 e02e74af 2019-05-28 stsp if (error != NULL)
1448 5e70831e 2019-05-28 stsp goto done;
1450 5e70831e 2019-05-28 stsp label1 = strdup(id_str1);
1451 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1452 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1453 e02e74af 2019-05-28 stsp goto done;
1457 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id2, id_str2, repo);
1458 e02e74af 2019-05-28 stsp if (error) {
1459 e02e74af 2019-05-28 stsp struct got_reference *ref;
1460 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1461 e02e74af 2019-05-28 stsp goto done;
1462 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1463 e02e74af 2019-05-28 stsp if (error != NULL)
1464 5e70831e 2019-05-28 stsp goto done;
1465 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
1466 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1467 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1468 e02e74af 2019-05-28 stsp goto done;
1470 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1471 e02e74af 2019-05-28 stsp got_ref_close(ref);
1472 e02e74af 2019-05-28 stsp if (error != NULL)
1473 e02e74af 2019-05-28 stsp goto done;
1475 5e70831e 2019-05-28 stsp label2 = strdup(id_str2);
1476 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1477 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1478 5e70831e 2019-05-28 stsp goto done;
1482 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1483 15a94983 2018-12-23 stsp if (error)
1484 15a94983 2018-12-23 stsp goto done;
1486 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1487 15a94983 2018-12-23 stsp if (error)
1488 15a94983 2018-12-23 stsp goto done;
1490 15a94983 2018-12-23 stsp if (type1 != type2) {
1491 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1492 b00d56cd 2018-04-01 stsp goto done;
1495 15a94983 2018-12-23 stsp switch (type1) {
1496 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1497 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1498 54156555 2018-12-24 stsp diff_context, repo, stdout);
1500 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1501 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1502 54156555 2018-12-24 stsp diff_context, repo, stdout);
1504 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1505 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
1506 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1507 c0cc5c62 2018-10-18 stsp repo, stdout);
1510 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1514 5e70831e 2019-05-28 stsp free(label1);
1515 5e70831e 2019-05-28 stsp free(label2);
1516 15a94983 2018-12-23 stsp free(id1);
1517 15a94983 2018-12-23 stsp free(id2);
1518 927df6b7 2019-02-10 stsp free(path);
1519 b72f483a 2019-02-05 stsp if (worktree)
1520 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1521 ad242220 2018-09-08 stsp if (repo) {
1522 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1523 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1524 ad242220 2018-09-08 stsp if (error == NULL)
1525 ad242220 2018-09-08 stsp error = repo_error;
1527 b00d56cd 2018-04-01 stsp return error;
1530 404c43c4 2018-06-21 stsp __dead static void
1531 404c43c4 2018-06-21 stsp usage_blame(void)
1533 9270e621 2019-02-05 stsp fprintf(stderr,
1534 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1535 404c43c4 2018-06-21 stsp getprogname());
1539 404c43c4 2018-06-21 stsp static const struct got_error *
1540 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1542 404c43c4 2018-06-21 stsp const struct got_error *error;
1543 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1544 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1545 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1546 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1547 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1550 404c43c4 2018-06-21 stsp #ifndef PROFILE
1551 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1552 36e2fb66 2019-01-04 stsp NULL) == -1)
1553 404c43c4 2018-06-21 stsp err(1, "pledge");
1556 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1557 404c43c4 2018-06-21 stsp switch (ch) {
1559 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1562 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1563 66bea077 2018-08-02 stsp if (repo_path == NULL)
1564 66bea077 2018-08-02 stsp err(1, "-r option");
1565 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1568 2deda0b9 2019-03-07 stsp usage_blame();
1569 404c43c4 2018-06-21 stsp /* NOTREACHED */
1573 404c43c4 2018-06-21 stsp argc -= optind;
1574 404c43c4 2018-06-21 stsp argv += optind;
1576 a39318fd 2018-08-02 stsp if (argc == 1)
1577 404c43c4 2018-06-21 stsp path = argv[0];
1579 404c43c4 2018-06-21 stsp usage_blame();
1581 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1582 66bea077 2018-08-02 stsp if (cwd == NULL) {
1583 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1584 66bea077 2018-08-02 stsp goto done;
1586 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1587 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1588 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1589 66bea077 2018-08-02 stsp goto done;
1591 0c06baac 2019-02-05 stsp error = NULL;
1592 0c06baac 2019-02-05 stsp if (worktree) {
1593 0c06baac 2019-02-05 stsp repo_path =
1594 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1595 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1596 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1597 0c06baac 2019-02-05 stsp if (error)
1598 0c06baac 2019-02-05 stsp goto done;
1600 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1601 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1602 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1603 0c06baac 2019-02-05 stsp goto done;
1608 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1609 c02c541e 2019-03-29 stsp if (error != NULL)
1610 36e2fb66 2019-01-04 stsp goto done;
1612 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1613 c02c541e 2019-03-29 stsp if (error)
1614 404c43c4 2018-06-21 stsp goto done;
1616 0c06baac 2019-02-05 stsp if (worktree) {
1617 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1618 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1619 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1620 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1621 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1622 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1623 6efaaa2d 2019-02-05 stsp path) == -1) {
1624 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1625 0c06baac 2019-02-05 stsp goto done;
1627 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1630 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1632 0c06baac 2019-02-05 stsp if (error)
1633 66bea077 2018-08-02 stsp goto done;
1635 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1636 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1637 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1638 404c43c4 2018-06-21 stsp if (error != NULL)
1639 66bea077 2018-08-02 stsp goto done;
1640 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1641 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1642 404c43c4 2018-06-21 stsp if (error != NULL)
1643 66bea077 2018-08-02 stsp goto done;
1645 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1646 e09a504c 2019-06-28 stsp commit_id_str, repo);
1647 404c43c4 2018-06-21 stsp if (error != NULL)
1648 66bea077 2018-08-02 stsp goto done;
1651 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1653 66bea077 2018-08-02 stsp free(in_repo_path);
1654 66bea077 2018-08-02 stsp free(repo_path);
1655 66bea077 2018-08-02 stsp free(cwd);
1656 404c43c4 2018-06-21 stsp free(commit_id);
1657 0c06baac 2019-02-05 stsp if (worktree)
1658 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1659 ad242220 2018-09-08 stsp if (repo) {
1660 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1661 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1662 ad242220 2018-09-08 stsp if (error == NULL)
1663 ad242220 2018-09-08 stsp error = repo_error;
1665 404c43c4 2018-06-21 stsp return error;
1668 5de5890b 2018-10-18 stsp __dead static void
1669 5de5890b 2018-10-18 stsp usage_tree(void)
1671 c1669e2e 2019-01-09 stsp fprintf(stderr,
1672 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1673 5de5890b 2018-10-18 stsp getprogname());
1677 c1669e2e 2019-01-09 stsp static void
1678 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1679 c1669e2e 2019-01-09 stsp const char *root_path)
1681 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1683 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1684 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1687 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1688 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1689 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1692 5de5890b 2018-10-18 stsp static const struct got_error *
1693 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1694 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1695 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1697 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1698 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1699 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1700 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1701 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1703 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1705 5de5890b 2018-10-18 stsp goto done;
1707 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1709 5de5890b 2018-10-18 stsp goto done;
1710 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1711 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1712 5de5890b 2018-10-18 stsp while (te) {
1713 5de5890b 2018-10-18 stsp char *id = NULL;
1715 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1718 5de5890b 2018-10-18 stsp if (show_ids) {
1719 5de5890b 2018-10-18 stsp char *id_str;
1720 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1722 5de5890b 2018-10-18 stsp goto done;
1723 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1724 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1725 5de5890b 2018-10-18 stsp free(id_str);
1726 5de5890b 2018-10-18 stsp goto done;
1728 5de5890b 2018-10-18 stsp free(id_str);
1730 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1733 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1734 c1669e2e 2019-01-09 stsp char *child_path;
1735 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1736 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1737 c1669e2e 2019-01-09 stsp te->name) == -1) {
1738 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1739 c1669e2e 2019-01-09 stsp goto done;
1741 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1742 c1669e2e 2019-01-09 stsp root_path, repo);
1743 c1669e2e 2019-01-09 stsp free(child_path);
1745 c1669e2e 2019-01-09 stsp goto done;
1748 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1752 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1753 5de5890b 2018-10-18 stsp free(tree_id);
1754 5de5890b 2018-10-18 stsp return err;
1757 5de5890b 2018-10-18 stsp static const struct got_error *
1758 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1760 5de5890b 2018-10-18 stsp const struct got_error *error;
1761 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1762 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1763 7a2c19d6 2019-02-05 stsp const char *path;
1764 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1765 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1766 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1767 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1770 5de5890b 2018-10-18 stsp #ifndef PROFILE
1771 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1772 0f8d269b 2019-01-04 stsp NULL) == -1)
1773 5de5890b 2018-10-18 stsp err(1, "pledge");
1776 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1777 5de5890b 2018-10-18 stsp switch (ch) {
1779 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1782 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1783 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1784 5de5890b 2018-10-18 stsp err(1, "-r option");
1785 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1788 5de5890b 2018-10-18 stsp show_ids = 1;
1791 c1669e2e 2019-01-09 stsp recurse = 1;
1794 2deda0b9 2019-03-07 stsp usage_tree();
1795 5de5890b 2018-10-18 stsp /* NOTREACHED */
1799 5de5890b 2018-10-18 stsp argc -= optind;
1800 5de5890b 2018-10-18 stsp argv += optind;
1802 5de5890b 2018-10-18 stsp if (argc == 1)
1803 5de5890b 2018-10-18 stsp path = argv[0];
1804 5de5890b 2018-10-18 stsp else if (argc > 1)
1805 5de5890b 2018-10-18 stsp usage_tree();
1807 7a2c19d6 2019-02-05 stsp path = NULL;
1809 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1810 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1811 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1812 9bf7a39b 2019-02-05 stsp goto done;
1814 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1815 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1816 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1817 7a2c19d6 2019-02-05 stsp goto done;
1819 7a2c19d6 2019-02-05 stsp error = NULL;
1820 7a2c19d6 2019-02-05 stsp if (worktree) {
1821 7a2c19d6 2019-02-05 stsp repo_path =
1822 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1823 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1824 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1825 7a2c19d6 2019-02-05 stsp if (error)
1826 7a2c19d6 2019-02-05 stsp goto done;
1828 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1829 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1830 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1831 7a2c19d6 2019-02-05 stsp goto done;
1836 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1837 5de5890b 2018-10-18 stsp if (error != NULL)
1838 c02c541e 2019-03-29 stsp goto done;
1840 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1841 c02c541e 2019-03-29 stsp if (error)
1842 5de5890b 2018-10-18 stsp goto done;
1844 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1845 9bf7a39b 2019-02-05 stsp if (worktree) {
1846 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1847 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1848 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1849 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1850 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1851 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1852 9bf7a39b 2019-02-05 stsp goto done;
1854 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1856 9bf7a39b 2019-02-05 stsp if (error)
1857 9bf7a39b 2019-02-05 stsp goto done;
1859 9bf7a39b 2019-02-05 stsp path = "/";
1861 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1862 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1863 9bf7a39b 2019-02-05 stsp if (error != NULL)
1864 9bf7a39b 2019-02-05 stsp goto done;
1867 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1868 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1869 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1870 5de5890b 2018-10-18 stsp if (error != NULL)
1871 5de5890b 2018-10-18 stsp goto done;
1872 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1873 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1874 5de5890b 2018-10-18 stsp if (error != NULL)
1875 5de5890b 2018-10-18 stsp goto done;
1877 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1878 e09a504c 2019-06-28 stsp commit_id_str, repo);
1879 5de5890b 2018-10-18 stsp if (error != NULL)
1880 5de5890b 2018-10-18 stsp goto done;
1883 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1884 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1886 5de5890b 2018-10-18 stsp free(in_repo_path);
1887 5de5890b 2018-10-18 stsp free(repo_path);
1888 5de5890b 2018-10-18 stsp free(cwd);
1889 5de5890b 2018-10-18 stsp free(commit_id);
1890 7a2c19d6 2019-02-05 stsp if (worktree)
1891 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1892 5de5890b 2018-10-18 stsp if (repo) {
1893 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1894 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1895 5de5890b 2018-10-18 stsp if (error == NULL)
1896 5de5890b 2018-10-18 stsp error = repo_error;
1898 5de5890b 2018-10-18 stsp return error;
1901 6bad629b 2019-02-04 stsp __dead static void
1902 6bad629b 2019-02-04 stsp usage_status(void)
1904 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1908 b72f483a 2019-02-05 stsp static const struct got_error *
1909 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1910 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1912 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1913 b72f483a 2019-02-05 stsp return NULL;
1916 6bad629b 2019-02-04 stsp static const struct got_error *
1917 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1919 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1920 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1921 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1922 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1925 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1926 6bad629b 2019-02-04 stsp switch (ch) {
1928 2deda0b9 2019-03-07 stsp usage_status();
1929 6bad629b 2019-02-04 stsp /* NOTREACHED */
1933 6bad629b 2019-02-04 stsp argc -= optind;
1934 6bad629b 2019-02-04 stsp argv += optind;
1936 6bad629b 2019-02-04 stsp #ifndef PROFILE
1937 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1938 6bad629b 2019-02-04 stsp NULL) == -1)
1939 6bad629b 2019-02-04 stsp err(1, "pledge");
1941 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1942 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1943 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1944 927df6b7 2019-02-10 stsp goto done;
1947 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1948 927df6b7 2019-02-10 stsp if (error != NULL)
1949 927df6b7 2019-02-10 stsp goto done;
1951 6bad629b 2019-02-04 stsp if (argc == 0) {
1952 927df6b7 2019-02-10 stsp path = strdup("");
1953 927df6b7 2019-02-10 stsp if (path == NULL) {
1954 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1955 6bad629b 2019-02-04 stsp goto done;
1957 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1958 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1959 927df6b7 2019-02-10 stsp if (error)
1960 6bad629b 2019-02-04 stsp goto done;
1962 6bad629b 2019-02-04 stsp usage_status();
1964 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1965 6bad629b 2019-02-04 stsp if (error != NULL)
1966 6bad629b 2019-02-04 stsp goto done;
1968 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1969 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1970 6bad629b 2019-02-04 stsp if (error)
1971 6bad629b 2019-02-04 stsp goto done;
1973 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
1974 6bad629b 2019-02-04 stsp check_cancelled, NULL);
1976 927df6b7 2019-02-10 stsp free(cwd);
1977 927df6b7 2019-02-10 stsp free(path);
1978 d0eebce4 2019-03-11 stsp return error;
1981 d0eebce4 2019-03-11 stsp __dead static void
1982 d0eebce4 2019-03-11 stsp usage_ref(void)
1984 d0eebce4 2019-03-11 stsp fprintf(stderr,
1985 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
1986 d0eebce4 2019-03-11 stsp getprogname());
1990 d0eebce4 2019-03-11 stsp static const struct got_error *
1991 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
1993 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
1994 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
1995 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
1997 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
1998 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2000 d0eebce4 2019-03-11 stsp return err;
2002 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2003 d0eebce4 2019-03-11 stsp char *refstr;
2004 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2005 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2006 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2007 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2008 d0eebce4 2019-03-11 stsp free(refstr);
2011 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2012 d0eebce4 2019-03-11 stsp return NULL;
2015 d0eebce4 2019-03-11 stsp static const struct got_error *
2016 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2018 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2019 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2021 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2023 d0eebce4 2019-03-11 stsp return err;
2025 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2026 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2027 d0eebce4 2019-03-11 stsp return err;
2030 d0eebce4 2019-03-11 stsp static const struct got_error *
2031 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2033 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2034 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2035 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2037 e09a504c 2019-06-28 stsp err = got_repo_match_object_id_prefix(&id, target, repo);
2038 d83d9d5c 2019-05-13 stsp if (err) {
2039 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2041 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2042 d83d9d5c 2019-05-13 stsp return err;
2043 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2045 d83d9d5c 2019-05-13 stsp return err;
2046 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2047 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2049 d83d9d5c 2019-05-13 stsp return err;
2052 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2054 d0eebce4 2019-03-11 stsp goto done;
2056 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2059 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2061 d0eebce4 2019-03-11 stsp return err;
2064 d0eebce4 2019-03-11 stsp static const struct got_error *
2065 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2067 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2068 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2069 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2070 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2071 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2072 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2074 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2075 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2076 d0eebce4 2019-03-11 stsp switch (ch) {
2078 d0eebce4 2019-03-11 stsp delref = optarg;
2081 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2082 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2083 d0eebce4 2019-03-11 stsp err(1, "-r option");
2084 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2087 d0eebce4 2019-03-11 stsp do_list = 1;
2090 d0eebce4 2019-03-11 stsp usage_ref();
2091 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2095 d0eebce4 2019-03-11 stsp if (do_list && delref)
2096 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2098 d0eebce4 2019-03-11 stsp argc -= optind;
2099 d0eebce4 2019-03-11 stsp argv += optind;
2101 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2102 d0eebce4 2019-03-11 stsp if (argc > 0)
2103 d0eebce4 2019-03-11 stsp usage_ref();
2104 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2105 d0eebce4 2019-03-11 stsp usage_ref();
2107 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2108 e0b57350 2019-03-12 stsp if (do_list) {
2109 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2110 e0b57350 2019-03-12 stsp NULL) == -1)
2111 e0b57350 2019-03-12 stsp err(1, "pledge");
2113 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2114 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2115 e0b57350 2019-03-12 stsp err(1, "pledge");
2118 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2119 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2120 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2121 d0eebce4 2019-03-11 stsp goto done;
2124 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2125 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2126 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2127 d0eebce4 2019-03-11 stsp goto done;
2129 d0eebce4 2019-03-11 stsp error = NULL;
2130 d0eebce4 2019-03-11 stsp if (worktree) {
2131 d0eebce4 2019-03-11 stsp repo_path =
2132 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2133 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2134 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2135 d0eebce4 2019-03-11 stsp if (error)
2136 d0eebce4 2019-03-11 stsp goto done;
2138 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2139 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2140 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2141 d0eebce4 2019-03-11 stsp goto done;
2146 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2147 d0eebce4 2019-03-11 stsp if (error != NULL)
2148 d0eebce4 2019-03-11 stsp goto done;
2150 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2151 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2152 c02c541e 2019-03-29 stsp if (error)
2153 c02c541e 2019-03-29 stsp goto done;
2155 d0eebce4 2019-03-11 stsp if (do_list)
2156 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2157 d0eebce4 2019-03-11 stsp else if (delref)
2158 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2160 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2163 4e759de4 2019-06-26 stsp got_repo_close(repo);
2164 4e759de4 2019-06-26 stsp if (worktree)
2165 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2166 4e759de4 2019-06-26 stsp free(cwd);
2167 4e759de4 2019-06-26 stsp free(repo_path);
2168 4e759de4 2019-06-26 stsp return error;
2171 4e759de4 2019-06-26 stsp __dead static void
2172 4e759de4 2019-06-26 stsp usage_branch(void)
2174 4e759de4 2019-06-26 stsp fprintf(stderr,
2175 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2176 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2180 4e759de4 2019-06-26 stsp static const struct got_error *
2181 4e759de4 2019-06-26 stsp list_branches(struct got_repository *repo)
2183 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2184 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2185 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2187 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2188 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2190 4e759de4 2019-06-26 stsp return err;
2192 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2193 4e759de4 2019-06-26 stsp const char *refname;
2194 4e759de4 2019-06-26 stsp char *refstr;
2195 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2196 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2198 4e759de4 2019-06-26 stsp refname += 11;
2199 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2200 4e759de4 2019-06-26 stsp if (refstr == NULL)
2201 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2202 4e759de4 2019-06-26 stsp printf("%s: %s\n", refname, refstr);
2203 4e759de4 2019-06-26 stsp free(refstr);
2206 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2207 4e759de4 2019-06-26 stsp return NULL;
2210 4e759de4 2019-06-26 stsp static const struct got_error *
2211 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2213 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2214 4e759de4 2019-06-26 stsp struct got_reference *ref;
2215 4e759de4 2019-06-26 stsp char *refname;
2217 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2218 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2220 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2222 4e759de4 2019-06-26 stsp goto done;
2224 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2225 4e759de4 2019-06-26 stsp got_ref_close(ref);
2227 4e759de4 2019-06-26 stsp free(refname);
2228 4e759de4 2019-06-26 stsp return err;
2231 4e759de4 2019-06-26 stsp static const struct got_error *
2232 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2233 4e759de4 2019-06-26 stsp const char *base_branch)
2235 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2236 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2237 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2238 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2239 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2241 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2242 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2243 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2244 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2245 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2246 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2248 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2250 4e759de4 2019-06-26 stsp goto done;
2251 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2252 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2254 4e759de4 2019-06-26 stsp goto done;
2256 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2257 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2258 4e759de4 2019-06-26 stsp goto done;
2261 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2262 4e759de4 2019-06-26 stsp if (err == NULL) {
2263 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2264 4e759de4 2019-06-26 stsp goto done;
2265 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2266 4e759de4 2019-06-26 stsp goto done;
2268 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2270 4e759de4 2019-06-26 stsp goto done;
2272 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2275 4e759de4 2019-06-26 stsp got_ref_close(ref);
2277 4e759de4 2019-06-26 stsp free(base_refname);
2278 4e759de4 2019-06-26 stsp free(refname);
2279 4e759de4 2019-06-26 stsp return err;
2282 4e759de4 2019-06-26 stsp static const struct got_error *
2283 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2285 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2286 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2287 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2288 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2289 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2290 4e759de4 2019-06-26 stsp const char *delref = NULL;
2292 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2293 4e759de4 2019-06-26 stsp switch (ch) {
2295 4e759de4 2019-06-26 stsp delref = optarg;
2298 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2299 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2300 4e759de4 2019-06-26 stsp err(1, "-r option");
2301 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2304 4e759de4 2019-06-26 stsp do_list = 1;
2307 4e759de4 2019-06-26 stsp usage_branch();
2308 4e759de4 2019-06-26 stsp /* NOTREACHED */
2312 4e759de4 2019-06-26 stsp if (do_list && delref)
2313 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2315 4e759de4 2019-06-26 stsp argc -= optind;
2316 4e759de4 2019-06-26 stsp argv += optind;
2318 4e759de4 2019-06-26 stsp if (do_list || delref) {
2319 4e759de4 2019-06-26 stsp if (argc > 0)
2320 4e759de4 2019-06-26 stsp usage_branch();
2321 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2322 4e759de4 2019-06-26 stsp usage_branch();
2324 4e759de4 2019-06-26 stsp #ifndef PROFILE
2325 4e759de4 2019-06-26 stsp if (do_list) {
2326 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2327 4e759de4 2019-06-26 stsp NULL) == -1)
2328 4e759de4 2019-06-26 stsp err(1, "pledge");
2330 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2331 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2332 4e759de4 2019-06-26 stsp err(1, "pledge");
2335 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2336 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2337 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2338 4e759de4 2019-06-26 stsp goto done;
2341 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2342 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2343 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2344 4e759de4 2019-06-26 stsp goto done;
2346 4e759de4 2019-06-26 stsp error = NULL;
2347 4e759de4 2019-06-26 stsp if (worktree) {
2348 4e759de4 2019-06-26 stsp repo_path =
2349 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2350 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2351 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2352 4e759de4 2019-06-26 stsp if (error)
2353 4e759de4 2019-06-26 stsp goto done;
2355 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2356 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2357 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2358 4e759de4 2019-06-26 stsp goto done;
2363 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2364 4e759de4 2019-06-26 stsp if (error != NULL)
2365 4e759de4 2019-06-26 stsp goto done;
2367 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2368 4e759de4 2019-06-26 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2369 4e759de4 2019-06-26 stsp if (error)
2370 4e759de4 2019-06-26 stsp goto done;
2372 4e759de4 2019-06-26 stsp if (do_list)
2373 4e759de4 2019-06-26 stsp error = list_branches(repo);
2374 4e759de4 2019-06-26 stsp else if (delref)
2375 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2377 4e759de4 2019-06-26 stsp const char *base_branch;
2378 4e759de4 2019-06-26 stsp if (argc == 1) {
2379 4e759de4 2019-06-26 stsp base_branch = worktree ?
2380 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2381 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2383 4e759de4 2019-06-26 stsp base_branch = argv[1];
2384 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2388 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2389 d0eebce4 2019-03-11 stsp if (worktree)
2390 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2391 d0eebce4 2019-03-11 stsp free(cwd);
2392 d0eebce4 2019-03-11 stsp free(repo_path);
2393 d00136be 2019-03-26 stsp return error;
2396 d00136be 2019-03-26 stsp __dead static void
2397 d00136be 2019-03-26 stsp usage_add(void)
2399 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2403 d00136be 2019-03-26 stsp static const struct got_error *
2404 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2406 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2407 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2408 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2409 1dd54920 2019-05-11 stsp char *cwd = NULL;
2410 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2411 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2414 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2416 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2417 d00136be 2019-03-26 stsp switch (ch) {
2419 d00136be 2019-03-26 stsp usage_add();
2420 d00136be 2019-03-26 stsp /* NOTREACHED */
2424 d00136be 2019-03-26 stsp argc -= optind;
2425 d00136be 2019-03-26 stsp argv += optind;
2427 723c305c 2019-05-11 jcs if (argc < 1)
2428 d00136be 2019-03-26 stsp usage_add();
2430 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
2431 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2432 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2433 723c305c 2019-05-11 jcs if (path == NULL) {
2434 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2437 1dd54920 2019-05-11 stsp free(path);
2440 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2441 d00136be 2019-03-26 stsp if (cwd == NULL) {
2442 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2443 d00136be 2019-03-26 stsp goto done;
2446 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2447 d00136be 2019-03-26 stsp if (error)
2448 d00136be 2019-03-26 stsp goto done;
2450 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2451 031a5338 2019-03-26 stsp if (error != NULL)
2452 031a5338 2019-03-26 stsp goto done;
2454 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2455 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2456 d00136be 2019-03-26 stsp if (error)
2457 d00136be 2019-03-26 stsp goto done;
2459 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2460 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2461 723c305c 2019-05-11 jcs if (path == NULL) {
2462 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2466 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2467 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2468 1dd54920 2019-05-11 stsp if (error) {
2469 1dd54920 2019-05-11 stsp free(path);
2473 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2474 1dd54920 2019-05-11 stsp NULL, repo);
2477 031a5338 2019-03-26 stsp got_repo_close(repo);
2478 d00136be 2019-03-26 stsp if (worktree)
2479 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2480 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2481 1dd54920 2019-05-11 stsp free((char *)pe->path);
2482 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2483 2ec1f75b 2019-03-26 stsp free(cwd);
2484 2ec1f75b 2019-03-26 stsp return error;
2487 2ec1f75b 2019-03-26 stsp __dead static void
2488 2ec1f75b 2019-03-26 stsp usage_rm(void)
2490 cc11e7e3 2019-06-04 stsp fprintf(stderr, "usage: %s rm [-f] file-path ...\n", getprogname());
2494 2ec1f75b 2019-03-26 stsp static const struct got_error *
2495 2ec1f75b 2019-03-26 stsp cmd_rm(int argc, char *argv[])
2497 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2498 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2499 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2500 17ed4618 2019-06-02 stsp char *cwd = NULL;
2501 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
2502 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2503 17ed4618 2019-06-02 stsp int ch, i, delete_local_mods = 0;
2505 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
2507 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2508 2ec1f75b 2019-03-26 stsp switch (ch) {
2510 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2513 2ec1f75b 2019-03-26 stsp usage_add();
2514 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2518 2ec1f75b 2019-03-26 stsp argc -= optind;
2519 2ec1f75b 2019-03-26 stsp argv += optind;
2521 17ed4618 2019-06-02 stsp if (argc < 1)
2522 2ec1f75b 2019-03-26 stsp usage_rm();
2524 17ed4618 2019-06-02 stsp /* make sure each file exists before doing anything halfway */
2525 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2526 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2527 17ed4618 2019-06-02 stsp if (path == NULL) {
2528 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2529 17ed4618 2019-06-02 stsp goto done;
2531 17ed4618 2019-06-02 stsp free(path);
2534 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2535 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2536 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2537 2ec1f75b 2019-03-26 stsp goto done;
2539 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2540 2ec1f75b 2019-03-26 stsp if (error)
2541 2ec1f75b 2019-03-26 stsp goto done;
2543 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2545 2ec1f75b 2019-03-26 stsp goto done;
2547 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2548 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2549 2ec1f75b 2019-03-26 stsp if (error)
2550 2ec1f75b 2019-03-26 stsp goto done;
2552 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2553 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2554 17ed4618 2019-06-02 stsp if (path == NULL) {
2555 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2556 17ed4618 2019-06-02 stsp goto done;
2559 17ed4618 2019-06-02 stsp got_path_strip_trailing_slashes(path);
2560 17ed4618 2019-06-02 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2561 17ed4618 2019-06-02 stsp if (error) {
2562 17ed4618 2019-06-02 stsp free(path);
2563 17ed4618 2019-06-02 stsp goto done;
2566 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
2567 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
2568 a129376b 2019-03-28 stsp if (error)
2569 a129376b 2019-03-28 stsp goto done;
2572 a129376b 2019-03-28 stsp got_repo_close(repo);
2573 a129376b 2019-03-28 stsp if (worktree)
2574 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2575 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
2576 17ed4618 2019-06-02 stsp free((char *)pe->path);
2577 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
2578 a129376b 2019-03-28 stsp free(cwd);
2579 a129376b 2019-03-28 stsp return error;
2582 a129376b 2019-03-28 stsp __dead static void
2583 a129376b 2019-03-28 stsp usage_revert(void)
2585 e20a8b6f 2019-06-04 stsp fprintf(stderr, "usage: %s revert file-path ...\n", getprogname());
2589 a129376b 2019-03-28 stsp static void
2590 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2592 a129376b 2019-03-28 stsp while (path[0] == '/')
2594 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2597 a129376b 2019-03-28 stsp static const struct got_error *
2598 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2600 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2601 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2602 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2603 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2604 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
2605 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2606 e20a8b6f 2019-06-04 stsp int ch, i;
2608 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
2610 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2611 a129376b 2019-03-28 stsp switch (ch) {
2613 a129376b 2019-03-28 stsp usage_revert();
2614 a129376b 2019-03-28 stsp /* NOTREACHED */
2618 a129376b 2019-03-28 stsp argc -= optind;
2619 a129376b 2019-03-28 stsp argv += optind;
2621 e20a8b6f 2019-06-04 stsp if (argc < 1)
2622 a129376b 2019-03-28 stsp usage_revert();
2624 e20a8b6f 2019-06-04 stsp for (i = 0; i < argc; i++) {
2625 e20a8b6f 2019-06-04 stsp char *path = realpath(argv[i], NULL);
2626 e20a8b6f 2019-06-04 stsp if (path == NULL) {
2627 e20a8b6f 2019-06-04 stsp error = got_error_from_errno2("realpath", argv[i]);
2628 e20a8b6f 2019-06-04 stsp goto done;
2631 e20a8b6f 2019-06-04 stsp got_path_strip_trailing_slashes(path);
2632 e20a8b6f 2019-06-04 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2633 e20a8b6f 2019-06-04 stsp if (error) {
2634 e20a8b6f 2019-06-04 stsp free(path);
2635 e20a8b6f 2019-06-04 stsp goto done;
2639 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2640 a129376b 2019-03-28 stsp if (cwd == NULL) {
2641 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2642 a129376b 2019-03-28 stsp goto done;
2644 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2645 2ec1f75b 2019-03-26 stsp if (error)
2646 2ec1f75b 2019-03-26 stsp goto done;
2648 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2649 a129376b 2019-03-28 stsp if (error != NULL)
2650 a129376b 2019-03-28 stsp goto done;
2652 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2653 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2654 a129376b 2019-03-28 stsp if (error)
2655 a129376b 2019-03-28 stsp goto done;
2657 e20a8b6f 2019-06-04 stsp error = got_worktree_revert(worktree, &paths,
2658 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2659 a129376b 2019-03-28 stsp if (error)
2660 a129376b 2019-03-28 stsp goto done;
2663 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2664 2ec1f75b 2019-03-26 stsp if (worktree)
2665 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2666 2ec1f75b 2019-03-26 stsp free(path);
2667 d00136be 2019-03-26 stsp free(cwd);
2668 6bad629b 2019-02-04 stsp return error;
2671 c4296144 2019-05-09 stsp __dead static void
2672 c4296144 2019-05-09 stsp usage_commit(void)
2674 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2679 e2ba3d07 2019-05-13 stsp spawn_editor(const char *editor, const char *file)
2682 33ad4cbe 2019-05-12 jcs sig_t sighup, sigint, sigquit;
2683 33ad4cbe 2019-05-12 jcs int st = -1;
2685 33ad4cbe 2019-05-12 jcs sighup = signal(SIGHUP, SIG_IGN);
2686 33ad4cbe 2019-05-12 jcs sigint = signal(SIGINT, SIG_IGN);
2687 33ad4cbe 2019-05-12 jcs sigquit = signal(SIGQUIT, SIG_IGN);
2689 33ad4cbe 2019-05-12 jcs switch (pid = fork()) {
2691 33ad4cbe 2019-05-12 jcs goto doneediting;
2693 e2ba3d07 2019-05-13 stsp execl(editor, editor, file, (char *)NULL);
2694 33ad4cbe 2019-05-12 jcs _exit(127);
2697 33ad4cbe 2019-05-12 jcs while (waitpid(pid, &st, 0) == -1)
2698 33ad4cbe 2019-05-12 jcs if (errno != EINTR)
2701 33ad4cbe 2019-05-12 jcs doneediting:
2702 33ad4cbe 2019-05-12 jcs (void)signal(SIGHUP, sighup);
2703 33ad4cbe 2019-05-12 jcs (void)signal(SIGINT, sigint);
2704 33ad4cbe 2019-05-12 jcs (void)signal(SIGQUIT, sigquit);
2706 33ad4cbe 2019-05-12 jcs if (!WIFEXITED(st)) {
2707 33ad4cbe 2019-05-12 jcs errno = EINTR;
2711 33ad4cbe 2019-05-12 jcs return WEXITSTATUS(st);
2714 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
2715 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
2716 e2ba3d07 2019-05-13 stsp const char *editor;
2717 e0870e44 2019-05-13 stsp const char *worktree_path;
2718 76d98825 2019-06-03 stsp const char *branch_name;
2719 314a6357 2019-05-13 stsp const char *repo_path;
2720 e0870e44 2019-05-13 stsp char *logmsg_path;
2724 33ad4cbe 2019-05-12 jcs static const struct got_error *
2725 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2728 76d98825 2019-06-03 stsp char *initial_content = NULL;
2729 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
2730 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
2731 e0870e44 2019-05-13 stsp char *template = NULL;
2732 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
2733 33ad4cbe 2019-05-12 jcs char buf[1024];
2734 33ad4cbe 2019-05-12 jcs struct stat st, st2;
2736 33ad4cbe 2019-05-12 jcs size_t len;
2737 e0870e44 2019-05-13 stsp int fd, content_changed = 0;
2739 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
2740 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2741 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
2742 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
2743 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
2744 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
2745 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
2746 33ad4cbe 2019-05-12 jcs return NULL;
2749 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2750 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
2752 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
2753 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
2754 76d98825 2019-06-03 stsp a->branch_name) == -1)
2755 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2757 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2759 e0870e44 2019-05-13 stsp goto done;
2761 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
2763 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
2764 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2765 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
2766 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
2767 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
2771 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st) == -1) {
2772 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", a->logmsg_path);
2776 e0870e44 2019-05-13 stsp if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2777 638f9024 2019-05-13 stsp err = got_error_from_errno("failed spawning editor");
2781 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st2) == -1) {
2782 638f9024 2019-05-13 stsp err = got_error_from_errno("stat");
2786 33ad4cbe 2019-05-12 jcs if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2787 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2788 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2789 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2790 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2791 33ad4cbe 2019-05-12 jcs "no changes made to commit message, aborting");
2795 33ad4cbe 2019-05-12 jcs *logmsg = malloc(st2.st_size + 1);
2796 fcde04d9 2019-05-13 stsp if (*logmsg == NULL) {
2797 638f9024 2019-05-13 stsp err = got_error_from_errno("malloc");
2798 fcde04d9 2019-05-13 stsp goto done;
2800 cc79381d 2019-05-22 stsp (*logmsg)[0] = '\0';
2803 e0870e44 2019-05-13 stsp fp = fopen(a->logmsg_path, "r");
2804 d4592c7c 2019-05-22 stsp if (fp == NULL) {
2805 d4592c7c 2019-05-22 stsp err = got_error_from_errno("fopen");
2806 d4592c7c 2019-05-22 stsp goto done;
2808 33ad4cbe 2019-05-12 jcs while (fgets(buf, sizeof(buf), fp) != NULL) {
2809 e0870e44 2019-05-13 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
2810 e0870e44 2019-05-13 stsp content_changed = 1;
2811 33ad4cbe 2019-05-12 jcs if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2812 78527a0a 2019-05-22 stsp continue; /* remove comments and leading empty lines */
2813 33ad4cbe 2019-05-12 jcs len = strlcat(*logmsg, buf, st2.st_size);
2815 33ad4cbe 2019-05-12 jcs fclose(fp);
2817 33ad4cbe 2019-05-12 jcs while (len > 0 && (*logmsg)[len - 1] == '\n') {
2818 33ad4cbe 2019-05-12 jcs (*logmsg)[len - 1] = '\0';
2822 e0870e44 2019-05-13 stsp if (len == 0 || !content_changed) {
2823 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2824 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2825 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2826 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2827 33ad4cbe 2019-05-12 jcs "commit message cannot be empty, aborting");
2831 76d98825 2019-06-03 stsp free(initial_content);
2832 e0870e44 2019-05-13 stsp free(template);
2834 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
2835 314a6357 2019-05-13 stsp if (err == NULL)
2836 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2837 33ad4cbe 2019-05-12 jcs return err;
2840 c4296144 2019-05-09 stsp static const struct got_error *
2841 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2843 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2844 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2845 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2846 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2847 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2848 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
2849 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2850 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
2851 e2ba3d07 2019-05-13 stsp char *editor = NULL;
2854 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2855 c4296144 2019-05-09 stsp switch (ch) {
2857 c4296144 2019-05-09 stsp logmsg = optarg;
2860 c4296144 2019-05-09 stsp usage_commit();
2861 c4296144 2019-05-09 stsp /* NOTREACHED */
2865 c4296144 2019-05-09 stsp argc -= optind;
2866 c4296144 2019-05-09 stsp argv += optind;
2868 c4296144 2019-05-09 stsp if (argc == 1) {
2869 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2870 c4296144 2019-05-09 stsp if (path == NULL) {
2871 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2872 c4296144 2019-05-09 stsp goto done;
2874 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2875 c4296144 2019-05-09 stsp } else if (argc != 0)
2876 c4296144 2019-05-09 stsp usage_commit();
2878 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2879 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2880 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2881 35bd8fed 2019-05-09 stsp goto done;
2884 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2885 c4296144 2019-05-09 stsp if (cwd == NULL) {
2886 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2887 c4296144 2019-05-09 stsp goto done;
2889 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2890 c4296144 2019-05-09 stsp if (error)
2891 c4296144 2019-05-09 stsp goto done;
2893 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2894 c4296144 2019-05-09 stsp if (error != NULL)
2895 c4296144 2019-05-09 stsp goto done;
2898 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
2899 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
2901 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
2902 314a6357 2019-05-13 stsp error = get_editor(&editor);
2904 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2905 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2906 c4296144 2019-05-09 stsp if (error)
2907 c4296144 2019-05-09 stsp goto done;
2909 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
2910 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
2911 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2912 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
2913 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "refs/", 5) == 0)
2914 76d98825 2019-06-03 stsp cl_arg.branch_name += 5;
2915 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "heads/", 6) == 0)
2916 76d98825 2019-06-03 stsp cl_arg.branch_name += 6;
2917 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
2918 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
2919 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2920 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2921 e0870e44 2019-05-13 stsp if (error) {
2922 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2923 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
2924 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
2925 c4296144 2019-05-09 stsp goto done;
2928 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2929 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
2931 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2932 c4296144 2019-05-09 stsp if (error)
2933 c4296144 2019-05-09 stsp goto done;
2934 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
2937 c4296144 2019-05-09 stsp got_repo_close(repo);
2938 c4296144 2019-05-09 stsp if (worktree)
2939 c4296144 2019-05-09 stsp got_worktree_close(worktree);
2940 c4296144 2019-05-09 stsp free(path);
2941 c4296144 2019-05-09 stsp free(cwd);
2942 c4296144 2019-05-09 stsp free(id_str);
2943 e2ba3d07 2019-05-13 stsp free(editor);
2944 234035bc 2019-06-01 stsp return error;
2947 234035bc 2019-06-01 stsp __dead static void
2948 234035bc 2019-06-01 stsp usage_cherrypick(void)
2950 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
2954 234035bc 2019-06-01 stsp static const struct got_error *
2955 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
2957 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
2958 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
2959 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
2960 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
2961 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
2962 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
2963 234035bc 2019-06-01 stsp struct got_object_qid *pid;
2964 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
2965 234035bc 2019-06-01 stsp int ch, did_something = 0;
2967 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2968 234035bc 2019-06-01 stsp switch (ch) {
2970 234035bc 2019-06-01 stsp usage_cherrypick();
2971 234035bc 2019-06-01 stsp /* NOTREACHED */
2975 234035bc 2019-06-01 stsp argc -= optind;
2976 234035bc 2019-06-01 stsp argv += optind;
2978 234035bc 2019-06-01 stsp if (argc != 1)
2979 234035bc 2019-06-01 stsp usage_cherrypick();
2981 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
2982 234035bc 2019-06-01 stsp if (cwd == NULL) {
2983 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
2984 234035bc 2019-06-01 stsp goto done;
2986 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
2987 234035bc 2019-06-01 stsp if (error)
2988 234035bc 2019-06-01 stsp goto done;
2990 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2991 234035bc 2019-06-01 stsp if (error != NULL)
2992 234035bc 2019-06-01 stsp goto done;
2994 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2995 234035bc 2019-06-01 stsp got_worktree_get_root_path(worktree), 0);
2996 234035bc 2019-06-01 stsp if (error)
2997 234035bc 2019-06-01 stsp goto done;
2999 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0], repo);
3000 234035bc 2019-06-01 stsp if (error != NULL) {
3001 234035bc 2019-06-01 stsp struct got_reference *ref;
3002 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3003 234035bc 2019-06-01 stsp goto done;
3004 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3005 234035bc 2019-06-01 stsp if (error != NULL)
3006 234035bc 2019-06-01 stsp goto done;
3007 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3008 234035bc 2019-06-01 stsp got_ref_close(ref);
3009 234035bc 2019-06-01 stsp if (error != NULL)
3010 234035bc 2019-06-01 stsp goto done;
3012 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3013 234035bc 2019-06-01 stsp if (error)
3014 234035bc 2019-06-01 stsp goto done;
3016 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3017 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3018 234035bc 2019-06-01 stsp if (error != NULL)
3019 234035bc 2019-06-01 stsp goto done;
3021 234035bc 2019-06-01 stsp error = check_same_branch(commit_id, head_ref, repo);
3022 234035bc 2019-06-01 stsp if (error) {
3023 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3024 234035bc 2019-06-01 stsp goto done;
3025 234035bc 2019-06-01 stsp error = NULL;
3027 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3028 234035bc 2019-06-01 stsp goto done;
3031 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3032 234035bc 2019-06-01 stsp if (error)
3033 234035bc 2019-06-01 stsp goto done;
3034 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3035 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3036 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3038 234035bc 2019-06-01 stsp if (error != NULL)
3039 234035bc 2019-06-01 stsp goto done;
3041 234035bc 2019-06-01 stsp if (did_something)
3042 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3044 234035bc 2019-06-01 stsp if (commit)
3045 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3046 234035bc 2019-06-01 stsp free(commit_id_str);
3047 234035bc 2019-06-01 stsp if (head_ref)
3048 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3049 234035bc 2019-06-01 stsp if (worktree)
3050 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3052 234035bc 2019-06-01 stsp got_repo_close(repo);
3053 c4296144 2019-05-09 stsp return error;
3056 5ef14e63 2019-06-02 stsp __dead static void
3057 5ef14e63 2019-06-02 stsp usage_backout(void)
3059 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3063 5ef14e63 2019-06-02 stsp static const struct got_error *
3064 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3066 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3067 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3068 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3069 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3070 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3071 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3072 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3073 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3074 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3076 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3077 5ef14e63 2019-06-02 stsp switch (ch) {
3079 5ef14e63 2019-06-02 stsp usage_backout();
3080 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3084 5ef14e63 2019-06-02 stsp argc -= optind;
3085 5ef14e63 2019-06-02 stsp argv += optind;
3087 5ef14e63 2019-06-02 stsp if (argc != 1)
3088 5ef14e63 2019-06-02 stsp usage_backout();
3090 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3091 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3092 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3093 5ef14e63 2019-06-02 stsp goto done;
3095 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3096 5ef14e63 2019-06-02 stsp if (error)
3097 5ef14e63 2019-06-02 stsp goto done;
3099 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3100 5ef14e63 2019-06-02 stsp if (error != NULL)
3101 5ef14e63 2019-06-02 stsp goto done;
3103 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3104 5ef14e63 2019-06-02 stsp got_worktree_get_root_path(worktree), 0);
3105 5ef14e63 2019-06-02 stsp if (error)
3106 5ef14e63 2019-06-02 stsp goto done;
3108 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0], repo);
3109 5ef14e63 2019-06-02 stsp if (error != NULL) {
3110 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3111 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3112 5ef14e63 2019-06-02 stsp goto done;
3113 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3114 5ef14e63 2019-06-02 stsp if (error != NULL)
3115 5ef14e63 2019-06-02 stsp goto done;
3116 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3117 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3118 5ef14e63 2019-06-02 stsp if (error != NULL)
3119 5ef14e63 2019-06-02 stsp goto done;
3121 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3122 5ef14e63 2019-06-02 stsp if (error)
3123 5ef14e63 2019-06-02 stsp goto done;
3125 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3126 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3127 5ef14e63 2019-06-02 stsp if (error != NULL)
3128 5ef14e63 2019-06-02 stsp goto done;
3130 5ef14e63 2019-06-02 stsp error = check_same_branch(commit_id, head_ref, repo);
3131 5ef14e63 2019-06-02 stsp if (error)
3132 5ef14e63 2019-06-02 stsp goto done;
3134 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3135 5ef14e63 2019-06-02 stsp if (error)
3136 5ef14e63 2019-06-02 stsp goto done;
3137 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3138 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3139 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3140 5ef14e63 2019-06-02 stsp goto done;
3143 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3144 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3145 5ef14e63 2019-06-02 stsp if (error != NULL)
3146 5ef14e63 2019-06-02 stsp goto done;
3148 5ef14e63 2019-06-02 stsp if (did_something)
3149 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3151 5ef14e63 2019-06-02 stsp if (commit)
3152 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3153 5ef14e63 2019-06-02 stsp free(commit_id_str);
3154 5ef14e63 2019-06-02 stsp if (head_ref)
3155 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3156 5ef14e63 2019-06-02 stsp if (worktree)
3157 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
3159 5ef14e63 2019-06-02 stsp got_repo_close(repo);
3160 5ef14e63 2019-06-02 stsp return error;
