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;
753 a367ff0f 2019-05-14 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
755 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
762 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
763 a367ff0f 2019-05-14 stsp is_same_branch = 1;
770 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
771 a367ff0f 2019-05-14 stsp free(head_commit_id);
772 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
773 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
774 a367ff0f 2019-05-14 stsp return err;
777 4ed7e80c 2018-05-20 stsp static const struct got_error *
778 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
780 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
781 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
782 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
783 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
784 c09a553d 2018-03-12 stsp char *repo_path = NULL;
785 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
786 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
787 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
788 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
789 72151b04 2019-05-11 stsp int ch, same_path_prefix;
791 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
792 0bb8a95e 2018-03-12 stsp switch (ch) {
794 08573d5b 2019-05-14 stsp branch_name = optarg;
797 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
798 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
799 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
802 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
805 2deda0b9 2019-03-07 stsp usage_checkout();
806 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
810 0bb8a95e 2018-03-12 stsp argc -= optind;
811 0bb8a95e 2018-03-12 stsp argv += optind;
813 6715a751 2018-03-16 stsp #ifndef PROFILE
814 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
815 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
816 c09a553d 2018-03-12 stsp err(1, "pledge");
818 0bb8a95e 2018-03-12 stsp if (argc == 1) {
819 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
820 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
821 76089277 2018-04-01 stsp if (repo_path == NULL)
822 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
823 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
824 76089277 2018-04-01 stsp if (cwd == NULL) {
825 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
828 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
829 230a42bd 2019-05-11 jcs base = basename(path_prefix);
830 230a42bd 2019-05-11 jcs if (base == NULL) {
831 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
832 230a42bd 2019-05-11 jcs path_prefix);
836 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
837 230a42bd 2019-05-11 jcs if (base == NULL) {
838 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
843 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
844 c09a553d 2018-03-12 stsp if (dotgit)
845 c09a553d 2018-03-12 stsp *dotgit = '\0';
846 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
847 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
852 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
853 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
854 76089277 2018-04-01 stsp if (repo_path == NULL) {
855 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
858 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
859 76089277 2018-04-01 stsp if (worktree_path == NULL) {
860 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[1]);
864 c09a553d 2018-03-12 stsp usage_checkout();
866 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
867 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
869 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
870 c09a553d 2018-03-12 stsp if (error != NULL)
873 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
877 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
878 c09a553d 2018-03-12 stsp if (error != NULL)
881 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
882 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
885 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
886 c09a553d 2018-03-12 stsp if (error != NULL)
889 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
890 e5dc7198 2018-12-29 stsp path_prefix);
891 e5dc7198 2018-12-29 stsp if (error != NULL)
893 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
894 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
898 8069f636 2019-01-12 stsp if (commit_id_str) {
899 8069f636 2019-01-12 stsp struct got_object_id *commit_id;
900 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
901 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
902 8069f636 2019-01-12 stsp if (error != NULL)
904 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
905 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
906 8069f636 2019-01-12 stsp if (error != NULL) {
907 8069f636 2019-01-12 stsp free(commit_id);
910 45d344f6 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
913 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
914 8069f636 2019-01-12 stsp commit_id);
915 8069f636 2019-01-12 stsp free(commit_id);
920 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, "", repo,
921 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
922 c09a553d 2018-03-12 stsp if (error != NULL)
925 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
928 8069f636 2019-01-12 stsp free(commit_id_str);
929 76089277 2018-04-01 stsp free(repo_path);
930 507dc3bb 2018-12-29 stsp free(worktree_path);
931 507dc3bb 2018-12-29 stsp return error;
934 507dc3bb 2018-12-29 stsp __dead static void
935 507dc3bb 2018-12-29 stsp usage_update(void)
937 024e9686 2019-05-14 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path]\n",
938 507dc3bb 2018-12-29 stsp getprogname());
942 1ee397ad 2019-07-12 stsp static const struct got_error *
943 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
945 784955db 2019-01-12 stsp int *did_something = arg;
947 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
948 1ee397ad 2019-07-12 stsp return NULL;
950 1545c615 2019-02-10 stsp *did_something = 1;
952 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
953 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
954 1ee397ad 2019-07-12 stsp return NULL;
956 507dc3bb 2018-12-29 stsp while (path[0] == '/')
958 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
959 1ee397ad 2019-07-12 stsp return NULL;
962 be7061eb 2018-12-30 stsp static const struct got_error *
963 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
964 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
965 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
967 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
968 a1fb16d8 2019-05-24 stsp char *base_id_str;
969 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
971 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
972 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
973 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
974 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
975 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
976 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
977 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
980 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
981 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
983 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
984 a1fb16d8 2019-05-24 stsp return err;
985 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
987 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
988 a1fb16d8 2019-05-24 stsp return NULL;
990 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
991 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
992 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
994 a1fb16d8 2019-05-24 stsp return err;
995 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
996 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
997 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
998 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
999 a1fb16d8 2019-05-24 stsp return NULL;
1002 a1fb16d8 2019-05-24 stsp static const struct got_error *
1003 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1005 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1006 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1007 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1008 c4cdcb68 2019-04-03 stsp char *worktree_path = NULL, *path = NULL;
1009 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1010 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1011 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1012 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1013 7d5807f4 2019-07-11 stsp int ch, did_something = 0, rebase_in_progress;
1015 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1016 507dc3bb 2018-12-29 stsp switch (ch) {
1018 024e9686 2019-05-14 stsp branch_name = optarg;
1021 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1022 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1023 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1026 2deda0b9 2019-03-07 stsp usage_update();
1027 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1031 507dc3bb 2018-12-29 stsp argc -= optind;
1032 507dc3bb 2018-12-29 stsp argv += optind;
1034 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1035 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1036 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1037 507dc3bb 2018-12-29 stsp err(1, "pledge");
1039 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1040 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1041 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1042 c4cdcb68 2019-04-03 stsp goto done;
1044 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1045 7d5807f4 2019-07-11 stsp if (error)
1046 7d5807f4 2019-07-11 stsp goto done;
1048 7d5807f4 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
1049 c4cdcb68 2019-04-03 stsp if (error)
1050 c4cdcb68 2019-04-03 stsp goto done;
1051 7d5807f4 2019-07-11 stsp if (rebase_in_progress) {
1052 7d5807f4 2019-07-11 stsp error = got_error(GOT_ERR_REBASING);
1053 7d5807f4 2019-07-11 stsp goto done;
1056 507dc3bb 2018-12-29 stsp if (argc == 0) {
1057 c4cdcb68 2019-04-03 stsp path = strdup("");
1058 c4cdcb68 2019-04-03 stsp if (path == NULL) {
1059 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1060 507dc3bb 2018-12-29 stsp goto done;
1062 507dc3bb 2018-12-29 stsp } else if (argc == 1) {
1063 c4cdcb68 2019-04-03 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
1064 c4cdcb68 2019-04-03 stsp if (error)
1065 507dc3bb 2018-12-29 stsp goto done;
1067 507dc3bb 2018-12-29 stsp usage_update();
1069 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1070 507dc3bb 2018-12-29 stsp if (error != NULL)
1071 507dc3bb 2018-12-29 stsp goto done;
1073 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1074 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
1075 0266afb7 2019-01-04 stsp if (error)
1076 0266afb7 2019-01-04 stsp goto done;
1078 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1079 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1080 024e9686 2019-05-14 stsp if (error != NULL)
1081 024e9686 2019-05-14 stsp goto done;
1082 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1083 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1084 9c4b8182 2019-01-02 stsp if (error != NULL)
1085 9c4b8182 2019-01-02 stsp goto done;
1086 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1087 507dc3bb 2018-12-29 stsp if (error != NULL)
1088 507dc3bb 2018-12-29 stsp goto done;
1090 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1091 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
1092 507dc3bb 2018-12-29 stsp if (error != NULL)
1093 a297e751 2019-07-11 stsp goto done;
1094 a297e751 2019-07-11 stsp free(commit_id_str);
1095 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1096 a297e751 2019-07-11 stsp if (error)
1097 507dc3bb 2018-12-29 stsp goto done;
1100 a1fb16d8 2019-05-24 stsp if (branch_name) {
1101 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1102 024e9686 2019-05-14 stsp if (strlen(path) != 0) {
1103 a1fb16d8 2019-05-24 stsp fprintf(stderr, "%s: switching between branches "
1104 a1fb16d8 2019-05-24 stsp "requires that the entire work tree "
1105 024e9686 2019-05-14 stsp "gets updated, not just '%s'\n",
1106 024e9686 2019-05-14 stsp getprogname(), path);
1107 024e9686 2019-05-14 stsp error = got_error(GOT_ERR_BAD_PATH);
1108 024e9686 2019-05-14 stsp goto done;
1110 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1111 024e9686 2019-05-14 stsp if (error)
1112 024e9686 2019-05-14 stsp goto done;
1113 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1114 a367ff0f 2019-05-14 stsp free(head_commit_id);
1115 024e9686 2019-05-14 stsp if (error != NULL)
1116 024e9686 2019-05-14 stsp goto done;
1117 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
1118 a367ff0f 2019-05-14 stsp if (error)
1119 a367ff0f 2019-05-14 stsp goto done;
1120 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1121 024e9686 2019-05-14 stsp if (error)
1122 024e9686 2019-05-14 stsp goto done;
1124 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1125 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1126 a367ff0f 2019-05-14 stsp if (error != NULL) {
1127 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1128 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1129 024e9686 2019-05-14 stsp goto done;
1131 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
1132 a367ff0f 2019-05-14 stsp if (error)
1133 a367ff0f 2019-05-14 stsp goto done;
1136 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1137 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1138 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1139 507dc3bb 2018-12-29 stsp commit_id);
1140 507dc3bb 2018-12-29 stsp if (error)
1141 507dc3bb 2018-12-29 stsp goto done;
1144 c4cdcb68 2019-04-03 stsp error = got_worktree_checkout_files(worktree, path, repo,
1145 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1146 507dc3bb 2018-12-29 stsp if (error != NULL)
1147 507dc3bb 2018-12-29 stsp goto done;
1149 784955db 2019-01-12 stsp if (did_something)
1150 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1152 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1154 c09a553d 2018-03-12 stsp free(worktree_path);
1155 c4cdcb68 2019-04-03 stsp free(path);
1156 507dc3bb 2018-12-29 stsp free(commit_id);
1157 9c4b8182 2019-01-02 stsp free(commit_id_str);
1158 c09a553d 2018-03-12 stsp return error;
1161 f42b1b34 2018-03-12 stsp static const struct got_error *
1162 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1163 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1165 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1166 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1167 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1168 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1169 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1171 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1172 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1174 79109fed 2018-03-27 stsp return err;
1176 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1177 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1178 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1180 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1182 79109fed 2018-03-27 stsp return err;
1184 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1185 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1186 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1188 0f2b3dca 2018-12-22 stsp return err;
1190 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1192 79109fed 2018-03-27 stsp return err;
1195 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1197 0f2b3dca 2018-12-22 stsp goto done;
1199 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1200 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1201 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1202 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1203 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff, &arg);
1205 79109fed 2018-03-27 stsp if (tree1)
1206 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1207 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1208 0f2b3dca 2018-12-22 stsp free(id_str1);
1209 0f2b3dca 2018-12-22 stsp free(id_str2);
1210 79109fed 2018-03-27 stsp return err;
1213 4bb494d5 2018-06-16 stsp static char *
1214 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1216 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
1217 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1219 6c281f94 2018-06-11 stsp *p = '\0';
1223 79109fed 2018-03-27 stsp static const struct got_error *
1224 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1225 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1226 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1228 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1229 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1230 6c281f94 2018-06-11 stsp char datebuf[26];
1231 45d799e2 2018-12-23 stsp time_t committer_time;
1232 45d799e2 2018-12-23 stsp const char *author, *committer;
1233 199a4027 2019-02-02 stsp char *refs_str = NULL;
1234 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1236 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1238 199a4027 2019-02-02 stsp const char *name;
1239 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
1241 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1242 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1244 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1245 199a4027 2019-02-02 stsp name += 5;
1246 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1248 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1249 e34f9ed6 2019-02-02 stsp name += 6;
1250 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1251 141c2bff 2019-02-04 stsp name += 8;
1252 199a4027 2019-02-02 stsp s = refs_str;
1253 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1254 199a4027 2019-02-02 stsp name) == -1) {
1255 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1261 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1263 8bf5b3c9 2018-03-17 stsp return err;
1265 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
1266 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1267 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1268 832c249c 2018-06-10 stsp free(id_str);
1269 d3d493d7 2019-02-21 stsp id_str = NULL;
1270 d3d493d7 2019-02-21 stsp free(refs_str);
1271 d3d493d7 2019-02-21 stsp refs_str = NULL;
1272 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1273 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1274 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1275 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
1276 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1277 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1278 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1279 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1280 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1281 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1282 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1283 3fe1abad 2018-06-10 stsp int n = 1;
1284 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1285 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1286 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1288 a0603db2 2018-06-10 stsp return err;
1289 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1290 a0603db2 2018-06-10 stsp free(id_str);
1294 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1295 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
1296 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1298 621015ac 2018-07-23 stsp logmsg = logmsg0;
1300 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1302 832c249c 2018-06-10 stsp printf(" %s\n", line);
1303 832c249c 2018-06-10 stsp } while (line);
1304 621015ac 2018-07-23 stsp free(logmsg0);
1306 971751ac 2018-03-27 stsp if (show_patch) {
1307 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1308 971751ac 2018-03-27 stsp if (err == 0)
1309 971751ac 2018-03-27 stsp printf("\n");
1312 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1313 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1314 07862c20 2018-09-15 stsp return err;
1317 f42b1b34 2018-03-12 stsp static const struct got_error *
1318 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1319 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1320 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1322 f42b1b34 2018-03-12 stsp const struct got_error *err;
1323 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1325 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1326 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1328 f42b1b34 2018-03-12 stsp return err;
1329 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1331 fcc85cad 2018-07-22 stsp goto done;
1333 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1334 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1336 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1339 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1340 372ccdbb 2018-06-10 stsp if (err) {
1341 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1342 9ba79e04 2018-06-11 stsp err = NULL;
1345 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1347 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1353 b43fbaa0 2018-06-11 stsp if (id == NULL)
1356 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1359 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1361 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1362 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1366 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1367 f42b1b34 2018-03-12 stsp return err;
1370 4ed7e80c 2018-05-20 stsp __dead static void
1371 6f3d1eb0 2018-03-12 stsp usage_log(void)
1373 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1374 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1378 4ed7e80c 2018-05-20 stsp static const struct got_error *
1379 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1381 f42b1b34 2018-03-12 stsp const struct got_error *error;
1382 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1383 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1384 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1385 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1386 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1387 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1388 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1389 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1390 64a96a6d 2018-04-01 stsp const char *errstr;
1391 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1393 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1395 6715a751 2018-03-16 stsp #ifndef PROFILE
1396 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1399 f42b1b34 2018-03-12 stsp err(1, "pledge");
1402 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1403 79109fed 2018-03-27 stsp switch (ch) {
1405 79109fed 2018-03-27 stsp show_patch = 1;
1408 d142fc45 2018-04-01 stsp start_commit = optarg;
1411 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1413 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1414 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1417 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1418 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1419 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1422 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1425 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1426 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1427 04ca23f4 2018-07-16 stsp err(1, "-r option");
1428 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1431 2deda0b9 2019-03-07 stsp usage_log();
1432 79109fed 2018-03-27 stsp /* NOTREACHED */
1436 79109fed 2018-03-27 stsp argc -= optind;
1437 79109fed 2018-03-27 stsp argv += optind;
1439 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1440 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1441 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1442 04ca23f4 2018-07-16 stsp goto done;
1445 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1446 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1447 cffc0aa4 2019-02-05 stsp goto done;
1448 cffc0aa4 2019-02-05 stsp error = NULL;
1450 e7301579 2019-03-18 stsp if (argc == 0) {
1451 cbd1af7a 2019-03-18 stsp path = strdup("");
1452 e7301579 2019-03-18 stsp if (path == NULL) {
1453 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1454 cbd1af7a 2019-03-18 stsp goto done;
1456 e7301579 2019-03-18 stsp } else if (argc == 1) {
1457 e7301579 2019-03-18 stsp if (worktree) {
1458 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1460 e7301579 2019-03-18 stsp if (error)
1461 e7301579 2019-03-18 stsp goto done;
1463 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1464 e7301579 2019-03-18 stsp if (path == NULL) {
1465 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1466 e7301579 2019-03-18 stsp goto done;
1470 cbd1af7a 2019-03-18 stsp usage_log();
1472 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1473 5486daa2 2019-05-11 stsp repo_path = worktree ?
1474 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1476 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1477 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1478 cffc0aa4 2019-02-05 stsp goto done;
1481 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1482 d7d4f210 2018-03-12 stsp if (error != NULL)
1483 04ca23f4 2018-07-16 stsp goto done;
1485 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1486 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1487 c02c541e 2019-03-29 stsp if (error)
1488 c02c541e 2019-03-29 stsp goto done;
1490 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1491 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1492 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1493 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1494 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1495 3235492e 2018-04-01 stsp if (error != NULL)
1496 3235492e 2018-04-01 stsp return error;
1497 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1498 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1499 3235492e 2018-04-01 stsp if (error != NULL)
1500 3235492e 2018-04-01 stsp return error;
1501 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1503 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1504 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1505 3235492e 2018-04-01 stsp if (error == NULL) {
1506 1caad61b 2019-02-01 stsp int obj_type;
1507 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1508 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1509 d1f2edc9 2018-06-13 stsp if (error != NULL)
1510 1caad61b 2019-02-01 stsp goto done;
1511 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1512 1caad61b 2019-02-01 stsp if (error != NULL)
1513 1caad61b 2019-02-01 stsp goto done;
1514 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1515 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1516 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1517 1caad61b 2019-02-01 stsp if (error != NULL)
1518 1caad61b 2019-02-01 stsp goto done;
1519 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1520 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1521 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1522 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1523 1caad61b 2019-02-01 stsp goto done;
1526 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1527 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1528 1caad61b 2019-02-01 stsp if (id == NULL)
1529 638f9024 2019-05-13 stsp error = got_error_from_errno(
1530 230a42bd 2019-05-11 jcs "got_object_id_dup");
1531 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1532 1caad61b 2019-02-01 stsp if (error)
1533 1caad61b 2019-02-01 stsp goto done;
1534 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1535 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1536 1caad61b 2019-02-01 stsp goto done;
1538 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1539 d1f2edc9 2018-06-13 stsp if (error != NULL)
1540 1caad61b 2019-02-01 stsp goto done;
1542 15a94983 2018-12-23 stsp if (commit == NULL) {
1543 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1544 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1545 d1f2edc9 2018-06-13 stsp if (error != NULL)
1546 d1f2edc9 2018-06-13 stsp return error;
1549 d7d4f210 2018-03-12 stsp if (error != NULL)
1550 04ca23f4 2018-07-16 stsp goto done;
1552 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1553 04ca23f4 2018-07-16 stsp if (error != NULL)
1554 04ca23f4 2018-07-16 stsp goto done;
1555 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1556 04ca23f4 2018-07-16 stsp free(path);
1557 04ca23f4 2018-07-16 stsp path = in_repo_path;
1560 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1561 199a4027 2019-02-02 stsp if (error)
1562 199a4027 2019-02-02 stsp goto done;
1564 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1565 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1567 04ca23f4 2018-07-16 stsp free(path);
1568 04ca23f4 2018-07-16 stsp free(repo_path);
1569 04ca23f4 2018-07-16 stsp free(cwd);
1571 cffc0aa4 2019-02-05 stsp if (worktree)
1572 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1573 ad242220 2018-09-08 stsp if (repo) {
1574 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1575 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1576 ad242220 2018-09-08 stsp if (error == NULL)
1577 ad242220 2018-09-08 stsp error = repo_error;
1579 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1580 8bf5b3c9 2018-03-17 stsp return error;
1583 4ed7e80c 2018-05-20 stsp __dead static void
1584 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1586 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1587 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1591 b72f483a 2019-02-05 stsp struct print_diff_arg {
1592 b72f483a 2019-02-05 stsp struct got_repository *repo;
1593 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1594 b72f483a 2019-02-05 stsp int diff_context;
1595 3fc0c068 2019-02-10 stsp const char *id_str;
1596 3fc0c068 2019-02-10 stsp int header_shown;
1599 4ed7e80c 2018-05-20 stsp static const struct got_error *
1600 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1601 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1603 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1604 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1605 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1606 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1607 b72f483a 2019-02-05 stsp char *abspath = NULL;
1608 b72f483a 2019-02-05 stsp struct stat sb;
1610 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1611 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1612 b72f483a 2019-02-05 stsp return NULL;
1614 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1615 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1616 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1617 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1620 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1621 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1623 d00136be 2019-03-26 stsp goto done;
1627 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1628 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1629 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1630 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1631 2ec1f75b 2019-03-26 stsp goto done;
1634 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1635 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1636 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1637 2ec1f75b 2019-03-26 stsp goto done;
1639 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1640 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1641 2ec1f75b 2019-03-26 stsp goto done;
1644 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1646 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1649 b72f483a 2019-02-05 stsp if (blob1)
1650 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1651 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1652 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1653 b72f483a 2019-02-05 stsp free(abspath);
1654 927df6b7 2019-02-10 stsp return err;
1657 927df6b7 2019-02-10 stsp static const struct got_error *
1658 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1660 b00d56cd 2018-04-01 stsp const struct got_error *error;
1661 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1662 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1663 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1664 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1665 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1666 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1667 15a94983 2018-12-23 stsp int type1, type2;
1668 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1669 c0cc5c62 2018-10-18 stsp const char *errstr;
1670 927df6b7 2019-02-10 stsp char *path = NULL;
1672 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1673 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1674 25eccc22 2019-01-04 stsp NULL) == -1)
1675 b00d56cd 2018-04-01 stsp err(1, "pledge");
1678 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1679 b00d56cd 2018-04-01 stsp switch (ch) {
1681 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1682 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1683 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1686 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1687 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1688 b72f483a 2019-02-05 stsp err(1, "-r option");
1689 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1692 2deda0b9 2019-03-07 stsp usage_diff();
1693 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1697 b00d56cd 2018-04-01 stsp argc -= optind;
1698 b00d56cd 2018-04-01 stsp argv += optind;
1700 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1701 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1702 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1703 b72f483a 2019-02-05 stsp goto done;
1705 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1706 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1707 927df6b7 2019-02-10 stsp goto done;
1708 927df6b7 2019-02-10 stsp if (argc <= 1) {
1709 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1710 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1711 927df6b7 2019-02-10 stsp goto done;
1713 b72f483a 2019-02-05 stsp if (repo_path)
1715 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1716 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1717 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1718 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1719 927df6b7 2019-02-10 stsp goto done;
1721 927df6b7 2019-02-10 stsp if (argc == 1) {
1722 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1724 927df6b7 2019-02-10 stsp if (error)
1725 927df6b7 2019-02-10 stsp goto done;
1727 927df6b7 2019-02-10 stsp path = strdup("");
1728 927df6b7 2019-02-10 stsp if (path == NULL) {
1729 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1730 927df6b7 2019-02-10 stsp goto done;
1733 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1734 15a94983 2018-12-23 stsp id_str1 = argv[0];
1735 15a94983 2018-12-23 stsp id_str2 = argv[1];
1736 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1737 30db809c 2019-06-05 stsp repo_path =
1738 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1739 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1740 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1741 30db809c 2019-06-05 stsp goto done;
1745 b00d56cd 2018-04-01 stsp usage_diff();
1747 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1748 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1749 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1750 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1753 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1754 76089277 2018-04-01 stsp free(repo_path);
1755 b00d56cd 2018-04-01 stsp if (error != NULL)
1756 b00d56cd 2018-04-01 stsp goto done;
1758 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1759 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1760 c02c541e 2019-03-29 stsp if (error)
1761 c02c541e 2019-03-29 stsp goto done;
1763 30db809c 2019-06-05 stsp if (argc <= 1) {
1764 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1765 b72f483a 2019-02-05 stsp char *id_str;
1766 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1767 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1768 b72f483a 2019-02-05 stsp if (error)
1769 b72f483a 2019-02-05 stsp goto done;
1770 b72f483a 2019-02-05 stsp arg.repo = repo;
1771 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1772 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1773 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1774 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1776 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_diff,
1777 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1778 b72f483a 2019-02-05 stsp free(id_str);
1779 b72f483a 2019-02-05 stsp goto done;
1782 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
1783 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1784 e02e74af 2019-05-28 stsp if (error) {
1785 e02e74af 2019-05-28 stsp struct got_reference *ref;
1786 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1787 e02e74af 2019-05-28 stsp goto done;
1788 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1789 e02e74af 2019-05-28 stsp if (error != NULL)
1790 e02e74af 2019-05-28 stsp goto done;
1791 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
1792 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1793 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1794 5e70831e 2019-05-28 stsp goto done;
1796 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1797 e02e74af 2019-05-28 stsp got_ref_close(ref);
1798 e02e74af 2019-05-28 stsp if (error != NULL)
1799 5e70831e 2019-05-28 stsp goto done;
1801 a297e751 2019-07-11 stsp error = got_object_id_str(&label1, id1);
1802 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1803 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1804 e02e74af 2019-05-28 stsp goto done;
1808 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
1809 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1810 e02e74af 2019-05-28 stsp if (error) {
1811 e02e74af 2019-05-28 stsp struct got_reference *ref;
1812 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1813 e02e74af 2019-05-28 stsp goto done;
1814 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1815 e02e74af 2019-05-28 stsp if (error != NULL)
1816 5e70831e 2019-05-28 stsp goto done;
1817 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
1818 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1819 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1820 e02e74af 2019-05-28 stsp goto done;
1822 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1823 e02e74af 2019-05-28 stsp got_ref_close(ref);
1824 e02e74af 2019-05-28 stsp if (error != NULL)
1825 e02e74af 2019-05-28 stsp goto done;
1827 a297e751 2019-07-11 stsp error = got_object_id_str(&label2, id2);
1828 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1829 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1830 5e70831e 2019-05-28 stsp goto done;
1834 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1835 15a94983 2018-12-23 stsp if (error)
1836 15a94983 2018-12-23 stsp goto done;
1838 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1839 15a94983 2018-12-23 stsp if (error)
1840 15a94983 2018-12-23 stsp goto done;
1842 15a94983 2018-12-23 stsp if (type1 != type2) {
1843 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1844 b00d56cd 2018-04-01 stsp goto done;
1847 15a94983 2018-12-23 stsp switch (type1) {
1848 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1849 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1850 54156555 2018-12-24 stsp diff_context, repo, stdout);
1852 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1853 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1854 54156555 2018-12-24 stsp diff_context, repo, stdout);
1856 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1857 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
1858 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1859 c0cc5c62 2018-10-18 stsp repo, stdout);
1862 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1866 5e70831e 2019-05-28 stsp free(label1);
1867 5e70831e 2019-05-28 stsp free(label2);
1868 15a94983 2018-12-23 stsp free(id1);
1869 15a94983 2018-12-23 stsp free(id2);
1870 927df6b7 2019-02-10 stsp free(path);
1871 b72f483a 2019-02-05 stsp if (worktree)
1872 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1873 ad242220 2018-09-08 stsp if (repo) {
1874 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1875 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1876 ad242220 2018-09-08 stsp if (error == NULL)
1877 ad242220 2018-09-08 stsp error = repo_error;
1879 b00d56cd 2018-04-01 stsp return error;
1882 404c43c4 2018-06-21 stsp __dead static void
1883 404c43c4 2018-06-21 stsp usage_blame(void)
1885 9270e621 2019-02-05 stsp fprintf(stderr,
1886 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1887 404c43c4 2018-06-21 stsp getprogname());
1891 404c43c4 2018-06-21 stsp static const struct got_error *
1892 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1894 404c43c4 2018-06-21 stsp const struct got_error *error;
1895 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1896 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1897 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1898 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1899 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1902 404c43c4 2018-06-21 stsp #ifndef PROFILE
1903 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1904 36e2fb66 2019-01-04 stsp NULL) == -1)
1905 404c43c4 2018-06-21 stsp err(1, "pledge");
1908 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1909 404c43c4 2018-06-21 stsp switch (ch) {
1911 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1914 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1915 66bea077 2018-08-02 stsp if (repo_path == NULL)
1916 66bea077 2018-08-02 stsp err(1, "-r option");
1917 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1920 2deda0b9 2019-03-07 stsp usage_blame();
1921 404c43c4 2018-06-21 stsp /* NOTREACHED */
1925 404c43c4 2018-06-21 stsp argc -= optind;
1926 404c43c4 2018-06-21 stsp argv += optind;
1928 a39318fd 2018-08-02 stsp if (argc == 1)
1929 404c43c4 2018-06-21 stsp path = argv[0];
1931 404c43c4 2018-06-21 stsp usage_blame();
1933 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
1934 66bea077 2018-08-02 stsp if (cwd == NULL) {
1935 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1936 66bea077 2018-08-02 stsp goto done;
1938 66bea077 2018-08-02 stsp if (repo_path == NULL) {
1939 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1940 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1941 66bea077 2018-08-02 stsp goto done;
1943 0c06baac 2019-02-05 stsp error = NULL;
1944 0c06baac 2019-02-05 stsp if (worktree) {
1945 0c06baac 2019-02-05 stsp repo_path =
1946 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1947 0c06baac 2019-02-05 stsp if (repo_path == NULL)
1948 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1949 0c06baac 2019-02-05 stsp if (error)
1950 0c06baac 2019-02-05 stsp goto done;
1952 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
1953 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
1954 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1955 0c06baac 2019-02-05 stsp goto done;
1960 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
1961 c02c541e 2019-03-29 stsp if (error != NULL)
1962 36e2fb66 2019-01-04 stsp goto done;
1964 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1965 c02c541e 2019-03-29 stsp if (error)
1966 404c43c4 2018-06-21 stsp goto done;
1968 0c06baac 2019-02-05 stsp if (worktree) {
1969 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1970 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
1971 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
1972 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
1973 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1974 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
1975 6efaaa2d 2019-02-05 stsp path) == -1) {
1976 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1977 0c06baac 2019-02-05 stsp goto done;
1979 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
1982 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1984 0c06baac 2019-02-05 stsp if (error)
1985 66bea077 2018-08-02 stsp goto done;
1987 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
1988 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
1989 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1990 404c43c4 2018-06-21 stsp if (error != NULL)
1991 66bea077 2018-08-02 stsp goto done;
1992 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1993 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
1994 404c43c4 2018-06-21 stsp if (error != NULL)
1995 66bea077 2018-08-02 stsp goto done;
1997 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
1998 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
1999 404c43c4 2018-06-21 stsp if (error != NULL)
2000 66bea077 2018-08-02 stsp goto done;
2003 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
2005 66bea077 2018-08-02 stsp free(in_repo_path);
2006 66bea077 2018-08-02 stsp free(repo_path);
2007 66bea077 2018-08-02 stsp free(cwd);
2008 404c43c4 2018-06-21 stsp free(commit_id);
2009 0c06baac 2019-02-05 stsp if (worktree)
2010 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2011 ad242220 2018-09-08 stsp if (repo) {
2012 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2013 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2014 ad242220 2018-09-08 stsp if (error == NULL)
2015 ad242220 2018-09-08 stsp error = repo_error;
2017 404c43c4 2018-06-21 stsp return error;
2020 5de5890b 2018-10-18 stsp __dead static void
2021 5de5890b 2018-10-18 stsp usage_tree(void)
2023 c1669e2e 2019-01-09 stsp fprintf(stderr,
2024 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2025 5de5890b 2018-10-18 stsp getprogname());
2029 c1669e2e 2019-01-09 stsp static void
2030 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2031 c1669e2e 2019-01-09 stsp const char *root_path)
2033 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2035 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2036 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2039 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2040 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
2041 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
2044 5de5890b 2018-10-18 stsp static const struct got_error *
2045 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2046 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2047 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2049 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2050 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2051 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2052 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2053 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2055 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2057 5de5890b 2018-10-18 stsp goto done;
2059 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2061 5de5890b 2018-10-18 stsp goto done;
2062 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2063 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2064 5de5890b 2018-10-18 stsp while (te) {
2065 5de5890b 2018-10-18 stsp char *id = NULL;
2067 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2070 5de5890b 2018-10-18 stsp if (show_ids) {
2071 5de5890b 2018-10-18 stsp char *id_str;
2072 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2074 5de5890b 2018-10-18 stsp goto done;
2075 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2076 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2077 5de5890b 2018-10-18 stsp free(id_str);
2078 5de5890b 2018-10-18 stsp goto done;
2080 5de5890b 2018-10-18 stsp free(id_str);
2082 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2085 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2086 c1669e2e 2019-01-09 stsp char *child_path;
2087 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2088 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2089 c1669e2e 2019-01-09 stsp te->name) == -1) {
2090 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2091 c1669e2e 2019-01-09 stsp goto done;
2093 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2094 c1669e2e 2019-01-09 stsp root_path, repo);
2095 c1669e2e 2019-01-09 stsp free(child_path);
2097 c1669e2e 2019-01-09 stsp goto done;
2100 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2104 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2105 5de5890b 2018-10-18 stsp free(tree_id);
2106 5de5890b 2018-10-18 stsp return err;
2109 5de5890b 2018-10-18 stsp static const struct got_error *
2110 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2112 5de5890b 2018-10-18 stsp const struct got_error *error;
2113 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2114 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2115 7a2c19d6 2019-02-05 stsp const char *path;
2116 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2117 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2118 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2119 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2122 5de5890b 2018-10-18 stsp #ifndef PROFILE
2123 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2124 0f8d269b 2019-01-04 stsp NULL) == -1)
2125 5de5890b 2018-10-18 stsp err(1, "pledge");
2128 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2129 5de5890b 2018-10-18 stsp switch (ch) {
2131 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2134 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2135 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2136 5de5890b 2018-10-18 stsp err(1, "-r option");
2137 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2140 5de5890b 2018-10-18 stsp show_ids = 1;
2143 c1669e2e 2019-01-09 stsp recurse = 1;
2146 2deda0b9 2019-03-07 stsp usage_tree();
2147 5de5890b 2018-10-18 stsp /* NOTREACHED */
2151 5de5890b 2018-10-18 stsp argc -= optind;
2152 5de5890b 2018-10-18 stsp argv += optind;
2154 5de5890b 2018-10-18 stsp if (argc == 1)
2155 5de5890b 2018-10-18 stsp path = argv[0];
2156 5de5890b 2018-10-18 stsp else if (argc > 1)
2157 5de5890b 2018-10-18 stsp usage_tree();
2159 7a2c19d6 2019-02-05 stsp path = NULL;
2161 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2162 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2163 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2164 9bf7a39b 2019-02-05 stsp goto done;
2166 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2167 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2168 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2169 7a2c19d6 2019-02-05 stsp goto done;
2171 7a2c19d6 2019-02-05 stsp error = NULL;
2172 7a2c19d6 2019-02-05 stsp if (worktree) {
2173 7a2c19d6 2019-02-05 stsp repo_path =
2174 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2175 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2176 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2177 7a2c19d6 2019-02-05 stsp if (error)
2178 7a2c19d6 2019-02-05 stsp goto done;
2180 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2181 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2182 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2183 7a2c19d6 2019-02-05 stsp goto done;
2188 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2189 5de5890b 2018-10-18 stsp if (error != NULL)
2190 c02c541e 2019-03-29 stsp goto done;
2192 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
2193 c02c541e 2019-03-29 stsp if (error)
2194 5de5890b 2018-10-18 stsp goto done;
2196 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2197 9bf7a39b 2019-02-05 stsp if (worktree) {
2198 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2199 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2200 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2201 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2202 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2203 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2204 9bf7a39b 2019-02-05 stsp goto done;
2206 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2208 9bf7a39b 2019-02-05 stsp if (error)
2209 9bf7a39b 2019-02-05 stsp goto done;
2211 9bf7a39b 2019-02-05 stsp path = "/";
2213 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2214 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2215 9bf7a39b 2019-02-05 stsp if (error != NULL)
2216 9bf7a39b 2019-02-05 stsp goto done;
2219 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2220 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2221 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2222 5de5890b 2018-10-18 stsp if (error != NULL)
2223 5de5890b 2018-10-18 stsp goto done;
2224 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2225 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2226 5de5890b 2018-10-18 stsp if (error != NULL)
2227 5de5890b 2018-10-18 stsp goto done;
2229 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
2230 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
2231 5de5890b 2018-10-18 stsp if (error != NULL)
2232 5de5890b 2018-10-18 stsp goto done;
2235 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2236 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2238 5de5890b 2018-10-18 stsp free(in_repo_path);
2239 5de5890b 2018-10-18 stsp free(repo_path);
2240 5de5890b 2018-10-18 stsp free(cwd);
2241 5de5890b 2018-10-18 stsp free(commit_id);
2242 7a2c19d6 2019-02-05 stsp if (worktree)
2243 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2244 5de5890b 2018-10-18 stsp if (repo) {
2245 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2246 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2247 5de5890b 2018-10-18 stsp if (error == NULL)
2248 5de5890b 2018-10-18 stsp error = repo_error;
2250 5de5890b 2018-10-18 stsp return error;
2253 6bad629b 2019-02-04 stsp __dead static void
2254 6bad629b 2019-02-04 stsp usage_status(void)
2256 927df6b7 2019-02-10 stsp fprintf(stderr, "usage: %s status [path]\n", getprogname());
2260 b72f483a 2019-02-05 stsp static const struct got_error *
2261 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
2262 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2264 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
2265 b72f483a 2019-02-05 stsp return NULL;
2268 6bad629b 2019-02-04 stsp static const struct got_error *
2269 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2271 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2272 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2273 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2274 927df6b7 2019-02-10 stsp char *cwd = NULL, *path = NULL;
2277 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2278 6bad629b 2019-02-04 stsp switch (ch) {
2280 2deda0b9 2019-03-07 stsp usage_status();
2281 6bad629b 2019-02-04 stsp /* NOTREACHED */
2285 6bad629b 2019-02-04 stsp argc -= optind;
2286 6bad629b 2019-02-04 stsp argv += optind;
2288 6bad629b 2019-02-04 stsp #ifndef PROFILE
2289 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2290 6bad629b 2019-02-04 stsp NULL) == -1)
2291 6bad629b 2019-02-04 stsp err(1, "pledge");
2293 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2294 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2295 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2296 927df6b7 2019-02-10 stsp goto done;
2299 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2300 927df6b7 2019-02-10 stsp if (error != NULL)
2301 927df6b7 2019-02-10 stsp goto done;
2303 6bad629b 2019-02-04 stsp if (argc == 0) {
2304 927df6b7 2019-02-10 stsp path = strdup("");
2305 927df6b7 2019-02-10 stsp if (path == NULL) {
2306 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2307 6bad629b 2019-02-04 stsp goto done;
2309 6bad629b 2019-02-04 stsp } else if (argc == 1) {
2310 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree, argv[0]);
2311 927df6b7 2019-02-10 stsp if (error)
2312 6bad629b 2019-02-04 stsp goto done;
2314 6bad629b 2019-02-04 stsp usage_status();
2316 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2317 6bad629b 2019-02-04 stsp if (error != NULL)
2318 6bad629b 2019-02-04 stsp goto done;
2320 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2321 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2322 6bad629b 2019-02-04 stsp if (error)
2323 6bad629b 2019-02-04 stsp goto done;
2325 927df6b7 2019-02-10 stsp error = got_worktree_status(worktree, path, repo, print_status, NULL,
2326 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2328 927df6b7 2019-02-10 stsp free(cwd);
2329 927df6b7 2019-02-10 stsp free(path);
2330 d0eebce4 2019-03-11 stsp return error;
2333 d0eebce4 2019-03-11 stsp __dead static void
2334 d0eebce4 2019-03-11 stsp usage_ref(void)
2336 d0eebce4 2019-03-11 stsp fprintf(stderr,
2337 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
2338 d0eebce4 2019-03-11 stsp getprogname());
2342 d0eebce4 2019-03-11 stsp static const struct got_error *
2343 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2345 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2346 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2347 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2349 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2350 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2352 d0eebce4 2019-03-11 stsp return err;
2354 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2355 d0eebce4 2019-03-11 stsp char *refstr;
2356 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2357 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2358 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2359 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2360 d0eebce4 2019-03-11 stsp free(refstr);
2363 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2364 d0eebce4 2019-03-11 stsp return NULL;
2367 d0eebce4 2019-03-11 stsp static const struct got_error *
2368 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2370 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2371 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2373 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2375 d0eebce4 2019-03-11 stsp return err;
2377 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2378 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2379 d0eebce4 2019-03-11 stsp return err;
2382 d0eebce4 2019-03-11 stsp static const struct got_error *
2383 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2385 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2386 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2387 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2390 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2391 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2392 d1644381 2019-07-14 stsp * an unintended typo.
2394 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2395 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2397 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2399 d83d9d5c 2019-05-13 stsp if (err) {
2400 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2402 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2403 d83d9d5c 2019-05-13 stsp return err;
2404 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2406 d83d9d5c 2019-05-13 stsp return err;
2407 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2408 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2410 d83d9d5c 2019-05-13 stsp return err;
2413 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2415 d0eebce4 2019-03-11 stsp goto done;
2417 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2420 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2422 d0eebce4 2019-03-11 stsp return err;
2425 d0eebce4 2019-03-11 stsp static const struct got_error *
2426 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2428 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2429 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2430 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2431 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2432 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2433 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2435 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2436 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2437 d0eebce4 2019-03-11 stsp switch (ch) {
2439 d0eebce4 2019-03-11 stsp delref = optarg;
2442 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2443 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2444 d0eebce4 2019-03-11 stsp err(1, "-r option");
2445 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2448 d0eebce4 2019-03-11 stsp do_list = 1;
2451 d0eebce4 2019-03-11 stsp usage_ref();
2452 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2456 d0eebce4 2019-03-11 stsp if (do_list && delref)
2457 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2459 d0eebce4 2019-03-11 stsp argc -= optind;
2460 d0eebce4 2019-03-11 stsp argv += optind;
2462 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2463 d0eebce4 2019-03-11 stsp if (argc > 0)
2464 d0eebce4 2019-03-11 stsp usage_ref();
2465 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2466 d0eebce4 2019-03-11 stsp usage_ref();
2468 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2469 e0b57350 2019-03-12 stsp if (do_list) {
2470 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2471 e0b57350 2019-03-12 stsp NULL) == -1)
2472 e0b57350 2019-03-12 stsp err(1, "pledge");
2474 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2475 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2476 e0b57350 2019-03-12 stsp err(1, "pledge");
2479 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2480 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2481 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2482 d0eebce4 2019-03-11 stsp goto done;
2485 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2486 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2487 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2488 d0eebce4 2019-03-11 stsp goto done;
2490 d0eebce4 2019-03-11 stsp error = NULL;
2491 d0eebce4 2019-03-11 stsp if (worktree) {
2492 d0eebce4 2019-03-11 stsp repo_path =
2493 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2494 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2495 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2496 d0eebce4 2019-03-11 stsp if (error)
2497 d0eebce4 2019-03-11 stsp goto done;
2499 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2500 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2501 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2502 d0eebce4 2019-03-11 stsp goto done;
2507 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2508 d0eebce4 2019-03-11 stsp if (error != NULL)
2509 d0eebce4 2019-03-11 stsp goto done;
2511 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2512 314a6357 2019-05-13 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2513 c02c541e 2019-03-29 stsp if (error)
2514 c02c541e 2019-03-29 stsp goto done;
2516 d0eebce4 2019-03-11 stsp if (do_list)
2517 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2518 d0eebce4 2019-03-11 stsp else if (delref)
2519 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2521 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2524 4e759de4 2019-06-26 stsp got_repo_close(repo);
2525 4e759de4 2019-06-26 stsp if (worktree)
2526 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2527 4e759de4 2019-06-26 stsp free(cwd);
2528 4e759de4 2019-06-26 stsp free(repo_path);
2529 4e759de4 2019-06-26 stsp return error;
2532 4e759de4 2019-06-26 stsp __dead static void
2533 4e759de4 2019-06-26 stsp usage_branch(void)
2535 4e759de4 2019-06-26 stsp fprintf(stderr,
2536 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2537 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2541 4e759de4 2019-06-26 stsp static const struct got_error *
2542 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2544 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2545 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2546 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2548 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2550 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2552 4e759de4 2019-06-26 stsp return err;
2554 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2555 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2556 4e759de4 2019-06-26 stsp char *refstr;
2557 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2558 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2560 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2561 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2562 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2563 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2565 ba882ee3 2019-07-11 stsp return err;
2566 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2567 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2568 ba882ee3 2019-07-11 stsp marker = "* ";
2570 ba882ee3 2019-07-11 stsp marker = "~ ";
2573 4e759de4 2019-06-26 stsp refname += 11;
2574 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2575 4e759de4 2019-06-26 stsp if (refstr == NULL)
2576 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2577 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2578 4e759de4 2019-06-26 stsp free(refstr);
2581 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2582 4e759de4 2019-06-26 stsp return NULL;
2585 4e759de4 2019-06-26 stsp static const struct got_error *
2586 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2588 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2589 4e759de4 2019-06-26 stsp struct got_reference *ref;
2590 4e759de4 2019-06-26 stsp char *refname;
2592 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2593 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2595 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2597 4e759de4 2019-06-26 stsp goto done;
2599 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2600 4e759de4 2019-06-26 stsp got_ref_close(ref);
2602 4e759de4 2019-06-26 stsp free(refname);
2603 4e759de4 2019-06-26 stsp return err;
2606 4e759de4 2019-06-26 stsp static const struct got_error *
2607 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2608 4e759de4 2019-06-26 stsp const char *base_branch)
2610 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2611 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2612 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2613 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2614 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2617 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2618 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2619 d3f84d51 2019-07-11 stsp * an unintended typo.
2621 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2622 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2624 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2625 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2626 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2627 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2628 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2629 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2631 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2633 4e759de4 2019-06-26 stsp goto done;
2634 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2635 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2637 4e759de4 2019-06-26 stsp goto done;
2639 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2640 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2641 4e759de4 2019-06-26 stsp goto done;
2644 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2645 4e759de4 2019-06-26 stsp if (err == NULL) {
2646 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2647 4e759de4 2019-06-26 stsp goto done;
2648 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2649 4e759de4 2019-06-26 stsp goto done;
2651 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2653 4e759de4 2019-06-26 stsp goto done;
2655 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2658 4e759de4 2019-06-26 stsp got_ref_close(ref);
2660 4e759de4 2019-06-26 stsp free(base_refname);
2661 4e759de4 2019-06-26 stsp free(refname);
2662 4e759de4 2019-06-26 stsp return err;
2665 4e759de4 2019-06-26 stsp static const struct got_error *
2666 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2668 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2669 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2670 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2671 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2672 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2673 4e759de4 2019-06-26 stsp const char *delref = NULL;
2675 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2676 4e759de4 2019-06-26 stsp switch (ch) {
2678 4e759de4 2019-06-26 stsp delref = optarg;
2681 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2682 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2683 4e759de4 2019-06-26 stsp err(1, "-r option");
2684 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2687 4e759de4 2019-06-26 stsp do_list = 1;
2690 4e759de4 2019-06-26 stsp usage_branch();
2691 4e759de4 2019-06-26 stsp /* NOTREACHED */
2695 4e759de4 2019-06-26 stsp if (do_list && delref)
2696 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2698 4e759de4 2019-06-26 stsp argc -= optind;
2699 4e759de4 2019-06-26 stsp argv += optind;
2701 4e759de4 2019-06-26 stsp if (do_list || delref) {
2702 4e759de4 2019-06-26 stsp if (argc > 0)
2703 4e759de4 2019-06-26 stsp usage_branch();
2704 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2705 4e759de4 2019-06-26 stsp usage_branch();
2707 4e759de4 2019-06-26 stsp #ifndef PROFILE
2708 4e759de4 2019-06-26 stsp if (do_list) {
2709 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2710 4e759de4 2019-06-26 stsp NULL) == -1)
2711 4e759de4 2019-06-26 stsp err(1, "pledge");
2713 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2714 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2715 4e759de4 2019-06-26 stsp err(1, "pledge");
2718 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2719 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2720 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2721 4e759de4 2019-06-26 stsp goto done;
2724 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2725 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2726 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2727 4e759de4 2019-06-26 stsp goto done;
2729 4e759de4 2019-06-26 stsp error = NULL;
2730 4e759de4 2019-06-26 stsp if (worktree) {
2731 4e759de4 2019-06-26 stsp repo_path =
2732 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2733 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2734 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2735 4e759de4 2019-06-26 stsp if (error)
2736 4e759de4 2019-06-26 stsp goto done;
2738 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2739 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2740 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2741 4e759de4 2019-06-26 stsp goto done;
2746 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2747 4e759de4 2019-06-26 stsp if (error != NULL)
2748 4e759de4 2019-06-26 stsp goto done;
2750 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2751 4e759de4 2019-06-26 stsp worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
2752 4e759de4 2019-06-26 stsp if (error)
2753 4e759de4 2019-06-26 stsp goto done;
2755 4e759de4 2019-06-26 stsp if (do_list)
2756 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
2757 4e759de4 2019-06-26 stsp else if (delref)
2758 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2760 4e759de4 2019-06-26 stsp const char *base_branch;
2761 4e759de4 2019-06-26 stsp if (argc == 1) {
2762 4e759de4 2019-06-26 stsp base_branch = worktree ?
2763 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2764 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2766 4e759de4 2019-06-26 stsp base_branch = argv[1];
2767 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2771 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2772 d0eebce4 2019-03-11 stsp if (worktree)
2773 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2774 d0eebce4 2019-03-11 stsp free(cwd);
2775 d0eebce4 2019-03-11 stsp free(repo_path);
2776 d00136be 2019-03-26 stsp return error;
2779 d00136be 2019-03-26 stsp __dead static void
2780 d00136be 2019-03-26 stsp usage_add(void)
2782 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2786 d00136be 2019-03-26 stsp static const struct got_error *
2787 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2789 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2790 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2791 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2792 1dd54920 2019-05-11 stsp char *cwd = NULL;
2793 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2794 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2797 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2799 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2800 d00136be 2019-03-26 stsp switch (ch) {
2802 d00136be 2019-03-26 stsp usage_add();
2803 d00136be 2019-03-26 stsp /* NOTREACHED */
2807 d00136be 2019-03-26 stsp argc -= optind;
2808 d00136be 2019-03-26 stsp argv += optind;
2810 43012d58 2019-07-14 stsp #ifndef PROFILE
2811 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2812 43012d58 2019-07-14 stsp NULL) == -1)
2813 43012d58 2019-07-14 stsp err(1, "pledge");
2815 723c305c 2019-05-11 jcs if (argc < 1)
2816 d00136be 2019-03-26 stsp usage_add();
2818 723c305c 2019-05-11 jcs /* make sure each file exists before doing anything halfway */
2819 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2820 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2821 723c305c 2019-05-11 jcs if (path == NULL) {
2822 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2825 1dd54920 2019-05-11 stsp free(path);
2828 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2829 d00136be 2019-03-26 stsp if (cwd == NULL) {
2830 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2831 d00136be 2019-03-26 stsp goto done;
2834 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2835 d00136be 2019-03-26 stsp if (error)
2836 d00136be 2019-03-26 stsp goto done;
2838 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2839 031a5338 2019-03-26 stsp if (error != NULL)
2840 031a5338 2019-03-26 stsp goto done;
2842 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2843 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2844 d00136be 2019-03-26 stsp if (error)
2845 d00136be 2019-03-26 stsp goto done;
2847 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2848 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2849 723c305c 2019-05-11 jcs if (path == NULL) {
2850 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2854 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2855 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2856 1dd54920 2019-05-11 stsp if (error) {
2857 1dd54920 2019-05-11 stsp free(path);
2861 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2862 1dd54920 2019-05-11 stsp NULL, repo);
2865 031a5338 2019-03-26 stsp got_repo_close(repo);
2866 d00136be 2019-03-26 stsp if (worktree)
2867 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2868 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2869 1dd54920 2019-05-11 stsp free((char *)pe->path);
2870 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2871 2ec1f75b 2019-03-26 stsp free(cwd);
2872 2ec1f75b 2019-03-26 stsp return error;
2875 2ec1f75b 2019-03-26 stsp __dead static void
2876 648e4ef7 2019-07-09 stsp usage_remove(void)
2878 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
2882 2ec1f75b 2019-03-26 stsp static const struct got_error *
2883 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
2885 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2886 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2887 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2888 17ed4618 2019-06-02 stsp char *cwd = NULL;
2889 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
2890 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2891 17ed4618 2019-06-02 stsp int ch, i, delete_local_mods = 0;
2893 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
2895 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2896 2ec1f75b 2019-03-26 stsp switch (ch) {
2898 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2901 2ec1f75b 2019-03-26 stsp usage_add();
2902 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2906 2ec1f75b 2019-03-26 stsp argc -= optind;
2907 2ec1f75b 2019-03-26 stsp argv += optind;
2909 43012d58 2019-07-14 stsp #ifndef PROFILE
2910 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2911 43012d58 2019-07-14 stsp NULL) == -1)
2912 43012d58 2019-07-14 stsp err(1, "pledge");
2914 17ed4618 2019-06-02 stsp if (argc < 1)
2915 648e4ef7 2019-07-09 stsp usage_remove();
2917 17ed4618 2019-06-02 stsp /* make sure each file exists before doing anything halfway */
2918 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2919 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2920 17ed4618 2019-06-02 stsp if (path == NULL) {
2921 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2922 17ed4618 2019-06-02 stsp goto done;
2924 17ed4618 2019-06-02 stsp free(path);
2927 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2928 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2929 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2930 2ec1f75b 2019-03-26 stsp goto done;
2932 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2933 2ec1f75b 2019-03-26 stsp if (error)
2934 2ec1f75b 2019-03-26 stsp goto done;
2936 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2938 2ec1f75b 2019-03-26 stsp goto done;
2940 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2941 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
2942 2ec1f75b 2019-03-26 stsp if (error)
2943 2ec1f75b 2019-03-26 stsp goto done;
2945 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
2946 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
2947 17ed4618 2019-06-02 stsp if (path == NULL) {
2948 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
2949 17ed4618 2019-06-02 stsp goto done;
2952 17ed4618 2019-06-02 stsp got_path_strip_trailing_slashes(path);
2953 17ed4618 2019-06-02 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2954 17ed4618 2019-06-02 stsp if (error) {
2955 17ed4618 2019-06-02 stsp free(path);
2956 17ed4618 2019-06-02 stsp goto done;
2959 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
2960 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
2961 a129376b 2019-03-28 stsp if (error)
2962 a129376b 2019-03-28 stsp goto done;
2965 a129376b 2019-03-28 stsp got_repo_close(repo);
2966 a129376b 2019-03-28 stsp if (worktree)
2967 a129376b 2019-03-28 stsp got_worktree_close(worktree);
2968 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
2969 17ed4618 2019-06-02 stsp free((char *)pe->path);
2970 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
2971 a129376b 2019-03-28 stsp free(cwd);
2972 a129376b 2019-03-28 stsp return error;
2975 a129376b 2019-03-28 stsp __dead static void
2976 a129376b 2019-03-28 stsp usage_revert(void)
2978 e20a8b6f 2019-06-04 stsp fprintf(stderr, "usage: %s revert file-path ...\n", getprogname());
2982 1ee397ad 2019-07-12 stsp static const struct got_error *
2983 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
2985 a129376b 2019-03-28 stsp while (path[0] == '/')
2987 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
2988 1ee397ad 2019-07-12 stsp return NULL;
2991 a129376b 2019-03-28 stsp static const struct got_error *
2992 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
2994 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
2995 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
2996 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
2997 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
2998 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
2999 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3000 e20a8b6f 2019-06-04 stsp int ch, i;
3002 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3004 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3005 a129376b 2019-03-28 stsp switch (ch) {
3007 a129376b 2019-03-28 stsp usage_revert();
3008 a129376b 2019-03-28 stsp /* NOTREACHED */
3012 a129376b 2019-03-28 stsp argc -= optind;
3013 a129376b 2019-03-28 stsp argv += optind;
3015 43012d58 2019-07-14 stsp #ifndef PROFILE
3016 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3017 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3018 43012d58 2019-07-14 stsp err(1, "pledge");
3020 e20a8b6f 2019-06-04 stsp if (argc < 1)
3021 a129376b 2019-03-28 stsp usage_revert();
3023 e20a8b6f 2019-06-04 stsp for (i = 0; i < argc; i++) {
3024 e20a8b6f 2019-06-04 stsp char *path = realpath(argv[i], NULL);
3025 e20a8b6f 2019-06-04 stsp if (path == NULL) {
3026 e20a8b6f 2019-06-04 stsp error = got_error_from_errno2("realpath", argv[i]);
3027 e20a8b6f 2019-06-04 stsp goto done;
3030 e20a8b6f 2019-06-04 stsp got_path_strip_trailing_slashes(path);
3031 e20a8b6f 2019-06-04 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
3032 e20a8b6f 2019-06-04 stsp if (error) {
3033 e20a8b6f 2019-06-04 stsp free(path);
3034 e20a8b6f 2019-06-04 stsp goto done;
3038 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3039 a129376b 2019-03-28 stsp if (cwd == NULL) {
3040 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3041 a129376b 2019-03-28 stsp goto done;
3043 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3044 2ec1f75b 2019-03-26 stsp if (error)
3045 2ec1f75b 2019-03-26 stsp goto done;
3047 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3048 a129376b 2019-03-28 stsp if (error != NULL)
3049 a129376b 2019-03-28 stsp goto done;
3051 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3052 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
3053 a129376b 2019-03-28 stsp if (error)
3054 a129376b 2019-03-28 stsp goto done;
3056 e20a8b6f 2019-06-04 stsp error = got_worktree_revert(worktree, &paths,
3057 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
3058 a129376b 2019-03-28 stsp if (error)
3059 a129376b 2019-03-28 stsp goto done;
3062 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3063 2ec1f75b 2019-03-26 stsp if (worktree)
3064 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3065 2ec1f75b 2019-03-26 stsp free(path);
3066 d00136be 2019-03-26 stsp free(cwd);
3067 6bad629b 2019-02-04 stsp return error;
3070 c4296144 2019-05-09 stsp __dead static void
3071 c4296144 2019-05-09 stsp usage_commit(void)
3073 c6fc0acd 2019-05-09 stsp fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
3077 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3078 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3079 e2ba3d07 2019-05-13 stsp const char *editor;
3080 e0870e44 2019-05-13 stsp const char *worktree_path;
3081 76d98825 2019-06-03 stsp const char *branch_name;
3082 314a6357 2019-05-13 stsp const char *repo_path;
3083 e0870e44 2019-05-13 stsp char *logmsg_path;
3087 33ad4cbe 2019-05-12 jcs static const struct got_error *
3088 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3091 76d98825 2019-06-03 stsp char *initial_content = NULL;
3092 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3093 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3094 e0870e44 2019-05-13 stsp char *template = NULL;
3095 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3097 33ad4cbe 2019-05-12 jcs size_t len;
3099 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3100 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3101 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3102 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3103 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3104 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3105 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3106 33ad4cbe 2019-05-12 jcs return NULL;
3109 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3110 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3112 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3113 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3114 76d98825 2019-06-03 stsp a->branch_name) == -1)
3115 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3117 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3119 e0870e44 2019-05-13 stsp goto done;
3121 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3123 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3124 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3125 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3126 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3127 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3131 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3133 3ce1b845 2019-07-15 stsp unlink(a->logmsg_path);
3134 3ce1b845 2019-07-15 stsp free(a->logmsg_path);
3135 76d98825 2019-06-03 stsp free(initial_content);
3136 e0870e44 2019-05-13 stsp free(template);
3138 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3139 3ce1b845 2019-07-15 stsp if (err == NULL) {
3140 314a6357 2019-05-13 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
3141 3ce1b845 2019-07-15 stsp if (err) {
3142 3ce1b845 2019-07-15 stsp free(*logmsg);
3143 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3146 33ad4cbe 2019-05-12 jcs return err;
3149 c4296144 2019-05-09 stsp static const struct got_error *
3150 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3152 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3153 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3154 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3155 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
3156 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3157 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3158 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
3159 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3160 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3161 7d5807f4 2019-07-11 stsp int ch, rebase_in_progress;
3163 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3164 c4296144 2019-05-09 stsp switch (ch) {
3166 c4296144 2019-05-09 stsp logmsg = optarg;
3169 c4296144 2019-05-09 stsp usage_commit();
3170 c4296144 2019-05-09 stsp /* NOTREACHED */
3174 c4296144 2019-05-09 stsp argc -= optind;
3175 c4296144 2019-05-09 stsp argv += optind;
3177 43012d58 2019-07-14 stsp #ifndef PROFILE
3178 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3179 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3180 43012d58 2019-07-14 stsp err(1, "pledge");
3182 c4296144 2019-05-09 stsp if (argc == 1) {
3183 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
3184 c4296144 2019-05-09 stsp if (path == NULL) {
3185 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
3186 c4296144 2019-05-09 stsp goto done;
3188 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
3189 c4296144 2019-05-09 stsp } else if (argc != 0)
3190 c4296144 2019-05-09 stsp usage_commit();
3192 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
3193 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
3194 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
3195 35bd8fed 2019-05-09 stsp goto done;
3198 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3199 c4296144 2019-05-09 stsp if (cwd == NULL) {
3200 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3201 c4296144 2019-05-09 stsp goto done;
3203 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3204 7d5807f4 2019-07-11 stsp if (error)
3205 7d5807f4 2019-07-11 stsp goto done;
3207 7d5807f4 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3208 c4296144 2019-05-09 stsp if (error)
3209 7d5807f4 2019-07-11 stsp goto done;
3210 7d5807f4 2019-07-11 stsp if (rebase_in_progress) {
3211 7d5807f4 2019-07-11 stsp error = got_error(GOT_ERR_REBASING);
3212 c4296144 2019-05-09 stsp goto done;
3215 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3216 c4296144 2019-05-09 stsp if (error != NULL)
3217 c4296144 2019-05-09 stsp goto done;
3220 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3221 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3223 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3224 314a6357 2019-05-13 stsp error = get_editor(&editor);
3226 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3227 314a6357 2019-05-13 stsp got_worktree_get_root_path(worktree), 0);
3228 c4296144 2019-05-09 stsp if (error)
3229 c4296144 2019-05-09 stsp goto done;
3231 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3232 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3233 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3234 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3235 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "refs/", 5) == 0)
3236 76d98825 2019-06-03 stsp cl_arg.branch_name += 5;
3237 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "heads/", 6) == 0)
3238 76d98825 2019-06-03 stsp cl_arg.branch_name += 6;
3239 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3240 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
3241 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
3242 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3243 e0870e44 2019-05-13 stsp if (error) {
3244 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3245 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3246 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3247 c4296144 2019-05-09 stsp goto done;
3250 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3251 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3253 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3254 c4296144 2019-05-09 stsp if (error)
3255 c4296144 2019-05-09 stsp goto done;
3256 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3259 c4296144 2019-05-09 stsp got_repo_close(repo);
3260 c4296144 2019-05-09 stsp if (worktree)
3261 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3262 c4296144 2019-05-09 stsp free(path);
3263 c4296144 2019-05-09 stsp free(cwd);
3264 c4296144 2019-05-09 stsp free(id_str);
3265 e2ba3d07 2019-05-13 stsp free(editor);
3266 234035bc 2019-06-01 stsp return error;
3269 234035bc 2019-06-01 stsp __dead static void
3270 234035bc 2019-06-01 stsp usage_cherrypick(void)
3272 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3276 234035bc 2019-06-01 stsp static const struct got_error *
3277 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3279 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3280 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3281 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3282 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3283 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3284 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3285 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3286 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3287 234035bc 2019-06-01 stsp int ch, did_something = 0;
3289 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3290 234035bc 2019-06-01 stsp switch (ch) {
3292 234035bc 2019-06-01 stsp usage_cherrypick();
3293 234035bc 2019-06-01 stsp /* NOTREACHED */
3297 234035bc 2019-06-01 stsp argc -= optind;
3298 234035bc 2019-06-01 stsp argv += optind;
3300 43012d58 2019-07-14 stsp #ifndef PROFILE
3301 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3302 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3303 43012d58 2019-07-14 stsp err(1, "pledge");
3305 234035bc 2019-06-01 stsp if (argc != 1)
3306 234035bc 2019-06-01 stsp usage_cherrypick();
3308 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3309 234035bc 2019-06-01 stsp if (cwd == NULL) {
3310 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3311 234035bc 2019-06-01 stsp goto done;
3313 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3314 234035bc 2019-06-01 stsp if (error)
3315 234035bc 2019-06-01 stsp goto done;
3317 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3318 234035bc 2019-06-01 stsp if (error != NULL)
3319 234035bc 2019-06-01 stsp goto done;
3321 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3322 234035bc 2019-06-01 stsp got_worktree_get_root_path(worktree), 0);
3323 234035bc 2019-06-01 stsp if (error)
3324 234035bc 2019-06-01 stsp goto done;
3326 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3327 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3328 234035bc 2019-06-01 stsp if (error != NULL) {
3329 234035bc 2019-06-01 stsp struct got_reference *ref;
3330 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3331 234035bc 2019-06-01 stsp goto done;
3332 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3333 234035bc 2019-06-01 stsp if (error != NULL)
3334 234035bc 2019-06-01 stsp goto done;
3335 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3336 234035bc 2019-06-01 stsp got_ref_close(ref);
3337 234035bc 2019-06-01 stsp if (error != NULL)
3338 234035bc 2019-06-01 stsp goto done;
3340 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3341 234035bc 2019-06-01 stsp if (error)
3342 234035bc 2019-06-01 stsp goto done;
3344 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3345 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3346 234035bc 2019-06-01 stsp if (error != NULL)
3347 234035bc 2019-06-01 stsp goto done;
3349 234035bc 2019-06-01 stsp error = check_same_branch(commit_id, head_ref, repo);
3350 234035bc 2019-06-01 stsp if (error) {
3351 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3352 234035bc 2019-06-01 stsp goto done;
3353 234035bc 2019-06-01 stsp error = NULL;
3355 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3356 234035bc 2019-06-01 stsp goto done;
3359 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3360 234035bc 2019-06-01 stsp if (error)
3361 234035bc 2019-06-01 stsp goto done;
3362 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3363 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3364 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3366 234035bc 2019-06-01 stsp if (error != NULL)
3367 234035bc 2019-06-01 stsp goto done;
3369 234035bc 2019-06-01 stsp if (did_something)
3370 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3372 234035bc 2019-06-01 stsp if (commit)
3373 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3374 234035bc 2019-06-01 stsp free(commit_id_str);
3375 234035bc 2019-06-01 stsp if (head_ref)
3376 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3377 234035bc 2019-06-01 stsp if (worktree)
3378 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3380 234035bc 2019-06-01 stsp got_repo_close(repo);
3381 c4296144 2019-05-09 stsp return error;
3384 5ef14e63 2019-06-02 stsp __dead static void
3385 5ef14e63 2019-06-02 stsp usage_backout(void)
3387 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3391 5ef14e63 2019-06-02 stsp static const struct got_error *
3392 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3394 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3395 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3396 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3397 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3398 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3399 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3400 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3401 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3402 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3404 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3405 5ef14e63 2019-06-02 stsp switch (ch) {
3407 5ef14e63 2019-06-02 stsp usage_backout();
3408 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3412 5ef14e63 2019-06-02 stsp argc -= optind;
3413 5ef14e63 2019-06-02 stsp argv += optind;
3415 43012d58 2019-07-14 stsp #ifndef PROFILE
3416 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3417 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3418 43012d58 2019-07-14 stsp err(1, "pledge");
3420 5ef14e63 2019-06-02 stsp if (argc != 1)
3421 5ef14e63 2019-06-02 stsp usage_backout();
3423 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3424 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3425 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3426 5ef14e63 2019-06-02 stsp goto done;
3428 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3429 5ef14e63 2019-06-02 stsp if (error)
3430 5ef14e63 2019-06-02 stsp goto done;
3432 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3433 5ef14e63 2019-06-02 stsp if (error != NULL)
3434 5ef14e63 2019-06-02 stsp goto done;
3436 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3437 5ef14e63 2019-06-02 stsp got_worktree_get_root_path(worktree), 0);
3438 5ef14e63 2019-06-02 stsp if (error)
3439 5ef14e63 2019-06-02 stsp goto done;
3441 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3442 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3443 5ef14e63 2019-06-02 stsp if (error != NULL) {
3444 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3445 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3446 5ef14e63 2019-06-02 stsp goto done;
3447 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3448 5ef14e63 2019-06-02 stsp if (error != NULL)
3449 5ef14e63 2019-06-02 stsp goto done;
3450 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3451 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3452 5ef14e63 2019-06-02 stsp if (error != NULL)
3453 5ef14e63 2019-06-02 stsp goto done;
3455 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3456 5ef14e63 2019-06-02 stsp if (error)
3457 5ef14e63 2019-06-02 stsp goto done;
3459 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3460 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3461 5ef14e63 2019-06-02 stsp if (error != NULL)
3462 5ef14e63 2019-06-02 stsp goto done;
3464 5ef14e63 2019-06-02 stsp error = check_same_branch(commit_id, head_ref, repo);
3465 5ef14e63 2019-06-02 stsp if (error)
3466 5ef14e63 2019-06-02 stsp goto done;
3468 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3469 5ef14e63 2019-06-02 stsp if (error)
3470 5ef14e63 2019-06-02 stsp goto done;
3471 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3472 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3473 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3474 5ef14e63 2019-06-02 stsp goto done;
3477 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3478 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3479 5ef14e63 2019-06-02 stsp if (error != NULL)
3480 5ef14e63 2019-06-02 stsp goto done;
3482 5ef14e63 2019-06-02 stsp if (did_something)
3483 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3485 5ef14e63 2019-06-02 stsp if (commit)
3486 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3487 5ef14e63 2019-06-02 stsp free(commit_id_str);
3488 5ef14e63 2019-06-02 stsp if (head_ref)
3489 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3490 818c7501 2019-07-11 stsp if (worktree)
3491 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3493 818c7501 2019-07-11 stsp got_repo_close(repo);
3494 818c7501 2019-07-11 stsp return error;
3497 818c7501 2019-07-11 stsp __dead static void
3498 818c7501 2019-07-11 stsp usage_rebase(void)
3500 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3501 af54c8f8 2019-07-11 stsp getprogname());
3505 818c7501 2019-07-11 stsp static const struct got_error *
3506 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3507 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3509 818c7501 2019-07-11 stsp const struct got_error *err;
3510 818c7501 2019-07-11 stsp char *old_id_str = NULL, *new_id_str = NULL;
3511 818c7501 2019-07-11 stsp char *logmsg0 = NULL, *logmsg, *nl;
3512 818c7501 2019-07-11 stsp size_t len;
3514 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3516 818c7501 2019-07-11 stsp goto done;
3518 ff0d2220 2019-07-11 stsp if (new_id) {
3519 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3521 ff0d2220 2019-07-11 stsp goto done;
3524 818c7501 2019-07-11 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
3525 818c7501 2019-07-11 stsp if (logmsg0 == NULL) {
3526 818c7501 2019-07-11 stsp err = got_error_from_errno("strdup");
3527 818c7501 2019-07-11 stsp goto done;
3529 818c7501 2019-07-11 stsp logmsg = logmsg0;
3531 10796104 2019-07-11 stsp while (isspace((unsigned char)logmsg[0]))
3534 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3535 ff0d2220 2019-07-11 stsp if (new_id_str)
3536 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3537 818c7501 2019-07-11 stsp len = strlen(logmsg);
3538 818c7501 2019-07-11 stsp if (len > 42)
3540 818c7501 2019-07-11 stsp logmsg[len] = '\0';
3541 818c7501 2019-07-11 stsp nl = strchr(logmsg, '\n');
3543 818c7501 2019-07-11 stsp *nl = '\0';
3544 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3545 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3547 818c7501 2019-07-11 stsp free(old_id_str);
3548 818c7501 2019-07-11 stsp free(new_id_str);
3549 818c7501 2019-07-11 stsp free(logmsg0);
3550 818c7501 2019-07-11 stsp return err;
3553 1ee397ad 2019-07-12 stsp static const struct got_error *
3554 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3556 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3558 818c7501 2019-07-11 stsp while (path[0] == '/')
3560 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3562 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3563 1ee397ad 2019-07-12 stsp return NULL;
3564 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3565 818c7501 2019-07-11 stsp *rebase_status = status;
3566 1ee397ad 2019-07-12 stsp return NULL;
3569 818c7501 2019-07-11 stsp static const struct got_error *
3570 818c7501 2019-07-11 stsp rebase_complete(struct got_worktree *worktree, struct got_reference *branch,
3571 818c7501 2019-07-11 stsp struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3572 818c7501 2019-07-11 stsp struct got_repository *repo)
3574 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3575 818c7501 2019-07-11 stsp return got_worktree_rebase_complete(worktree,
3576 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3579 818c7501 2019-07-11 stsp static const struct got_error *
3580 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
3581 01757395 2019-07-12 stsp struct got_worktree *worktree, struct got_reference *tmp_branch,
3582 ff0d2220 2019-07-11 stsp struct got_object_id *commit_id, struct got_repository *repo)
3584 ff0d2220 2019-07-11 stsp const struct got_error *error;
3585 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
3586 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
3588 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3589 ff0d2220 2019-07-11 stsp if (error)
3590 ff0d2220 2019-07-11 stsp return error;
3592 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
3593 01757395 2019-07-12 stsp worktree, tmp_branch, commit, commit_id, repo);
3594 ff0d2220 2019-07-11 stsp if (error) {
3595 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3596 ff0d2220 2019-07-11 stsp goto done;
3597 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
3599 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
3600 ff0d2220 2019-07-11 stsp free(new_commit_id);
3603 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
3604 ff0d2220 2019-07-11 stsp return error;
3607 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
3608 64c6d990 2019-07-11 stsp const char *path_prefix;
3609 64c6d990 2019-07-11 stsp size_t len;
3612 64c6d990 2019-07-11 stsp static const struct got_error *
3613 64c6d990 2019-07-11 stsp check_path_prefix(void *arg, struct got_blob_object *blob1,
3614 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3615 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
3616 64c6d990 2019-07-11 stsp struct got_repository *repo)
3618 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
3620 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3621 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3622 64c6d990 2019-07-11 stsp return got_error(GOT_ERR_REBASE_PATH);
3624 64c6d990 2019-07-11 stsp return NULL;
3627 64c6d990 2019-07-11 stsp static const struct got_error *
3628 64c6d990 2019-07-11 stsp rebase_check_path_prefix(struct got_object_id *parent_id,
3629 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
3630 64c6d990 2019-07-11 stsp struct got_repository *repo)
3632 64c6d990 2019-07-11 stsp const struct got_error *err;
3633 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3634 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
3635 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
3637 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
3638 64c6d990 2019-07-11 stsp return NULL;
3640 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3642 64c6d990 2019-07-11 stsp goto done;
3644 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
3646 64c6d990 2019-07-11 stsp goto done;
3648 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
3649 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
3651 64c6d990 2019-07-11 stsp goto done;
3653 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
3654 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
3656 64c6d990 2019-07-11 stsp goto done;
3658 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
3659 64c6d990 2019-07-11 stsp cpp_arg.len = strlen(path_prefix);
3660 64c6d990 2019-07-11 stsp err = got_diff_tree(tree1, tree2, "", "", repo, check_path_prefix,
3661 64c6d990 2019-07-11 stsp &cpp_arg);
3663 64c6d990 2019-07-11 stsp if (tree1)
3664 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
3665 64c6d990 2019-07-11 stsp if (tree2)
3666 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
3667 64c6d990 2019-07-11 stsp if (commit)
3668 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
3669 64c6d990 2019-07-11 stsp if (parent_commit)
3670 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
3671 64c6d990 2019-07-11 stsp return err;
3674 ff0d2220 2019-07-11 stsp static const struct got_error *
3675 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
3677 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
3678 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
3679 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
3680 818c7501 2019-07-11 stsp char *cwd = NULL;
3681 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
3682 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
3683 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
3684 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
3685 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
3686 818c7501 2019-07-11 stsp struct got_commit_graph *graph = NULL;
3687 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
3688 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
3689 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
3690 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
3691 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
3692 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
3693 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
3695 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
3696 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
3698 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
3699 818c7501 2019-07-11 stsp switch (ch) {
3701 818c7501 2019-07-11 stsp abort_rebase = 1;
3704 818c7501 2019-07-11 stsp continue_rebase = 1;
3707 818c7501 2019-07-11 stsp usage_rebase();
3708 818c7501 2019-07-11 stsp /* NOTREACHED */
3712 818c7501 2019-07-11 stsp argc -= optind;
3713 818c7501 2019-07-11 stsp argv += optind;
3715 43012d58 2019-07-14 stsp #ifndef PROFILE
3716 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3717 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3718 43012d58 2019-07-14 stsp err(1, "pledge");
3720 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
3721 818c7501 2019-07-11 stsp usage_rebase();
3722 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
3723 818c7501 2019-07-11 stsp if (argc != 0)
3724 818c7501 2019-07-11 stsp usage_rebase();
3725 818c7501 2019-07-11 stsp } else if (argc != 1)
3726 818c7501 2019-07-11 stsp usage_rebase();
3728 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
3729 818c7501 2019-07-11 stsp if (cwd == NULL) {
3730 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
3731 818c7501 2019-07-11 stsp goto done;
3733 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
3734 818c7501 2019-07-11 stsp if (error)
3735 818c7501 2019-07-11 stsp goto done;
3737 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3738 818c7501 2019-07-11 stsp if (error != NULL)
3739 818c7501 2019-07-11 stsp goto done;
3741 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3742 818c7501 2019-07-11 stsp got_worktree_get_root_path(worktree), 0);
3743 818c7501 2019-07-11 stsp if (error)
3744 818c7501 2019-07-11 stsp goto done;
3746 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3747 818c7501 2019-07-11 stsp if (error)
3748 818c7501 2019-07-11 stsp goto done;
3750 818c7501 2019-07-11 stsp if (rebase_in_progress && abort_rebase) {
3751 818c7501 2019-07-11 stsp int did_something;
3752 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3753 818c7501 2019-07-11 stsp &new_base_branch, &tmp_branch, &branch, worktree, repo);
3754 818c7501 2019-07-11 stsp if (error)
3755 818c7501 2019-07-11 stsp goto done;
3756 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
3757 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
3758 818c7501 2019-07-11 stsp error = got_worktree_rebase_abort(worktree, repo,
3759 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
3760 818c7501 2019-07-11 stsp if (error)
3761 818c7501 2019-07-11 stsp goto done;
3762 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
3763 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
3764 818c7501 2019-07-11 stsp } else if (abort_rebase) {
3765 818c7501 2019-07-11 stsp error = got_error(GOT_ERR_NOT_REBASING);
3766 818c7501 2019-07-11 stsp goto done;
3769 818c7501 2019-07-11 stsp if (continue_rebase) {
3770 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3771 818c7501 2019-07-11 stsp &new_base_branch, &tmp_branch, &branch, worktree, repo);
3772 818c7501 2019-07-11 stsp if (error)
3773 818c7501 2019-07-11 stsp goto done;
3775 01757395 2019-07-12 stsp error = rebase_commit(NULL, worktree, tmp_branch,
3776 01757395 2019-07-12 stsp resume_commit_id, repo);
3777 818c7501 2019-07-11 stsp if (error)
3778 818c7501 2019-07-11 stsp goto done;
3780 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
3781 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
3782 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
3783 818c7501 2019-07-11 stsp goto done;
3786 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
3787 818c7501 2019-07-11 stsp if (error != NULL)
3788 818c7501 2019-07-11 stsp goto done;
3790 818c7501 2019-07-11 stsp error = check_same_branch(
3791 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree), branch, repo);
3792 818c7501 2019-07-11 stsp if (error) {
3793 818c7501 2019-07-11 stsp if (error->code != GOT_ERR_ANCESTRY)
3794 818c7501 2019-07-11 stsp goto done;
3795 818c7501 2019-07-11 stsp error = NULL;
3797 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
3798 818c7501 2019-07-11 stsp "specified branch resolves to a commit which "
3799 818c7501 2019-07-11 stsp "is already contained in work tree's branch");
3800 818c7501 2019-07-11 stsp goto done;
3804 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
3805 ff0d2220 2019-07-11 stsp if (error)
3806 ff0d2220 2019-07-11 stsp goto done;
3808 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
3809 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
3810 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree),
3811 818c7501 2019-07-11 stsp branch_head_commit_id, repo);
3812 818c7501 2019-07-11 stsp if (error)
3813 818c7501 2019-07-11 stsp goto done;
3814 818c7501 2019-07-11 stsp if (yca_id == NULL) {
3815 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3816 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
3817 818c7501 2019-07-11 stsp "with work tree's branch");
3818 818c7501 2019-07-11 stsp goto done;
3821 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
3822 818c7501 2019-07-11 stsp &tmp_branch, worktree, branch, repo);
3823 818c7501 2019-07-11 stsp if (error)
3824 818c7501 2019-07-11 stsp goto done;
3827 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
3828 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3829 818c7501 2019-07-11 stsp if (error)
3830 818c7501 2019-07-11 stsp goto done;
3832 818c7501 2019-07-11 stsp error = got_commit_graph_open(&graph, commit_id, "/", 1, repo);
3833 818c7501 2019-07-11 stsp if (error)
3834 818c7501 2019-07-11 stsp goto done;
3835 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3836 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
3837 818c7501 2019-07-11 stsp error = got_commit_graph_iter_start(graph, pid->id, repo);
3838 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3839 818c7501 2019-07-11 stsp commit = NULL;
3840 818c7501 2019-07-11 stsp if (error)
3841 818c7501 2019-07-11 stsp goto done;
3842 818c7501 2019-07-11 stsp while (got_object_id_cmp(commit_id, yca_id) != 0) {
3843 818c7501 2019-07-11 stsp error = got_commit_graph_iter_next(&parent_id, graph);
3844 818c7501 2019-07-11 stsp if (error) {
3845 818c7501 2019-07-11 stsp if (error->code == GOT_ERR_ITER_COMPLETED) {
3846 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3847 818c7501 2019-07-11 stsp "ran out of commits to rebase before "
3848 818c7501 2019-07-11 stsp "youngest common ancestor commit has "
3849 818c7501 2019-07-11 stsp "been reached?!?");
3850 818c7501 2019-07-11 stsp goto done;
3851 818c7501 2019-07-11 stsp } else if (error->code != GOT_ERR_ITER_NEED_MORE)
3852 818c7501 2019-07-11 stsp goto done;
3853 818c7501 2019-07-11 stsp error = got_commit_graph_fetch_commits(graph, 1, repo);
3854 818c7501 2019-07-11 stsp if (error)
3855 818c7501 2019-07-11 stsp goto done;
3857 64c6d990 2019-07-11 stsp error = rebase_check_path_prefix(parent_id, commit_id,
3858 64c6d990 2019-07-11 stsp got_worktree_get_path_prefix(worktree), repo);
3859 64c6d990 2019-07-11 stsp if (error)
3860 64c6d990 2019-07-11 stsp goto done;
3862 818c7501 2019-07-11 stsp error = got_object_qid_alloc(&qid, commit_id);
3863 818c7501 2019-07-11 stsp if (error)
3864 818c7501 2019-07-11 stsp goto done;
3865 818c7501 2019-07-11 stsp SIMPLEQ_INSERT_HEAD(&commits, qid, entry);
3866 818c7501 2019-07-11 stsp commit_id = parent_id;
3869 f35c2426 2019-07-15 stsp got_commit_graph_close(graph);
3870 f35c2426 2019-07-15 stsp graph = NULL;
3872 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
3873 ff0d2220 2019-07-11 stsp if (continue_rebase)
3874 ff0d2220 2019-07-11 stsp error = rebase_complete(worktree, branch,
3875 ff0d2220 2019-07-11 stsp new_base_branch, tmp_branch, repo);
3877 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
3878 818c7501 2019-07-11 stsp goto done;
3881 818c7501 2019-07-11 stsp pid = NULL;
3882 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
3883 818c7501 2019-07-11 stsp commit_id = qid->id;
3884 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
3885 818c7501 2019-07-11 stsp pid = qid;
3887 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
3888 01757395 2019-07-12 stsp worktree, parent_id, commit_id, repo, rebase_progress,
3889 01757395 2019-07-12 stsp &rebase_status, check_cancelled, NULL);
3890 818c7501 2019-07-11 stsp if (error)
3891 818c7501 2019-07-11 stsp goto done;
3893 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
3894 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
3898 01757395 2019-07-12 stsp error = rebase_commit(&merged_paths, worktree, tmp_branch,
3899 01757395 2019-07-12 stsp commit_id, repo);
3900 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
3901 818c7501 2019-07-11 stsp if (error)
3902 818c7501 2019-07-11 stsp goto done;
3905 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
3906 818c7501 2019-07-11 stsp error = got_worktree_rebase_postpone(worktree);
3907 818c7501 2019-07-11 stsp if (error)
3908 818c7501 2019-07-11 stsp goto done;
3909 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
3910 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
3912 818c7501 2019-07-11 stsp error = rebase_complete(worktree, branch, new_base_branch,
3913 818c7501 2019-07-11 stsp tmp_branch, repo);
3915 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
3916 818c7501 2019-07-11 stsp free(branch_head_commit_id);
3917 818c7501 2019-07-11 stsp free(resume_commit_id);
3918 818c7501 2019-07-11 stsp free(yca_id);
3919 818c7501 2019-07-11 stsp if (graph)
3920 818c7501 2019-07-11 stsp got_commit_graph_close(graph);
3921 818c7501 2019-07-11 stsp if (commit)
3922 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3923 818c7501 2019-07-11 stsp if (branch)
3924 818c7501 2019-07-11 stsp got_ref_close(branch);
3925 818c7501 2019-07-11 stsp if (new_base_branch)
3926 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
3927 818c7501 2019-07-11 stsp if (tmp_branch)
3928 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
3929 5ef14e63 2019-06-02 stsp if (worktree)
3930 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
3932 5ef14e63 2019-06-02 stsp got_repo_close(repo);
3933 5ef14e63 2019-06-02 stsp return error;
