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 818c7501 2019-07-11 stsp #include <ctype.h>
29 99437157 2018-11-11 stsp #include <signal.h>
30 5c860e29 2018-03-12 stsp #include <stdio.h>
31 5c860e29 2018-03-12 stsp #include <stdlib.h>
32 5c860e29 2018-03-12 stsp #include <string.h>
33 5c860e29 2018-03-12 stsp #include <unistd.h>
34 c09a553d 2018-03-12 stsp #include <libgen.h>
35 c0768b0f 2018-06-10 stsp #include <time.h>
36 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 f42b1b34 2018-03-12 stsp #include "got_error.h"
39 f42b1b34 2018-03-12 stsp #include "got_object.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 f42b1b34 2018-03-12 stsp #include "got_repository.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 c09a553d 2018-03-12 stsp #include "got_worktree.h"
44 79109fed 2018-03-27 stsp #include "got_diff.h"
45 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
46 404c43c4 2018-06-21 stsp #include "got_blame.h"
47 63219cd2 2019-01-04 stsp #include "got_privsep.h"
48 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
50 5c860e29 2018-03-12 stsp #ifndef nitems
51 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
54 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
55 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
58 99437157 2018-11-11 stsp catch_sigint(int signo)
60 99437157 2018-11-11 stsp sigint_received = 1;
64 99437157 2018-11-11 stsp catch_sigpipe(int signo)
66 99437157 2018-11-11 stsp sigpipe_received = 1;
70 8cfb4057 2019-07-09 stsp struct got_cmd {
71 5c860e29 2018-03-12 stsp const char *cmd_name;
72 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
73 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
74 97b3a7be 2019-07-09 stsp const char *cmd_alias;
77 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
78 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
79 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
80 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
83 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
84 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
85 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
86 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
87 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
88 d00136be 2019-03-26 stsp __dead static void usage_add(void);
89 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
90 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
91 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
92 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
93 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
94 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
96 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
97 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
98 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
99 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
100 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
101 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
102 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
103 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
104 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
105 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
106 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
107 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
108 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
109 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
110 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
111 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
112 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
114 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
115 97b3a7be 2019-07-09 stsp { "init", cmd_init, usage_init, "" },
116 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
117 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
118 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
119 97b3a7be 2019-07-09 stsp { "diff", cmd_diff, usage_diff, "" },
120 97b3a7be 2019-07-09 stsp { "blame", cmd_blame, usage_blame, "" },
121 97b3a7be 2019-07-09 stsp { "tree", cmd_tree, usage_tree, "" },
122 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
123 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
124 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
125 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
126 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
127 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
128 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
129 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
130 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
131 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
134 ce5b7c56 2019-07-09 stsp static void
135 ce5b7c56 2019-07-09 stsp list_commands(void)
139 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
140 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
141 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
142 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
144 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
148 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
150 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
151 5c860e29 2018-03-12 stsp unsigned int i;
153 1b6b95a8 2018-03-12 stsp int hflag = 0;
155 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
157 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
158 5c860e29 2018-03-12 stsp switch (ch) {
163 ce5b7c56 2019-07-09 stsp usage(hflag);
164 5c860e29 2018-03-12 stsp /* NOTREACHED */
168 5c860e29 2018-03-12 stsp argc -= optind;
169 5c860e29 2018-03-12 stsp argv += optind;
170 1e70621d 2018-03-27 stsp optind = 0;
172 5c860e29 2018-03-12 stsp if (argc <= 0)
173 ce5b7c56 2019-07-09 stsp usage(hflag);
175 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
176 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
178 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
179 d7d4f210 2018-03-12 stsp const struct got_error *error;
181 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
183 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
184 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
188 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
190 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
191 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
192 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
199 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
200 ce5b7c56 2019-07-09 stsp list_commands();
204 4ed7e80c 2018-05-20 stsp __dead static void
205 ce5b7c56 2019-07-09 stsp usage(int hflag)
207 5e070240 2019-06-22 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n", getprogname());
209 ce5b7c56 2019-07-09 stsp list_commands();
213 0266afb7 2019-01-04 stsp static const struct got_error *
214 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
216 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
217 e2ba3d07 2019-05-13 stsp const char *editor;
219 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
220 e2ba3d07 2019-05-13 stsp if (editor == NULL)
221 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
223 0ee7065d 2019-05-13 stsp if (editor) {
224 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
226 0ee7065d 2019-05-13 stsp return err;
229 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
230 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
231 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
232 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
235 e2ba3d07 2019-05-13 stsp return NULL;
238 e2ba3d07 2019-05-13 stsp static const struct got_error *
239 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
240 314a6357 2019-05-13 stsp const char *worktree_path, int create_worktree)
242 163ce85a 2019-05-13 stsp const struct got_error *err;
244 a0937847 2019-05-11 stsp if (create_worktree) {
245 a0937847 2019-05-11 stsp /* Pre-create work tree path to avoid unveiling its parents. */
246 163ce85a 2019-05-13 stsp err = got_path_mkdir(worktree_path);
248 3c45a30a 2019-05-12 jcs if (errno == EEXIST) {
249 280f921b 2019-05-12 stsp if (got_path_dir_is_empty(worktree_path)) {
251 163ce85a 2019-05-13 stsp err = NULL;
253 df056ada 2019-05-15 stsp err = got_error_path(worktree_path,
254 df056ada 2019-05-15 stsp GOT_ERR_DIR_NOT_EMPTY);
258 163ce85a 2019-05-13 stsp if (err && (err->code != GOT_ERR_ERRNO || errno != EISDIR))
259 163ce85a 2019-05-13 stsp return err;
262 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
263 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
265 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
266 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
268 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
269 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
271 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
272 163ce85a 2019-05-13 stsp if (err != NULL)
273 163ce85a 2019-05-13 stsp return err;
275 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
276 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
278 0266afb7 2019-01-04 stsp return NULL;
281 2c7829a4 2019-06-17 stsp __dead static void
282 2c7829a4 2019-06-17 stsp usage_init(void)
284 2c7829a4 2019-06-17 stsp fprintf(stderr, "usage: %s init path\n", getprogname());
288 2c7829a4 2019-06-17 stsp static const struct got_error *
289 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
291 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
292 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
295 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
296 2c7829a4 2019-06-17 stsp switch (ch) {
298 2c7829a4 2019-06-17 stsp usage_init();
299 2c7829a4 2019-06-17 stsp /* NOTREACHED */
303 2c7829a4 2019-06-17 stsp argc -= optind;
304 2c7829a4 2019-06-17 stsp argv += optind;
306 2c7829a4 2019-06-17 stsp #ifndef PROFILE
307 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
308 2c7829a4 2019-06-17 stsp err(1, "pledge");
310 2c7829a4 2019-06-17 stsp if (argc != 1)
311 bc20e173 2019-06-17 stsp usage_init();
313 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
314 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
315 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
317 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
319 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
320 2c7829a4 2019-06-17 stsp if (error &&
321 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
324 2c7829a4 2019-06-17 stsp error = apply_unveil(repo_path, 0, NULL, 0);
328 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
329 2c7829a4 2019-06-17 stsp if (error != NULL)
333 2c7829a4 2019-06-17 stsp free(repo_path);
334 2c7829a4 2019-06-17 stsp return error;
337 4ed7e80c 2018-05-20 stsp __dead static void
338 c09a553d 2018-03-12 stsp usage_checkout(void)
340 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
341 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
345 92a684f4 2018-03-12 stsp static void
346 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
348 92a684f4 2018-03-12 stsp char *worktree_path = arg;
350 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
351 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
354 92a684f4 2018-03-12 stsp while (path[0] == '/')
357 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
360 99437157 2018-11-11 stsp static const struct got_error *
361 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
363 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
364 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
365 99437157 2018-11-11 stsp return NULL;
368 8069f636 2019-01-12 stsp static const struct got_error *
369 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
370 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
372 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
373 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
375 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
376 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
378 36a38700 2019-05-10 stsp return err;
380 d5bea539 2019-05-13 stsp if (yca_id == NULL)
381 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
384 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
385 d5bea539 2019-05-13 stsp * and the work tree's base commit.
387 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
389 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
397 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
398 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
399 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
401 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
402 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
403 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
405 d5bea539 2019-05-13 stsp free(yca_id);
406 d5bea539 2019-05-13 stsp return NULL;
409 a367ff0f 2019-05-14 stsp static const struct got_error *
410 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
411 a367ff0f 2019-05-14 stsp struct got_reference *head_ref, struct got_repository *repo)
413 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
414 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
415 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
416 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
418 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
422 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
426 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
431 a367ff0f 2019-05-14 stsp struct got_object_id *id;
432 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
434 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
435 a367ff0f 2019-05-14 stsp err = NULL;
438 a367ff0f 2019-05-14 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
440 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
447 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
448 a367ff0f 2019-05-14 stsp is_same_branch = 1;
455 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
456 a367ff0f 2019-05-14 stsp free(head_commit_id);
457 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
458 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
459 a367ff0f 2019-05-14 stsp return err;
462 4ed7e80c 2018-05-20 stsp static const struct got_error *
463 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
465 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
466 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
467 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
468 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
469 c09a553d 2018-03-12 stsp char *repo_path = NULL;
470 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
471 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
472 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
473 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
474 72151b04 2019-05-11 stsp int ch, same_path_prefix;
476 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
477 0bb8a95e 2018-03-12 stsp switch (ch) {
479 08573d5b 2019-05-14 stsp branch_name = optarg;
482 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
483 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
484 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
487 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
490 2deda0b9 2019-03-07 stsp usage_checkout();
491 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
495 0bb8a95e 2018-03-12 stsp argc -= optind;
496 0bb8a95e 2018-03-12 stsp argv += optind;
498 6715a751 2018-03-16 stsp #ifndef PROFILE
499 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
500 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
501 c09a553d 2018-03-12 stsp err(1, "pledge");
503 0bb8a95e 2018-03-12 stsp if (argc == 1) {
504 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
505 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
506 76089277 2018-04-01 stsp if (repo_path == NULL)
507 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
508 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
509 76089277 2018-04-01 stsp if (cwd == NULL) {
510 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
513 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
514 230a42bd 2019-05-11 jcs base = basename(path_prefix);
515 230a42bd 2019-05-11 jcs if (base == NULL) {
516 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
517 230a42bd 2019-05-11 jcs path_prefix);
521 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
522 230a42bd 2019-05-11 jcs if (base == NULL) {
523 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
528 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
529 c09a553d 2018-03-12 stsp if (dotgit)
530 c09a553d 2018-03-12 stsp *dotgit = '\0';
531 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
532 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
537 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
538 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
539 76089277 2018-04-01 stsp if (repo_path == NULL) {
540 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
543 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
544 76089277 2018-04-01 stsp if (worktree_path == NULL) {
545 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
549 c09a553d 2018-03-12 stsp usage_checkout();
551 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
552 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
554 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
555 c09a553d 2018-03-12 stsp if (error != NULL)
558 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
562 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
563 c09a553d 2018-03-12 stsp if (error != NULL)
566 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
567 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
570 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
571 c09a553d 2018-03-12 stsp if (error != NULL)
574 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
575 e5dc7198 2018-12-29 stsp path_prefix);
576 e5dc7198 2018-12-29 stsp if (error != NULL)
578 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
579 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
583 8069f636 2019-01-12 stsp if (commit_id_str) {
584 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
585 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
586 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
587 8069f636 2019-01-12 stsp if (error != NULL)
589 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
590 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
591 8069f636 2019-01-12 stsp if (error != NULL) {
592 8069f636 2019-01-12 stsp free(commit_id);
595 45d344f6 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
598 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
599 8069f636 2019-01-12 stsp commit_id);
600 8069f636 2019-01-12 stsp free(commit_id);
605 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
606 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
607 c09a553d 2018-03-12 stsp if (error != NULL)
610 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
613 8069f636 2019-01-12 stsp free(commit_id_str);
614 76089277 2018-04-01 stsp free(repo_path);
615 507dc3bb 2018-12-29 stsp free(worktree_path);
616 507dc3bb 2018-12-29 stsp return error;
619 507dc3bb 2018-12-29 stsp __dead static void
620 507dc3bb 2018-12-29 stsp usage_update(void)
622 024e9686 2019-05-14 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path]\n",
623 507dc3bb 2018-12-29 stsp getprogname());
627 507dc3bb 2018-12-29 stsp static void
628 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
630 784955db 2019-01-12 stsp int *did_something = arg;
632 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
635 1545c615 2019-02-10 stsp *did_something = 1;
637 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
638 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
641 507dc3bb 2018-12-29 stsp while (path[0] == '/')
643 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
646 be7061eb 2018-12-30 stsp static const struct got_error *
647 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
648 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
649 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
651 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
652 a1fb16d8 2019-05-24 stsp char *base_id_str;
653 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
655 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
656 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
657 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
658 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
659 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
660 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
661 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
664 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
665 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
667 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
668 a1fb16d8 2019-05-24 stsp return err;
669 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
671 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
672 a1fb16d8 2019-05-24 stsp return NULL;
674 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
675 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
676 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
678 a1fb16d8 2019-05-24 stsp return err;
679 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
680 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
681 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
682 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
683 a1fb16d8 2019-05-24 stsp return NULL;
686 a1fb16d8 2019-05-24 stsp static const struct got_error *
687 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
689 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
690 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
691 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
692 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
693 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
694 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
695 024e9686 2019-05-14 stsp const char *branch_name = NULL;
696 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
697 7d5807f4 2019-07-11 stsp int ch, did_something = 0, rebase_in_progress;
699 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
700 507dc3bb 2018-12-29 stsp switch (ch) {
702 024e9686 2019-05-14 stsp branch_name = optarg;
705 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
706 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
707 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
710 2deda0b9 2019-03-07 stsp usage_update();
711 507dc3bb 2018-12-29 stsp /* NOTREACHED */
715 507dc3bb 2018-12-29 stsp argc -= optind;
716 507dc3bb 2018-12-29 stsp argv += optind;
718 507dc3bb 2018-12-29 stsp #ifndef PROFILE
719 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
720 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
721 507dc3bb 2018-12-29 stsp err(1, "pledge");
723 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
724 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
725 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
728 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
732 7d5807f4 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
735 7d5807f4 2019-07-11 stsp if (rebase_in_progress) {
736 7d5807f4 2019-07-11 stsp error = got_error(GOT_ERR_REBASING);
740 507dc3bb 2018-12-29 stsp if (argc == 0) {
741 c4cdcb68 2019-04-03 stsp path = strdup("");
742 c4cdcb68 2019-04-03 stsp if (path == NULL) {
743 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
746 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
747 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
751 507dc3bb 2018-12-29 stsp usage_update();
753 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
754 507dc3bb 2018-12-29 stsp if (error != NULL)
757 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
758 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
762 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
763 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
764 024e9686 2019-05-14 stsp if (error != NULL)
766 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
767 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
768 9c4b8182 2019-01-02 stsp if (error != NULL)
770 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
771 507dc3bb 2018-12-29 stsp if (error != NULL)
774 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
775 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
776 507dc3bb 2018-12-29 stsp if (error != NULL)
778 a297e751 2019-07-11 stsp free(commit_id_str);
779 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
784 a1fb16d8 2019-05-24 stsp if (branch_name) {
785 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
786 024e9686 2019-05-14 stsp if (strlen(path) != 0) {
787 a1fb16d8 2019-05-24 stsp fprintf(stderr, "%s: switching between branches "
788 a1fb16d8 2019-05-24 stsp "requires that the entire work tree "
789 024e9686 2019-05-14 stsp "gets updated, not just '%s'\n",
790 024e9686 2019-05-14 stsp getprogname(), path);
791 024e9686 2019-05-14 stsp error = got_error(GOT_ERR_BAD_PATH);
794 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
797 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
798 a367ff0f 2019-05-14 stsp free(head_commit_id);
799 024e9686 2019-05-14 stsp if (error != NULL)
801 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
804 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
808 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
809 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
810 a367ff0f 2019-05-14 stsp if (error != NULL) {
811 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
812 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
815 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
820 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
821 507dc3bb 2018-12-29 stsp commit_id) != 0) {
822 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
823 507dc3bb 2018-12-29 stsp commit_id);
828 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
829 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
830 507dc3bb 2018-12-29 stsp if (error != NULL)
833 784955db 2019-01-12 stsp if (did_something)
834 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
836 784955db 2019-01-12 stsp printf("Already up-to-date\n");
838 c09a553d 2018-03-12 stsp free(worktree_path);
839 c4cdcb68 2019-04-03 stsp free(path);
840 507dc3bb 2018-12-29 stsp free(commit_id);
841 9c4b8182 2019-01-02 stsp free(commit_id_str);
842 c09a553d 2018-03-12 stsp return error;
845 f42b1b34 2018-03-12 stsp static const struct got_error *
846 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
847 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
849 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
850 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
851 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
852 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
853 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
855 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
856 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
858 79109fed 2018-03-27 stsp return err;
860 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
861 79f35eb3 2018-06-11 stsp if (qid != NULL) {
862 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
864 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
866 79109fed 2018-03-27 stsp return err;
868 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
869 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
870 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
872 0f2b3dca 2018-12-22 stsp return err;
874 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
876 79109fed 2018-03-27 stsp return err;
879 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
883 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
884 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
885 aaa13589 2019-06-01 stsp arg.outfile = stdout;
886 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
887 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff, &arg);
890 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
891 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
892 0f2b3dca 2018-12-22 stsp free(id_str1);
893 0f2b3dca 2018-12-22 stsp free(id_str2);
894 79109fed 2018-03-27 stsp return err;
897 4bb494d5 2018-06-16 stsp static char *
898 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
900 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
901 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
907 79109fed 2018-03-27 stsp static const struct got_error *
908 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
909 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
910 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
912 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
913 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
914 6c281f94 2018-06-11 stsp char datebuf[26];
915 45d799e2 2018-12-23 stsp time_t committer_time;
916 45d799e2 2018-12-23 stsp const char *author, *committer;
917 199a4027 2019-02-02 stsp char *refs_str = NULL;
918 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
920 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
922 199a4027 2019-02-02 stsp const char *name;
923 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
925 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
926 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
928 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
930 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
932 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
934 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
936 199a4027 2019-02-02 stsp s = refs_str;
937 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
938 199a4027 2019-02-02 stsp name) == -1) {
939 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
945 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
947 8bf5b3c9 2018-03-17 stsp return err;
949 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
950 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
951 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
952 832c249c 2018-06-10 stsp free(id_str);
953 d3d493d7 2019-02-21 stsp id_str = NULL;
954 d3d493d7 2019-02-21 stsp free(refs_str);
955 d3d493d7 2019-02-21 stsp refs_str = NULL;
956 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
957 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
958 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
959 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
960 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
961 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
962 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
963 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
964 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
965 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
966 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
968 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
969 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
970 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
972 a0603db2 2018-06-10 stsp return err;
973 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
974 a0603db2 2018-06-10 stsp free(id_str);
978 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
979 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
980 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
982 621015ac 2018-07-23 stsp logmsg = logmsg0;
984 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
986 832c249c 2018-06-10 stsp printf(" %s\n", line);
987 832c249c 2018-06-10 stsp } while (line);
988 621015ac 2018-07-23 stsp free(logmsg0);
990 971751ac 2018-03-27 stsp if (show_patch) {
991 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
992 971751ac 2018-03-27 stsp if (err == 0)
993 971751ac 2018-03-27 stsp printf("\n");
996 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
997 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
998 07862c20 2018-09-15 stsp return err;
1001 f42b1b34 2018-03-12 stsp static const struct got_error *
1002 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1003 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1004 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1006 f42b1b34 2018-03-12 stsp const struct got_error *err;
1007 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1009 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1010 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1012 f42b1b34 2018-03-12 stsp return err;
1013 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1015 fcc85cad 2018-07-22 stsp goto done;
1017 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1018 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1020 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1023 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1024 372ccdbb 2018-06-10 stsp if (err) {
1025 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1026 9ba79e04 2018-06-11 stsp err = NULL;
1029 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1031 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1037 b43fbaa0 2018-06-11 stsp if (id == NULL)
1040 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1043 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1045 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1046 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1050 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1051 f42b1b34 2018-03-12 stsp return err;
1054 4ed7e80c 2018-05-20 stsp __dead static void
1055 6f3d1eb0 2018-03-12 stsp usage_log(void)
1057 499d7ecc 2019-05-22 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
1058 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1062 4ed7e80c 2018-05-20 stsp static const struct got_error *
1063 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1065 f42b1b34 2018-03-12 stsp const struct got_error *error;
1066 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1067 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1068 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1069 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1070 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1071 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1072 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1073 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1074 64a96a6d 2018-04-01 stsp const char *errstr;
1075 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1077 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1079 6715a751 2018-03-16 stsp #ifndef PROFILE
1080 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1083 f42b1b34 2018-03-12 stsp err(1, "pledge");
1086 499d7ecc 2019-05-22 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:")) != -1) {
1087 79109fed 2018-03-27 stsp switch (ch) {
1089 499d7ecc 2019-05-22 stsp first_parent_traversal = 1;
1092 79109fed 2018-03-27 stsp show_patch = 1;
1095 d142fc45 2018-04-01 stsp start_commit = optarg;
1098 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1100 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1101 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1104 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1105 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1106 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1109 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1110 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1111 04ca23f4 2018-07-16 stsp err(1, "-r option");
1112 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1115 2deda0b9 2019-03-07 stsp usage_log();
1116 79109fed 2018-03-27 stsp /* NOTREACHED */
1120 79109fed 2018-03-27 stsp argc -= optind;
1121 79109fed 2018-03-27 stsp argv += optind;
1123 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1124 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1125 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1126 04ca23f4 2018-07-16 stsp goto done;
1129 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1130 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1131 cffc0aa4 2019-02-05 stsp goto done;
1132 cffc0aa4 2019-02-05 stsp error = NULL;
1134 e7301579 2019-03-18 stsp if (argc == 0) {
1135 cbd1af7a 2019-03-18 stsp path = strdup("");
1136 e7301579 2019-03-18 stsp if (path == NULL) {
1137 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1138 cbd1af7a 2019-03-18 stsp goto done;
1140 e7301579 2019-03-18 stsp } else if (argc == 1) {
1141 e7301579 2019-03-18 stsp if (worktree) {
1142 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1144 e7301579 2019-03-18 stsp if (error)
1145 e7301579 2019-03-18 stsp goto done;
1147 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1148 e7301579 2019-03-18 stsp if (path == NULL) {
1149 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1150 e7301579 2019-03-18 stsp goto done;
1154 cbd1af7a 2019-03-18 stsp usage_log();
1156 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1157 5486daa2 2019-05-11 stsp repo_path = worktree ?
1158 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1160 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1161 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1162 cffc0aa4 2019-02-05 stsp goto done;
1165 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1166 d7d4f210 2018-03-12 stsp if (error != NULL)
1167 04ca23f4 2018-07-16 stsp goto done;
1169 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1170 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1171 c02c541e 2019-03-29 stsp if (error)
1172 c02c541e 2019-03-29 stsp goto done;
1174 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1175 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1176 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1177 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1178 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1179 3235492e 2018-04-01 stsp if (error != NULL)
1180 3235492e 2018-04-01 stsp return error;
1181 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1182 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1183 3235492e 2018-04-01 stsp if (error != NULL)
1184 3235492e 2018-04-01 stsp return error;
1185 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1187 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1188 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1189 3235492e 2018-04-01 stsp if (error == NULL) {
1190 1caad61b 2019-02-01 stsp int obj_type;
1191 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1192 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1193 d1f2edc9 2018-06-13 stsp if (error != NULL)
1194 1caad61b 2019-02-01 stsp goto done;
1195 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1196 1caad61b 2019-02-01 stsp if (error != NULL)
1197 1caad61b 2019-02-01 stsp goto done;
1198 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1199 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1200 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1201 1caad61b 2019-02-01 stsp if (error != NULL)
1202 1caad61b 2019-02-01 stsp goto done;
1203 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1204 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1205 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1206 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1207 1caad61b 2019-02-01 stsp goto done;
1210 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1211 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1212 1caad61b 2019-02-01 stsp if (id == NULL)
1213 638f9024 2019-05-13 stsp error = got_error_from_errno(
1214 230a42bd 2019-05-11 jcs "got_object_id_dup");
1215 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1216 1caad61b 2019-02-01 stsp if (error)
1217 1caad61b 2019-02-01 stsp goto done;
1218 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1219 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1220 1caad61b 2019-02-01 stsp goto done;
1222 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1223 d1f2edc9 2018-06-13 stsp if (error != NULL)
1224 1caad61b 2019-02-01 stsp goto done;
1226 15a94983 2018-12-23 stsp if (commit == NULL) {
1227 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1228 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1229 d1f2edc9 2018-06-13 stsp if (error != NULL)
1230 d1f2edc9 2018-06-13 stsp return error;
1233 d7d4f210 2018-03-12 stsp if (error != NULL)
1234 04ca23f4 2018-07-16 stsp goto done;
1236 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1237 04ca23f4 2018-07-16 stsp if (error != NULL)
1238 04ca23f4 2018-07-16 stsp goto done;
1239 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1240 04ca23f4 2018-07-16 stsp free(path);
1241 04ca23f4 2018-07-16 stsp path = in_repo_path;
1244 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1245 199a4027 2019-02-02 stsp if (error)
1246 199a4027 2019-02-02 stsp goto done;
1248 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1249 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1251 04ca23f4 2018-07-16 stsp free(path);
1252 04ca23f4 2018-07-16 stsp free(repo_path);
1253 04ca23f4 2018-07-16 stsp free(cwd);
1255 cffc0aa4 2019-02-05 stsp if (worktree)
1256 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1257 ad242220 2018-09-08 stsp if (repo) {
1258 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1259 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1260 ad242220 2018-09-08 stsp if (error == NULL)
1261 ad242220 2018-09-08 stsp error = repo_error;
1263 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1264 8bf5b3c9 2018-03-17 stsp return error;
1267 4ed7e80c 2018-05-20 stsp __dead static void
1268 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1270 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1271 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1275 b72f483a 2019-02-05 stsp struct print_diff_arg {
1276 b72f483a 2019-02-05 stsp struct got_repository *repo;
1277 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1278 b72f483a 2019-02-05 stsp int diff_context;
1279 3fc0c068 2019-02-10 stsp const char *id_str;
1280 3fc0c068 2019-02-10 stsp int header_shown;
1283 4ed7e80c 2018-05-20 stsp static const struct got_error *
1284 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1285 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1287 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1288 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1289 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1290 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1291 b72f483a 2019-02-05 stsp char *abspath = NULL;
1292 b72f483a 2019-02-05 stsp struct stat sb;
1294 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1295 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1296 b72f483a 2019-02-05 stsp return NULL;
1298 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1299 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1300 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1301 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1304 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1305 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1307 d00136be 2019-03-26 stsp goto done;
1311 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1312 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1313 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1314 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1315 2ec1f75b 2019-03-26 stsp goto done;
1318 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1319 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1320 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1321 2ec1f75b 2019-03-26 stsp goto done;
1323 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1324 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1325 2ec1f75b 2019-03-26 stsp goto done;
1328 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1330 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1333 b72f483a 2019-02-05 stsp if (blob1)
1334 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1335 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1336 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1337 b72f483a 2019-02-05 stsp free(abspath);
1338 927df6b7 2019-02-10 stsp return err;
1341 927df6b7 2019-02-10 stsp static const struct got_error *
1342 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1344 b00d56cd 2018-04-01 stsp const struct got_error *error;
1345 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1346 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1347 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1348 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1349 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1350 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1351 15a94983 2018-12-23 stsp int type1, type2;
1352 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1353 c0cc5c62 2018-10-18 stsp const char *errstr;
1354 927df6b7 2019-02-10 stsp char *path = NULL;
1356 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1357 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1358 25eccc22 2019-01-04 stsp NULL) == -1)
1359 b00d56cd 2018-04-01 stsp err(1, "pledge");
1362 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1363 b00d56cd 2018-04-01 stsp switch (ch) {
1365 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1366 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1367 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1370 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1371 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1372 b72f483a 2019-02-05 stsp err(1, "-r option");
1373 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1376 2deda0b9 2019-03-07 stsp usage_diff();
1377 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1381 b00d56cd 2018-04-01 stsp argc -= optind;
1382 b00d56cd 2018-04-01 stsp argv += optind;
1384 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1385 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1386 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1387 b72f483a 2019-02-05 stsp goto done;
1389 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1390 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1391 927df6b7 2019-02-10 stsp goto done;
1392 927df6b7 2019-02-10 stsp if (argc <= 1) {
1393 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1394 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1395 927df6b7 2019-02-10 stsp goto done;
1397 b72f483a 2019-02-05 stsp if (repo_path)
1399 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1400 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1401 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1402 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1403 927df6b7 2019-02-10 stsp goto done;
1405 927df6b7 2019-02-10 stsp if (argc == 1) {
1406 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1408 927df6b7 2019-02-10 stsp if (error)
1409 927df6b7 2019-02-10 stsp goto done;
1411 927df6b7 2019-02-10 stsp path = strdup("");
1412 927df6b7 2019-02-10 stsp if (path == NULL) {
1413 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1414 927df6b7 2019-02-10 stsp goto done;
1417 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1418 15a94983 2018-12-23 stsp id_str1 = argv[0];
1419 15a94983 2018-12-23 stsp id_str2 = argv[1];
1420 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1421 30db809c 2019-06-05 stsp repo_path =
1422 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1423 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1424 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1425 30db809c 2019-06-05 stsp goto done;
1429 b00d56cd 2018-04-01 stsp usage_diff();
1431 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1432 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1433 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1434 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1437 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1438 76089277 2018-04-01 stsp free(repo_path);
1439 b00d56cd 2018-04-01 stsp if (error != NULL)
1440 b00d56cd 2018-04-01 stsp goto done;
1442 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1443 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1444 c02c541e 2019-03-29 stsp if (error)
1445 c02c541e 2019-03-29 stsp goto done;
1447 30db809c 2019-06-05 stsp if (argc <= 1) {
1448 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1449 b72f483a 2019-02-05 stsp char *id_str;
1450 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1451 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1452 b72f483a 2019-02-05 stsp if (error)
1453 b72f483a 2019-02-05 stsp goto done;
1454 b72f483a 2019-02-05 stsp arg.repo = repo;
1455 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1456 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1457 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1458 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1460 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1461 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1462 b72f483a 2019-02-05 stsp free(id_str);
1463 b72f483a 2019-02-05 stsp goto done;
1466 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
1467 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1468 e02e74af 2019-05-28 stsp if (error) {
1469 e02e74af 2019-05-28 stsp struct got_reference *ref;
1470 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1471 e02e74af 2019-05-28 stsp goto done;
1472 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1473 e02e74af 2019-05-28 stsp if (error != NULL)
1474 e02e74af 2019-05-28 stsp goto done;
1475 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
1476 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1477 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1478 5e70831e 2019-05-28 stsp goto done;
1480 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1481 e02e74af 2019-05-28 stsp got_ref_close(ref);
1482 e02e74af 2019-05-28 stsp if (error != NULL)
1483 5e70831e 2019-05-28 stsp goto done;
1485 a297e751 2019-07-11 stsp error = got_object_id_str(&label1, id1);
1486 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1487 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1488 e02e74af 2019-05-28 stsp goto done;
1492 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
1493 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1494 e02e74af 2019-05-28 stsp if (error) {
1495 e02e74af 2019-05-28 stsp struct got_reference *ref;
1496 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1497 e02e74af 2019-05-28 stsp goto done;
1498 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1499 e02e74af 2019-05-28 stsp if (error != NULL)
1500 5e70831e 2019-05-28 stsp goto done;
1501 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
1502 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1503 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1504 e02e74af 2019-05-28 stsp goto done;
1506 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1507 e02e74af 2019-05-28 stsp got_ref_close(ref);
1508 e02e74af 2019-05-28 stsp if (error != NULL)
1509 e02e74af 2019-05-28 stsp goto done;
1511 a297e751 2019-07-11 stsp error = got_object_id_str(&label2, id2);
1512 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1513 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1514 5e70831e 2019-05-28 stsp goto done;
1518 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1519 15a94983 2018-12-23 stsp if (error)
1520 15a94983 2018-12-23 stsp goto done;
1522 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1523 15a94983 2018-12-23 stsp if (error)
1524 15a94983 2018-12-23 stsp goto done;
1526 15a94983 2018-12-23 stsp if (type1 != type2) {
1527 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1528 b00d56cd 2018-04-01 stsp goto done;
1531 15a94983 2018-12-23 stsp switch (type1) {
1532 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1533 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1534 54156555 2018-12-24 stsp diff_context, repo, stdout);
1536 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1537 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1538 54156555 2018-12-24 stsp diff_context, repo, stdout);
1540 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1541 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
1542 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1543 c0cc5c62 2018-10-18 stsp repo, stdout);
1546 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1550 5e70831e 2019-05-28 stsp free(label1);
1551 5e70831e 2019-05-28 stsp free(label2);
1552 15a94983 2018-12-23 stsp free(id1);
1553 15a94983 2018-12-23 stsp free(id2);
1554 927df6b7 2019-02-10 stsp free(path);
1555 b72f483a 2019-02-05 stsp if (worktree)
1556 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1557 ad242220 2018-09-08 stsp if (repo) {
1558 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1559 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1560 ad242220 2018-09-08 stsp if (error == NULL)
1561 ad242220 2018-09-08 stsp error = repo_error;
1563 b00d56cd 2018-04-01 stsp return error;
1566 404c43c4 2018-06-21 stsp __dead static void
1567 404c43c4 2018-06-21 stsp usage_blame(void)
1569 9270e621 2019-02-05 stsp fprintf(stderr,
1570 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1571 404c43c4 2018-06-21 stsp getprogname());
1575 404c43c4 2018-06-21 stsp static const struct got_error *
1576 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1578 404c43c4 2018-06-21 stsp const struct got_error *error;
1579 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1580 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1581 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1582 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1583 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1586 404c43c4 2018-06-21 stsp #ifndef PROFILE
1587 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1588 36e2fb66 2019-01-04 stsp NULL) == -1)
1589 404c43c4 2018-06-21 stsp err(1, "pledge");
1592 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1593 404c43c4 2018-06-21 stsp switch (ch) {
1595 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1598 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1599 66bea077 2018-08-02 stsp if (repo_path == NULL)
1600 66bea077 2018-08-02 stsp err(1, "-r option");
1601 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1604 2deda0b9 2019-03-07 stsp usage_blame();
1605 404c43c4 2018-06-21 stsp /* NOTREACHED */
1609 404c43c4 2018-06-21 stsp argc -= optind;
1610 404c43c4 2018-06-21 stsp argv += optind;
1612 a39318fd 2018-08-02 stsp if (argc == 1)
1613 404c43c4 2018-06-21 stsp path = argv[0];
1615 404c43c4 2018-06-21 stsp usage_blame();
1617 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1618 66bea077 2018-08-02 stsp if (cwd == NULL) {
1619 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1620 66bea077 2018-08-02 stsp goto done;
1622 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1623 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1624 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1625 66bea077 2018-08-02 stsp goto done;
1627 0c06baac 2019-02-05 stsp error = NULL;
1628 0c06baac 2019-02-05 stsp if (worktree) {
1629 0c06baac 2019-02-05 stsp repo_path =
1630 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1631 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1632 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1633 0c06baac 2019-02-05 stsp if (error)
1634 0c06baac 2019-02-05 stsp goto done;
1636 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1637 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1638 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1639 0c06baac 2019-02-05 stsp goto done;
1644 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1645 c02c541e 2019-03-29 stsp if (error != NULL)
1646 36e2fb66 2019-01-04 stsp goto done;
1648 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1649 c02c541e 2019-03-29 stsp if (error)
1650 404c43c4 2018-06-21 stsp goto done;
1652 0c06baac 2019-02-05 stsp if (worktree) {
1653 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1654 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1655 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1656 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1657 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1658 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1659 6efaaa2d 2019-02-05 stsp path) == -1) {
1660 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1661 0c06baac 2019-02-05 stsp goto done;
1663 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1666 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1668 0c06baac 2019-02-05 stsp if (error)
1669 66bea077 2018-08-02 stsp goto done;
1671 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1672 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1673 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1674 404c43c4 2018-06-21 stsp if (error != NULL)
1675 66bea077 2018-08-02 stsp goto done;
1676 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1677 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1678 404c43c4 2018-06-21 stsp if (error != NULL)
1679 66bea077 2018-08-02 stsp goto done;
1681 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1682 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
1683 404c43c4 2018-06-21 stsp if (error != NULL)
1684 66bea077 2018-08-02 stsp goto done;
1687 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
1689 66bea077 2018-08-02 stsp free(in_repo_path);
1690 66bea077 2018-08-02 stsp free(repo_path);
1691 66bea077 2018-08-02 stsp free(cwd);
1692 404c43c4 2018-06-21 stsp free(commit_id);
1693 0c06baac 2019-02-05 stsp if (worktree)
1694 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
1695 ad242220 2018-09-08 stsp if (repo) {
1696 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1697 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1698 ad242220 2018-09-08 stsp if (error == NULL)
1699 ad242220 2018-09-08 stsp error = repo_error;
1701 404c43c4 2018-06-21 stsp return error;
1704 5de5890b 2018-10-18 stsp __dead static void
1705 5de5890b 2018-10-18 stsp usage_tree(void)
1707 c1669e2e 2019-01-09 stsp fprintf(stderr,
1708 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1709 5de5890b 2018-10-18 stsp getprogname());
1713 c1669e2e 2019-01-09 stsp static void
1714 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
1715 c1669e2e 2019-01-09 stsp const char *root_path)
1717 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
1719 c1669e2e 2019-01-09 stsp path += strlen(root_path);
1720 c1669e2e 2019-01-09 stsp while (path[0] == '/')
1723 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
1724 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
1725 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1728 5de5890b 2018-10-18 stsp static const struct got_error *
1729 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
1730 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
1731 c1669e2e 2019-01-09 stsp struct got_repository *repo)
1733 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
1734 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
1735 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
1736 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
1737 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
1739 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1741 5de5890b 2018-10-18 stsp goto done;
1743 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1745 5de5890b 2018-10-18 stsp goto done;
1746 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
1747 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
1748 5de5890b 2018-10-18 stsp while (te) {
1749 5de5890b 2018-10-18 stsp char *id = NULL;
1751 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1754 5de5890b 2018-10-18 stsp if (show_ids) {
1755 5de5890b 2018-10-18 stsp char *id_str;
1756 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
1758 5de5890b 2018-10-18 stsp goto done;
1759 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
1760 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1761 5de5890b 2018-10-18 stsp free(id_str);
1762 5de5890b 2018-10-18 stsp goto done;
1764 5de5890b 2018-10-18 stsp free(id_str);
1766 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
1769 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
1770 c1669e2e 2019-01-09 stsp char *child_path;
1771 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
1772 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
1773 c1669e2e 2019-01-09 stsp te->name) == -1) {
1774 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1775 c1669e2e 2019-01-09 stsp goto done;
1777 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
1778 c1669e2e 2019-01-09 stsp root_path, repo);
1779 c1669e2e 2019-01-09 stsp free(child_path);
1781 c1669e2e 2019-01-09 stsp goto done;
1784 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
1788 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
1789 5de5890b 2018-10-18 stsp free(tree_id);
1790 5de5890b 2018-10-18 stsp return err;
1793 5de5890b 2018-10-18 stsp static const struct got_error *
1794 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
1796 5de5890b 2018-10-18 stsp const struct got_error *error;
1797 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
1798 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
1799 7a2c19d6 2019-02-05 stsp const char *path;
1800 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1801 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
1802 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
1803 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
1806 5de5890b 2018-10-18 stsp #ifndef PROFILE
1807 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1808 0f8d269b 2019-01-04 stsp NULL) == -1)
1809 5de5890b 2018-10-18 stsp err(1, "pledge");
1812 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1813 5de5890b 2018-10-18 stsp switch (ch) {
1815 5de5890b 2018-10-18 stsp commit_id_str = optarg;
1818 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
1819 5de5890b 2018-10-18 stsp if (repo_path == NULL)
1820 5de5890b 2018-10-18 stsp err(1, "-r option");
1821 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1824 5de5890b 2018-10-18 stsp show_ids = 1;
1827 c1669e2e 2019-01-09 stsp recurse = 1;
1830 2deda0b9 2019-03-07 stsp usage_tree();
1831 5de5890b 2018-10-18 stsp /* NOTREACHED */
1835 5de5890b 2018-10-18 stsp argc -= optind;
1836 5de5890b 2018-10-18 stsp argv += optind;
1838 5de5890b 2018-10-18 stsp if (argc == 1)
1839 5de5890b 2018-10-18 stsp path = argv[0];
1840 5de5890b 2018-10-18 stsp else if (argc > 1)
1841 5de5890b 2018-10-18 stsp usage_tree();
1843 7a2c19d6 2019-02-05 stsp path = NULL;
1845 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
1846 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
1847 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1848 9bf7a39b 2019-02-05 stsp goto done;
1850 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
1851 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1852 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1853 7a2c19d6 2019-02-05 stsp goto done;
1855 7a2c19d6 2019-02-05 stsp error = NULL;
1856 7a2c19d6 2019-02-05 stsp if (worktree) {
1857 7a2c19d6 2019-02-05 stsp repo_path =
1858 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1859 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
1860 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1861 7a2c19d6 2019-02-05 stsp if (error)
1862 7a2c19d6 2019-02-05 stsp goto done;
1864 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
1865 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
1866 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1867 7a2c19d6 2019-02-05 stsp goto done;
1872 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
1873 5de5890b 2018-10-18 stsp if (error != NULL)
1874 c02c541e 2019-03-29 stsp goto done;
1876 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1877 c02c541e 2019-03-29 stsp if (error)
1878 5de5890b 2018-10-18 stsp goto done;
1880 9bf7a39b 2019-02-05 stsp if (path == NULL) {
1881 9bf7a39b 2019-02-05 stsp if (worktree) {
1882 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1883 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1884 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
1885 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
1886 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
1887 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1888 9bf7a39b 2019-02-05 stsp goto done;
1890 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1892 9bf7a39b 2019-02-05 stsp if (error)
1893 9bf7a39b 2019-02-05 stsp goto done;
1895 9bf7a39b 2019-02-05 stsp path = "/";
1897 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
1898 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1899 9bf7a39b 2019-02-05 stsp if (error != NULL)
1900 9bf7a39b 2019-02-05 stsp goto done;
1903 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
1904 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
1905 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1906 5de5890b 2018-10-18 stsp if (error != NULL)
1907 5de5890b 2018-10-18 stsp goto done;
1908 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1909 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
1910 5de5890b 2018-10-18 stsp if (error != NULL)
1911 5de5890b 2018-10-18 stsp goto done;
1913 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1914 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
1915 5de5890b 2018-10-18 stsp if (error != NULL)
1916 5de5890b 2018-10-18 stsp goto done;
1919 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1920 c1669e2e 2019-01-09 stsp in_repo_path, repo);
1922 5de5890b 2018-10-18 stsp free(in_repo_path);
1923 5de5890b 2018-10-18 stsp free(repo_path);
1924 5de5890b 2018-10-18 stsp free(cwd);
1925 5de5890b 2018-10-18 stsp free(commit_id);
1926 7a2c19d6 2019-02-05 stsp if (worktree)
1927 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
1928 5de5890b 2018-10-18 stsp if (repo) {
1929 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
1930 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
1931 5de5890b 2018-10-18 stsp if (error == NULL)
1932 5de5890b 2018-10-18 stsp error = repo_error;
1934 5de5890b 2018-10-18 stsp return error;
1937 6bad629b 2019-02-04 stsp __dead static void
1938 6bad629b 2019-02-04 stsp usage_status(void)
1940 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
1944 b72f483a 2019-02-05 stsp static const struct got_error *
1945 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
1946 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1948 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
1949 b72f483a 2019-02-05 stsp return NULL;
1952 6bad629b 2019-02-04 stsp static const struct got_error *
1953 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
1955 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
1956 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
1957 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
1958 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
1961 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1962 6bad629b 2019-02-04 stsp switch (ch) {
1964 2deda0b9 2019-03-07 stsp usage_status();
1965 6bad629b 2019-02-04 stsp /* NOTREACHED */
1969 6bad629b 2019-02-04 stsp argc -= optind;
1970 6bad629b 2019-02-04 stsp argv += optind;
1972 6bad629b 2019-02-04 stsp #ifndef PROFILE
1973 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1974 6bad629b 2019-02-04 stsp NULL) == -1)
1975 6bad629b 2019-02-04 stsp err(1, "pledge");
1977 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
1978 927df6b7 2019-02-10 stsp if (cwd == NULL) {
1979 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1980 927df6b7 2019-02-10 stsp goto done;
1983 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1984 927df6b7 2019-02-10 stsp if (error != NULL)
1985 927df6b7 2019-02-10 stsp goto done;
1987 6bad629b 2019-02-04 stsp if (argc == 0) {
1988 927df6b7 2019-02-10 stsp path = strdup("");
1989 927df6b7 2019-02-10 stsp if (path == NULL) {
1990 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1991 6bad629b 2019-02-04 stsp goto done;
1993 6bad629b 2019-02-04 stsp } else if (argc == 1) {
1994 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1995 927df6b7 2019-02-10 stsp if (error)
1996 6bad629b 2019-02-04 stsp goto done;
1998 6bad629b 2019-02-04 stsp usage_status();
2000 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2001 6bad629b 2019-02-04 stsp if (error != NULL)
2002 6bad629b 2019-02-04 stsp goto done;
2004 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2005 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2006 6bad629b 2019-02-04 stsp if (error)
2007 6bad629b 2019-02-04 stsp goto done;
2009 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
2010 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2012 927df6b7 2019-02-10 stsp free(cwd);
2013 927df6b7 2019-02-10 stsp free(path);
2014 d0eebce4 2019-03-11 stsp return error;
2017 d0eebce4 2019-03-11 stsp __dead static void
2018 d0eebce4 2019-03-11 stsp usage_ref(void)
2020 d0eebce4 2019-03-11 stsp fprintf(stderr,
2021 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
2022 d0eebce4 2019-03-11 stsp getprogname());
2026 d0eebce4 2019-03-11 stsp static const struct got_error *
2027 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2029 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2030 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2031 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2033 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2034 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2036 d0eebce4 2019-03-11 stsp return err;
2038 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2039 d0eebce4 2019-03-11 stsp char *refstr;
2040 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2041 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2042 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2043 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2044 d0eebce4 2019-03-11 stsp free(refstr);
2047 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2048 d0eebce4 2019-03-11 stsp return NULL;
2051 d0eebce4 2019-03-11 stsp static const struct got_error *
2052 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2054 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2055 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2057 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2059 d0eebce4 2019-03-11 stsp return err;
2061 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2062 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2063 d0eebce4 2019-03-11 stsp return err;
2066 d0eebce4 2019-03-11 stsp static const struct got_error *
2067 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2069 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2070 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2071 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2073 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2075 d83d9d5c 2019-05-13 stsp if (err) {
2076 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2078 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2079 d83d9d5c 2019-05-13 stsp return err;
2080 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2082 d83d9d5c 2019-05-13 stsp return err;
2083 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2084 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2086 d83d9d5c 2019-05-13 stsp return err;
2089 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2091 d0eebce4 2019-03-11 stsp goto done;
2093 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2096 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2098 d0eebce4 2019-03-11 stsp return err;
2101 d0eebce4 2019-03-11 stsp static const struct got_error *
2102 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2104 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2105 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2106 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2107 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2108 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2109 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2111 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2112 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2113 d0eebce4 2019-03-11 stsp switch (ch) {
2115 d0eebce4 2019-03-11 stsp delref = optarg;
2118 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2119 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2120 d0eebce4 2019-03-11 stsp err(1, "-r option");
2121 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2124 d0eebce4 2019-03-11 stsp do_list = 1;
2127 d0eebce4 2019-03-11 stsp usage_ref();
2128 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2132 d0eebce4 2019-03-11 stsp if (do_list && delref)
2133 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2135 d0eebce4 2019-03-11 stsp argc -= optind;
2136 d0eebce4 2019-03-11 stsp argv += optind;
2138 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2139 d0eebce4 2019-03-11 stsp if (argc > 0)
2140 d0eebce4 2019-03-11 stsp usage_ref();
2141 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2142 d0eebce4 2019-03-11 stsp usage_ref();
2144 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2145 e0b57350 2019-03-12 stsp if (do_list) {
2146 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2147 e0b57350 2019-03-12 stsp NULL) == -1)
2148 e0b57350 2019-03-12 stsp err(1, "pledge");
2150 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2151 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2152 e0b57350 2019-03-12 stsp err(1, "pledge");
2155 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2156 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2157 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2158 d0eebce4 2019-03-11 stsp goto done;
2161 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2162 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2163 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2164 d0eebce4 2019-03-11 stsp goto done;
2166 d0eebce4 2019-03-11 stsp error = NULL;
2167 d0eebce4 2019-03-11 stsp if (worktree) {
2168 d0eebce4 2019-03-11 stsp repo_path =
2169 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2170 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2171 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2172 d0eebce4 2019-03-11 stsp if (error)
2173 d0eebce4 2019-03-11 stsp goto done;
2175 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2176 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2177 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2178 d0eebce4 2019-03-11 stsp goto done;
2183 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2184 d0eebce4 2019-03-11 stsp if (error != NULL)
2185 d0eebce4 2019-03-11 stsp goto done;
2187 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2188 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2189 c02c541e 2019-03-29 stsp if (error)
2190 c02c541e 2019-03-29 stsp goto done;
2192 d0eebce4 2019-03-11 stsp if (do_list)
2193 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2194 d0eebce4 2019-03-11 stsp else if (delref)
2195 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2197 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2200 4e759de4 2019-06-26 stsp got_repo_close(repo);
2201 4e759de4 2019-06-26 stsp if (worktree)
2202 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2203 4e759de4 2019-06-26 stsp free(cwd);
2204 4e759de4 2019-06-26 stsp free(repo_path);
2205 4e759de4 2019-06-26 stsp return error;
2208 4e759de4 2019-06-26 stsp __dead static void
2209 4e759de4 2019-06-26 stsp usage_branch(void)
2211 4e759de4 2019-06-26 stsp fprintf(stderr,
2212 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2213 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2217 4e759de4 2019-06-26 stsp static const struct got_error *
2218 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2220 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2221 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2222 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2224 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2226 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2228 4e759de4 2019-06-26 stsp return err;
2230 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2231 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2232 4e759de4 2019-06-26 stsp char *refstr;
2233 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2234 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2236 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2237 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2238 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2239 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2241 ba882ee3 2019-07-11 stsp return err;
2242 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2243 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2244 ba882ee3 2019-07-11 stsp marker = "* ";
2246 ba882ee3 2019-07-11 stsp marker = "~ ";
2249 4e759de4 2019-06-26 stsp refname += 11;
2250 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2251 4e759de4 2019-06-26 stsp if (refstr == NULL)
2252 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2253 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2254 4e759de4 2019-06-26 stsp free(refstr);
2257 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2258 4e759de4 2019-06-26 stsp return NULL;
2261 4e759de4 2019-06-26 stsp static const struct got_error *
2262 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2264 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2265 4e759de4 2019-06-26 stsp struct got_reference *ref;
2266 4e759de4 2019-06-26 stsp char *refname;
2268 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2269 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2271 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2273 4e759de4 2019-06-26 stsp goto done;
2275 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2276 4e759de4 2019-06-26 stsp got_ref_close(ref);
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 add_branch(struct got_repository *repo, const char *branch_name,
2284 4e759de4 2019-06-26 stsp const char *base_branch)
2286 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2287 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2288 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2289 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2290 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2293 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2294 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2295 d3f84d51 2019-07-11 stsp * an unintended typo.
2297 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2298 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2300 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2301 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2302 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2303 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2304 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2305 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2307 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2309 4e759de4 2019-06-26 stsp goto done;
2310 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2311 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2313 4e759de4 2019-06-26 stsp goto done;
2315 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2316 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2317 4e759de4 2019-06-26 stsp goto done;
2320 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2321 4e759de4 2019-06-26 stsp if (err == NULL) {
2322 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2323 4e759de4 2019-06-26 stsp goto done;
2324 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2325 4e759de4 2019-06-26 stsp goto done;
2327 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2329 4e759de4 2019-06-26 stsp goto done;
2331 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2334 4e759de4 2019-06-26 stsp got_ref_close(ref);
2336 4e759de4 2019-06-26 stsp free(base_refname);
2337 4e759de4 2019-06-26 stsp free(refname);
2338 4e759de4 2019-06-26 stsp return err;
2341 4e759de4 2019-06-26 stsp static const struct got_error *
2342 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2344 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2345 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2346 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2347 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2348 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2349 4e759de4 2019-06-26 stsp const char *delref = NULL;
2351 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2352 4e759de4 2019-06-26 stsp switch (ch) {
2354 4e759de4 2019-06-26 stsp delref = optarg;
2357 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2358 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2359 4e759de4 2019-06-26 stsp err(1, "-r option");
2360 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2363 4e759de4 2019-06-26 stsp do_list = 1;
2366 4e759de4 2019-06-26 stsp usage_branch();
2367 4e759de4 2019-06-26 stsp /* NOTREACHED */
2371 4e759de4 2019-06-26 stsp if (do_list && delref)
2372 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2374 4e759de4 2019-06-26 stsp argc -= optind;
2375 4e759de4 2019-06-26 stsp argv += optind;
2377 4e759de4 2019-06-26 stsp if (do_list || delref) {
2378 4e759de4 2019-06-26 stsp if (argc > 0)
2379 4e759de4 2019-06-26 stsp usage_branch();
2380 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2381 4e759de4 2019-06-26 stsp usage_branch();
2383 4e759de4 2019-06-26 stsp #ifndef PROFILE
2384 4e759de4 2019-06-26 stsp if (do_list) {
2385 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2386 4e759de4 2019-06-26 stsp NULL) == -1)
2387 4e759de4 2019-06-26 stsp err(1, "pledge");
2389 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2390 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2391 4e759de4 2019-06-26 stsp err(1, "pledge");
2394 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2395 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2396 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2397 4e759de4 2019-06-26 stsp goto done;
2400 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2401 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2402 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2403 4e759de4 2019-06-26 stsp goto done;
2405 4e759de4 2019-06-26 stsp error = NULL;
2406 4e759de4 2019-06-26 stsp if (worktree) {
2407 4e759de4 2019-06-26 stsp repo_path =
2408 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2409 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2410 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2411 4e759de4 2019-06-26 stsp if (error)
2412 4e759de4 2019-06-26 stsp goto done;
2414 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2415 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2416 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2417 4e759de4 2019-06-26 stsp goto done;
2422 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2423 4e759de4 2019-06-26 stsp if (error != NULL)
2424 4e759de4 2019-06-26 stsp goto done;
2426 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2427 4e759de4 2019-06-26 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2428 4e759de4 2019-06-26 stsp if (error)
2429 4e759de4 2019-06-26 stsp goto done;
2431 4e759de4 2019-06-26 stsp if (do_list)
2432 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
2433 4e759de4 2019-06-26 stsp else if (delref)
2434 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2436 4e759de4 2019-06-26 stsp const char *base_branch;
2437 4e759de4 2019-06-26 stsp if (argc == 1) {
2438 4e759de4 2019-06-26 stsp base_branch = worktree ?
2439 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2440 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2442 4e759de4 2019-06-26 stsp base_branch = argv[1];
2443 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2447 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2448 d0eebce4 2019-03-11 stsp if (worktree)
2449 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2450 d0eebce4 2019-03-11 stsp free(cwd);
2451 d0eebce4 2019-03-11 stsp free(repo_path);
2452 d00136be 2019-03-26 stsp return error;
2455 d00136be 2019-03-26 stsp __dead static void
2456 d00136be 2019-03-26 stsp usage_add(void)
2458 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2462 d00136be 2019-03-26 stsp static const struct got_error *
2463 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2465 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2466 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2467 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2468 1dd54920 2019-05-11 stsp char *cwd = NULL;
2469 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2470 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2473 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2475 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2476 d00136be 2019-03-26 stsp switch (ch) {
2478 d00136be 2019-03-26 stsp usage_add();
2479 d00136be 2019-03-26 stsp /* NOTREACHED */
2483 d00136be 2019-03-26 stsp argc -= optind;
2484 d00136be 2019-03-26 stsp argv += optind;
2486 723c305c 2019-05-11 jcs if (argc < 1)
2487 d00136be 2019-03-26 stsp usage_add();
2489 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
2490 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2491 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2492 723c305c 2019-05-11 jcs if (path == NULL) {
2493 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2496 1dd54920 2019-05-11 stsp free(path);
2499 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2500 d00136be 2019-03-26 stsp if (cwd == NULL) {
2501 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2502 d00136be 2019-03-26 stsp goto done;
2505 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2506 d00136be 2019-03-26 stsp if (error)
2507 d00136be 2019-03-26 stsp goto done;
2509 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2510 031a5338 2019-03-26 stsp if (error != NULL)
2511 031a5338 2019-03-26 stsp goto done;
2513 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2514 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2515 d00136be 2019-03-26 stsp if (error)
2516 d00136be 2019-03-26 stsp goto done;
2518 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2519 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2520 723c305c 2019-05-11 jcs if (path == NULL) {
2521 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2525 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2526 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2527 1dd54920 2019-05-11 stsp if (error) {
2528 1dd54920 2019-05-11 stsp free(path);
2532 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2533 1dd54920 2019-05-11 stsp NULL, repo);
2536 031a5338 2019-03-26 stsp got_repo_close(repo);
2537 d00136be 2019-03-26 stsp if (worktree)
2538 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2539 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2540 1dd54920 2019-05-11 stsp free((char *)pe->path);
2541 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2542 2ec1f75b 2019-03-26 stsp free(cwd);
2543 2ec1f75b 2019-03-26 stsp return error;
2546 2ec1f75b 2019-03-26 stsp __dead static void
2547 648e4ef7 2019-07-09 stsp usage_remove(void)
2549 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
2553 2ec1f75b 2019-03-26 stsp static const struct got_error *
2554 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
2556 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2557 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2558 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2559 17ed4618 2019-06-02 stsp char *cwd = NULL;
2560 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
2561 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2562 17ed4618 2019-06-02 stsp int ch, i, delete_local_mods = 0;
2564 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
2566 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2567 2ec1f75b 2019-03-26 stsp switch (ch) {
2569 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2572 2ec1f75b 2019-03-26 stsp usage_add();
2573 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2577 2ec1f75b 2019-03-26 stsp argc -= optind;
2578 2ec1f75b 2019-03-26 stsp argv += optind;
2580 17ed4618 2019-06-02 stsp if (argc < 1)
2581 648e4ef7 2019-07-09 stsp usage_remove();
2583 17ed4618 2019-06-02 stsp /* make sure each file exists before doing anything halfway */
2584 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2585 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2586 17ed4618 2019-06-02 stsp if (path == NULL) {
2587 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2588 17ed4618 2019-06-02 stsp goto done;
2590 17ed4618 2019-06-02 stsp free(path);
2593 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2594 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2595 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2596 2ec1f75b 2019-03-26 stsp goto done;
2598 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2599 2ec1f75b 2019-03-26 stsp if (error)
2600 2ec1f75b 2019-03-26 stsp goto done;
2602 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2604 2ec1f75b 2019-03-26 stsp goto done;
2606 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2607 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2608 2ec1f75b 2019-03-26 stsp if (error)
2609 2ec1f75b 2019-03-26 stsp goto done;
2611 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2612 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2613 17ed4618 2019-06-02 stsp if (path == NULL) {
2614 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2615 17ed4618 2019-06-02 stsp goto done;
2618 17ed4618 2019-06-02 stsp got_path_strip_trailing_slashes(path);
2619 17ed4618 2019-06-02 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2620 17ed4618 2019-06-02 stsp if (error) {
2621 17ed4618 2019-06-02 stsp free(path);
2622 17ed4618 2019-06-02 stsp goto done;
2625 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
2626 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
2627 a129376b 2019-03-28 stsp if (error)
2628 a129376b 2019-03-28 stsp goto done;
2631 a129376b 2019-03-28 stsp got_repo_close(repo);
2632 a129376b 2019-03-28 stsp if (worktree)
2633 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2634 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
2635 17ed4618 2019-06-02 stsp free((char *)pe->path);
2636 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
2637 a129376b 2019-03-28 stsp free(cwd);
2638 a129376b 2019-03-28 stsp return error;
2641 a129376b 2019-03-28 stsp __dead static void
2642 a129376b 2019-03-28 stsp usage_revert(void)
2644 e20a8b6f 2019-06-04 stsp fprintf(stderr, "usage: %s revert file-path ...\n", getprogname());
2648 a129376b 2019-03-28 stsp static void
2649 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2651 a129376b 2019-03-28 stsp while (path[0] == '/')
2653 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2656 a129376b 2019-03-28 stsp static const struct got_error *
2657 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2659 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2660 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2661 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2662 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2663 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
2664 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2665 e20a8b6f 2019-06-04 stsp int ch, i;
2667 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
2669 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2670 a129376b 2019-03-28 stsp switch (ch) {
2672 a129376b 2019-03-28 stsp usage_revert();
2673 a129376b 2019-03-28 stsp /* NOTREACHED */
2677 a129376b 2019-03-28 stsp argc -= optind;
2678 a129376b 2019-03-28 stsp argv += optind;
2680 e20a8b6f 2019-06-04 stsp if (argc < 1)
2681 a129376b 2019-03-28 stsp usage_revert();
2683 e20a8b6f 2019-06-04 stsp for (i = 0; i < argc; i++) {
2684 e20a8b6f 2019-06-04 stsp char *path = realpath(argv[i], NULL);
2685 e20a8b6f 2019-06-04 stsp if (path == NULL) {
2686 e20a8b6f 2019-06-04 stsp error = got_error_from_errno2("realpath", argv[i]);
2687 e20a8b6f 2019-06-04 stsp goto done;
2690 e20a8b6f 2019-06-04 stsp got_path_strip_trailing_slashes(path);
2691 e20a8b6f 2019-06-04 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2692 e20a8b6f 2019-06-04 stsp if (error) {
2693 e20a8b6f 2019-06-04 stsp free(path);
2694 e20a8b6f 2019-06-04 stsp goto done;
2698 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
2699 a129376b 2019-03-28 stsp if (cwd == NULL) {
2700 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2701 a129376b 2019-03-28 stsp goto done;
2703 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
2704 2ec1f75b 2019-03-26 stsp if (error)
2705 2ec1f75b 2019-03-26 stsp goto done;
2707 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2708 a129376b 2019-03-28 stsp if (error != NULL)
2709 a129376b 2019-03-28 stsp goto done;
2711 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2712 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2713 a129376b 2019-03-28 stsp if (error)
2714 a129376b 2019-03-28 stsp goto done;
2716 e20a8b6f 2019-06-04 stsp error = got_worktree_revert(worktree, &paths,
2717 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
2718 a129376b 2019-03-28 stsp if (error)
2719 a129376b 2019-03-28 stsp goto done;
2722 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
2723 2ec1f75b 2019-03-26 stsp if (worktree)
2724 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
2725 2ec1f75b 2019-03-26 stsp free(path);
2726 d00136be 2019-03-26 stsp free(cwd);
2727 6bad629b 2019-02-04 stsp return error;
2730 c4296144 2019-05-09 stsp __dead static void
2731 c4296144 2019-05-09 stsp usage_commit(void)
2733 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2738 e2ba3d07 2019-05-13 stsp spawn_editor(const char *editor, const char *file)
2741 33ad4cbe 2019-05-12 jcs sig_t sighup, sigint, sigquit;
2742 33ad4cbe 2019-05-12 jcs int st = -1;
2744 33ad4cbe 2019-05-12 jcs sighup = signal(SIGHUP, SIG_IGN);
2745 33ad4cbe 2019-05-12 jcs sigint = signal(SIGINT, SIG_IGN);
2746 33ad4cbe 2019-05-12 jcs sigquit = signal(SIGQUIT, SIG_IGN);
2748 33ad4cbe 2019-05-12 jcs switch (pid = fork()) {
2750 33ad4cbe 2019-05-12 jcs goto doneediting;
2752 e2ba3d07 2019-05-13 stsp execl(editor, editor, file, (char *)NULL);
2753 33ad4cbe 2019-05-12 jcs _exit(127);
2756 33ad4cbe 2019-05-12 jcs while (waitpid(pid, &st, 0) == -1)
2757 33ad4cbe 2019-05-12 jcs if (errno != EINTR)
2760 33ad4cbe 2019-05-12 jcs doneediting:
2761 33ad4cbe 2019-05-12 jcs (void)signal(SIGHUP, sighup);
2762 33ad4cbe 2019-05-12 jcs (void)signal(SIGINT, sigint);
2763 33ad4cbe 2019-05-12 jcs (void)signal(SIGQUIT, sigquit);
2765 33ad4cbe 2019-05-12 jcs if (!WIFEXITED(st)) {
2766 33ad4cbe 2019-05-12 jcs errno = EINTR;
2770 33ad4cbe 2019-05-12 jcs return WEXITSTATUS(st);
2773 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
2774 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
2775 e2ba3d07 2019-05-13 stsp const char *editor;
2776 e0870e44 2019-05-13 stsp const char *worktree_path;
2777 76d98825 2019-06-03 stsp const char *branch_name;
2778 314a6357 2019-05-13 stsp const char *repo_path;
2779 e0870e44 2019-05-13 stsp char *logmsg_path;
2783 33ad4cbe 2019-05-12 jcs static const struct got_error *
2784 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2787 76d98825 2019-06-03 stsp char *initial_content = NULL;
2788 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
2789 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
2790 e0870e44 2019-05-13 stsp char *template = NULL;
2791 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
2792 33ad4cbe 2019-05-12 jcs char buf[1024];
2793 33ad4cbe 2019-05-12 jcs struct stat st, st2;
2795 33ad4cbe 2019-05-12 jcs size_t len;
2796 e0870e44 2019-05-13 stsp int fd, content_changed = 0;
2798 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
2799 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2800 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
2801 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
2802 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
2803 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
2804 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
2805 33ad4cbe 2019-05-12 jcs return NULL;
2808 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2809 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
2811 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
2812 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
2813 76d98825 2019-06-03 stsp a->branch_name) == -1)
2814 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2816 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2818 e0870e44 2019-05-13 stsp goto done;
2820 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
2822 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
2823 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2824 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
2825 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
2826 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
2830 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st) == -1) {
2831 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", a->logmsg_path);
2835 e0870e44 2019-05-13 stsp if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2836 638f9024 2019-05-13 stsp err = got_error_from_errno("failed spawning editor");
2840 e0870e44 2019-05-13 stsp if (stat(a->logmsg_path, &st2) == -1) {
2841 638f9024 2019-05-13 stsp err = got_error_from_errno("stat");
2845 33ad4cbe 2019-05-12 jcs if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2846 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2847 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2848 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2849 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2850 33ad4cbe 2019-05-12 jcs "no changes made to commit message, aborting");
2854 33ad4cbe 2019-05-12 jcs *logmsg = malloc(st2.st_size + 1);
2855 fcde04d9 2019-05-13 stsp if (*logmsg == NULL) {
2856 638f9024 2019-05-13 stsp err = got_error_from_errno("malloc");
2857 fcde04d9 2019-05-13 stsp goto done;
2859 cc79381d 2019-05-22 stsp (*logmsg)[0] = '\0';
2862 e0870e44 2019-05-13 stsp fp = fopen(a->logmsg_path, "r");
2863 d4592c7c 2019-05-22 stsp if (fp == NULL) {
2864 d4592c7c 2019-05-22 stsp err = got_error_from_errno("fopen");
2865 d4592c7c 2019-05-22 stsp goto done;
2867 33ad4cbe 2019-05-12 jcs while (fgets(buf, sizeof(buf), fp) != NULL) {
2868 e0870e44 2019-05-13 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
2869 e0870e44 2019-05-13 stsp content_changed = 1;
2870 33ad4cbe 2019-05-12 jcs if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2871 78527a0a 2019-05-22 stsp continue; /* remove comments and leading empty lines */
2872 33ad4cbe 2019-05-12 jcs len = strlcat(*logmsg, buf, st2.st_size);
2874 33ad4cbe 2019-05-12 jcs fclose(fp);
2876 33ad4cbe 2019-05-12 jcs while (len > 0 && (*logmsg)[len - 1] == '\n') {
2877 33ad4cbe 2019-05-12 jcs (*logmsg)[len - 1] = '\0';
2881 e0870e44 2019-05-13 stsp if (len == 0 || !content_changed) {
2882 e0870e44 2019-05-13 stsp unlink(a->logmsg_path);
2883 e0870e44 2019-05-13 stsp free(a->logmsg_path);
2884 e0870e44 2019-05-13 stsp a->logmsg_path = NULL;
2885 33ad4cbe 2019-05-12 jcs err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2886 33ad4cbe 2019-05-12 jcs "commit message cannot be empty, aborting");
2890 76d98825 2019-06-03 stsp free(initial_content);
2891 e0870e44 2019-05-13 stsp free(template);
2893 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
2894 314a6357 2019-05-13 stsp if (err == NULL)
2895 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2896 33ad4cbe 2019-05-12 jcs return err;
2899 c4296144 2019-05-09 stsp static const struct got_error *
2900 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
2902 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
2903 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
2904 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
2905 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
2906 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
2907 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
2908 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
2909 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
2910 e2ba3d07 2019-05-13 stsp char *editor = NULL;
2911 7d5807f4 2019-07-11 stsp int ch, rebase_in_progress;
2913 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
2914 c4296144 2019-05-09 stsp switch (ch) {
2916 c4296144 2019-05-09 stsp logmsg = optarg;
2919 c4296144 2019-05-09 stsp usage_commit();
2920 c4296144 2019-05-09 stsp /* NOTREACHED */
2924 c4296144 2019-05-09 stsp argc -= optind;
2925 c4296144 2019-05-09 stsp argv += optind;
2927 c4296144 2019-05-09 stsp if (argc == 1) {
2928 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
2929 c4296144 2019-05-09 stsp if (path == NULL) {
2930 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2931 c4296144 2019-05-09 stsp goto done;
2933 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
2934 c4296144 2019-05-09 stsp } else if (argc != 0)
2935 c4296144 2019-05-09 stsp usage_commit();
2937 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
2938 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
2939 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2940 35bd8fed 2019-05-09 stsp goto done;
2943 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
2944 c4296144 2019-05-09 stsp if (cwd == NULL) {
2945 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2946 c4296144 2019-05-09 stsp goto done;
2948 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
2949 7d5807f4 2019-07-11 stsp if (error)
2950 7d5807f4 2019-07-11 stsp goto done;
2952 7d5807f4 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
2953 c4296144 2019-05-09 stsp if (error)
2954 7d5807f4 2019-07-11 stsp goto done;
2955 7d5807f4 2019-07-11 stsp if (rebase_in_progress) {
2956 7d5807f4 2019-07-11 stsp error = got_error(GOT_ERR_REBASING);
2957 c4296144 2019-05-09 stsp goto done;
2960 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2961 c4296144 2019-05-09 stsp if (error != NULL)
2962 c4296144 2019-05-09 stsp goto done;
2965 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
2966 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
2968 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
2969 314a6357 2019-05-13 stsp error = get_editor(&editor);
2971 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2972 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2973 c4296144 2019-05-09 stsp if (error)
2974 c4296144 2019-05-09 stsp goto done;
2976 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
2977 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
2978 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2979 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
2980 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "refs/", 5) == 0)
2981 76d98825 2019-06-03 stsp cl_arg.branch_name += 5;
2982 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "heads/", 6) == 0)
2983 76d98825 2019-06-03 stsp cl_arg.branch_name += 6;
2984 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
2985 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
2986 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2987 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2988 e0870e44 2019-05-13 stsp if (error) {
2989 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2990 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
2991 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
2992 c4296144 2019-05-09 stsp goto done;
2995 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
2996 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
2998 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
2999 c4296144 2019-05-09 stsp if (error)
3000 c4296144 2019-05-09 stsp goto done;
3001 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3004 c4296144 2019-05-09 stsp got_repo_close(repo);
3005 c4296144 2019-05-09 stsp if (worktree)
3006 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3007 c4296144 2019-05-09 stsp free(path);
3008 c4296144 2019-05-09 stsp free(cwd);
3009 c4296144 2019-05-09 stsp free(id_str);
3010 e2ba3d07 2019-05-13 stsp free(editor);
3011 234035bc 2019-06-01 stsp return error;
3014 234035bc 2019-06-01 stsp __dead static void
3015 234035bc 2019-06-01 stsp usage_cherrypick(void)
3017 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3021 234035bc 2019-06-01 stsp static const struct got_error *
3022 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3024 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3025 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3026 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3027 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3028 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3029 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3030 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3031 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3032 234035bc 2019-06-01 stsp int ch, did_something = 0;
3034 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3035 234035bc 2019-06-01 stsp switch (ch) {
3037 234035bc 2019-06-01 stsp usage_cherrypick();
3038 234035bc 2019-06-01 stsp /* NOTREACHED */
3042 234035bc 2019-06-01 stsp argc -= optind;
3043 234035bc 2019-06-01 stsp argv += optind;
3045 234035bc 2019-06-01 stsp if (argc != 1)
3046 234035bc 2019-06-01 stsp usage_cherrypick();
3048 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3049 234035bc 2019-06-01 stsp if (cwd == NULL) {
3050 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3051 234035bc 2019-06-01 stsp goto done;
3053 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3054 234035bc 2019-06-01 stsp if (error)
3055 234035bc 2019-06-01 stsp goto done;
3057 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3058 234035bc 2019-06-01 stsp if (error != NULL)
3059 234035bc 2019-06-01 stsp goto done;
3061 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3062 234035bc 2019-06-01 stsp got_worktree_get_root_path(worktree), 0);
3063 234035bc 2019-06-01 stsp if (error)
3064 234035bc 2019-06-01 stsp goto done;
3066 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3067 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3068 234035bc 2019-06-01 stsp if (error != NULL) {
3069 234035bc 2019-06-01 stsp struct got_reference *ref;
3070 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3071 234035bc 2019-06-01 stsp goto done;
3072 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3073 234035bc 2019-06-01 stsp if (error != NULL)
3074 234035bc 2019-06-01 stsp goto done;
3075 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3076 234035bc 2019-06-01 stsp got_ref_close(ref);
3077 234035bc 2019-06-01 stsp if (error != NULL)
3078 234035bc 2019-06-01 stsp goto done;
3080 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3081 234035bc 2019-06-01 stsp if (error)
3082 234035bc 2019-06-01 stsp goto done;
3084 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3085 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3086 234035bc 2019-06-01 stsp if (error != NULL)
3087 234035bc 2019-06-01 stsp goto done;
3089 234035bc 2019-06-01 stsp error = check_same_branch(commit_id, head_ref, repo);
3090 234035bc 2019-06-01 stsp if (error) {
3091 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3092 234035bc 2019-06-01 stsp goto done;
3093 234035bc 2019-06-01 stsp error = NULL;
3095 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3096 234035bc 2019-06-01 stsp goto done;
3099 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3100 234035bc 2019-06-01 stsp if (error)
3101 234035bc 2019-06-01 stsp goto done;
3102 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3103 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3104 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3106 234035bc 2019-06-01 stsp if (error != NULL)
3107 234035bc 2019-06-01 stsp goto done;
3109 234035bc 2019-06-01 stsp if (did_something)
3110 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3112 234035bc 2019-06-01 stsp if (commit)
3113 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3114 234035bc 2019-06-01 stsp free(commit_id_str);
3115 234035bc 2019-06-01 stsp if (head_ref)
3116 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3117 234035bc 2019-06-01 stsp if (worktree)
3118 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3120 234035bc 2019-06-01 stsp got_repo_close(repo);
3121 c4296144 2019-05-09 stsp return error;
3124 5ef14e63 2019-06-02 stsp __dead static void
3125 5ef14e63 2019-06-02 stsp usage_backout(void)
3127 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3131 5ef14e63 2019-06-02 stsp static const struct got_error *
3132 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3134 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3135 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3136 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3137 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3138 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3139 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3140 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3141 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3142 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3144 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3145 5ef14e63 2019-06-02 stsp switch (ch) {
3147 5ef14e63 2019-06-02 stsp usage_backout();
3148 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3152 5ef14e63 2019-06-02 stsp argc -= optind;
3153 5ef14e63 2019-06-02 stsp argv += optind;
3155 5ef14e63 2019-06-02 stsp if (argc != 1)
3156 5ef14e63 2019-06-02 stsp usage_backout();
3158 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3159 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3160 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3161 5ef14e63 2019-06-02 stsp goto done;
3163 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3164 5ef14e63 2019-06-02 stsp if (error)
3165 5ef14e63 2019-06-02 stsp goto done;
3167 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3168 5ef14e63 2019-06-02 stsp if (error != NULL)
3169 5ef14e63 2019-06-02 stsp goto done;
3171 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3172 5ef14e63 2019-06-02 stsp got_worktree_get_root_path(worktree), 0);
3173 5ef14e63 2019-06-02 stsp if (error)
3174 5ef14e63 2019-06-02 stsp goto done;
3176 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3177 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3178 5ef14e63 2019-06-02 stsp if (error != NULL) {
3179 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3180 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3181 5ef14e63 2019-06-02 stsp goto done;
3182 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3183 5ef14e63 2019-06-02 stsp if (error != NULL)
3184 5ef14e63 2019-06-02 stsp goto done;
3185 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3186 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3187 5ef14e63 2019-06-02 stsp if (error != NULL)
3188 5ef14e63 2019-06-02 stsp goto done;
3190 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3191 5ef14e63 2019-06-02 stsp if (error)
3192 5ef14e63 2019-06-02 stsp goto done;
3194 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3195 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3196 5ef14e63 2019-06-02 stsp if (error != NULL)
3197 5ef14e63 2019-06-02 stsp goto done;
3199 5ef14e63 2019-06-02 stsp error = check_same_branch(commit_id, head_ref, repo);
3200 5ef14e63 2019-06-02 stsp if (error)
3201 5ef14e63 2019-06-02 stsp goto done;
3203 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3204 5ef14e63 2019-06-02 stsp if (error)
3205 5ef14e63 2019-06-02 stsp goto done;
3206 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3207 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3208 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3209 5ef14e63 2019-06-02 stsp goto done;
3212 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3213 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3214 5ef14e63 2019-06-02 stsp if (error != NULL)
3215 5ef14e63 2019-06-02 stsp goto done;
3217 5ef14e63 2019-06-02 stsp if (did_something)
3218 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3220 5ef14e63 2019-06-02 stsp if (commit)
3221 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3222 5ef14e63 2019-06-02 stsp free(commit_id_str);
3223 5ef14e63 2019-06-02 stsp if (head_ref)
3224 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3225 818c7501 2019-07-11 stsp if (worktree)
3226 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3228 818c7501 2019-07-11 stsp got_repo_close(repo);
3229 818c7501 2019-07-11 stsp return error;
3232 818c7501 2019-07-11 stsp __dead static void
3233 818c7501 2019-07-11 stsp usage_rebase(void)
3235 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3236 af54c8f8 2019-07-11 stsp getprogname());
3240 818c7501 2019-07-11 stsp static const struct got_error *
3241 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3242 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3244 818c7501 2019-07-11 stsp const struct got_error *err;
3245 818c7501 2019-07-11 stsp char *old_id_str = NULL, *new_id_str = NULL;
3246 818c7501 2019-07-11 stsp char *logmsg0 = NULL, *logmsg, *nl;
3247 818c7501 2019-07-11 stsp size_t len;
3249 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3251 818c7501 2019-07-11 stsp goto done;
3253 ff0d2220 2019-07-11 stsp if (new_id) {
3254 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3256 ff0d2220 2019-07-11 stsp goto done;
3259 818c7501 2019-07-11 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
3260 818c7501 2019-07-11 stsp if (logmsg0 == NULL) {
3261 818c7501 2019-07-11 stsp err = got_error_from_errno("strdup");
3262 818c7501 2019-07-11 stsp goto done;
3264 818c7501 2019-07-11 stsp logmsg = logmsg0;
3266 10796104 2019-07-11 stsp while (isspace((unsigned char)logmsg[0]))
3269 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3270 ff0d2220 2019-07-11 stsp if (new_id_str)
3271 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3272 818c7501 2019-07-11 stsp len = strlen(logmsg);
3273 818c7501 2019-07-11 stsp if (len > 42)
3275 818c7501 2019-07-11 stsp logmsg[len] = '\0';
3276 818c7501 2019-07-11 stsp nl = strchr(logmsg, '\n');
3278 818c7501 2019-07-11 stsp *nl = '\0';
3279 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3280 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3282 818c7501 2019-07-11 stsp free(old_id_str);
3283 818c7501 2019-07-11 stsp free(new_id_str);
3284 818c7501 2019-07-11 stsp free(logmsg0);
3285 818c7501 2019-07-11 stsp return err;
3288 818c7501 2019-07-11 stsp static void
3289 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3291 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3293 818c7501 2019-07-11 stsp while (path[0] == '/')
3295 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3297 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3299 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3300 818c7501 2019-07-11 stsp *rebase_status = status;
3303 818c7501 2019-07-11 stsp static const struct got_error *
3304 818c7501 2019-07-11 stsp rebase_complete(struct got_worktree *worktree, struct got_reference *branch,
3305 818c7501 2019-07-11 stsp struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3306 818c7501 2019-07-11 stsp struct got_repository *repo)
3308 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3309 818c7501 2019-07-11 stsp return got_worktree_rebase_complete(worktree,
3310 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3313 818c7501 2019-07-11 stsp static const struct got_error *
3314 ff0d2220 2019-07-11 stsp rebase_commit(struct got_worktree *worktree, struct got_reference *tmp_branch,
3315 ff0d2220 2019-07-11 stsp struct got_object_id *commit_id, struct got_repository *repo)
3317 ff0d2220 2019-07-11 stsp const struct got_error *error;
3318 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
3319 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
3321 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3322 ff0d2220 2019-07-11 stsp if (error)
3323 ff0d2220 2019-07-11 stsp return error;
3325 ff0d2220 2019-07-11 stsp error = got_worktree_rebase_commit(&new_commit_id, worktree,
3326 ff0d2220 2019-07-11 stsp tmp_branch, commit, commit_id, repo);
3327 ff0d2220 2019-07-11 stsp if (error) {
3328 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3329 ff0d2220 2019-07-11 stsp goto done;
3330 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
3332 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
3333 ff0d2220 2019-07-11 stsp free(new_commit_id);
3336 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
3337 ff0d2220 2019-07-11 stsp return error;
3340 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
3341 64c6d990 2019-07-11 stsp const char *path_prefix;
3342 64c6d990 2019-07-11 stsp size_t len;
3345 64c6d990 2019-07-11 stsp static const struct got_error *
3346 64c6d990 2019-07-11 stsp check_path_prefix(void *arg, struct got_blob_object *blob1,
3347 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3348 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
3349 64c6d990 2019-07-11 stsp struct got_repository *repo)
3351 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
3353 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3354 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3355 64c6d990 2019-07-11 stsp return got_error(GOT_ERR_REBASE_PATH);
3357 64c6d990 2019-07-11 stsp return NULL;
3360 64c6d990 2019-07-11 stsp static const struct got_error *
3361 64c6d990 2019-07-11 stsp rebase_check_path_prefix(struct got_object_id *parent_id,
3362 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
3363 64c6d990 2019-07-11 stsp struct got_repository *repo)
3365 64c6d990 2019-07-11 stsp const struct got_error *err;
3366 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3367 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
3368 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
3370 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
3371 64c6d990 2019-07-11 stsp return NULL;
3373 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3375 64c6d990 2019-07-11 stsp goto done;
3377 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
3379 64c6d990 2019-07-11 stsp goto done;
3381 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
3382 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
3384 64c6d990 2019-07-11 stsp goto done;
3386 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
3387 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
3389 64c6d990 2019-07-11 stsp goto done;
3391 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
3392 64c6d990 2019-07-11 stsp cpp_arg.len = strlen(path_prefix);
3393 64c6d990 2019-07-11 stsp err = got_diff_tree(tree1, tree2, "", "", repo, check_path_prefix,
3394 64c6d990 2019-07-11 stsp &cpp_arg);
3396 64c6d990 2019-07-11 stsp if (tree1)
3397 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
3398 64c6d990 2019-07-11 stsp if (tree2)
3399 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
3400 64c6d990 2019-07-11 stsp if (commit)
3401 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
3402 64c6d990 2019-07-11 stsp if (parent_commit)
3403 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
3404 64c6d990 2019-07-11 stsp return err;
3407 ff0d2220 2019-07-11 stsp static const struct got_error *
3408 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
3410 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
3411 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
3412 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
3413 818c7501 2019-07-11 stsp char *cwd = NULL;
3414 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
3415 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
3416 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
3417 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
3418 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
3419 818c7501 2019-07-11 stsp struct got_commit_graph *graph = NULL;
3420 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
3421 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
3422 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
3423 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
3424 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
3425 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
3427 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
3429 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
3430 818c7501 2019-07-11 stsp switch (ch) {
3432 818c7501 2019-07-11 stsp abort_rebase = 1;
3435 818c7501 2019-07-11 stsp continue_rebase = 1;
3438 818c7501 2019-07-11 stsp usage_rebase();
3439 818c7501 2019-07-11 stsp /* NOTREACHED */
3443 818c7501 2019-07-11 stsp argc -= optind;
3444 818c7501 2019-07-11 stsp argv += optind;
3446 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
3447 818c7501 2019-07-11 stsp usage_rebase();
3448 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
3449 818c7501 2019-07-11 stsp if (argc != 0)
3450 818c7501 2019-07-11 stsp usage_rebase();
3451 818c7501 2019-07-11 stsp } else if (argc != 1)
3452 818c7501 2019-07-11 stsp usage_rebase();
3454 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
3455 818c7501 2019-07-11 stsp if (cwd == NULL) {
3456 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
3457 818c7501 2019-07-11 stsp goto done;
3459 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
3460 818c7501 2019-07-11 stsp if (error)
3461 818c7501 2019-07-11 stsp goto done;
3463 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3464 818c7501 2019-07-11 stsp if (error != NULL)
3465 818c7501 2019-07-11 stsp goto done;
3467 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3468 818c7501 2019-07-11 stsp got_worktree_get_root_path(worktree), 0);
3469 818c7501 2019-07-11 stsp if (error)
3470 818c7501 2019-07-11 stsp goto done;
3472 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3473 818c7501 2019-07-11 stsp if (error)
3474 818c7501 2019-07-11 stsp goto done;
3476 818c7501 2019-07-11 stsp if (rebase_in_progress && abort_rebase) {
3477 818c7501 2019-07-11 stsp int did_something;
3478 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3479 818c7501 2019-07-11 stsp &new_base_branch, &tmp_branch, &branch, worktree, repo);
3480 818c7501 2019-07-11 stsp if (error)
3481 818c7501 2019-07-11 stsp goto done;
3482 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
3483 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
3484 818c7501 2019-07-11 stsp error = got_worktree_rebase_abort(worktree, repo,
3485 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
3486 818c7501 2019-07-11 stsp if (error)
3487 818c7501 2019-07-11 stsp goto done;
3488 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
3489 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
3490 818c7501 2019-07-11 stsp } else if (abort_rebase) {
3491 818c7501 2019-07-11 stsp error = got_error(GOT_ERR_NOT_REBASING);
3492 818c7501 2019-07-11 stsp goto done;
3495 818c7501 2019-07-11 stsp if (continue_rebase) {
3496 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3497 818c7501 2019-07-11 stsp &new_base_branch, &tmp_branch, &branch, worktree, repo);
3498 818c7501 2019-07-11 stsp if (error)
3499 818c7501 2019-07-11 stsp goto done;
3501 ff0d2220 2019-07-11 stsp error = rebase_commit(worktree, tmp_branch, resume_commit_id,
3503 818c7501 2019-07-11 stsp if (error)
3504 818c7501 2019-07-11 stsp goto done;
3506 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
3507 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
3508 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
3509 818c7501 2019-07-11 stsp goto done;
3512 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
3513 818c7501 2019-07-11 stsp if (error != NULL)
3514 818c7501 2019-07-11 stsp goto done;
3516 818c7501 2019-07-11 stsp error = check_same_branch(
3517 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree), branch, repo);
3518 818c7501 2019-07-11 stsp if (error) {
3519 818c7501 2019-07-11 stsp if (error->code != GOT_ERR_ANCESTRY)
3520 818c7501 2019-07-11 stsp goto done;
3521 818c7501 2019-07-11 stsp error = NULL;
3523 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
3524 818c7501 2019-07-11 stsp "specified branch resolves to a commit which "
3525 818c7501 2019-07-11 stsp "is already contained in work tree's branch");
3526 818c7501 2019-07-11 stsp goto done;
3530 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
3531 ff0d2220 2019-07-11 stsp if (error)
3532 ff0d2220 2019-07-11 stsp goto done;
3534 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
3535 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
3536 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree),
3537 818c7501 2019-07-11 stsp branch_head_commit_id, repo);
3538 818c7501 2019-07-11 stsp if (error)
3539 818c7501 2019-07-11 stsp goto done;
3540 818c7501 2019-07-11 stsp if (yca_id == NULL) {
3541 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3542 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
3543 818c7501 2019-07-11 stsp "with work tree's branch");
3544 818c7501 2019-07-11 stsp goto done;
3547 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
3548 818c7501 2019-07-11 stsp &tmp_branch, worktree, branch, repo);
3549 818c7501 2019-07-11 stsp if (error)
3550 818c7501 2019-07-11 stsp goto done;
3553 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
3554 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3555 818c7501 2019-07-11 stsp if (error)
3556 818c7501 2019-07-11 stsp goto done;
3558 818c7501 2019-07-11 stsp error = got_commit_graph_open(&graph, commit_id, "/", 1, repo);
3559 818c7501 2019-07-11 stsp if (error)
3560 818c7501 2019-07-11 stsp goto done;
3561 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3562 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
3563 818c7501 2019-07-11 stsp error = got_commit_graph_iter_start(graph, pid->id, repo);
3564 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3565 818c7501 2019-07-11 stsp commit = NULL;
3566 818c7501 2019-07-11 stsp if (error)
3567 818c7501 2019-07-11 stsp goto done;
3568 818c7501 2019-07-11 stsp while (got_object_id_cmp(commit_id, yca_id) != 0) {
3569 818c7501 2019-07-11 stsp error = got_commit_graph_iter_next(&parent_id, graph);
3570 818c7501 2019-07-11 stsp if (error) {
3571 818c7501 2019-07-11 stsp if (error->code == GOT_ERR_ITER_COMPLETED) {
3572 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3573 818c7501 2019-07-11 stsp "ran out of commits to rebase before "
3574 818c7501 2019-07-11 stsp "youngest common ancestor commit has "
3575 818c7501 2019-07-11 stsp "been reached?!?");
3576 818c7501 2019-07-11 stsp goto done;
3577 818c7501 2019-07-11 stsp } else if (error->code != GOT_ERR_ITER_NEED_MORE)
3578 818c7501 2019-07-11 stsp goto done;
3579 818c7501 2019-07-11 stsp error = got_commit_graph_fetch_commits(graph, 1, repo);
3580 818c7501 2019-07-11 stsp if (error)
3581 818c7501 2019-07-11 stsp goto done;
3583 64c6d990 2019-07-11 stsp error = rebase_check_path_prefix(parent_id, commit_id,
3584 64c6d990 2019-07-11 stsp got_worktree_get_path_prefix(worktree), repo);
3585 64c6d990 2019-07-11 stsp if (error)
3586 64c6d990 2019-07-11 stsp goto done;
3588 818c7501 2019-07-11 stsp error = got_object_qid_alloc(&qid, commit_id);
3589 818c7501 2019-07-11 stsp if (error)
3590 818c7501 2019-07-11 stsp goto done;
3591 818c7501 2019-07-11 stsp SIMPLEQ_INSERT_HEAD(&commits, qid, entry);
3592 818c7501 2019-07-11 stsp commit_id = parent_id;
3596 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
3597 ff0d2220 2019-07-11 stsp if (continue_rebase)
3598 ff0d2220 2019-07-11 stsp error = rebase_complete(worktree, branch,
3599 ff0d2220 2019-07-11 stsp new_base_branch, tmp_branch, repo);
3601 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
3602 818c7501 2019-07-11 stsp goto done;
3605 818c7501 2019-07-11 stsp pid = NULL;
3606 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
3607 818c7501 2019-07-11 stsp commit_id = qid->id;
3608 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
3609 818c7501 2019-07-11 stsp pid = qid;
3611 818c7501 2019-07-11 stsp error = got_worktree_rebase_merge_files(worktree, parent_id,
3612 818c7501 2019-07-11 stsp commit_id, repo, rebase_progress, &rebase_status,
3613 818c7501 2019-07-11 stsp check_cancelled, NULL);
3614 818c7501 2019-07-11 stsp if (error)
3615 818c7501 2019-07-11 stsp goto done;
3617 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT)
3620 ff0d2220 2019-07-11 stsp error = rebase_commit(worktree, tmp_branch, commit_id, repo);
3621 818c7501 2019-07-11 stsp if (error)
3622 818c7501 2019-07-11 stsp goto done;
3625 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
3626 818c7501 2019-07-11 stsp error = got_worktree_rebase_postpone(worktree);
3627 818c7501 2019-07-11 stsp if (error)
3628 818c7501 2019-07-11 stsp goto done;
3629 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
3630 818c7501 2019-07-11 stsp "conflicts must be resolved before rebase can be resumed");
3632 818c7501 2019-07-11 stsp error = rebase_complete(worktree, branch, new_base_branch,
3633 818c7501 2019-07-11 stsp tmp_branch, repo);
3635 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
3636 818c7501 2019-07-11 stsp free(branch_head_commit_id);
3637 818c7501 2019-07-11 stsp free(resume_commit_id);
3638 818c7501 2019-07-11 stsp free(yca_id);
3639 818c7501 2019-07-11 stsp if (graph)
3640 818c7501 2019-07-11 stsp got_commit_graph_close(graph);
3641 818c7501 2019-07-11 stsp if (commit)
3642 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3643 818c7501 2019-07-11 stsp if (branch)
3644 818c7501 2019-07-11 stsp got_ref_close(branch);
3645 818c7501 2019-07-11 stsp if (new_base_branch)
3646 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
3647 818c7501 2019-07-11 stsp if (tmp_branch)
3648 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
3649 5ef14e63 2019-06-02 stsp if (worktree)
3650 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
3652 5ef14e63 2019-06-02 stsp got_repo_close(repo);
3653 5ef14e63 2019-06-02 stsp return error;
