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 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
81 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
83 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
84 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
85 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
86 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
87 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
88 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
89 d00136be 2019-03-26 stsp __dead static void usage_add(void);
90 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
91 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
92 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
93 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
94 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
95 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
97 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
98 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
99 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
100 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
101 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
102 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
103 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
104 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
105 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
106 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
107 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
108 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
109 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
110 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
111 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
112 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
113 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
114 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
116 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
117 97b3a7be 2019-07-09 stsp { "init", cmd_init, usage_init, "" },
118 3ce1b845 2019-07-15 stsp { "import", cmd_import, usage_import, "" },
119 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
120 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
121 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
122 97b3a7be 2019-07-09 stsp { "diff", cmd_diff, usage_diff, "" },
123 97b3a7be 2019-07-09 stsp { "blame", cmd_blame, usage_blame, "" },
124 97b3a7be 2019-07-09 stsp { "tree", cmd_tree, usage_tree, "" },
125 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
126 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
127 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
128 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
129 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
130 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
131 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
132 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
133 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
134 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
137 ce5b7c56 2019-07-09 stsp static void
138 ce5b7c56 2019-07-09 stsp list_commands(void)
142 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
143 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
144 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
145 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
147 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
151 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
153 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
154 5c860e29 2018-03-12 stsp unsigned int i;
156 1b6b95a8 2018-03-12 stsp int hflag = 0;
158 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
160 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
161 5c860e29 2018-03-12 stsp switch (ch) {
166 ce5b7c56 2019-07-09 stsp usage(hflag);
167 5c860e29 2018-03-12 stsp /* NOTREACHED */
171 5c860e29 2018-03-12 stsp argc -= optind;
172 5c860e29 2018-03-12 stsp argv += optind;
173 1e70621d 2018-03-27 stsp optind = 0;
175 5c860e29 2018-03-12 stsp if (argc <= 0)
176 ce5b7c56 2019-07-09 stsp usage(hflag);
178 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
179 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
181 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
182 d7d4f210 2018-03-12 stsp const struct got_error *error;
184 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
186 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
187 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
191 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
193 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
194 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
195 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
202 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
203 ce5b7c56 2019-07-09 stsp list_commands();
207 4ed7e80c 2018-05-20 stsp __dead static void
208 ce5b7c56 2019-07-09 stsp usage(int hflag)
210 5e070240 2019-06-22 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n", getprogname());
212 ce5b7c56 2019-07-09 stsp list_commands();
216 0266afb7 2019-01-04 stsp static const struct got_error *
217 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
219 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
220 e2ba3d07 2019-05-13 stsp const char *editor;
222 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
223 e2ba3d07 2019-05-13 stsp if (editor == NULL)
224 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
226 0ee7065d 2019-05-13 stsp if (editor) {
227 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
229 0ee7065d 2019-05-13 stsp return err;
232 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
233 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
234 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
235 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
238 e2ba3d07 2019-05-13 stsp return NULL;
241 e2ba3d07 2019-05-13 stsp static const struct got_error *
242 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
243 314a6357 2019-05-13 stsp const char *worktree_path, int create_worktree)
245 163ce85a 2019-05-13 stsp const struct got_error *err;
247 37c06ea4 2019-07-15 stsp #ifdef PROFILE
248 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
249 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
251 a0937847 2019-05-11 stsp if (create_worktree) {
252 a0937847 2019-05-11 stsp /* Pre-create work tree path to avoid unveiling its parents. */
253 163ce85a 2019-05-13 stsp err = got_path_mkdir(worktree_path);
255 3c45a30a 2019-05-12 jcs if (errno == EEXIST) {
256 280f921b 2019-05-12 stsp if (got_path_dir_is_empty(worktree_path)) {
258 163ce85a 2019-05-13 stsp err = NULL;
260 df056ada 2019-05-15 stsp err = got_error_path(worktree_path,
261 df056ada 2019-05-15 stsp GOT_ERR_DIR_NOT_EMPTY);
265 163ce85a 2019-05-13 stsp if (err && (err->code != GOT_ERR_ERRNO || errno != EISDIR))
266 163ce85a 2019-05-13 stsp return err;
269 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
270 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
272 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
273 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
275 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
276 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
278 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
279 163ce85a 2019-05-13 stsp if (err != NULL)
280 163ce85a 2019-05-13 stsp return err;
282 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
283 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
285 0266afb7 2019-01-04 stsp return NULL;
288 2c7829a4 2019-06-17 stsp __dead static void
289 2c7829a4 2019-06-17 stsp usage_init(void)
291 2c7829a4 2019-06-17 stsp fprintf(stderr, "usage: %s init path\n", getprogname());
295 2c7829a4 2019-06-17 stsp static const struct got_error *
296 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
298 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
299 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
302 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
303 2c7829a4 2019-06-17 stsp switch (ch) {
305 2c7829a4 2019-06-17 stsp usage_init();
306 2c7829a4 2019-06-17 stsp /* NOTREACHED */
310 2c7829a4 2019-06-17 stsp argc -= optind;
311 2c7829a4 2019-06-17 stsp argv += optind;
313 2c7829a4 2019-06-17 stsp #ifndef PROFILE
314 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
315 2c7829a4 2019-06-17 stsp err(1, "pledge");
317 2c7829a4 2019-06-17 stsp if (argc != 1)
318 bc20e173 2019-06-17 stsp usage_init();
320 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
321 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
322 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
324 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
326 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
327 2c7829a4 2019-06-17 stsp if (error &&
328 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
331 2c7829a4 2019-06-17 stsp error = apply_unveil(repo_path, 0, NULL, 0);
335 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
336 2c7829a4 2019-06-17 stsp if (error != NULL)
340 3ce1b845 2019-07-15 stsp free(repo_path);
341 3ce1b845 2019-07-15 stsp return error;
344 3ce1b845 2019-07-15 stsp __dead static void
345 3ce1b845 2019-07-15 stsp usage_import(void)
347 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
348 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
353 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
356 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
357 3ce1b845 2019-07-15 stsp int st = -1;
359 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
360 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
361 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
363 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
365 3ce1b845 2019-07-15 stsp goto doneediting;
367 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
368 3ce1b845 2019-07-15 stsp _exit(127);
371 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
372 3ce1b845 2019-07-15 stsp if (errno != EINTR)
375 3ce1b845 2019-07-15 stsp doneediting:
376 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
377 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
378 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
380 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
381 3ce1b845 2019-07-15 stsp errno = EINTR;
385 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
388 3ce1b845 2019-07-15 stsp static const struct got_error *
389 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
390 3ce1b845 2019-07-15 stsp const char *initial_content)
392 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
393 3ce1b845 2019-07-15 stsp char buf[1024];
394 3ce1b845 2019-07-15 stsp struct stat st, st2;
396 3ce1b845 2019-07-15 stsp int content_changed = 0;
397 3ce1b845 2019-07-15 stsp size_t len;
399 3ce1b845 2019-07-15 stsp *logmsg = NULL;
401 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
402 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
404 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
405 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
407 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
408 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
410 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
411 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
412 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
414 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
415 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
416 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
417 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
420 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
421 3ce1b845 2019-07-15 stsp if (fp == NULL) {
422 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
425 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
426 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
427 3ce1b845 2019-07-15 stsp content_changed = 1;
428 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
429 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
430 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
432 3ce1b845 2019-07-15 stsp fclose(fp);
434 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
435 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
439 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
440 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
441 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
444 3ce1b845 2019-07-15 stsp free(*logmsg);
445 3ce1b845 2019-07-15 stsp *logmsg = NULL;
447 3ce1b845 2019-07-15 stsp return err;
450 3ce1b845 2019-07-15 stsp static const struct got_error *
451 3ce1b845 2019-07-15 stsp collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
452 3ce1b845 2019-07-15 stsp const char *branch_name)
454 3ce1b845 2019-07-15 stsp char *initial_content = NULL, *logmsg_path = NULL;
455 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
458 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
459 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
460 3ce1b845 2019-07-15 stsp branch_name) == -1)
461 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
463 3ce1b845 2019-07-15 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
467 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
470 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
472 3ce1b845 2019-07-15 stsp free(initial_content);
473 3ce1b845 2019-07-15 stsp free(logmsg_path);
474 3ce1b845 2019-07-15 stsp return err;
477 3ce1b845 2019-07-15 stsp static const struct got_error *
478 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
480 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
481 3ce1b845 2019-07-15 stsp return NULL;
484 3ce1b845 2019-07-15 stsp static const struct got_error *
485 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
487 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
488 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
489 3ce1b845 2019-07-15 stsp char *editor = NULL;
490 3ce1b845 2019-07-15 stsp const char *got_author = getenv("GOT_AUTHOR");
491 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
492 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
493 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
494 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
495 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
497 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
498 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
500 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
502 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
503 3ce1b845 2019-07-15 stsp switch (ch) {
505 3ce1b845 2019-07-15 stsp branch_name = optarg;
508 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
509 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
510 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
515 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
516 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
517 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
522 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
524 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
530 3ce1b845 2019-07-15 stsp usage_init();
531 3ce1b845 2019-07-15 stsp /* NOTREACHED */
535 3ce1b845 2019-07-15 stsp argc -= optind;
536 3ce1b845 2019-07-15 stsp argv += optind;
538 3ce1b845 2019-07-15 stsp #ifndef PROFILE
539 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
540 3ce1b845 2019-07-15 stsp NULL) == -1)
541 3ce1b845 2019-07-15 stsp err(1, "pledge");
543 3ce1b845 2019-07-15 stsp if (argc != 1)
544 3ce1b845 2019-07-15 stsp usage_import();
546 3ce1b845 2019-07-15 stsp if (got_author == NULL) {
547 3ce1b845 2019-07-15 stsp /* TODO: Look current user up in password database */
548 3ce1b845 2019-07-15 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
552 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
553 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
554 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
555 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
557 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
558 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
562 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
563 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
567 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
568 3ce1b845 2019-07-15 stsp if (error) {
569 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
572 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
573 3ce1b845 2019-07-15 stsp "import target branch already exists");
577 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
578 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
579 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
582 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
585 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
586 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
588 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
589 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
592 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
597 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
598 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
600 3ce1b845 2019-07-15 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL, 0);
604 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
605 3ce1b845 2019-07-15 stsp got_author, &ignores, repo, import_progress, NULL);
609 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
613 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
617 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
621 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
622 3ce1b845 2019-07-15 stsp if (error) {
623 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
626 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
627 3ce1b845 2019-07-15 stsp branch_ref);
631 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
636 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
637 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
639 2c7829a4 2019-06-17 stsp free(repo_path);
640 3ce1b845 2019-07-15 stsp free(editor);
641 3ce1b845 2019-07-15 stsp free(refname);
642 3ce1b845 2019-07-15 stsp free(new_commit_id);
643 3ce1b845 2019-07-15 stsp free(id_str);
644 3ce1b845 2019-07-15 stsp if (branch_ref)
645 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
646 3ce1b845 2019-07-15 stsp if (head_ref)
647 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
648 2c7829a4 2019-06-17 stsp return error;
651 4ed7e80c 2018-05-20 stsp __dead static void
652 c09a553d 2018-03-12 stsp usage_checkout(void)
654 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
655 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
659 1ee397ad 2019-07-12 stsp static const struct got_error *
660 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
662 92a684f4 2018-03-12 stsp char *worktree_path = arg;
664 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
665 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
666 1ee397ad 2019-07-12 stsp return NULL;
668 92a684f4 2018-03-12 stsp while (path[0] == '/')
671 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
672 1ee397ad 2019-07-12 stsp return NULL;
675 99437157 2018-11-11 stsp static const struct got_error *
676 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
678 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
679 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
680 99437157 2018-11-11 stsp return NULL;
683 8069f636 2019-01-12 stsp static const struct got_error *
684 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
685 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
687 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
688 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
690 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
691 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
693 36a38700 2019-05-10 stsp return err;
695 d5bea539 2019-05-13 stsp if (yca_id == NULL)
696 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
699 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
700 d5bea539 2019-05-13 stsp * and the work tree's base commit.
702 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
704 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
712 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
713 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
714 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
716 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
717 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
718 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
720 d5bea539 2019-05-13 stsp free(yca_id);
721 d5bea539 2019-05-13 stsp return NULL;
724 a367ff0f 2019-05-14 stsp static const struct got_error *
725 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
726 a367ff0f 2019-05-14 stsp struct got_reference *head_ref, struct got_repository *repo)
728 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
729 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
730 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
731 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
733 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
737 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
741 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
746 a367ff0f 2019-05-14 stsp struct got_object_id *id;
747 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
749 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
750 a367ff0f 2019-05-14 stsp err = NULL;
752 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
754 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
761 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
762 a367ff0f 2019-05-14 stsp is_same_branch = 1;
769 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
770 a367ff0f 2019-05-14 stsp free(head_commit_id);
771 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
772 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
773 a367ff0f 2019-05-14 stsp return err;
776 4ed7e80c 2018-05-20 stsp static const struct got_error *
777 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
779 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
780 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
781 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
782 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
783 c09a553d 2018-03-12 stsp char *repo_path = NULL;
784 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
785 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
786 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
787 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
788 72151b04 2019-05-11 stsp int ch, same_path_prefix;
790 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
791 0bb8a95e 2018-03-12 stsp switch (ch) {
793 08573d5b 2019-05-14 stsp branch_name = optarg;
796 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
797 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
798 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
801 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
804 2deda0b9 2019-03-07 stsp usage_checkout();
805 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
809 0bb8a95e 2018-03-12 stsp argc -= optind;
810 0bb8a95e 2018-03-12 stsp argv += optind;
812 6715a751 2018-03-16 stsp #ifndef PROFILE
813 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
814 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
815 c09a553d 2018-03-12 stsp err(1, "pledge");
817 0bb8a95e 2018-03-12 stsp if (argc == 1) {
818 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
819 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
820 76089277 2018-04-01 stsp if (repo_path == NULL)
821 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
822 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
823 76089277 2018-04-01 stsp if (cwd == NULL) {
824 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
827 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
828 230a42bd 2019-05-11 jcs base = basename(path_prefix);
829 230a42bd 2019-05-11 jcs if (base == NULL) {
830 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
831 230a42bd 2019-05-11 jcs path_prefix);
835 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
836 230a42bd 2019-05-11 jcs if (base == NULL) {
837 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
842 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
843 c09a553d 2018-03-12 stsp if (dotgit)
844 c09a553d 2018-03-12 stsp *dotgit = '\0';
845 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
846 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
851 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
852 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
853 76089277 2018-04-01 stsp if (repo_path == NULL) {
854 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
857 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
858 76089277 2018-04-01 stsp if (worktree_path == NULL) {
859 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
863 c09a553d 2018-03-12 stsp usage_checkout();
865 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
866 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
868 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
869 c09a553d 2018-03-12 stsp if (error != NULL)
872 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
876 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
877 c09a553d 2018-03-12 stsp if (error != NULL)
880 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
881 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
884 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
885 c09a553d 2018-03-12 stsp if (error != NULL)
888 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
889 e5dc7198 2018-12-29 stsp path_prefix);
890 e5dc7198 2018-12-29 stsp if (error != NULL)
892 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
893 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
897 8069f636 2019-01-12 stsp if (commit_id_str) {
898 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
899 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
900 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
901 8069f636 2019-01-12 stsp if (error != NULL)
903 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
904 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
905 8069f636 2019-01-12 stsp if (error != NULL) {
906 8069f636 2019-01-12 stsp free(commit_id);
909 45d344f6 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
912 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
913 8069f636 2019-01-12 stsp commit_id);
914 8069f636 2019-01-12 stsp free(commit_id);
919 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
920 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
921 c09a553d 2018-03-12 stsp if (error != NULL)
924 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
927 8069f636 2019-01-12 stsp free(commit_id_str);
928 76089277 2018-04-01 stsp free(repo_path);
929 507dc3bb 2018-12-29 stsp free(worktree_path);
930 507dc3bb 2018-12-29 stsp return error;
933 507dc3bb 2018-12-29 stsp __dead static void
934 507dc3bb 2018-12-29 stsp usage_update(void)
936 024e9686 2019-05-14 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path]\n",
937 507dc3bb 2018-12-29 stsp getprogname());
941 1ee397ad 2019-07-12 stsp static const struct got_error *
942 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
944 784955db 2019-01-12 stsp int *did_something = arg;
946 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
947 1ee397ad 2019-07-12 stsp return NULL;
949 1545c615 2019-02-10 stsp *did_something = 1;
951 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
952 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
953 1ee397ad 2019-07-12 stsp return NULL;
955 507dc3bb 2018-12-29 stsp while (path[0] == '/')
957 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
958 1ee397ad 2019-07-12 stsp return NULL;
961 be7061eb 2018-12-30 stsp static const struct got_error *
962 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
963 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
964 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
966 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
967 a1fb16d8 2019-05-24 stsp char *base_id_str;
968 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
970 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
971 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
972 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
973 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
974 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
975 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
976 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
979 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
980 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
982 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
983 a1fb16d8 2019-05-24 stsp return err;
984 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
986 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
987 a1fb16d8 2019-05-24 stsp return NULL;
989 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
990 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
991 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
993 a1fb16d8 2019-05-24 stsp return err;
994 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
995 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
996 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
997 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
998 a1fb16d8 2019-05-24 stsp return NULL;
1001 a1fb16d8 2019-05-24 stsp static const struct got_error *
1002 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1004 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1005 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1006 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1007 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
1008 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1009 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1010 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1011 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1012 7d5807f4 2019-07-11 stsp int ch, did_something = 0, rebase_in_progress;
1014 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1015 507dc3bb 2018-12-29 stsp switch (ch) {
1017 024e9686 2019-05-14 stsp branch_name = optarg;
1020 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1021 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1022 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1025 2deda0b9 2019-03-07 stsp usage_update();
1026 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1030 507dc3bb 2018-12-29 stsp argc -= optind;
1031 507dc3bb 2018-12-29 stsp argv += optind;
1033 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1034 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1035 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1036 507dc3bb 2018-12-29 stsp err(1, "pledge");
1038 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1039 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1040 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1041 c4cdcb68 2019-04-03 stsp goto done;
1043 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1044 7d5807f4 2019-07-11 stsp if (error)
1045 7d5807f4 2019-07-11 stsp goto done;
1047 7d5807f4 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
1048 c4cdcb68 2019-04-03 stsp if (error)
1049 c4cdcb68 2019-04-03 stsp goto done;
1050 7d5807f4 2019-07-11 stsp if (rebase_in_progress) {
1051 7d5807f4 2019-07-11 stsp error = got_error(GOT_ERR_REBASING);
1052 7d5807f4 2019-07-11 stsp goto done;
1055 507dc3bb 2018-12-29 stsp if (argc == 0) {
1056 c4cdcb68 2019-04-03 stsp path = strdup("");
1057 c4cdcb68 2019-04-03 stsp if (path == NULL) {
1058 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1059 507dc3bb 2018-12-29 stsp goto done;
1061 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
1062 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1063 c4cdcb68 2019-04-03 stsp if (error)
1064 507dc3bb 2018-12-29 stsp goto done;
1066 507dc3bb 2018-12-29 stsp usage_update();
1068 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1069 507dc3bb 2018-12-29 stsp if (error != NULL)
1070 507dc3bb 2018-12-29 stsp goto done;
1072 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1073 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1074 0266afb7 2019-01-04 stsp if (error)
1075 0266afb7 2019-01-04 stsp goto done;
1077 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1078 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1079 024e9686 2019-05-14 stsp if (error != NULL)
1080 024e9686 2019-05-14 stsp goto done;
1081 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1082 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1083 9c4b8182 2019-01-02 stsp if (error != NULL)
1084 9c4b8182 2019-01-02 stsp goto done;
1085 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1086 507dc3bb 2018-12-29 stsp if (error != NULL)
1087 507dc3bb 2018-12-29 stsp goto done;
1089 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1090 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
1091 507dc3bb 2018-12-29 stsp if (error != NULL)
1092 a297e751 2019-07-11 stsp goto done;
1093 a297e751 2019-07-11 stsp free(commit_id_str);
1094 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1095 a297e751 2019-07-11 stsp if (error)
1096 507dc3bb 2018-12-29 stsp goto done;
1099 a1fb16d8 2019-05-24 stsp if (branch_name) {
1100 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1101 024e9686 2019-05-14 stsp if (strlen(path) != 0) {
1102 a1fb16d8 2019-05-24 stsp fprintf(stderr, "%s: switching between branches "
1103 a1fb16d8 2019-05-24 stsp "requires that the entire work tree "
1104 024e9686 2019-05-14 stsp "gets updated, not just '%s'\n",
1105 024e9686 2019-05-14 stsp getprogname(), path);
1106 024e9686 2019-05-14 stsp error = got_error(GOT_ERR_BAD_PATH);
1107 024e9686 2019-05-14 stsp goto done;
1109 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1110 024e9686 2019-05-14 stsp if (error)
1111 024e9686 2019-05-14 stsp goto done;
1112 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1113 a367ff0f 2019-05-14 stsp free(head_commit_id);
1114 024e9686 2019-05-14 stsp if (error != NULL)
1115 024e9686 2019-05-14 stsp goto done;
1116 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
1117 a367ff0f 2019-05-14 stsp if (error)
1118 a367ff0f 2019-05-14 stsp goto done;
1119 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1120 024e9686 2019-05-14 stsp if (error)
1121 024e9686 2019-05-14 stsp goto done;
1123 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1124 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1125 a367ff0f 2019-05-14 stsp if (error != NULL) {
1126 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1127 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1128 024e9686 2019-05-14 stsp goto done;
1130 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
1131 a367ff0f 2019-05-14 stsp if (error)
1132 a367ff0f 2019-05-14 stsp goto done;
1135 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1136 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1137 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1138 507dc3bb 2018-12-29 stsp commit_id);
1139 507dc3bb 2018-12-29 stsp if (error)
1140 507dc3bb 2018-12-29 stsp goto done;
1143 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
1144 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1145 507dc3bb 2018-12-29 stsp if (error != NULL)
1146 507dc3bb 2018-12-29 stsp goto done;
1148 784955db 2019-01-12 stsp if (did_something)
1149 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1151 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1153 c09a553d 2018-03-12 stsp free(worktree_path);
1154 c4cdcb68 2019-04-03 stsp free(path);
1155 507dc3bb 2018-12-29 stsp free(commit_id);
1156 9c4b8182 2019-01-02 stsp free(commit_id_str);
1157 c09a553d 2018-03-12 stsp return error;
1160 f42b1b34 2018-03-12 stsp static const struct got_error *
1161 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1162 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1164 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1165 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1166 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1167 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1168 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1170 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1171 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1173 79109fed 2018-03-27 stsp return err;
1175 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1176 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1177 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1179 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1181 79109fed 2018-03-27 stsp return err;
1183 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1184 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1185 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1187 0f2b3dca 2018-12-22 stsp return err;
1189 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1191 79109fed 2018-03-27 stsp return err;
1194 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1196 0f2b3dca 2018-12-22 stsp goto done;
1198 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1199 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1200 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1201 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1202 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff, &arg);
1204 79109fed 2018-03-27 stsp if (tree1)
1205 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1206 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1207 0f2b3dca 2018-12-22 stsp free(id_str1);
1208 0f2b3dca 2018-12-22 stsp free(id_str2);
1209 79109fed 2018-03-27 stsp return err;
1212 4bb494d5 2018-06-16 stsp static char *
1213 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1215 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
1216 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1218 6c281f94 2018-06-11 stsp *p = '\0';
1222 79109fed 2018-03-27 stsp static const struct got_error *
1223 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1224 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1225 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1227 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1228 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1229 6c281f94 2018-06-11 stsp char datebuf[26];
1230 45d799e2 2018-12-23 stsp time_t committer_time;
1231 45d799e2 2018-12-23 stsp const char *author, *committer;
1232 199a4027 2019-02-02 stsp char *refs_str = NULL;
1233 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1235 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1237 199a4027 2019-02-02 stsp const char *name;
1238 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
1240 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1241 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1243 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1244 199a4027 2019-02-02 stsp name += 5;
1245 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1247 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1248 e34f9ed6 2019-02-02 stsp name += 6;
1249 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1250 141c2bff 2019-02-04 stsp name += 8;
1251 199a4027 2019-02-02 stsp s = refs_str;
1252 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1253 199a4027 2019-02-02 stsp name) == -1) {
1254 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1260 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1262 8bf5b3c9 2018-03-17 stsp return err;
1264 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
1265 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1266 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1267 832c249c 2018-06-10 stsp free(id_str);
1268 d3d493d7 2019-02-21 stsp id_str = NULL;
1269 d3d493d7 2019-02-21 stsp free(refs_str);
1270 d3d493d7 2019-02-21 stsp refs_str = NULL;
1271 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1272 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1273 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1274 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
1275 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1276 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1277 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1278 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1279 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1280 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1281 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1282 3fe1abad 2018-06-10 stsp int n = 1;
1283 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1284 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1285 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1287 a0603db2 2018-06-10 stsp return err;
1288 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1289 a0603db2 2018-06-10 stsp free(id_str);
1293 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1294 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
1295 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1297 621015ac 2018-07-23 stsp logmsg = logmsg0;
1299 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1301 832c249c 2018-06-10 stsp printf(" %s\n", line);
1302 832c249c 2018-06-10 stsp } while (line);
1303 621015ac 2018-07-23 stsp free(logmsg0);
1305 971751ac 2018-03-27 stsp if (show_patch) {
1306 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1307 971751ac 2018-03-27 stsp if (err == 0)
1308 971751ac 2018-03-27 stsp printf("\n");
1311 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1312 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1313 07862c20 2018-09-15 stsp return err;
1316 f42b1b34 2018-03-12 stsp static const struct got_error *
1317 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1318 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1319 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1321 f42b1b34 2018-03-12 stsp const struct got_error *err;
1322 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1324 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1325 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1327 f42b1b34 2018-03-12 stsp return err;
1328 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1330 fcc85cad 2018-07-22 stsp goto done;
1332 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1333 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1335 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1338 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1339 372ccdbb 2018-06-10 stsp if (err) {
1340 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1341 9ba79e04 2018-06-11 stsp err = NULL;
1344 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1346 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1352 b43fbaa0 2018-06-11 stsp if (id == NULL)
1355 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1358 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1360 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1361 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1365 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1366 f42b1b34 2018-03-12 stsp return err;
1369 4ed7e80c 2018-05-20 stsp __dead static void
1370 6f3d1eb0 2018-03-12 stsp usage_log(void)
1372 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1373 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1377 4ed7e80c 2018-05-20 stsp static const struct got_error *
1378 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1380 f42b1b34 2018-03-12 stsp const struct got_error *error;
1381 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1382 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1383 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1384 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1385 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1386 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1387 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1388 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1389 64a96a6d 2018-04-01 stsp const char *errstr;
1390 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1392 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1394 6715a751 2018-03-16 stsp #ifndef PROFILE
1395 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1398 f42b1b34 2018-03-12 stsp err(1, "pledge");
1401 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1402 79109fed 2018-03-27 stsp switch (ch) {
1404 79109fed 2018-03-27 stsp show_patch = 1;
1407 d142fc45 2018-04-01 stsp start_commit = optarg;
1410 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1412 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1413 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1416 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1417 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1418 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1421 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1424 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1425 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1426 04ca23f4 2018-07-16 stsp err(1, "-r option");
1427 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1430 2deda0b9 2019-03-07 stsp usage_log();
1431 79109fed 2018-03-27 stsp /* NOTREACHED */
1435 79109fed 2018-03-27 stsp argc -= optind;
1436 79109fed 2018-03-27 stsp argv += optind;
1438 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1439 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1440 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1441 04ca23f4 2018-07-16 stsp goto done;
1444 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1445 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1446 cffc0aa4 2019-02-05 stsp goto done;
1447 cffc0aa4 2019-02-05 stsp error = NULL;
1449 e7301579 2019-03-18 stsp if (argc == 0) {
1450 cbd1af7a 2019-03-18 stsp path = strdup("");
1451 e7301579 2019-03-18 stsp if (path == NULL) {
1452 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1453 cbd1af7a 2019-03-18 stsp goto done;
1455 e7301579 2019-03-18 stsp } else if (argc == 1) {
1456 e7301579 2019-03-18 stsp if (worktree) {
1457 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1459 e7301579 2019-03-18 stsp if (error)
1460 e7301579 2019-03-18 stsp goto done;
1462 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1463 e7301579 2019-03-18 stsp if (path == NULL) {
1464 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1465 e7301579 2019-03-18 stsp goto done;
1469 cbd1af7a 2019-03-18 stsp usage_log();
1471 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1472 5486daa2 2019-05-11 stsp repo_path = worktree ?
1473 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1475 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1476 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1477 cffc0aa4 2019-02-05 stsp goto done;
1480 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1481 d7d4f210 2018-03-12 stsp if (error != NULL)
1482 04ca23f4 2018-07-16 stsp goto done;
1484 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1485 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1486 c02c541e 2019-03-29 stsp if (error)
1487 c02c541e 2019-03-29 stsp goto done;
1489 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1490 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1491 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1492 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1493 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1494 3235492e 2018-04-01 stsp if (error != NULL)
1495 3235492e 2018-04-01 stsp return error;
1496 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1497 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1498 3235492e 2018-04-01 stsp if (error != NULL)
1499 3235492e 2018-04-01 stsp return error;
1500 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1502 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1503 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1504 3235492e 2018-04-01 stsp if (error == NULL) {
1505 1caad61b 2019-02-01 stsp int obj_type;
1506 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1507 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1508 d1f2edc9 2018-06-13 stsp if (error != NULL)
1509 1caad61b 2019-02-01 stsp goto done;
1510 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1511 1caad61b 2019-02-01 stsp if (error != NULL)
1512 1caad61b 2019-02-01 stsp goto done;
1513 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1514 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1515 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1516 1caad61b 2019-02-01 stsp if (error != NULL)
1517 1caad61b 2019-02-01 stsp goto done;
1518 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1519 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1520 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1521 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1522 1caad61b 2019-02-01 stsp goto done;
1525 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1526 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1527 1caad61b 2019-02-01 stsp if (id == NULL)
1528 638f9024 2019-05-13 stsp error = got_error_from_errno(
1529 230a42bd 2019-05-11 jcs "got_object_id_dup");
1530 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1531 1caad61b 2019-02-01 stsp if (error)
1532 1caad61b 2019-02-01 stsp goto done;
1533 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1534 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1535 1caad61b 2019-02-01 stsp goto done;
1537 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1538 d1f2edc9 2018-06-13 stsp if (error != NULL)
1539 1caad61b 2019-02-01 stsp goto done;
1541 15a94983 2018-12-23 stsp if (commit == NULL) {
1542 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1543 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1544 d1f2edc9 2018-06-13 stsp if (error != NULL)
1545 d1f2edc9 2018-06-13 stsp return error;
1548 d7d4f210 2018-03-12 stsp if (error != NULL)
1549 04ca23f4 2018-07-16 stsp goto done;
1551 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1552 04ca23f4 2018-07-16 stsp if (error != NULL)
1553 04ca23f4 2018-07-16 stsp goto done;
1554 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1555 04ca23f4 2018-07-16 stsp free(path);
1556 04ca23f4 2018-07-16 stsp path = in_repo_path;
1559 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1560 199a4027 2019-02-02 stsp if (error)
1561 199a4027 2019-02-02 stsp goto done;
1563 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1564 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1566 04ca23f4 2018-07-16 stsp free(path);
1567 04ca23f4 2018-07-16 stsp free(repo_path);
1568 04ca23f4 2018-07-16 stsp free(cwd);
1570 cffc0aa4 2019-02-05 stsp if (worktree)
1571 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1572 ad242220 2018-09-08 stsp if (repo) {
1573 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1574 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1575 ad242220 2018-09-08 stsp if (error == NULL)
1576 ad242220 2018-09-08 stsp error = repo_error;
1578 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1579 8bf5b3c9 2018-03-17 stsp return error;
1582 4ed7e80c 2018-05-20 stsp __dead static void
1583 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1585 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1586 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1590 b72f483a 2019-02-05 stsp struct print_diff_arg {
1591 b72f483a 2019-02-05 stsp struct got_repository *repo;
1592 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1593 b72f483a 2019-02-05 stsp int diff_context;
1594 3fc0c068 2019-02-10 stsp const char *id_str;
1595 3fc0c068 2019-02-10 stsp int header_shown;
1598 4ed7e80c 2018-05-20 stsp static const struct got_error *
1599 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1600 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1602 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1603 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1604 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1605 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1606 b72f483a 2019-02-05 stsp char *abspath = NULL;
1607 b72f483a 2019-02-05 stsp struct stat sb;
1609 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1610 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1611 b72f483a 2019-02-05 stsp return NULL;
1613 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1614 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1615 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1616 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1619 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1620 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1622 d00136be 2019-03-26 stsp goto done;
1626 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1627 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1628 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1629 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1630 2ec1f75b 2019-03-26 stsp goto done;
1633 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1634 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1635 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1636 2ec1f75b 2019-03-26 stsp goto done;
1638 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1639 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1640 2ec1f75b 2019-03-26 stsp goto done;
1643 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1645 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1648 b72f483a 2019-02-05 stsp if (blob1)
1649 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1650 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1651 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1652 b72f483a 2019-02-05 stsp free(abspath);
1653 927df6b7 2019-02-10 stsp return err;
1656 927df6b7 2019-02-10 stsp static const struct got_error *
1657 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1659 b00d56cd 2018-04-01 stsp const struct got_error *error;
1660 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1661 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1662 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1663 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1664 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1665 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1666 15a94983 2018-12-23 stsp int type1, type2;
1667 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1668 c0cc5c62 2018-10-18 stsp const char *errstr;
1669 927df6b7 2019-02-10 stsp char *path = NULL;
1671 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1672 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1673 25eccc22 2019-01-04 stsp NULL) == -1)
1674 b00d56cd 2018-04-01 stsp err(1, "pledge");
1677 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1678 b00d56cd 2018-04-01 stsp switch (ch) {
1680 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1681 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1682 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1685 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1686 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1687 b72f483a 2019-02-05 stsp err(1, "-r option");
1688 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1691 2deda0b9 2019-03-07 stsp usage_diff();
1692 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1696 b00d56cd 2018-04-01 stsp argc -= optind;
1697 b00d56cd 2018-04-01 stsp argv += optind;
1699 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1700 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1701 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1702 b72f483a 2019-02-05 stsp goto done;
1704 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1705 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1706 927df6b7 2019-02-10 stsp goto done;
1707 927df6b7 2019-02-10 stsp if (argc <= 1) {
1708 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1709 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1710 927df6b7 2019-02-10 stsp goto done;
1712 b72f483a 2019-02-05 stsp if (repo_path)
1714 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1715 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1716 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1717 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1718 927df6b7 2019-02-10 stsp goto done;
1720 927df6b7 2019-02-10 stsp if (argc == 1) {
1721 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1723 927df6b7 2019-02-10 stsp if (error)
1724 927df6b7 2019-02-10 stsp goto done;
1726 927df6b7 2019-02-10 stsp path = strdup("");
1727 927df6b7 2019-02-10 stsp if (path == NULL) {
1728 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1729 927df6b7 2019-02-10 stsp goto done;
1732 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1733 15a94983 2018-12-23 stsp id_str1 = argv[0];
1734 15a94983 2018-12-23 stsp id_str2 = argv[1];
1735 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1736 30db809c 2019-06-05 stsp repo_path =
1737 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1738 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1739 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1740 30db809c 2019-06-05 stsp goto done;
1744 b00d56cd 2018-04-01 stsp usage_diff();
1746 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1747 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1748 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1749 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1752 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1753 76089277 2018-04-01 stsp free(repo_path);
1754 b00d56cd 2018-04-01 stsp if (error != NULL)
1755 b00d56cd 2018-04-01 stsp goto done;
1757 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1758 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1759 c02c541e 2019-03-29 stsp if (error)
1760 c02c541e 2019-03-29 stsp goto done;
1762 30db809c 2019-06-05 stsp if (argc <= 1) {
1763 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1764 b72f483a 2019-02-05 stsp char *id_str;
1765 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1766 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1767 b72f483a 2019-02-05 stsp if (error)
1768 b72f483a 2019-02-05 stsp goto done;
1769 b72f483a 2019-02-05 stsp arg.repo = repo;
1770 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1771 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1772 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1773 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1775 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1776 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1777 b72f483a 2019-02-05 stsp free(id_str);
1778 b72f483a 2019-02-05 stsp goto done;
1781 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
1782 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1783 e02e74af 2019-05-28 stsp if (error) {
1784 e02e74af 2019-05-28 stsp struct got_reference *ref;
1785 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1786 e02e74af 2019-05-28 stsp goto done;
1787 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1788 e02e74af 2019-05-28 stsp if (error != NULL)
1789 e02e74af 2019-05-28 stsp goto done;
1790 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
1791 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1792 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1793 5e70831e 2019-05-28 stsp goto done;
1795 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1796 e02e74af 2019-05-28 stsp got_ref_close(ref);
1797 e02e74af 2019-05-28 stsp if (error != NULL)
1798 5e70831e 2019-05-28 stsp goto done;
1800 a297e751 2019-07-11 stsp error = got_object_id_str(&label1, id1);
1801 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1802 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1803 e02e74af 2019-05-28 stsp goto done;
1807 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
1808 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1809 e02e74af 2019-05-28 stsp if (error) {
1810 e02e74af 2019-05-28 stsp struct got_reference *ref;
1811 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1812 e02e74af 2019-05-28 stsp goto done;
1813 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1814 e02e74af 2019-05-28 stsp if (error != NULL)
1815 5e70831e 2019-05-28 stsp goto done;
1816 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
1817 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1818 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1819 e02e74af 2019-05-28 stsp goto done;
1821 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1822 e02e74af 2019-05-28 stsp got_ref_close(ref);
1823 e02e74af 2019-05-28 stsp if (error != NULL)
1824 e02e74af 2019-05-28 stsp goto done;
1826 a297e751 2019-07-11 stsp error = got_object_id_str(&label2, id2);
1827 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1828 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1829 5e70831e 2019-05-28 stsp goto done;
1833 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1834 15a94983 2018-12-23 stsp if (error)
1835 15a94983 2018-12-23 stsp goto done;
1837 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1838 15a94983 2018-12-23 stsp if (error)
1839 15a94983 2018-12-23 stsp goto done;
1841 15a94983 2018-12-23 stsp if (type1 != type2) {
1842 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1843 b00d56cd 2018-04-01 stsp goto done;
1846 15a94983 2018-12-23 stsp switch (type1) {
1847 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1848 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1849 54156555 2018-12-24 stsp diff_context, repo, stdout);
1851 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1852 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1853 54156555 2018-12-24 stsp diff_context, repo, stdout);
1855 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1856 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
1857 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1858 c0cc5c62 2018-10-18 stsp repo, stdout);
1861 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1865 5e70831e 2019-05-28 stsp free(label1);
1866 5e70831e 2019-05-28 stsp free(label2);
1867 15a94983 2018-12-23 stsp free(id1);
1868 15a94983 2018-12-23 stsp free(id2);
1869 927df6b7 2019-02-10 stsp free(path);
1870 b72f483a 2019-02-05 stsp if (worktree)
1871 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1872 ad242220 2018-09-08 stsp if (repo) {
1873 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1874 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1875 ad242220 2018-09-08 stsp if (error == NULL)
1876 ad242220 2018-09-08 stsp error = repo_error;
1878 b00d56cd 2018-04-01 stsp return error;
1881 404c43c4 2018-06-21 stsp __dead static void
1882 404c43c4 2018-06-21 stsp usage_blame(void)
1884 9270e621 2019-02-05 stsp fprintf(stderr,
1885 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1886 404c43c4 2018-06-21 stsp getprogname());
1890 404c43c4 2018-06-21 stsp static const struct got_error *
1891 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1893 404c43c4 2018-06-21 stsp const struct got_error *error;
1894 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1895 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1896 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1897 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1898 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1901 404c43c4 2018-06-21 stsp #ifndef PROFILE
1902 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1903 36e2fb66 2019-01-04 stsp NULL) == -1)
1904 404c43c4 2018-06-21 stsp err(1, "pledge");
1907 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1908 404c43c4 2018-06-21 stsp switch (ch) {
1910 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1913 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1914 66bea077 2018-08-02 stsp if (repo_path == NULL)
1915 66bea077 2018-08-02 stsp err(1, "-r option");
1916 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1919 2deda0b9 2019-03-07 stsp usage_blame();
1920 404c43c4 2018-06-21 stsp /* NOTREACHED */
1924 404c43c4 2018-06-21 stsp argc -= optind;
1925 404c43c4 2018-06-21 stsp argv += optind;
1927 a39318fd 2018-08-02 stsp if (argc == 1)
1928 404c43c4 2018-06-21 stsp path = argv[0];
1930 404c43c4 2018-06-21 stsp usage_blame();
1932 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1933 66bea077 2018-08-02 stsp if (cwd == NULL) {
1934 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1935 66bea077 2018-08-02 stsp goto done;
1937 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1938 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1939 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1940 66bea077 2018-08-02 stsp goto done;
1942 0c06baac 2019-02-05 stsp error = NULL;
1943 0c06baac 2019-02-05 stsp if (worktree) {
1944 0c06baac 2019-02-05 stsp repo_path =
1945 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1946 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1947 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1948 0c06baac 2019-02-05 stsp if (error)
1949 0c06baac 2019-02-05 stsp goto done;
1951 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1952 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1953 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1954 0c06baac 2019-02-05 stsp goto done;
1959 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1960 c02c541e 2019-03-29 stsp if (error != NULL)
1961 36e2fb66 2019-01-04 stsp goto done;
1963 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1964 c02c541e 2019-03-29 stsp if (error)
1965 404c43c4 2018-06-21 stsp goto done;
1967 0c06baac 2019-02-05 stsp if (worktree) {
1968 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1969 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1970 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1971 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1972 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1973 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1974 6efaaa2d 2019-02-05 stsp path) == -1) {
1975 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1976 0c06baac 2019-02-05 stsp goto done;
1978 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1981 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1983 0c06baac 2019-02-05 stsp if (error)
1984 66bea077 2018-08-02 stsp goto done;
1986 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1987 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1988 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1989 404c43c4 2018-06-21 stsp if (error != NULL)
1990 66bea077 2018-08-02 stsp goto done;
1991 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1992 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1993 404c43c4 2018-06-21 stsp if (error != NULL)
1994 66bea077 2018-08-02 stsp goto done;
1996 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1997 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
1998 404c43c4 2018-06-21 stsp if (error != NULL)
1999 66bea077 2018-08-02 stsp goto done;
2002 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
2004 66bea077 2018-08-02 stsp free(in_repo_path);
2005 66bea077 2018-08-02 stsp free(repo_path);
2006 66bea077 2018-08-02 stsp free(cwd);
2007 404c43c4 2018-06-21 stsp free(commit_id);
2008 0c06baac 2019-02-05 stsp if (worktree)
2009 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2010 ad242220 2018-09-08 stsp if (repo) {
2011 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2012 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2013 ad242220 2018-09-08 stsp if (error == NULL)
2014 ad242220 2018-09-08 stsp error = repo_error;
2016 404c43c4 2018-06-21 stsp return error;
2019 5de5890b 2018-10-18 stsp __dead static void
2020 5de5890b 2018-10-18 stsp usage_tree(void)
2022 c1669e2e 2019-01-09 stsp fprintf(stderr,
2023 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2024 5de5890b 2018-10-18 stsp getprogname());
2028 c1669e2e 2019-01-09 stsp static void
2029 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2030 c1669e2e 2019-01-09 stsp const char *root_path)
2032 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2034 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2035 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2038 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2039 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
2040 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
2043 5de5890b 2018-10-18 stsp static const struct got_error *
2044 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2045 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2046 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2048 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2049 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2050 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2051 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2052 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2054 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2056 5de5890b 2018-10-18 stsp goto done;
2058 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2060 5de5890b 2018-10-18 stsp goto done;
2061 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2062 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2063 5de5890b 2018-10-18 stsp while (te) {
2064 5de5890b 2018-10-18 stsp char *id = NULL;
2066 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2069 5de5890b 2018-10-18 stsp if (show_ids) {
2070 5de5890b 2018-10-18 stsp char *id_str;
2071 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2073 5de5890b 2018-10-18 stsp goto done;
2074 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2075 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2076 5de5890b 2018-10-18 stsp free(id_str);
2077 5de5890b 2018-10-18 stsp goto done;
2079 5de5890b 2018-10-18 stsp free(id_str);
2081 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2084 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2085 c1669e2e 2019-01-09 stsp char *child_path;
2086 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2087 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2088 c1669e2e 2019-01-09 stsp te->name) == -1) {
2089 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2090 c1669e2e 2019-01-09 stsp goto done;
2092 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2093 c1669e2e 2019-01-09 stsp root_path, repo);
2094 c1669e2e 2019-01-09 stsp free(child_path);
2096 c1669e2e 2019-01-09 stsp goto done;
2099 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2103 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2104 5de5890b 2018-10-18 stsp free(tree_id);
2105 5de5890b 2018-10-18 stsp return err;
2108 5de5890b 2018-10-18 stsp static const struct got_error *
2109 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2111 5de5890b 2018-10-18 stsp const struct got_error *error;
2112 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2113 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2114 7a2c19d6 2019-02-05 stsp const char *path;
2115 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2116 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2117 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2118 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2121 5de5890b 2018-10-18 stsp #ifndef PROFILE
2122 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2123 0f8d269b 2019-01-04 stsp NULL) == -1)
2124 5de5890b 2018-10-18 stsp err(1, "pledge");
2127 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2128 5de5890b 2018-10-18 stsp switch (ch) {
2130 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2133 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2134 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2135 5de5890b 2018-10-18 stsp err(1, "-r option");
2136 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2139 5de5890b 2018-10-18 stsp show_ids = 1;
2142 c1669e2e 2019-01-09 stsp recurse = 1;
2145 2deda0b9 2019-03-07 stsp usage_tree();
2146 5de5890b 2018-10-18 stsp /* NOTREACHED */
2150 5de5890b 2018-10-18 stsp argc -= optind;
2151 5de5890b 2018-10-18 stsp argv += optind;
2153 5de5890b 2018-10-18 stsp if (argc == 1)
2154 5de5890b 2018-10-18 stsp path = argv[0];
2155 5de5890b 2018-10-18 stsp else if (argc > 1)
2156 5de5890b 2018-10-18 stsp usage_tree();
2158 7a2c19d6 2019-02-05 stsp path = NULL;
2160 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2161 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2162 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2163 9bf7a39b 2019-02-05 stsp goto done;
2165 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2166 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2167 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2168 7a2c19d6 2019-02-05 stsp goto done;
2170 7a2c19d6 2019-02-05 stsp error = NULL;
2171 7a2c19d6 2019-02-05 stsp if (worktree) {
2172 7a2c19d6 2019-02-05 stsp repo_path =
2173 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2174 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2175 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2176 7a2c19d6 2019-02-05 stsp if (error)
2177 7a2c19d6 2019-02-05 stsp goto done;
2179 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2180 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2181 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2182 7a2c19d6 2019-02-05 stsp goto done;
2187 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2188 5de5890b 2018-10-18 stsp if (error != NULL)
2189 c02c541e 2019-03-29 stsp goto done;
2191 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
2192 c02c541e 2019-03-29 stsp if (error)
2193 5de5890b 2018-10-18 stsp goto done;
2195 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2196 9bf7a39b 2019-02-05 stsp if (worktree) {
2197 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2198 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2199 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2200 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2201 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2202 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2203 9bf7a39b 2019-02-05 stsp goto done;
2205 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2207 9bf7a39b 2019-02-05 stsp if (error)
2208 9bf7a39b 2019-02-05 stsp goto done;
2210 9bf7a39b 2019-02-05 stsp path = "/";
2212 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2213 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2214 9bf7a39b 2019-02-05 stsp if (error != NULL)
2215 9bf7a39b 2019-02-05 stsp goto done;
2218 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2219 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2220 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2221 5de5890b 2018-10-18 stsp if (error != NULL)
2222 5de5890b 2018-10-18 stsp goto done;
2223 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2224 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2225 5de5890b 2018-10-18 stsp if (error != NULL)
2226 5de5890b 2018-10-18 stsp goto done;
2228 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
2229 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
2230 5de5890b 2018-10-18 stsp if (error != NULL)
2231 5de5890b 2018-10-18 stsp goto done;
2234 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2235 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2237 5de5890b 2018-10-18 stsp free(in_repo_path);
2238 5de5890b 2018-10-18 stsp free(repo_path);
2239 5de5890b 2018-10-18 stsp free(cwd);
2240 5de5890b 2018-10-18 stsp free(commit_id);
2241 7a2c19d6 2019-02-05 stsp if (worktree)
2242 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2243 5de5890b 2018-10-18 stsp if (repo) {
2244 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2245 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2246 5de5890b 2018-10-18 stsp if (error == NULL)
2247 5de5890b 2018-10-18 stsp error = repo_error;
2249 5de5890b 2018-10-18 stsp return error;
2252 6bad629b 2019-02-04 stsp __dead static void
2253 6bad629b 2019-02-04 stsp usage_status(void)
2255 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
2259 b72f483a 2019-02-05 stsp static const struct got_error *
2260 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
2261 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2263 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
2264 b72f483a 2019-02-05 stsp return NULL;
2267 6bad629b 2019-02-04 stsp static const struct got_error *
2268 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2270 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2271 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2272 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2273 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
2276 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2277 6bad629b 2019-02-04 stsp switch (ch) {
2279 2deda0b9 2019-03-07 stsp usage_status();
2280 6bad629b 2019-02-04 stsp /* NOTREACHED */
2284 6bad629b 2019-02-04 stsp argc -= optind;
2285 6bad629b 2019-02-04 stsp argv += optind;
2287 6bad629b 2019-02-04 stsp #ifndef PROFILE
2288 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2289 6bad629b 2019-02-04 stsp NULL) == -1)
2290 6bad629b 2019-02-04 stsp err(1, "pledge");
2292 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2293 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2294 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2295 927df6b7 2019-02-10 stsp goto done;
2298 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2299 927df6b7 2019-02-10 stsp if (error != NULL)
2300 927df6b7 2019-02-10 stsp goto done;
2302 6bad629b 2019-02-04 stsp if (argc == 0) {
2303 927df6b7 2019-02-10 stsp path = strdup("");
2304 927df6b7 2019-02-10 stsp if (path == NULL) {
2305 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2306 6bad629b 2019-02-04 stsp goto done;
2308 6bad629b 2019-02-04 stsp } else if (argc == 1) {
2309 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
2310 927df6b7 2019-02-10 stsp if (error)
2311 6bad629b 2019-02-04 stsp goto done;
2313 6bad629b 2019-02-04 stsp usage_status();
2315 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2316 6bad629b 2019-02-04 stsp if (error != NULL)
2317 6bad629b 2019-02-04 stsp goto done;
2319 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2320 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2321 6bad629b 2019-02-04 stsp if (error)
2322 6bad629b 2019-02-04 stsp goto done;
2324 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
2325 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2327 927df6b7 2019-02-10 stsp free(cwd);
2328 927df6b7 2019-02-10 stsp free(path);
2329 d0eebce4 2019-03-11 stsp return error;
2332 d0eebce4 2019-03-11 stsp __dead static void
2333 d0eebce4 2019-03-11 stsp usage_ref(void)
2335 d0eebce4 2019-03-11 stsp fprintf(stderr,
2336 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
2337 d0eebce4 2019-03-11 stsp getprogname());
2341 d0eebce4 2019-03-11 stsp static const struct got_error *
2342 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2344 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2345 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2346 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2348 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2349 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2351 d0eebce4 2019-03-11 stsp return err;
2353 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2354 d0eebce4 2019-03-11 stsp char *refstr;
2355 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2356 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2357 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2358 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2359 d0eebce4 2019-03-11 stsp free(refstr);
2362 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2363 d0eebce4 2019-03-11 stsp return NULL;
2366 d0eebce4 2019-03-11 stsp static const struct got_error *
2367 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2369 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2370 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2372 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2374 d0eebce4 2019-03-11 stsp return err;
2376 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2377 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2378 d0eebce4 2019-03-11 stsp return err;
2381 d0eebce4 2019-03-11 stsp static const struct got_error *
2382 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2384 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2385 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2386 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2389 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2390 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2391 d1644381 2019-07-14 stsp * an unintended typo.
2393 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2394 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2396 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2398 d83d9d5c 2019-05-13 stsp if (err) {
2399 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2401 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2402 d83d9d5c 2019-05-13 stsp return err;
2403 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2405 d83d9d5c 2019-05-13 stsp return err;
2406 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2407 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2409 d83d9d5c 2019-05-13 stsp return err;
2412 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2414 d0eebce4 2019-03-11 stsp goto done;
2416 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2419 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2421 d0eebce4 2019-03-11 stsp return err;
2424 d0eebce4 2019-03-11 stsp static const struct got_error *
2425 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2427 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2428 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2429 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2430 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2431 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2432 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2434 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2435 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2436 d0eebce4 2019-03-11 stsp switch (ch) {
2438 d0eebce4 2019-03-11 stsp delref = optarg;
2441 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2442 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2443 d0eebce4 2019-03-11 stsp err(1, "-r option");
2444 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2447 d0eebce4 2019-03-11 stsp do_list = 1;
2450 d0eebce4 2019-03-11 stsp usage_ref();
2451 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2455 d0eebce4 2019-03-11 stsp if (do_list && delref)
2456 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2458 d0eebce4 2019-03-11 stsp argc -= optind;
2459 d0eebce4 2019-03-11 stsp argv += optind;
2461 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2462 d0eebce4 2019-03-11 stsp if (argc > 0)
2463 d0eebce4 2019-03-11 stsp usage_ref();
2464 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2465 d0eebce4 2019-03-11 stsp usage_ref();
2467 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2468 e0b57350 2019-03-12 stsp if (do_list) {
2469 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2470 e0b57350 2019-03-12 stsp NULL) == -1)
2471 e0b57350 2019-03-12 stsp err(1, "pledge");
2473 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2474 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2475 e0b57350 2019-03-12 stsp err(1, "pledge");
2478 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2479 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2480 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2481 d0eebce4 2019-03-11 stsp goto done;
2484 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2485 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2486 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2487 d0eebce4 2019-03-11 stsp goto done;
2489 d0eebce4 2019-03-11 stsp error = NULL;
2490 d0eebce4 2019-03-11 stsp if (worktree) {
2491 d0eebce4 2019-03-11 stsp repo_path =
2492 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2493 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2494 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2495 d0eebce4 2019-03-11 stsp if (error)
2496 d0eebce4 2019-03-11 stsp goto done;
2498 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2499 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2500 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2501 d0eebce4 2019-03-11 stsp goto done;
2506 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2507 d0eebce4 2019-03-11 stsp if (error != NULL)
2508 d0eebce4 2019-03-11 stsp goto done;
2510 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2511 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2512 c02c541e 2019-03-29 stsp if (error)
2513 c02c541e 2019-03-29 stsp goto done;
2515 d0eebce4 2019-03-11 stsp if (do_list)
2516 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2517 d0eebce4 2019-03-11 stsp else if (delref)
2518 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2520 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2523 4e759de4 2019-06-26 stsp got_repo_close(repo);
2524 4e759de4 2019-06-26 stsp if (worktree)
2525 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2526 4e759de4 2019-06-26 stsp free(cwd);
2527 4e759de4 2019-06-26 stsp free(repo_path);
2528 4e759de4 2019-06-26 stsp return error;
2531 4e759de4 2019-06-26 stsp __dead static void
2532 4e759de4 2019-06-26 stsp usage_branch(void)
2534 4e759de4 2019-06-26 stsp fprintf(stderr,
2535 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2536 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2540 4e759de4 2019-06-26 stsp static const struct got_error *
2541 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2543 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2544 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2545 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2547 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2549 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2551 4e759de4 2019-06-26 stsp return err;
2553 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2554 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2555 4e759de4 2019-06-26 stsp char *refstr;
2556 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2557 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2559 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2560 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2561 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2562 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2564 ba882ee3 2019-07-11 stsp return err;
2565 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2566 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2567 ba882ee3 2019-07-11 stsp marker = "* ";
2569 ba882ee3 2019-07-11 stsp marker = "~ ";
2572 4e759de4 2019-06-26 stsp refname += 11;
2573 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2574 4e759de4 2019-06-26 stsp if (refstr == NULL)
2575 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2576 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2577 4e759de4 2019-06-26 stsp free(refstr);
2580 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2581 4e759de4 2019-06-26 stsp return NULL;
2584 4e759de4 2019-06-26 stsp static const struct got_error *
2585 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2587 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2588 4e759de4 2019-06-26 stsp struct got_reference *ref;
2589 4e759de4 2019-06-26 stsp char *refname;
2591 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2592 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2594 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2596 4e759de4 2019-06-26 stsp goto done;
2598 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2599 4e759de4 2019-06-26 stsp got_ref_close(ref);
2601 4e759de4 2019-06-26 stsp free(refname);
2602 4e759de4 2019-06-26 stsp return err;
2605 4e759de4 2019-06-26 stsp static const struct got_error *
2606 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2607 4e759de4 2019-06-26 stsp const char *base_branch)
2609 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2610 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2611 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2612 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2613 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2616 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2617 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2618 d3f84d51 2019-07-11 stsp * an unintended typo.
2620 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2621 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2623 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2624 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2625 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2626 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2627 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2628 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2630 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2632 4e759de4 2019-06-26 stsp goto done;
2633 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2634 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2636 4e759de4 2019-06-26 stsp goto done;
2638 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2639 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2640 4e759de4 2019-06-26 stsp goto done;
2643 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2644 4e759de4 2019-06-26 stsp if (err == NULL) {
2645 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2646 4e759de4 2019-06-26 stsp goto done;
2647 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2648 4e759de4 2019-06-26 stsp goto done;
2650 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2652 4e759de4 2019-06-26 stsp goto done;
2654 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2657 4e759de4 2019-06-26 stsp got_ref_close(ref);
2659 4e759de4 2019-06-26 stsp free(base_refname);
2660 4e759de4 2019-06-26 stsp free(refname);
2661 4e759de4 2019-06-26 stsp return err;
2664 4e759de4 2019-06-26 stsp static const struct got_error *
2665 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2667 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2668 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2669 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2670 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2671 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2672 4e759de4 2019-06-26 stsp const char *delref = NULL;
2674 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2675 4e759de4 2019-06-26 stsp switch (ch) {
2677 4e759de4 2019-06-26 stsp delref = optarg;
2680 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2681 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2682 4e759de4 2019-06-26 stsp err(1, "-r option");
2683 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2686 4e759de4 2019-06-26 stsp do_list = 1;
2689 4e759de4 2019-06-26 stsp usage_branch();
2690 4e759de4 2019-06-26 stsp /* NOTREACHED */
2694 4e759de4 2019-06-26 stsp if (do_list && delref)
2695 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2697 4e759de4 2019-06-26 stsp argc -= optind;
2698 4e759de4 2019-06-26 stsp argv += optind;
2700 4e759de4 2019-06-26 stsp if (do_list || delref) {
2701 4e759de4 2019-06-26 stsp if (argc > 0)
2702 4e759de4 2019-06-26 stsp usage_branch();
2703 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2704 4e759de4 2019-06-26 stsp usage_branch();
2706 4e759de4 2019-06-26 stsp #ifndef PROFILE
2707 4e759de4 2019-06-26 stsp if (do_list) {
2708 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2709 4e759de4 2019-06-26 stsp NULL) == -1)
2710 4e759de4 2019-06-26 stsp err(1, "pledge");
2712 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2713 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2714 4e759de4 2019-06-26 stsp err(1, "pledge");
2717 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2718 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2719 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2720 4e759de4 2019-06-26 stsp goto done;
2723 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2724 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2725 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2726 4e759de4 2019-06-26 stsp goto done;
2728 4e759de4 2019-06-26 stsp error = NULL;
2729 4e759de4 2019-06-26 stsp if (worktree) {
2730 4e759de4 2019-06-26 stsp repo_path =
2731 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2732 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2733 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2734 4e759de4 2019-06-26 stsp if (error)
2735 4e759de4 2019-06-26 stsp goto done;
2737 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2738 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2739 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2740 4e759de4 2019-06-26 stsp goto done;
2745 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2746 4e759de4 2019-06-26 stsp if (error != NULL)
2747 4e759de4 2019-06-26 stsp goto done;
2749 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2750 4e759de4 2019-06-26 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2751 4e759de4 2019-06-26 stsp if (error)
2752 4e759de4 2019-06-26 stsp goto done;
2754 4e759de4 2019-06-26 stsp if (do_list)
2755 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
2756 4e759de4 2019-06-26 stsp else if (delref)
2757 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2759 4e759de4 2019-06-26 stsp const char *base_branch;
2760 4e759de4 2019-06-26 stsp if (argc == 1) {
2761 4e759de4 2019-06-26 stsp base_branch = worktree ?
2762 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2763 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2765 4e759de4 2019-06-26 stsp base_branch = argv[1];
2766 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2770 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2771 d0eebce4 2019-03-11 stsp if (worktree)
2772 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2773 d0eebce4 2019-03-11 stsp free(cwd);
2774 d0eebce4 2019-03-11 stsp free(repo_path);
2775 d00136be 2019-03-26 stsp return error;
2778 d00136be 2019-03-26 stsp __dead static void
2779 d00136be 2019-03-26 stsp usage_add(void)
2781 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2785 d00136be 2019-03-26 stsp static const struct got_error *
2786 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2788 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2789 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2790 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2791 1dd54920 2019-05-11 stsp char *cwd = NULL;
2792 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2793 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2796 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2798 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2799 d00136be 2019-03-26 stsp switch (ch) {
2801 d00136be 2019-03-26 stsp usage_add();
2802 d00136be 2019-03-26 stsp /* NOTREACHED */
2806 d00136be 2019-03-26 stsp argc -= optind;
2807 d00136be 2019-03-26 stsp argv += optind;
2809 43012d58 2019-07-14 stsp #ifndef PROFILE
2810 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2811 43012d58 2019-07-14 stsp NULL) == -1)
2812 43012d58 2019-07-14 stsp err(1, "pledge");
2814 723c305c 2019-05-11 jcs if (argc < 1)
2815 d00136be 2019-03-26 stsp usage_add();
2817 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
2818 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2819 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2820 723c305c 2019-05-11 jcs if (path == NULL) {
2821 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2824 1dd54920 2019-05-11 stsp free(path);
2827 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2828 d00136be 2019-03-26 stsp if (cwd == NULL) {
2829 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2830 d00136be 2019-03-26 stsp goto done;
2833 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2834 d00136be 2019-03-26 stsp if (error)
2835 d00136be 2019-03-26 stsp goto done;
2837 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2838 031a5338 2019-03-26 stsp if (error != NULL)
2839 031a5338 2019-03-26 stsp goto done;
2841 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2842 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2843 d00136be 2019-03-26 stsp if (error)
2844 d00136be 2019-03-26 stsp goto done;
2846 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2847 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2848 723c305c 2019-05-11 jcs if (path == NULL) {
2849 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2853 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2854 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2855 1dd54920 2019-05-11 stsp if (error) {
2856 1dd54920 2019-05-11 stsp free(path);
2860 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2861 1dd54920 2019-05-11 stsp NULL, repo);
2864 031a5338 2019-03-26 stsp got_repo_close(repo);
2865 d00136be 2019-03-26 stsp if (worktree)
2866 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2867 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2868 1dd54920 2019-05-11 stsp free((char *)pe->path);
2869 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2870 2ec1f75b 2019-03-26 stsp free(cwd);
2871 2ec1f75b 2019-03-26 stsp return error;
2874 2ec1f75b 2019-03-26 stsp __dead static void
2875 648e4ef7 2019-07-09 stsp usage_remove(void)
2877 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
2881 2ec1f75b 2019-03-26 stsp static const struct got_error *
2882 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
2884 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2885 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2886 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2887 17ed4618 2019-06-02 stsp char *cwd = NULL;
2888 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
2889 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2890 17ed4618 2019-06-02 stsp int ch, i, delete_local_mods = 0;
2892 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
2894 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2895 2ec1f75b 2019-03-26 stsp switch (ch) {
2897 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2900 2ec1f75b 2019-03-26 stsp usage_add();
2901 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2905 2ec1f75b 2019-03-26 stsp argc -= optind;
2906 2ec1f75b 2019-03-26 stsp argv += optind;
2908 43012d58 2019-07-14 stsp #ifndef PROFILE
2909 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2910 43012d58 2019-07-14 stsp NULL) == -1)
2911 43012d58 2019-07-14 stsp err(1, "pledge");
2913 17ed4618 2019-06-02 stsp if (argc < 1)
2914 648e4ef7 2019-07-09 stsp usage_remove();
2916 17ed4618 2019-06-02 stsp /* make sure each file exists before doing anything halfway */
2917 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2918 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2919 17ed4618 2019-06-02 stsp if (path == NULL) {
2920 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2921 17ed4618 2019-06-02 stsp goto done;
2923 17ed4618 2019-06-02 stsp free(path);
2926 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2927 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2928 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2929 2ec1f75b 2019-03-26 stsp goto done;
2931 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2932 2ec1f75b 2019-03-26 stsp if (error)
2933 2ec1f75b 2019-03-26 stsp goto done;
2935 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2937 2ec1f75b 2019-03-26 stsp goto done;
2939 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2940 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2941 2ec1f75b 2019-03-26 stsp if (error)
2942 2ec1f75b 2019-03-26 stsp goto done;
2944 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2945 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2946 17ed4618 2019-06-02 stsp if (path == NULL) {
2947 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2948 17ed4618 2019-06-02 stsp goto done;
2951 17ed4618 2019-06-02 stsp got_path_strip_trailing_slashes(path);
2952 17ed4618 2019-06-02 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2953 17ed4618 2019-06-02 stsp if (error) {
2954 17ed4618 2019-06-02 stsp free(path);
2955 17ed4618 2019-06-02 stsp goto done;
2958 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
2959 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
2960 a129376b 2019-03-28 stsp if (error)
2961 a129376b 2019-03-28 stsp goto done;
2964 a129376b 2019-03-28 stsp got_repo_close(repo);
2965 a129376b 2019-03-28 stsp if (worktree)
2966 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2967 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
2968 17ed4618 2019-06-02 stsp free((char *)pe->path);
2969 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
2970 a129376b 2019-03-28 stsp free(cwd);
2971 a129376b 2019-03-28 stsp return error;
2974 a129376b 2019-03-28 stsp __dead static void
2975 a129376b 2019-03-28 stsp usage_revert(void)
2977 e20a8b6f 2019-06-04 stsp fprintf(stderr, "usage: %s revert file-path ...\n", getprogname());
2981 1ee397ad 2019-07-12 stsp static const struct got_error *
2982 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2984 a129376b 2019-03-28 stsp while (path[0] == '/')
2986 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2987 1ee397ad 2019-07-12 stsp return NULL;
2990 a129376b 2019-03-28 stsp static const struct got_error *
2991 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2993 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2994 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2995 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2996 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2997 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
2998 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2999 e20a8b6f 2019-06-04 stsp int ch, i;
3001 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3003 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3004 a129376b 2019-03-28 stsp switch (ch) {
3006 a129376b 2019-03-28 stsp usage_revert();
3007 a129376b 2019-03-28 stsp /* NOTREACHED */
3011 a129376b 2019-03-28 stsp argc -= optind;
3012 a129376b 2019-03-28 stsp argv += optind;
3014 43012d58 2019-07-14 stsp #ifndef PROFILE
3015 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3016 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3017 43012d58 2019-07-14 stsp err(1, "pledge");
3019 e20a8b6f 2019-06-04 stsp if (argc < 1)
3020 a129376b 2019-03-28 stsp usage_revert();
3022 e20a8b6f 2019-06-04 stsp for (i = 0; i < argc; i++) {
3023 e20a8b6f 2019-06-04 stsp char *path = realpath(argv[i], NULL);
3024 e20a8b6f 2019-06-04 stsp if (path == NULL) {
3025 e20a8b6f 2019-06-04 stsp error = got_error_from_errno2("realpath", argv[i]);
3026 e20a8b6f 2019-06-04 stsp goto done;
3029 e20a8b6f 2019-06-04 stsp got_path_strip_trailing_slashes(path);
3030 e20a8b6f 2019-06-04 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
3031 e20a8b6f 2019-06-04 stsp if (error) {
3032 e20a8b6f 2019-06-04 stsp free(path);
3033 e20a8b6f 2019-06-04 stsp goto done;
3037 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3038 a129376b 2019-03-28 stsp if (cwd == NULL) {
3039 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3040 a129376b 2019-03-28 stsp goto done;
3042 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3043 2ec1f75b 2019-03-26 stsp if (error)
3044 2ec1f75b 2019-03-26 stsp goto done;
3046 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3047 a129376b 2019-03-28 stsp if (error != NULL)
3048 a129376b 2019-03-28 stsp goto done;
3050 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3051 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
3052 a129376b 2019-03-28 stsp if (error)
3053 a129376b 2019-03-28 stsp goto done;
3055 e20a8b6f 2019-06-04 stsp error = got_worktree_revert(worktree, &paths,
3056 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
3057 a129376b 2019-03-28 stsp if (error)
3058 a129376b 2019-03-28 stsp goto done;
3061 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3062 2ec1f75b 2019-03-26 stsp if (worktree)
3063 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3064 2ec1f75b 2019-03-26 stsp free(path);
3065 d00136be 2019-03-26 stsp free(cwd);
3066 6bad629b 2019-02-04 stsp return error;
3069 c4296144 2019-05-09 stsp __dead static void
3070 c4296144 2019-05-09 stsp usage_commit(void)
3072 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
3076 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3077 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3078 e2ba3d07 2019-05-13 stsp const char *editor;
3079 e0870e44 2019-05-13 stsp const char *worktree_path;
3080 76d98825 2019-06-03 stsp const char *branch_name;
3081 314a6357 2019-05-13 stsp const char *repo_path;
3082 e0870e44 2019-05-13 stsp char *logmsg_path;
3086 33ad4cbe 2019-05-12 jcs static const struct got_error *
3087 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3090 76d98825 2019-06-03 stsp char *initial_content = NULL;
3091 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3092 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3093 e0870e44 2019-05-13 stsp char *template = NULL;
3094 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3096 33ad4cbe 2019-05-12 jcs size_t len;
3098 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3099 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3100 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3101 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3102 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3103 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3104 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3105 33ad4cbe 2019-05-12 jcs return NULL;
3108 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3109 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3111 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3112 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3113 76d98825 2019-06-03 stsp a->branch_name) == -1)
3114 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3116 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3118 e0870e44 2019-05-13 stsp goto done;
3120 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3122 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3123 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3124 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3125 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3126 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3130 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3132 3ce1b845 2019-07-15 stsp unlink(a->logmsg_path);
3133 3ce1b845 2019-07-15 stsp free(a->logmsg_path);
3134 76d98825 2019-06-03 stsp free(initial_content);
3135 e0870e44 2019-05-13 stsp free(template);
3137 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3138 3ce1b845 2019-07-15 stsp if (err == NULL) {
3139 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
3140 3ce1b845 2019-07-15 stsp if (err) {
3141 3ce1b845 2019-07-15 stsp free(*logmsg);
3142 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3145 33ad4cbe 2019-05-12 jcs return err;
3148 c4296144 2019-05-09 stsp static const struct got_error *
3149 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3151 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3152 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3153 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3154 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
3155 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3156 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3157 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
3158 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3159 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3160 7d5807f4 2019-07-11 stsp int ch, rebase_in_progress;
3162 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3163 c4296144 2019-05-09 stsp switch (ch) {
3165 c4296144 2019-05-09 stsp logmsg = optarg;
3168 c4296144 2019-05-09 stsp usage_commit();
3169 c4296144 2019-05-09 stsp /* NOTREACHED */
3173 c4296144 2019-05-09 stsp argc -= optind;
3174 c4296144 2019-05-09 stsp argv += optind;
3176 43012d58 2019-07-14 stsp #ifndef PROFILE
3177 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3178 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3179 43012d58 2019-07-14 stsp err(1, "pledge");
3181 c4296144 2019-05-09 stsp if (argc == 1) {
3182 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
3183 c4296144 2019-05-09 stsp if (path == NULL) {
3184 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
3185 c4296144 2019-05-09 stsp goto done;
3187 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
3188 c4296144 2019-05-09 stsp } else if (argc != 0)
3189 c4296144 2019-05-09 stsp usage_commit();
3191 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
3192 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
3193 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
3194 35bd8fed 2019-05-09 stsp goto done;
3197 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3198 c4296144 2019-05-09 stsp if (cwd == NULL) {
3199 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3200 c4296144 2019-05-09 stsp goto done;
3202 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3203 7d5807f4 2019-07-11 stsp if (error)
3204 7d5807f4 2019-07-11 stsp goto done;
3206 7d5807f4 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3207 c4296144 2019-05-09 stsp if (error)
3208 7d5807f4 2019-07-11 stsp goto done;
3209 7d5807f4 2019-07-11 stsp if (rebase_in_progress) {
3210 7d5807f4 2019-07-11 stsp error = got_error(GOT_ERR_REBASING);
3211 c4296144 2019-05-09 stsp goto done;
3214 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3215 c4296144 2019-05-09 stsp if (error != NULL)
3216 c4296144 2019-05-09 stsp goto done;
3219 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3220 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3222 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3223 314a6357 2019-05-13 stsp error = get_editor(&editor);
3225 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3226 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
3227 c4296144 2019-05-09 stsp if (error)
3228 c4296144 2019-05-09 stsp goto done;
3230 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3231 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3232 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3233 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3234 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "refs/", 5) == 0)
3235 76d98825 2019-06-03 stsp cl_arg.branch_name += 5;
3236 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "heads/", 6) == 0)
3237 76d98825 2019-06-03 stsp cl_arg.branch_name += 6;
3238 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3239 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
3240 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
3241 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3242 e0870e44 2019-05-13 stsp if (error) {
3243 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3244 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3245 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3246 c4296144 2019-05-09 stsp goto done;
3249 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3250 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3252 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3253 c4296144 2019-05-09 stsp if (error)
3254 c4296144 2019-05-09 stsp goto done;
3255 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3258 c4296144 2019-05-09 stsp got_repo_close(repo);
3259 c4296144 2019-05-09 stsp if (worktree)
3260 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3261 c4296144 2019-05-09 stsp free(path);
3262 c4296144 2019-05-09 stsp free(cwd);
3263 c4296144 2019-05-09 stsp free(id_str);
3264 e2ba3d07 2019-05-13 stsp free(editor);
3265 234035bc 2019-06-01 stsp return error;
3268 234035bc 2019-06-01 stsp __dead static void
3269 234035bc 2019-06-01 stsp usage_cherrypick(void)
3271 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3275 234035bc 2019-06-01 stsp static const struct got_error *
3276 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3278 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3279 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3280 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3281 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3282 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3283 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3284 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3285 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3286 234035bc 2019-06-01 stsp int ch, did_something = 0;
3288 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3289 234035bc 2019-06-01 stsp switch (ch) {
3291 234035bc 2019-06-01 stsp usage_cherrypick();
3292 234035bc 2019-06-01 stsp /* NOTREACHED */
3296 234035bc 2019-06-01 stsp argc -= optind;
3297 234035bc 2019-06-01 stsp argv += optind;
3299 43012d58 2019-07-14 stsp #ifndef PROFILE
3300 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3301 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3302 43012d58 2019-07-14 stsp err(1, "pledge");
3304 234035bc 2019-06-01 stsp if (argc != 1)
3305 234035bc 2019-06-01 stsp usage_cherrypick();
3307 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3308 234035bc 2019-06-01 stsp if (cwd == NULL) {
3309 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3310 234035bc 2019-06-01 stsp goto done;
3312 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3313 234035bc 2019-06-01 stsp if (error)
3314 234035bc 2019-06-01 stsp goto done;
3316 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3317 234035bc 2019-06-01 stsp if (error != NULL)
3318 234035bc 2019-06-01 stsp goto done;
3320 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3321 234035bc 2019-06-01 stsp got_worktree_get_root_path(worktree), 0);
3322 234035bc 2019-06-01 stsp if (error)
3323 234035bc 2019-06-01 stsp goto done;
3325 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3326 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3327 234035bc 2019-06-01 stsp if (error != NULL) {
3328 234035bc 2019-06-01 stsp struct got_reference *ref;
3329 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3330 234035bc 2019-06-01 stsp goto done;
3331 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3332 234035bc 2019-06-01 stsp if (error != NULL)
3333 234035bc 2019-06-01 stsp goto done;
3334 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3335 234035bc 2019-06-01 stsp got_ref_close(ref);
3336 234035bc 2019-06-01 stsp if (error != NULL)
3337 234035bc 2019-06-01 stsp goto done;
3339 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3340 234035bc 2019-06-01 stsp if (error)
3341 234035bc 2019-06-01 stsp goto done;
3343 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3344 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3345 234035bc 2019-06-01 stsp if (error != NULL)
3346 234035bc 2019-06-01 stsp goto done;
3348 234035bc 2019-06-01 stsp error = check_same_branch(commit_id, head_ref, repo);
3349 234035bc 2019-06-01 stsp if (error) {
3350 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3351 234035bc 2019-06-01 stsp goto done;
3352 234035bc 2019-06-01 stsp error = NULL;
3354 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3355 234035bc 2019-06-01 stsp goto done;
3358 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3359 234035bc 2019-06-01 stsp if (error)
3360 234035bc 2019-06-01 stsp goto done;
3361 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3362 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3363 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3365 234035bc 2019-06-01 stsp if (error != NULL)
3366 234035bc 2019-06-01 stsp goto done;
3368 234035bc 2019-06-01 stsp if (did_something)
3369 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3371 234035bc 2019-06-01 stsp if (commit)
3372 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3373 234035bc 2019-06-01 stsp free(commit_id_str);
3374 234035bc 2019-06-01 stsp if (head_ref)
3375 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3376 234035bc 2019-06-01 stsp if (worktree)
3377 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3379 234035bc 2019-06-01 stsp got_repo_close(repo);
3380 c4296144 2019-05-09 stsp return error;
3383 5ef14e63 2019-06-02 stsp __dead static void
3384 5ef14e63 2019-06-02 stsp usage_backout(void)
3386 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3390 5ef14e63 2019-06-02 stsp static const struct got_error *
3391 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3393 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3394 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3395 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3396 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3397 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3398 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3399 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3400 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3401 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3403 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3404 5ef14e63 2019-06-02 stsp switch (ch) {
3406 5ef14e63 2019-06-02 stsp usage_backout();
3407 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3411 5ef14e63 2019-06-02 stsp argc -= optind;
3412 5ef14e63 2019-06-02 stsp argv += optind;
3414 43012d58 2019-07-14 stsp #ifndef PROFILE
3415 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3416 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3417 43012d58 2019-07-14 stsp err(1, "pledge");
3419 5ef14e63 2019-06-02 stsp if (argc != 1)
3420 5ef14e63 2019-06-02 stsp usage_backout();
3422 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3423 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3424 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3425 5ef14e63 2019-06-02 stsp goto done;
3427 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3428 5ef14e63 2019-06-02 stsp if (error)
3429 5ef14e63 2019-06-02 stsp goto done;
3431 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3432 5ef14e63 2019-06-02 stsp if (error != NULL)
3433 5ef14e63 2019-06-02 stsp goto done;
3435 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3436 5ef14e63 2019-06-02 stsp got_worktree_get_root_path(worktree), 0);
3437 5ef14e63 2019-06-02 stsp if (error)
3438 5ef14e63 2019-06-02 stsp goto done;
3440 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3441 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3442 5ef14e63 2019-06-02 stsp if (error != NULL) {
3443 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3444 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3445 5ef14e63 2019-06-02 stsp goto done;
3446 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3447 5ef14e63 2019-06-02 stsp if (error != NULL)
3448 5ef14e63 2019-06-02 stsp goto done;
3449 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3450 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3451 5ef14e63 2019-06-02 stsp if (error != NULL)
3452 5ef14e63 2019-06-02 stsp goto done;
3454 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3455 5ef14e63 2019-06-02 stsp if (error)
3456 5ef14e63 2019-06-02 stsp goto done;
3458 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3459 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3460 5ef14e63 2019-06-02 stsp if (error != NULL)
3461 5ef14e63 2019-06-02 stsp goto done;
3463 5ef14e63 2019-06-02 stsp error = check_same_branch(commit_id, head_ref, repo);
3464 5ef14e63 2019-06-02 stsp if (error)
3465 5ef14e63 2019-06-02 stsp goto done;
3467 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3468 5ef14e63 2019-06-02 stsp if (error)
3469 5ef14e63 2019-06-02 stsp goto done;
3470 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3471 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3472 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3473 5ef14e63 2019-06-02 stsp goto done;
3476 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3477 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3478 5ef14e63 2019-06-02 stsp if (error != NULL)
3479 5ef14e63 2019-06-02 stsp goto done;
3481 5ef14e63 2019-06-02 stsp if (did_something)
3482 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3484 5ef14e63 2019-06-02 stsp if (commit)
3485 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3486 5ef14e63 2019-06-02 stsp free(commit_id_str);
3487 5ef14e63 2019-06-02 stsp if (head_ref)
3488 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3489 818c7501 2019-07-11 stsp if (worktree)
3490 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3492 818c7501 2019-07-11 stsp got_repo_close(repo);
3493 818c7501 2019-07-11 stsp return error;
3496 818c7501 2019-07-11 stsp __dead static void
3497 818c7501 2019-07-11 stsp usage_rebase(void)
3499 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3500 af54c8f8 2019-07-11 stsp getprogname());
3504 818c7501 2019-07-11 stsp static const struct got_error *
3505 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3506 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3508 818c7501 2019-07-11 stsp const struct got_error *err;
3509 818c7501 2019-07-11 stsp char *old_id_str = NULL, *new_id_str = NULL;
3510 818c7501 2019-07-11 stsp char *logmsg0 = NULL, *logmsg, *nl;
3511 818c7501 2019-07-11 stsp size_t len;
3513 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3515 818c7501 2019-07-11 stsp goto done;
3517 ff0d2220 2019-07-11 stsp if (new_id) {
3518 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3520 ff0d2220 2019-07-11 stsp goto done;
3523 818c7501 2019-07-11 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
3524 818c7501 2019-07-11 stsp if (logmsg0 == NULL) {
3525 818c7501 2019-07-11 stsp err = got_error_from_errno("strdup");
3526 818c7501 2019-07-11 stsp goto done;
3528 818c7501 2019-07-11 stsp logmsg = logmsg0;
3530 10796104 2019-07-11 stsp while (isspace((unsigned char)logmsg[0]))
3533 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3534 ff0d2220 2019-07-11 stsp if (new_id_str)
3535 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3536 818c7501 2019-07-11 stsp len = strlen(logmsg);
3537 818c7501 2019-07-11 stsp if (len > 42)
3539 818c7501 2019-07-11 stsp logmsg[len] = '\0';
3540 818c7501 2019-07-11 stsp nl = strchr(logmsg, '\n');
3542 818c7501 2019-07-11 stsp *nl = '\0';
3543 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3544 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3546 818c7501 2019-07-11 stsp free(old_id_str);
3547 818c7501 2019-07-11 stsp free(new_id_str);
3548 818c7501 2019-07-11 stsp free(logmsg0);
3549 818c7501 2019-07-11 stsp return err;
3552 1ee397ad 2019-07-12 stsp static const struct got_error *
3553 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3555 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3557 818c7501 2019-07-11 stsp while (path[0] == '/')
3559 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3561 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3562 1ee397ad 2019-07-12 stsp return NULL;
3563 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3564 818c7501 2019-07-11 stsp *rebase_status = status;
3565 1ee397ad 2019-07-12 stsp return NULL;
3568 818c7501 2019-07-11 stsp static const struct got_error *
3569 818c7501 2019-07-11 stsp rebase_complete(struct got_worktree *worktree, struct got_reference *branch,
3570 818c7501 2019-07-11 stsp struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3571 818c7501 2019-07-11 stsp struct got_repository *repo)
3573 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3574 818c7501 2019-07-11 stsp return got_worktree_rebase_complete(worktree,
3575 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3578 818c7501 2019-07-11 stsp static const struct got_error *
3579 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
3580 01757395 2019-07-12 stsp struct got_worktree *worktree, struct got_reference *tmp_branch,
3581 ff0d2220 2019-07-11 stsp struct got_object_id *commit_id, struct got_repository *repo)
3583 ff0d2220 2019-07-11 stsp const struct got_error *error;
3584 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
3585 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
3587 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3588 ff0d2220 2019-07-11 stsp if (error)
3589 ff0d2220 2019-07-11 stsp return error;
3591 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
3592 01757395 2019-07-12 stsp worktree, tmp_branch, commit, commit_id, repo);
3593 ff0d2220 2019-07-11 stsp if (error) {
3594 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3595 ff0d2220 2019-07-11 stsp goto done;
3596 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
3598 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
3599 ff0d2220 2019-07-11 stsp free(new_commit_id);
3602 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
3603 ff0d2220 2019-07-11 stsp return error;
3606 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
3607 64c6d990 2019-07-11 stsp const char *path_prefix;
3608 64c6d990 2019-07-11 stsp size_t len;
3611 64c6d990 2019-07-11 stsp static const struct got_error *
3612 64c6d990 2019-07-11 stsp check_path_prefix(void *arg, struct got_blob_object *blob1,
3613 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3614 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
3615 64c6d990 2019-07-11 stsp struct got_repository *repo)
3617 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
3619 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3620 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3621 64c6d990 2019-07-11 stsp return got_error(GOT_ERR_REBASE_PATH);
3623 64c6d990 2019-07-11 stsp return NULL;
3626 64c6d990 2019-07-11 stsp static const struct got_error *
3627 64c6d990 2019-07-11 stsp rebase_check_path_prefix(struct got_object_id *parent_id,
3628 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
3629 64c6d990 2019-07-11 stsp struct got_repository *repo)
3631 64c6d990 2019-07-11 stsp const struct got_error *err;
3632 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3633 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
3634 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
3636 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
3637 64c6d990 2019-07-11 stsp return NULL;
3639 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3641 64c6d990 2019-07-11 stsp goto done;
3643 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
3645 64c6d990 2019-07-11 stsp goto done;
3647 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
3648 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
3650 64c6d990 2019-07-11 stsp goto done;
3652 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
3653 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
3655 64c6d990 2019-07-11 stsp goto done;
3657 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
3658 64c6d990 2019-07-11 stsp cpp_arg.len = strlen(path_prefix);
3659 64c6d990 2019-07-11 stsp err = got_diff_tree(tree1, tree2, "", "", repo, check_path_prefix,
3660 64c6d990 2019-07-11 stsp &cpp_arg);
3662 64c6d990 2019-07-11 stsp if (tree1)
3663 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
3664 64c6d990 2019-07-11 stsp if (tree2)
3665 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
3666 64c6d990 2019-07-11 stsp if (commit)
3667 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
3668 64c6d990 2019-07-11 stsp if (parent_commit)
3669 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
3670 64c6d990 2019-07-11 stsp return err;
3673 ff0d2220 2019-07-11 stsp static const struct got_error *
3674 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
3676 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
3677 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
3678 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
3679 818c7501 2019-07-11 stsp char *cwd = NULL;
3680 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
3681 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
3682 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
3683 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
3684 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
3685 818c7501 2019-07-11 stsp struct got_commit_graph *graph = NULL;
3686 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
3687 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
3688 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
3689 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
3690 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
3691 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
3692 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
3694 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
3695 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
3697 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
3698 818c7501 2019-07-11 stsp switch (ch) {
3700 818c7501 2019-07-11 stsp abort_rebase = 1;
3703 818c7501 2019-07-11 stsp continue_rebase = 1;
3706 818c7501 2019-07-11 stsp usage_rebase();
3707 818c7501 2019-07-11 stsp /* NOTREACHED */
3711 818c7501 2019-07-11 stsp argc -= optind;
3712 818c7501 2019-07-11 stsp argv += optind;
3714 43012d58 2019-07-14 stsp #ifndef PROFILE
3715 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3716 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3717 43012d58 2019-07-14 stsp err(1, "pledge");
3719 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
3720 818c7501 2019-07-11 stsp usage_rebase();
3721 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
3722 818c7501 2019-07-11 stsp if (argc != 0)
3723 818c7501 2019-07-11 stsp usage_rebase();
3724 818c7501 2019-07-11 stsp } else if (argc != 1)
3725 818c7501 2019-07-11 stsp usage_rebase();
3727 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
3728 818c7501 2019-07-11 stsp if (cwd == NULL) {
3729 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
3730 818c7501 2019-07-11 stsp goto done;
3732 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
3733 818c7501 2019-07-11 stsp if (error)
3734 818c7501 2019-07-11 stsp goto done;
3736 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3737 818c7501 2019-07-11 stsp if (error != NULL)
3738 818c7501 2019-07-11 stsp goto done;
3740 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3741 818c7501 2019-07-11 stsp got_worktree_get_root_path(worktree), 0);
3742 818c7501 2019-07-11 stsp if (error)
3743 818c7501 2019-07-11 stsp goto done;
3745 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3746 818c7501 2019-07-11 stsp if (error)
3747 818c7501 2019-07-11 stsp goto done;
3749 818c7501 2019-07-11 stsp if (rebase_in_progress && abort_rebase) {
3750 818c7501 2019-07-11 stsp int did_something;
3751 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3752 818c7501 2019-07-11 stsp &new_base_branch, &tmp_branch, &branch, worktree, repo);
3753 818c7501 2019-07-11 stsp if (error)
3754 818c7501 2019-07-11 stsp goto done;
3755 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
3756 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
3757 818c7501 2019-07-11 stsp error = got_worktree_rebase_abort(worktree, repo,
3758 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
3759 818c7501 2019-07-11 stsp if (error)
3760 818c7501 2019-07-11 stsp goto done;
3761 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
3762 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
3763 818c7501 2019-07-11 stsp } else if (abort_rebase) {
3764 818c7501 2019-07-11 stsp error = got_error(GOT_ERR_NOT_REBASING);
3765 818c7501 2019-07-11 stsp goto done;
3768 818c7501 2019-07-11 stsp if (continue_rebase) {
3769 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3770 818c7501 2019-07-11 stsp &new_base_branch, &tmp_branch, &branch, worktree, repo);
3771 818c7501 2019-07-11 stsp if (error)
3772 818c7501 2019-07-11 stsp goto done;
3774 01757395 2019-07-12 stsp error = rebase_commit(NULL, worktree, tmp_branch,
3775 01757395 2019-07-12 stsp resume_commit_id, repo);
3776 818c7501 2019-07-11 stsp if (error)
3777 818c7501 2019-07-11 stsp goto done;
3779 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
3780 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
3781 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
3782 818c7501 2019-07-11 stsp goto done;
3785 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
3786 818c7501 2019-07-11 stsp if (error != NULL)
3787 818c7501 2019-07-11 stsp goto done;
3789 818c7501 2019-07-11 stsp error = check_same_branch(
3790 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree), branch, repo);
3791 818c7501 2019-07-11 stsp if (error) {
3792 818c7501 2019-07-11 stsp if (error->code != GOT_ERR_ANCESTRY)
3793 818c7501 2019-07-11 stsp goto done;
3794 818c7501 2019-07-11 stsp error = NULL;
3796 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
3797 818c7501 2019-07-11 stsp "specified branch resolves to a commit which "
3798 818c7501 2019-07-11 stsp "is already contained in work tree's branch");
3799 818c7501 2019-07-11 stsp goto done;
3803 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
3804 ff0d2220 2019-07-11 stsp if (error)
3805 ff0d2220 2019-07-11 stsp goto done;
3807 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
3808 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
3809 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree),
3810 818c7501 2019-07-11 stsp branch_head_commit_id, repo);
3811 818c7501 2019-07-11 stsp if (error)
3812 818c7501 2019-07-11 stsp goto done;
3813 818c7501 2019-07-11 stsp if (yca_id == NULL) {
3814 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3815 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
3816 818c7501 2019-07-11 stsp "with work tree's branch");
3817 818c7501 2019-07-11 stsp goto done;
3820 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
3821 818c7501 2019-07-11 stsp &tmp_branch, worktree, branch, repo);
3822 818c7501 2019-07-11 stsp if (error)
3823 818c7501 2019-07-11 stsp goto done;
3826 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
3827 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3828 818c7501 2019-07-11 stsp if (error)
3829 818c7501 2019-07-11 stsp goto done;
3831 818c7501 2019-07-11 stsp error = got_commit_graph_open(&graph, commit_id, "/", 1, repo);
3832 818c7501 2019-07-11 stsp if (error)
3833 818c7501 2019-07-11 stsp goto done;
3834 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3835 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
3836 818c7501 2019-07-11 stsp error = got_commit_graph_iter_start(graph, pid->id, repo);
3837 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3838 818c7501 2019-07-11 stsp commit = NULL;
3839 818c7501 2019-07-11 stsp if (error)
3840 818c7501 2019-07-11 stsp goto done;
3841 818c7501 2019-07-11 stsp while (got_object_id_cmp(commit_id, yca_id) != 0) {
3842 818c7501 2019-07-11 stsp error = got_commit_graph_iter_next(&parent_id, graph);
3843 818c7501 2019-07-11 stsp if (error) {
3844 818c7501 2019-07-11 stsp if (error->code == GOT_ERR_ITER_COMPLETED) {
3845 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3846 818c7501 2019-07-11 stsp "ran out of commits to rebase before "
3847 818c7501 2019-07-11 stsp "youngest common ancestor commit has "
3848 818c7501 2019-07-11 stsp "been reached?!?");
3849 818c7501 2019-07-11 stsp goto done;
3850 818c7501 2019-07-11 stsp } else if (error->code != GOT_ERR_ITER_NEED_MORE)
3851 818c7501 2019-07-11 stsp goto done;
3852 818c7501 2019-07-11 stsp error = got_commit_graph_fetch_commits(graph, 1, repo);
3853 818c7501 2019-07-11 stsp if (error)
3854 818c7501 2019-07-11 stsp goto done;
3856 64c6d990 2019-07-11 stsp error = rebase_check_path_prefix(parent_id, commit_id,
3857 64c6d990 2019-07-11 stsp got_worktree_get_path_prefix(worktree), repo);
3858 64c6d990 2019-07-11 stsp if (error)
3859 64c6d990 2019-07-11 stsp goto done;
3861 818c7501 2019-07-11 stsp error = got_object_qid_alloc(&qid, commit_id);
3862 818c7501 2019-07-11 stsp if (error)
3863 818c7501 2019-07-11 stsp goto done;
3864 818c7501 2019-07-11 stsp SIMPLEQ_INSERT_HEAD(&commits, qid, entry);
3865 818c7501 2019-07-11 stsp commit_id = parent_id;
3868 f35c2426 2019-07-15 stsp got_commit_graph_close(graph);
3869 f35c2426 2019-07-15 stsp graph = NULL;
3871 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
3872 ff0d2220 2019-07-11 stsp if (continue_rebase)
3873 ff0d2220 2019-07-11 stsp error = rebase_complete(worktree, branch,
3874 ff0d2220 2019-07-11 stsp new_base_branch, tmp_branch, repo);
3876 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
3877 818c7501 2019-07-11 stsp goto done;
3880 818c7501 2019-07-11 stsp pid = NULL;
3881 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
3882 818c7501 2019-07-11 stsp commit_id = qid->id;
3883 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
3884 818c7501 2019-07-11 stsp pid = qid;
3886 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
3887 01757395 2019-07-12 stsp worktree, parent_id, commit_id, repo, rebase_progress,
3888 01757395 2019-07-12 stsp &rebase_status, check_cancelled, NULL);
3889 818c7501 2019-07-11 stsp if (error)
3890 818c7501 2019-07-11 stsp goto done;
3892 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
3893 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
3897 01757395 2019-07-12 stsp error = rebase_commit(&merged_paths, worktree, tmp_branch,
3898 01757395 2019-07-12 stsp commit_id, repo);
3899 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
3900 818c7501 2019-07-11 stsp if (error)
3901 818c7501 2019-07-11 stsp goto done;
3904 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
3905 818c7501 2019-07-11 stsp error = got_worktree_rebase_postpone(worktree);
3906 818c7501 2019-07-11 stsp if (error)
3907 818c7501 2019-07-11 stsp goto done;
3908 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
3909 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
3911 818c7501 2019-07-11 stsp error = rebase_complete(worktree, branch, new_base_branch,
3912 818c7501 2019-07-11 stsp tmp_branch, repo);
3914 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
3915 818c7501 2019-07-11 stsp free(branch_head_commit_id);
3916 818c7501 2019-07-11 stsp free(resume_commit_id);
3917 818c7501 2019-07-11 stsp free(yca_id);
3918 818c7501 2019-07-11 stsp if (graph)
3919 818c7501 2019-07-11 stsp got_commit_graph_close(graph);
3920 818c7501 2019-07-11 stsp if (commit)
3921 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3922 818c7501 2019-07-11 stsp if (branch)
3923 818c7501 2019-07-11 stsp got_ref_close(branch);
3924 818c7501 2019-07-11 stsp if (new_base_branch)
3925 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
3926 818c7501 2019-07-11 stsp if (tmp_branch)
3927 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
3928 5ef14e63 2019-06-02 stsp if (worktree)
3929 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
3931 5ef14e63 2019-06-02 stsp got_repo_close(repo);
3932 5ef14e63 2019-06-02 stsp return error;
