1 5c860e29 2018-03-12 stsp /*
    2 f42b1b34 2018-03-12 stsp  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
    3 5aa81393 2020-01-06 stsp  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
    4 93658fb9 2020-03-18 stsp  * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
    5 5c860e29 2018-03-12 stsp  *
    6 5c860e29 2018-03-12 stsp  * Permission to use, copy, modify, and distribute this software for any
    7 5c860e29 2018-03-12 stsp  * purpose with or without fee is hereby granted, provided that the above
    8 5c860e29 2018-03-12 stsp  * copyright notice and this permission notice appear in all copies.
    9 5c860e29 2018-03-12 stsp  *
   10 5c860e29 2018-03-12 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
   11 5c860e29 2018-03-12 stsp  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
   12 5c860e29 2018-03-12 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
   13 5c860e29 2018-03-12 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
   14 5c860e29 2018-03-12 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   15 5c860e29 2018-03-12 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
   16 5c860e29 2018-03-12 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   17 5c860e29 2018-03-12 stsp  */
   18 5c860e29 2018-03-12 stsp 
   19 c0768b0f 2018-06-10 stsp #include <sys/types.h>
   20 5de5890b 2018-10-18 stsp #include <sys/stat.h>
   21 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
   22 f42b1b34 2018-03-12 stsp 
   23 5c860e29 2018-03-12 stsp #include <err.h>
   24 5c860e29 2018-03-12 stsp #include <errno.h>
   25 12463d8b 2019-12-13 stsp #include <fcntl.h>
   26 12ce7a6c 2019-08-12 stsp #include <limits.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>
   37 6841bf13 2019-11-29 kn #include <regex.h>
   38 83cd27f8 2020-01-13 stsp #include <getopt.h>
   39 dd038bc6 2021-09-21 thomas.ad 
   40 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"
   41 5c860e29 2018-03-12 stsp 
   42 53ccebc2 2019-07-30 stsp #include "got_version.h"
   43 f42b1b34 2018-03-12 stsp #include "got_error.h"
   44 f42b1b34 2018-03-12 stsp #include "got_object.h"
   45 5261c201 2018-04-01 stsp #include "got_reference.h"
   46 f42b1b34 2018-03-12 stsp #include "got_repository.h"
   47 1dd54920 2019-05-11 stsp #include "got_path.h"
   48 e6209546 2019-08-22 stsp #include "got_cancel.h"
   49 c09a553d 2018-03-12 stsp #include "got_worktree.h"
   50 79109fed 2018-03-27 stsp #include "got_diff.h"
   51 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
   52 6f23baec 2020-03-18 stsp #include "got_fetch.h"
   53 f8a36e22 2021-08-26 stsp #include "got_send.h"
   54 404c43c4 2018-06-21 stsp #include "got_blame.h"
   55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
   56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
   57 50b0790e 2020-09-11 stsp #include "got_gotconfig.h"
   58 d65a88a2 2021-09-05 stsp #include "got_dial.h"
   59 5c860e29 2018-03-12 stsp 
   60 5c860e29 2018-03-12 stsp #ifndef nitems
   61 5c860e29 2018-03-12 stsp #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
   62 5c860e29 2018-03-12 stsp #endif
   63 99437157 2018-11-11 stsp 
   64 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
   65 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
   66 99437157 2018-11-11 stsp 
   67 99437157 2018-11-11 stsp static void
   68 99437157 2018-11-11 stsp catch_sigint(int signo)
   69 99437157 2018-11-11 stsp {
   70 99437157 2018-11-11 stsp 	sigint_received = 1;
   71 99437157 2018-11-11 stsp }
   72 99437157 2018-11-11 stsp 
   73 99437157 2018-11-11 stsp static void
   74 99437157 2018-11-11 stsp catch_sigpipe(int signo)
   75 99437157 2018-11-11 stsp {
   76 99437157 2018-11-11 stsp 	sigpipe_received = 1;
   77 99437157 2018-11-11 stsp }
   78 5c860e29 2018-03-12 stsp 
   79 99437157 2018-11-11 stsp 
   80 8cfb4057 2019-07-09 stsp struct got_cmd {
   81 820059fa 2020-09-25 stsp 	const char	*cmd_name;
   82 d7d4f210 2018-03-12 stsp 	const struct got_error *(*cmd_main)(int, char *[]);
   83 1b6b95a8 2018-03-12 stsp 	void		(*cmd_usage)(void);
   84 97b3a7be 2019-07-09 stsp 	const char	*cmd_alias;
   85 5c860e29 2018-03-12 stsp };
   86 5c860e29 2018-03-12 stsp 
   87 6879ba42 2020-10-01 naddy __dead static void	usage(int, int);
   88 2c7829a4 2019-06-17 stsp __dead static void	usage_init(void);
   89 3ce1b845 2019-07-15 stsp __dead static void	usage_import(void);
   90 93658fb9 2020-03-18 stsp __dead static void	usage_clone(void);
   91 7848a0e1 2020-03-19 stsp __dead static void	usage_fetch(void);
   92 2ab43947 2020-03-18 stsp __dead static void	usage_checkout(void);
   93 507dc3bb 2018-12-29 stsp __dead static void	usage_update(void);
   94 4ed7e80c 2018-05-20 stsp __dead static void	usage_log(void);
   95 4ed7e80c 2018-05-20 stsp __dead static void	usage_diff(void);
   96 404c43c4 2018-06-21 stsp __dead static void	usage_blame(void);
   97 5de5890b 2018-10-18 stsp __dead static void	usage_tree(void);
   98 6bad629b 2019-02-04 stsp __dead static void	usage_status(void);
   99 d0eebce4 2019-03-11 stsp __dead static void	usage_ref(void);
  100 4e759de4 2019-06-26 stsp __dead static void	usage_branch(void);
  101 8e7bd50a 2019-08-22 stsp __dead static void	usage_tag(void);
  102 d00136be 2019-03-26 stsp __dead static void	usage_add(void);
  103 648e4ef7 2019-07-09 stsp __dead static void	usage_remove(void);
  104 a129376b 2019-03-28 stsp __dead static void	usage_revert(void);
  105 c4296144 2019-05-09 stsp __dead static void	usage_commit(void);
  106 f8a36e22 2021-08-26 stsp __dead static void	usage_send(void);
  107 234035bc 2019-06-01 stsp __dead static void	usage_cherrypick(void);
  108 5ef14e63 2019-06-02 stsp __dead static void	usage_backout(void);
  109 818c7501 2019-07-11 stsp __dead static void	usage_rebase(void);
  110 0ebf8283 2019-07-24 stsp __dead static void	usage_histedit(void);
  111 2822a352 2019-10-15 stsp __dead static void	usage_integrate(void);
  112 10604dce 2021-09-24 thomas __dead static void	usage_merge(void);
  113 715dc77e 2019-08-03 stsp __dead static void	usage_stage(void);
  114 ad493afc 2019-08-03 stsp __dead static void	usage_unstage(void);
  115 01073a5d 2019-08-22 stsp __dead static void	usage_cat(void);
  116 b2118c49 2020-07-28 stsp __dead static void	usage_info(void);
  117 5c860e29 2018-03-12 stsp 
  118 2c7829a4 2019-06-17 stsp static const struct got_error*		cmd_init(int, char *[]);
  119 3ce1b845 2019-07-15 stsp static const struct got_error*		cmd_import(int, char *[]);
  120 93658fb9 2020-03-18 stsp static const struct got_error*		cmd_clone(int, char *[]);
  121 7848a0e1 2020-03-19 stsp static const struct got_error*		cmd_fetch(int, char *[]);
  122 4ed7e80c 2018-05-20 stsp static const struct got_error*		cmd_checkout(int, char *[]);
  123 507dc3bb 2018-12-29 stsp static const struct got_error*		cmd_update(int, char *[]);
  124 4ed7e80c 2018-05-20 stsp static const struct got_error*		cmd_log(int, char *[]);
  125 4ed7e80c 2018-05-20 stsp static const struct got_error*		cmd_diff(int, char *[]);
  126 404c43c4 2018-06-21 stsp static const struct got_error*		cmd_blame(int, char *[]);
  127 5de5890b 2018-10-18 stsp static const struct got_error*		cmd_tree(int, char *[]);
  128 4ed7e80c 2018-05-20 stsp static const struct got_error*		cmd_status(int, char *[]);
  129 d0eebce4 2019-03-11 stsp static const struct got_error*		cmd_ref(int, char *[]);
  130 4e759de4 2019-06-26 stsp static const struct got_error*		cmd_branch(int, char *[]);
  131 8e7bd50a 2019-08-22 stsp static const struct got_error*		cmd_tag(int, char *[]);
  132 d00136be 2019-03-26 stsp static const struct got_error*		cmd_add(int, char *[]);
  133 648e4ef7 2019-07-09 stsp static const struct got_error*		cmd_remove(int, char *[]);
  134 a129376b 2019-03-28 stsp static const struct got_error*		cmd_revert(int, char *[]);
  135 c4296144 2019-05-09 stsp static const struct got_error*		cmd_commit(int, char *[]);
  136 f8a36e22 2021-08-26 stsp static const struct got_error*		cmd_send(int, char *[]);
  137 234035bc 2019-06-01 stsp static const struct got_error*		cmd_cherrypick(int, char *[]);
  138 5ef14e63 2019-06-02 stsp static const struct got_error*		cmd_backout(int, char *[]);
  139 818c7501 2019-07-11 stsp static const struct got_error*		cmd_rebase(int, char *[]);
  140 0ebf8283 2019-07-24 stsp static const struct got_error*		cmd_histedit(int, char *[]);
  141 2822a352 2019-10-15 stsp static const struct got_error*		cmd_integrate(int, char *[]);
  142 10604dce 2021-09-24 thomas static const struct got_error*		cmd_merge(int, char *[]);
  143 715dc77e 2019-08-03 stsp static const struct got_error*		cmd_stage(int, char *[]);
  144 ad493afc 2019-08-03 stsp static const struct got_error*		cmd_unstage(int, char *[]);
  145 01073a5d 2019-08-22 stsp static const struct got_error*		cmd_cat(int, char *[]);
  146 b2118c49 2020-07-28 stsp static const struct got_error*		cmd_info(int, char *[]);
  147 5c860e29 2018-03-12 stsp 
  148 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
  149 b2118c49 2020-07-28 stsp 	{ "init",	cmd_init,	usage_init,	"" },
  150 bc26cce8 2019-08-04 stsp 	{ "import",	cmd_import,	usage_import,	"im" },
  151 93658fb9 2020-03-18 stsp 	{ "clone",	cmd_clone,	usage_clone,	"cl" },
  152 7848a0e1 2020-03-19 stsp 	{ "fetch",	cmd_fetch,	usage_fetch,	"fe" },
  153 2ab43947 2020-03-18 stsp 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
  154 97b3a7be 2019-07-09 stsp 	{ "update",	cmd_update,	usage_update,	"up" },
  155 97b3a7be 2019-07-09 stsp 	{ "log",	cmd_log,	usage_log,	"" },
  156 bc26cce8 2019-08-04 stsp 	{ "diff",	cmd_diff,	usage_diff,	"di" },
  157 bc26cce8 2019-08-04 stsp 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
  158 bc26cce8 2019-08-04 stsp 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
  159 97b3a7be 2019-07-09 stsp 	{ "status",	cmd_status,	usage_status,	"st" },
  160 97b3a7be 2019-07-09 stsp 	{ "ref",	cmd_ref,	usage_ref,	"" },
  161 97b3a7be 2019-07-09 stsp 	{ "branch",	cmd_branch,	usage_branch,	"br" },
  162 8e7bd50a 2019-08-22 stsp 	{ "tag",	cmd_tag,	usage_tag,	"" },
  163 97b3a7be 2019-07-09 stsp 	{ "add",	cmd_add,	usage_add,	"" },
  164 648e4ef7 2019-07-09 stsp 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
  165 97b3a7be 2019-07-09 stsp 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
  166 97b3a7be 2019-07-09 stsp 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
  167 f8a36e22 2021-08-26 stsp 	{ "send",	cmd_send,	usage_send,	"se" },
  168 016477fd 2019-07-09 stsp 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
  169 97b3a7be 2019-07-09 stsp 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
  170 818c7501 2019-07-11 stsp 	{ "rebase",	cmd_rebase,	usage_rebase,	"rb" },
  171 0ebf8283 2019-07-24 stsp 	{ "histedit",	cmd_histedit,	usage_histedit,	"he" },
  172 2822a352 2019-10-15 stsp 	{ "integrate",  cmd_integrate,  usage_integrate,"ig" },
  173 10604dce 2021-09-24 thomas 	{ "merge",	cmd_merge,	usage_merge,	"mg" },
  174 715dc77e 2019-08-03 stsp 	{ "stage",	cmd_stage,	usage_stage,	"sg" },
  175 ad493afc 2019-08-03 stsp 	{ "unstage",	cmd_unstage,	usage_unstage,	"ug" },
  176 01073a5d 2019-08-22 stsp 	{ "cat",	cmd_cat,	usage_cat,	"" },
  177 b2118c49 2020-07-28 stsp 	{ "info",	cmd_info,	usage_info,	"" },
  178 5c860e29 2018-03-12 stsp };
  179 ce5b7c56 2019-07-09 stsp 
  180 ce5b7c56 2019-07-09 stsp static void
  181 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
  182 ce5b7c56 2019-07-09 stsp {
  183 6059809a 2020-12-17 stsp 	size_t i;
  184 ce5b7c56 2019-07-09 stsp 
  185 6879ba42 2020-10-01 naddy 	fprintf(fp, "commands:");
  186 ce5b7c56 2019-07-09 stsp 	for (i = 0; i < nitems(got_commands); i++) {
  187 ce5b7c56 2019-07-09 stsp 		struct got_cmd *cmd = &got_commands[i];
  188 6879ba42 2020-10-01 naddy 		fprintf(fp, " %s", cmd->cmd_name);
  189 ce5b7c56 2019-07-09 stsp 	}
  190 6879ba42 2020-10-01 naddy 	fputc('\n', fp);
  191 ce5b7c56 2019-07-09 stsp }
  192 5c860e29 2018-03-12 stsp 
  193 ff69268e 2020-12-13 stsp __dead static void
  194 ff69268e 2020-12-13 stsp option_conflict(char a, char b)
  195 ff69268e 2020-12-13 stsp {
  196 ff69268e 2020-12-13 stsp 	errx(1, "-%c and -%c options are mutually exclusive", a, b);
  197 ff69268e 2020-12-13 stsp }
  198 ff69268e 2020-12-13 stsp 
  199 5c860e29 2018-03-12 stsp int
  200 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
  201 5c860e29 2018-03-12 stsp {
  202 8cfb4057 2019-07-09 stsp 	struct got_cmd *cmd;
  203 6059809a 2020-12-17 stsp 	size_t i;
  204 5c860e29 2018-03-12 stsp 	int ch;
  205 53ccebc2 2019-07-30 stsp 	int hflag = 0, Vflag = 0;
  206 83cd27f8 2020-01-13 stsp 	static struct option longopts[] = {
  207 62d463ca 2020-10-20 naddy 	    { "version", no_argument, NULL, 'V' },
  208 62d463ca 2020-10-20 naddy 	    { NULL, 0, NULL, 0 }
  209 83cd27f8 2020-01-13 stsp 	};
  210 5c860e29 2018-03-12 stsp 
  211 289e3cbf 2019-02-04 stsp 	setlocale(LC_CTYPE, "");
  212 5c860e29 2018-03-12 stsp 
  213 6586ea88 2020-01-13 stsp 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
  214 5c860e29 2018-03-12 stsp 		switch (ch) {
  215 1b6b95a8 2018-03-12 stsp 		case 'h':
  216 1b6b95a8 2018-03-12 stsp 			hflag = 1;
  217 53ccebc2 2019-07-30 stsp 			break;
  218 53ccebc2 2019-07-30 stsp 		case 'V':
  219 53ccebc2 2019-07-30 stsp 			Vflag = 1;
  220 1b6b95a8 2018-03-12 stsp 			break;
  221 5c860e29 2018-03-12 stsp 		default:
  222 6879ba42 2020-10-01 naddy 			usage(hflag, 1);
  223 5c860e29 2018-03-12 stsp 			/* NOTREACHED */
  224 5c860e29 2018-03-12 stsp 		}
  225 5c860e29 2018-03-12 stsp 	}
  226 5c860e29 2018-03-12 stsp 
  227 5c860e29 2018-03-12 stsp 	argc -= optind;
  228 5c860e29 2018-03-12 stsp 	argv += optind;
  229 9814e6a3 2020-09-27 naddy 	optind = 1;
  230 9814e6a3 2020-09-27 naddy 	optreset = 1;
  231 53ccebc2 2019-07-30 stsp 
  232 53ccebc2 2019-07-30 stsp 	if (Vflag) {
  233 53ccebc2 2019-07-30 stsp 		got_version_print_str();
  234 6879ba42 2020-10-01 naddy 		return 0;
  235 53ccebc2 2019-07-30 stsp 	}
  236 5c860e29 2018-03-12 stsp 
  237 5c860e29 2018-03-12 stsp 	if (argc <= 0)
  238 6879ba42 2020-10-01 naddy 		usage(hflag, hflag ? 0 : 1);
  239 5c860e29 2018-03-12 stsp 
  240 99437157 2018-11-11 stsp 	signal(SIGINT, catch_sigint);
  241 99437157 2018-11-11 stsp 	signal(SIGPIPE, catch_sigpipe);
  242 99437157 2018-11-11 stsp 
  243 5c860e29 2018-03-12 stsp 	for (i = 0; i < nitems(got_commands); i++) {
  244 d7d4f210 2018-03-12 stsp 		const struct got_error *error;
  245 d7d4f210 2018-03-12 stsp 
  246 5c860e29 2018-03-12 stsp 		cmd = &got_commands[i];
  247 5c860e29 2018-03-12 stsp 
  248 97b3a7be 2019-07-09 stsp 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
  249 97b3a7be 2019-07-09 stsp 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
  250 5c860e29 2018-03-12 stsp 			continue;
  251 5c860e29 2018-03-12 stsp 
  252 1b6b95a8 2018-03-12 stsp 		if (hflag)
  253 1b6b95a8 2018-03-12 stsp 			got_commands[i].cmd_usage();
  254 1b6b95a8 2018-03-12 stsp 
  255 d7d4f210 2018-03-12 stsp 		error = got_commands[i].cmd_main(argc, argv);
  256 f8afbdc8 2019-11-08 stsp 		if (error && error->code != GOT_ERR_CANCELLED &&
  257 f8afbdc8 2019-11-08 stsp 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
  258 f8afbdc8 2019-11-08 stsp 		    !(sigpipe_received &&
  259 70015d7a 2019-11-08 stsp 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
  260 70015d7a 2019-11-08 stsp 		    !(sigint_received &&
  261 70015d7a 2019-11-08 stsp 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
  262 d7d4f210 2018-03-12 stsp 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
  263 d7d4f210 2018-03-12 stsp 			return 1;
  264 d7d4f210 2018-03-12 stsp 		}
  265 d7d4f210 2018-03-12 stsp 
  266 d7d4f210 2018-03-12 stsp 		return 0;
  267 5c860e29 2018-03-12 stsp 	}
  268 5c860e29 2018-03-12 stsp 
  269 20ecf764 2018-03-12 stsp 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
  270 6879ba42 2020-10-01 naddy 	list_commands(stderr);
  271 5c860e29 2018-03-12 stsp 	return 1;
  272 5c860e29 2018-03-12 stsp }
  273 5c860e29 2018-03-12 stsp 
  274 4ed7e80c 2018-05-20 stsp __dead static void
  275 6879ba42 2020-10-01 naddy usage(int hflag, int status)
  276 5c860e29 2018-03-12 stsp {
  277 6879ba42 2020-10-01 naddy 	FILE *fp = (status == 0) ? stdout : stderr;
  278 6879ba42 2020-10-01 naddy 
  279 6879ba42 2020-10-01 naddy 	fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
  280 53ccebc2 2019-07-30 stsp 	    getprogname());
  281 ce5b7c56 2019-07-09 stsp 	if (hflag)
  282 6879ba42 2020-10-01 naddy 		list_commands(fp);
  283 6879ba42 2020-10-01 naddy 	exit(status);
  284 5c860e29 2018-03-12 stsp }
  285 5c860e29 2018-03-12 stsp 
  286 0266afb7 2019-01-04 stsp static const struct got_error *
  287 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
  288 e2ba3d07 2019-05-13 stsp {
  289 0ee7065d 2019-05-13 stsp 	const struct got_error *err = NULL;
  290 e2ba3d07 2019-05-13 stsp 	const char *editor;
  291 8920fa04 2019-08-18 stsp 
  292 8920fa04 2019-08-18 stsp 	*abspath = NULL;
  293 e2ba3d07 2019-05-13 stsp 
  294 e2ba3d07 2019-05-13 stsp 	editor = getenv("VISUAL");
  295 e2ba3d07 2019-05-13 stsp 	if (editor == NULL)
  296 e2ba3d07 2019-05-13 stsp 		editor = getenv("EDITOR");
  297 e2ba3d07 2019-05-13 stsp 
  298 0ee7065d 2019-05-13 stsp 	if (editor) {
  299 0ee7065d 2019-05-13 stsp 		err = got_path_find_prog(abspath, editor);
  300 0ee7065d 2019-05-13 stsp 		if (err)
  301 0ee7065d 2019-05-13 stsp 			return err;
  302 0ee7065d 2019-05-13 stsp 	}
  303 e2ba3d07 2019-05-13 stsp 
  304 0ee7065d 2019-05-13 stsp 	if (*abspath == NULL) {
  305 0ee7065d 2019-05-13 stsp 		*abspath = strdup("/bin/ed");
  306 0ee7065d 2019-05-13 stsp 		if (*abspath == NULL)
  307 0ee7065d 2019-05-13 stsp 			return got_error_from_errno("strdup");
  308 0ee7065d 2019-05-13 stsp 	}
  309 0ee7065d 2019-05-13 stsp 
  310 e2ba3d07 2019-05-13 stsp 	return NULL;
  311 e2ba3d07 2019-05-13 stsp }
  312 e2ba3d07 2019-05-13 stsp 
  313 e2ba3d07 2019-05-13 stsp static const struct got_error *
  314 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
  315 c530dc23 2019-07-23 stsp     const char *worktree_path)
  316 0266afb7 2019-01-04 stsp {
  317 163ce85a 2019-05-13 stsp 	const struct got_error *err;
  318 0266afb7 2019-01-04 stsp 
  319 37c06ea4 2019-07-15 stsp #ifdef PROFILE
  320 37c06ea4 2019-07-15 stsp 	if (unveil("gmon.out", "rwc") != 0)
  321 37c06ea4 2019-07-15 stsp 		return got_error_from_errno2("unveil", "gmon.out");
  322 37c06ea4 2019-07-15 stsp #endif
  323 d0eebce4 2019-03-11 stsp 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
  324 638f9024 2019-05-13 stsp 		return got_error_from_errno2("unveil", repo_path);
  325 0266afb7 2019-01-04 stsp 
  326 0266afb7 2019-01-04 stsp 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
  327 638f9024 2019-05-13 stsp 		return got_error_from_errno2("unveil", worktree_path);
  328 0266afb7 2019-01-04 stsp 
  329 bb63914a 2020-02-17 stsp 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
  330 bb63914a 2020-02-17 stsp 		return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
  331 0266afb7 2019-01-04 stsp 
  332 163ce85a 2019-05-13 stsp 	err = got_privsep_unveil_exec_helpers();
  333 163ce85a 2019-05-13 stsp 	if (err != NULL)
  334 163ce85a 2019-05-13 stsp 		return err;
  335 0266afb7 2019-01-04 stsp 
  336 0266afb7 2019-01-04 stsp 	if (unveil(NULL, NULL) != 0)
  337 638f9024 2019-05-13 stsp 		return got_error_from_errno("unveil");
  338 0266afb7 2019-01-04 stsp 
  339 0266afb7 2019-01-04 stsp 	return NULL;
  340 2c7829a4 2019-06-17 stsp }
  341 2c7829a4 2019-06-17 stsp 
  342 2c7829a4 2019-06-17 stsp __dead static void
  343 2c7829a4 2019-06-17 stsp usage_init(void)
  344 2c7829a4 2019-06-17 stsp {
  345 09ea71ba 2019-07-27 stsp 	fprintf(stderr, "usage: %s init repository-path\n", getprogname());
  346 2c7829a4 2019-06-17 stsp 	exit(1);
  347 2c7829a4 2019-06-17 stsp }
  348 2c7829a4 2019-06-17 stsp 
  349 2c7829a4 2019-06-17 stsp static const struct got_error *
  350 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
  351 2c7829a4 2019-06-17 stsp {
  352 2c7829a4 2019-06-17 stsp 	const struct got_error *error = NULL;
  353 2c7829a4 2019-06-17 stsp 	char *repo_path = NULL;
  354 2c7829a4 2019-06-17 stsp 	int ch;
  355 2c7829a4 2019-06-17 stsp 
  356 2c7829a4 2019-06-17 stsp 	while ((ch = getopt(argc, argv, "")) != -1) {
  357 2c7829a4 2019-06-17 stsp 		switch (ch) {
  358 2c7829a4 2019-06-17 stsp 		default:
  359 2c7829a4 2019-06-17 stsp 			usage_init();
  360 2c7829a4 2019-06-17 stsp 			/* NOTREACHED */
  361 2c7829a4 2019-06-17 stsp 		}
  362 2c7829a4 2019-06-17 stsp 	}
  363 2c7829a4 2019-06-17 stsp 
  364 2c7829a4 2019-06-17 stsp 	argc -= optind;
  365 2c7829a4 2019-06-17 stsp 	argv += optind;
  366 2c7829a4 2019-06-17 stsp 
  367 2c7829a4 2019-06-17 stsp #ifndef PROFILE
  368 2c7829a4 2019-06-17 stsp 	if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
  369 2c7829a4 2019-06-17 stsp 		err(1, "pledge");
  370 2c7829a4 2019-06-17 stsp #endif
  371 2c7829a4 2019-06-17 stsp 	if (argc != 1)
  372 bc20e173 2019-06-17 stsp 		usage_init();
  373 2c7829a4 2019-06-17 stsp 
  374 2c7829a4 2019-06-17 stsp 	repo_path = strdup(argv[0]);
  375 2c7829a4 2019-06-17 stsp 	if (repo_path == NULL)
  376 2c7829a4 2019-06-17 stsp 		return got_error_from_errno("strdup");
  377 2c7829a4 2019-06-17 stsp 
  378 2c7829a4 2019-06-17 stsp 	got_path_strip_trailing_slashes(repo_path);
  379 2c7829a4 2019-06-17 stsp 
  380 2c7829a4 2019-06-17 stsp 	error = got_path_mkdir(repo_path);
  381 2c7829a4 2019-06-17 stsp 	if (error &&
  382 2c7829a4 2019-06-17 stsp 	    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
  383 2c7829a4 2019-06-17 stsp 		goto done;
  384 2c7829a4 2019-06-17 stsp 
  385 c530dc23 2019-07-23 stsp 	error = apply_unveil(repo_path, 0, NULL);
  386 2c7829a4 2019-06-17 stsp 	if (error)
  387 2c7829a4 2019-06-17 stsp 		goto done;
  388 2c7829a4 2019-06-17 stsp 
  389 2c7829a4 2019-06-17 stsp 	error = got_repo_init(repo_path);
  390 3ce1b845 2019-07-15 stsp done:
  391 3ce1b845 2019-07-15 stsp 	free(repo_path);
  392 3ce1b845 2019-07-15 stsp 	return error;
  393 3ce1b845 2019-07-15 stsp }
  394 3ce1b845 2019-07-15 stsp 
  395 3ce1b845 2019-07-15 stsp __dead static void
  396 3ce1b845 2019-07-15 stsp usage_import(void)
  397 3ce1b845 2019-07-15 stsp {
  398 3ce1b845 2019-07-15 stsp 	fprintf(stderr, "usage: %s import [-b branch] [-m message] "
  399 3ce1b845 2019-07-15 stsp 	    "[-r repository-path] [-I pattern] path\n", getprogname());
  400 3ce1b845 2019-07-15 stsp 	exit(1);
  401 3ce1b845 2019-07-15 stsp }
  402 3ce1b845 2019-07-15 stsp 
  403 3ce1b845 2019-07-15 stsp int
  404 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
  405 3ce1b845 2019-07-15 stsp {
  406 3ce1b845 2019-07-15 stsp 	pid_t pid;
  407 3ce1b845 2019-07-15 stsp 	sig_t sighup, sigint, sigquit;
  408 3ce1b845 2019-07-15 stsp 	int st = -1;
  409 3ce1b845 2019-07-15 stsp 
  410 3ce1b845 2019-07-15 stsp 	sighup = signal(SIGHUP, SIG_IGN);
  411 3ce1b845 2019-07-15 stsp 	sigint = signal(SIGINT, SIG_IGN);
  412 3ce1b845 2019-07-15 stsp 	sigquit = signal(SIGQUIT, SIG_IGN);
  413 3ce1b845 2019-07-15 stsp 
  414 3ce1b845 2019-07-15 stsp 	switch (pid = fork()) {
  415 3ce1b845 2019-07-15 stsp 	case -1:
  416 3ce1b845 2019-07-15 stsp 		goto doneediting;
  417 3ce1b845 2019-07-15 stsp 	case 0:
  418 3ce1b845 2019-07-15 stsp 		execl(editor, editor, file, (char *)NULL);
  419 3ce1b845 2019-07-15 stsp 		_exit(127);
  420 3ce1b845 2019-07-15 stsp 	}
  421 3ce1b845 2019-07-15 stsp 
  422 3ce1b845 2019-07-15 stsp 	while (waitpid(pid, &st, 0) == -1)
  423 3ce1b845 2019-07-15 stsp 		if (errno != EINTR)
  424 3ce1b845 2019-07-15 stsp 			break;
  425 3ce1b845 2019-07-15 stsp 
  426 3ce1b845 2019-07-15 stsp doneediting:
  427 3ce1b845 2019-07-15 stsp 	(void)signal(SIGHUP, sighup);
  428 3ce1b845 2019-07-15 stsp 	(void)signal(SIGINT, sigint);
  429 3ce1b845 2019-07-15 stsp 	(void)signal(SIGQUIT, sigquit);
  430 3ce1b845 2019-07-15 stsp 
  431 3ce1b845 2019-07-15 stsp 	if (!WIFEXITED(st)) {
  432 3ce1b845 2019-07-15 stsp 		errno = EINTR;
  433 3ce1b845 2019-07-15 stsp 		return -1;
  434 3ce1b845 2019-07-15 stsp 	}
  435 3ce1b845 2019-07-15 stsp 
  436 3ce1b845 2019-07-15 stsp 	return WEXITSTATUS(st);
  437 3ce1b845 2019-07-15 stsp }
  438 3ce1b845 2019-07-15 stsp 
  439 3ce1b845 2019-07-15 stsp static const struct got_error *
  440 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
  441 28cf319f 2021-01-28 stsp     const char *initial_content, size_t initial_content_len,
  442 28cf319f 2021-01-28 stsp     int require_modification)
  443 3ce1b845 2019-07-15 stsp {
  444 3ce1b845 2019-07-15 stsp 	const struct got_error *err = NULL;
  445 bfa12d5e 2020-09-26 stsp 	char *line = NULL;
  446 bfa12d5e 2020-09-26 stsp 	size_t linesize = 0;
  447 bfa12d5e 2020-09-26 stsp 	ssize_t linelen;
  448 3ce1b845 2019-07-15 stsp 	struct stat st, st2;
  449 bfa12d5e 2020-09-26 stsp 	FILE *fp = NULL;
  450 bfa12d5e 2020-09-26 stsp 	size_t len, logmsg_len;
  451 bfa12d5e 2020-09-26 stsp 	char *initial_content_stripped = NULL, *buf = NULL, *s;
  452 3ce1b845 2019-07-15 stsp 
  453 3ce1b845 2019-07-15 stsp 	*logmsg = NULL;
  454 3ce1b845 2019-07-15 stsp 
  455 3ce1b845 2019-07-15 stsp 	if (stat(logmsg_path, &st) == -1)
  456 3ce1b845 2019-07-15 stsp 		return got_error_from_errno2("stat", logmsg_path);
  457 3ce1b845 2019-07-15 stsp 
  458 3ce1b845 2019-07-15 stsp 	if (spawn_editor(editor, logmsg_path) == -1)
  459 3ce1b845 2019-07-15 stsp 		return got_error_from_errno("failed spawning editor");
  460 3ce1b845 2019-07-15 stsp 
  461 3ce1b845 2019-07-15 stsp 	if (stat(logmsg_path, &st2) == -1)
  462 3ce1b845 2019-07-15 stsp 		return got_error_from_errno("stat");
  463 3ce1b845 2019-07-15 stsp 
  464 28cf319f 2021-01-28 stsp 	if (require_modification &&
  465 28cf319f 2021-01-28 stsp 	    st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
  466 3ce1b845 2019-07-15 stsp 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
  467 3ce1b845 2019-07-15 stsp 		    "no changes made to commit message, aborting");
  468 3ce1b845 2019-07-15 stsp 
  469 bfa12d5e 2020-09-26 stsp 	/*
  470 bfa12d5e 2020-09-26 stsp 	 * Set up a stripped version of the initial content without comments
  471 bfa12d5e 2020-09-26 stsp 	 * and blank lines. We need this in order to check if the message
  472 bfa12d5e 2020-09-26 stsp 	 * has in fact been edited.
  473 bfa12d5e 2020-09-26 stsp 	 */
  474 bfa12d5e 2020-09-26 stsp 	initial_content_stripped = malloc(initial_content_len + 1);
  475 bfa12d5e 2020-09-26 stsp 	if (initial_content_stripped == NULL)
  476 bfa12d5e 2020-09-26 stsp 		return got_error_from_errno("malloc");
  477 bfa12d5e 2020-09-26 stsp 	initial_content_stripped[0] = '\0';
  478 bfa12d5e 2020-09-26 stsp 
  479 bfa12d5e 2020-09-26 stsp 	buf = strdup(initial_content);
  480 bfa12d5e 2020-09-26 stsp 	if (buf == NULL) {
  481 bfa12d5e 2020-09-26 stsp 		err = got_error_from_errno("strdup");
  482 bfa12d5e 2020-09-26 stsp 		goto done;
  483 bfa12d5e 2020-09-26 stsp 	}
  484 bfa12d5e 2020-09-26 stsp 	s = buf;
  485 bfa12d5e 2020-09-26 stsp 	len = 0;
  486 bfa12d5e 2020-09-26 stsp 	while ((line = strsep(&s, "\n")) != NULL) {
  487 bfa12d5e 2020-09-26 stsp 		if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
  488 bfa12d5e 2020-09-26 stsp 			continue; /* remove comments and leading empty lines */
  489 bfa12d5e 2020-09-26 stsp 		len = strlcat(initial_content_stripped, line,
  490 bfa12d5e 2020-09-26 stsp 		    initial_content_len + 1);
  491 bfa12d5e 2020-09-26 stsp 		if (len >= initial_content_len + 1) {
  492 bfa12d5e 2020-09-26 stsp 			err = got_error(GOT_ERR_NO_SPACE);
  493 bfa12d5e 2020-09-26 stsp 			goto done;
  494 bfa12d5e 2020-09-26 stsp 		}
  495 bfa12d5e 2020-09-26 stsp 	}
  496 bfa12d5e 2020-09-26 stsp 	while (len > 0 && initial_content_stripped[len - 1] == '\n') {
  497 bfa12d5e 2020-09-26 stsp 		initial_content_stripped[len - 1] = '\0';
  498 bfa12d5e 2020-09-26 stsp 		len--;
  499 bfa12d5e 2020-09-26 stsp 	}
  500 bfa12d5e 2020-09-26 stsp 
  501 bfa12d5e 2020-09-26 stsp 	logmsg_len = st2.st_size;
  502 bfa12d5e 2020-09-26 stsp 	*logmsg = malloc(logmsg_len + 1);
  503 3ce1b845 2019-07-15 stsp 	if (*logmsg == NULL)
  504 3ce1b845 2019-07-15 stsp 		return got_error_from_errno("malloc");
  505 3ce1b845 2019-07-15 stsp 	(*logmsg)[0] = '\0';
  506 3ce1b845 2019-07-15 stsp 
  507 3ce1b845 2019-07-15 stsp 	fp = fopen(logmsg_path, "r");
  508 3ce1b845 2019-07-15 stsp 	if (fp == NULL) {
  509 3ce1b845 2019-07-15 stsp 		err = got_error_from_errno("fopen");
  510 3ce1b845 2019-07-15 stsp 		goto done;
  511 3ce1b845 2019-07-15 stsp 	}
  512 bfa12d5e 2020-09-26 stsp 
  513 bfa12d5e 2020-09-26 stsp 	len = 0;
  514 bfa12d5e 2020-09-26 stsp 	while ((linelen = getline(&line, &linesize, fp)) != -1) {
  515 bfa12d5e 2020-09-26 stsp 		if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
  516 3ce1b845 2019-07-15 stsp 			continue; /* remove comments and leading empty lines */
  517 bfa12d5e 2020-09-26 stsp 		len = strlcat(*logmsg, line, logmsg_len + 1);
  518 bfa12d5e 2020-09-26 stsp 		if (len >= logmsg_len + 1) {
  519 bfa12d5e 2020-09-26 stsp 			err = got_error(GOT_ERR_NO_SPACE);
  520 bfa12d5e 2020-09-26 stsp 			goto done;
  521 bfa12d5e 2020-09-26 stsp 		}
  522 3ce1b845 2019-07-15 stsp 	}
  523 bfa12d5e 2020-09-26 stsp 	free(line);
  524 bfa12d5e 2020-09-26 stsp 	if (ferror(fp)) {
  525 bfa12d5e 2020-09-26 stsp 		err = got_ferror(fp, GOT_ERR_IO);
  526 bfa12d5e 2020-09-26 stsp 		goto done;
  527 bfa12d5e 2020-09-26 stsp 	}
  528 3ce1b845 2019-07-15 stsp 	while (len > 0 && (*logmsg)[len - 1] == '\n') {
  529 3ce1b845 2019-07-15 stsp 		(*logmsg)[len - 1] = '\0';
  530 3ce1b845 2019-07-15 stsp 		len--;
  531 3ce1b845 2019-07-15 stsp 	}
  532 3ce1b845 2019-07-15 stsp 
  533 bfa12d5e 2020-09-26 stsp 	if (len == 0) {
  534 3ce1b845 2019-07-15 stsp 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
  535 3ce1b845 2019-07-15 stsp 		    "commit message cannot be empty, aborting");
  536 bfa12d5e 2020-09-26 stsp 		goto done;
  537 bfa12d5e 2020-09-26 stsp 	}
  538 28cf319f 2021-01-28 stsp 	if (require_modification &&
  539 28cf319f 2021-01-28 stsp 	    strcmp(*logmsg, initial_content_stripped) == 0)
  540 bfa12d5e 2020-09-26 stsp 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
  541 bfa12d5e 2020-09-26 stsp 		    "no changes made to commit message, aborting");
  542 3ce1b845 2019-07-15 stsp done:
  543 bfa12d5e 2020-09-26 stsp 	free(initial_content_stripped);
  544 bfa12d5e 2020-09-26 stsp 	free(buf);
  545 bfa12d5e 2020-09-26 stsp 	if (fp && fclose(fp) == EOF && err == NULL)
  546 bfa12d5e 2020-09-26 stsp 		err = got_error_from_errno("fclose");
  547 3ce1b845 2019-07-15 stsp 	if (err) {
  548 3ce1b845 2019-07-15 stsp 		free(*logmsg);
  549 3ce1b845 2019-07-15 stsp 		*logmsg = NULL;
  550 3ce1b845 2019-07-15 stsp 	}
  551 3ce1b845 2019-07-15 stsp 	return err;
  552 3ce1b845 2019-07-15 stsp }
  553 3ce1b845 2019-07-15 stsp 
  554 3ce1b845 2019-07-15 stsp static const struct got_error *
  555 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
  556 ef293bdd 2019-10-21 stsp     const char *path_dir, const char *branch_name)
  557 3ce1b845 2019-07-15 stsp {
  558 ef293bdd 2019-10-21 stsp 	char *initial_content = NULL;
  559 3ce1b845 2019-07-15 stsp 	const struct got_error *err = NULL;
  560 1601cb9f 2020-09-11 naddy 	int initial_content_len;
  561 97972933 2020-09-11 stsp 	int fd = -1;
  562 3ce1b845 2019-07-15 stsp 
  563 1601cb9f 2020-09-11 naddy 	initial_content_len = asprintf(&initial_content,
  564 3ce1b845 2019-07-15 stsp 	    "\n# %s to be imported to branch %s\n", path_dir,
  565 1601cb9f 2020-09-11 naddy 	    branch_name);
  566 1601cb9f 2020-09-11 naddy 	if (initial_content_len == -1)
  567 3ce1b845 2019-07-15 stsp 		return got_error_from_errno("asprintf");
  568 3ce1b845 2019-07-15 stsp 
  569 bb63914a 2020-02-17 stsp 	err = got_opentemp_named_fd(logmsg_path, &fd,
  570 bb63914a 2020-02-17 stsp 	    GOT_TMPDIR_STR "/got-importmsg");
  571 3ce1b845 2019-07-15 stsp 	if (err)
  572 3ce1b845 2019-07-15 stsp 		goto done;
  573 3ce1b845 2019-07-15 stsp 
  574 97972933 2020-09-11 stsp 	if (write(fd, initial_content, initial_content_len) == -1) {
  575 97972933 2020-09-11 stsp 		err = got_error_from_errno2("write", *logmsg_path);
  576 97972933 2020-09-11 stsp 		goto done;
  577 97972933 2020-09-11 stsp 	}
  578 3ce1b845 2019-07-15 stsp 
  579 bfa12d5e 2020-09-26 stsp 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
  580 0d5bb276 2020-12-15 stsp 	    initial_content_len, 1);
  581 3ce1b845 2019-07-15 stsp done:
  582 97972933 2020-09-11 stsp 	if (fd != -1 && close(fd) == -1 && err == NULL)
  583 97972933 2020-09-11 stsp 		err = got_error_from_errno2("close", *logmsg_path);
  584 3ce1b845 2019-07-15 stsp 	free(initial_content);
  585 59f86c76 2020-09-11 stsp 	if (err) {
  586 59f86c76 2020-09-11 stsp 		free(*logmsg_path);
  587 59f86c76 2020-09-11 stsp 		*logmsg_path = NULL;
  588 59f86c76 2020-09-11 stsp 	}
  589 3ce1b845 2019-07-15 stsp 	return err;
  590 3ce1b845 2019-07-15 stsp }
  591 3ce1b845 2019-07-15 stsp 
  592 3ce1b845 2019-07-15 stsp static const struct got_error *
  593 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
  594 3ce1b845 2019-07-15 stsp {
  595 3ce1b845 2019-07-15 stsp 	printf("A  %s\n", path);
  596 3ce1b845 2019-07-15 stsp 	return NULL;
  597 3ce1b845 2019-07-15 stsp }
  598 3ce1b845 2019-07-15 stsp 
  599 3ce1b845 2019-07-15 stsp static const struct got_error *
  600 50b0790e 2020-09-11 stsp get_author(char **author, struct got_repository *repo,
  601 50b0790e 2020-09-11 stsp     struct got_worktree *worktree)
  602 84792843 2019-08-09 stsp {
  603 aba9c984 2019-09-08 stsp 	const struct got_error *err = NULL;
  604 50b0790e 2020-09-11 stsp 	const char *got_author = NULL, *name, *email;
  605 50b0790e 2020-09-11 stsp 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
  606 84792843 2019-08-09 stsp 
  607 84792843 2019-08-09 stsp 	*author = NULL;
  608 aba9c984 2019-09-08 stsp 
  609 50b0790e 2020-09-11 stsp 	if (worktree)
  610 50b0790e 2020-09-11 stsp 		worktree_conf = got_worktree_get_gotconfig(worktree);
  611 50b0790e 2020-09-11 stsp 	repo_conf = got_repo_get_gotconfig(repo);
  612 50b0790e 2020-09-11 stsp 
  613 50b0790e 2020-09-11 stsp 	/*
  614 50b0790e 2020-09-11 stsp 	 * Priority of potential author information sources, from most
  615 50b0790e 2020-09-11 stsp 	 * significant to least significant:
  616 50b0790e 2020-09-11 stsp 	 * 1) work tree's .got/got.conf file
  617 50b0790e 2020-09-11 stsp 	 * 2) repository's got.conf file
  618 50b0790e 2020-09-11 stsp 	 * 3) repository's git config file
  619 50b0790e 2020-09-11 stsp 	 * 4) environment variables
  620 50b0790e 2020-09-11 stsp 	 * 5) global git config files (in user's home directory or /etc)
  621 50b0790e 2020-09-11 stsp 	 */
  622 50b0790e 2020-09-11 stsp 
  623 50b0790e 2020-09-11 stsp 	if (worktree_conf)
  624 50b0790e 2020-09-11 stsp 		got_author = got_gotconfig_get_author(worktree_conf);
  625 50b0790e 2020-09-11 stsp 	if (got_author == NULL)
  626 50b0790e 2020-09-11 stsp 		got_author = got_gotconfig_get_author(repo_conf);
  627 84792843 2019-08-09 stsp 	if (got_author == NULL) {
  628 257add31 2020-09-09 stsp 		name = got_repo_get_gitconfig_author_name(repo);
  629 257add31 2020-09-09 stsp 		email = got_repo_get_gitconfig_author_email(repo);
  630 c9956ddf 2019-09-08 stsp 		if (name && email) {
  631 c9956ddf 2019-09-08 stsp 			if (asprintf(author, "%s <%s>", name, email) == -1)
  632 c9956ddf 2019-09-08 stsp 				return got_error_from_errno("asprintf");
  633 c9956ddf 2019-09-08 stsp 			return NULL;
  634 c9956ddf 2019-09-08 stsp 		}
  635 257add31 2020-09-09 stsp 
  636 257add31 2020-09-09 stsp 		got_author = getenv("GOT_AUTHOR");
  637 257add31 2020-09-09 stsp 		if (got_author == NULL) {
  638 257add31 2020-09-09 stsp 			name = got_repo_get_global_gitconfig_author_name(repo);
  639 257add31 2020-09-09 stsp 			email = got_repo_get_global_gitconfig_author_email(
  640 257add31 2020-09-09 stsp 			    repo);
  641 257add31 2020-09-09 stsp 			if (name && email) {
  642 257add31 2020-09-09 stsp 				if (asprintf(author, "%s <%s>", name, email)
  643 257add31 2020-09-09 stsp 				    == -1)
  644 257add31 2020-09-09 stsp 					return got_error_from_errno("asprintf");
  645 257add31 2020-09-09 stsp 				return NULL;
  646 257add31 2020-09-09 stsp 			}
  647 257add31 2020-09-09 stsp 			/* TODO: Look up user in password database? */
  648 257add31 2020-09-09 stsp 			return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
  649 257add31 2020-09-09 stsp 		}
  650 84792843 2019-08-09 stsp 	}
  651 84792843 2019-08-09 stsp 
  652 aba9c984 2019-09-08 stsp 	*author = strdup(got_author);
  653 aba9c984 2019-09-08 stsp 	if (*author == NULL)
  654 aba9c984 2019-09-08 stsp 		return got_error_from_errno("strdup");
  655 84792843 2019-08-09 stsp 
  656 84792843 2019-08-09 stsp 	/*
  657 84792843 2019-08-09 stsp 	 * Really dumb email address check; we're only doing this to
  658 84792843 2019-08-09 stsp 	 * avoid git's object parser breaking on commits we create.
  659 84792843 2019-08-09 stsp 	 */
  660 84792843 2019-08-09 stsp 	while (*got_author && *got_author != '<')
  661 84792843 2019-08-09 stsp 		got_author++;
  662 aba9c984 2019-09-08 stsp 	if (*got_author != '<') {
  663 aba9c984 2019-09-08 stsp 		err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
  664 aba9c984 2019-09-08 stsp 		goto done;
  665 aba9c984 2019-09-08 stsp 	}
  666 84792843 2019-08-09 stsp 	while (*got_author && *got_author != '@')
  667 84792843 2019-08-09 stsp 		got_author++;
  668 aba9c984 2019-09-08 stsp 	if (*got_author != '@') {
  669 aba9c984 2019-09-08 stsp 		err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
  670 aba9c984 2019-09-08 stsp 		goto done;
  671 aba9c984 2019-09-08 stsp 	}
  672 84792843 2019-08-09 stsp 	while (*got_author && *got_author != '>')
  673 84792843 2019-08-09 stsp 		got_author++;
  674 84792843 2019-08-09 stsp 	if (*got_author != '>')
  675 aba9c984 2019-09-08 stsp 		err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
  676 aba9c984 2019-09-08 stsp done:
  677 aba9c984 2019-09-08 stsp 	if (err) {
  678 aba9c984 2019-09-08 stsp 		free(*author);
  679 aba9c984 2019-09-08 stsp 		*author = NULL;
  680 aba9c984 2019-09-08 stsp 	}
  681 aba9c984 2019-09-08 stsp 	return err;
  682 c9956ddf 2019-09-08 stsp }
  683 c9956ddf 2019-09-08 stsp 
  684 c9956ddf 2019-09-08 stsp static const struct got_error *
  685 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
  686 c9956ddf 2019-09-08 stsp {
  687 c9956ddf 2019-09-08 stsp 	const char *homedir = getenv("HOME");
  688 c9956ddf 2019-09-08 stsp 
  689 c9956ddf 2019-09-08 stsp 	*gitconfig_path = NULL;
  690 c9956ddf 2019-09-08 stsp 	if (homedir) {
  691 c9956ddf 2019-09-08 stsp 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
  692 c9956ddf 2019-09-08 stsp 			return got_error_from_errno("asprintf");
  693 c9956ddf 2019-09-08 stsp 
  694 c9956ddf 2019-09-08 stsp 	}
  695 c9956ddf 2019-09-08 stsp 	return NULL;
  696 84792843 2019-08-09 stsp }
  697 84792843 2019-08-09 stsp 
  698 84792843 2019-08-09 stsp static const struct got_error *
  699 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
  700 3ce1b845 2019-07-15 stsp {
  701 3ce1b845 2019-07-15 stsp 	const struct got_error *error = NULL;
  702 3ce1b845 2019-07-15 stsp 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
  703 c9956ddf 2019-09-08 stsp 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
  704 5d67f40d 2019-11-08 stsp 	const char *branch_name = "main";
  705 ef293bdd 2019-10-21 stsp 	char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
  706 3ce1b845 2019-07-15 stsp 	struct got_repository *repo = NULL;
  707 3ce1b845 2019-07-15 stsp 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
  708 3ce1b845 2019-07-15 stsp 	struct got_object_id *new_commit_id = NULL;
  709 3ce1b845 2019-07-15 stsp 	int ch;
  710 3ce1b845 2019-07-15 stsp 	struct got_pathlist_head ignores;
  711 3ce1b845 2019-07-15 stsp 	struct got_pathlist_entry *pe;
  712 ef293bdd 2019-10-21 stsp 	int preserve_logmsg = 0;
  713 3ce1b845 2019-07-15 stsp 
  714 3ce1b845 2019-07-15 stsp 	TAILQ_INIT(&ignores);
  715 3ce1b845 2019-07-15 stsp 
  716 3ce1b845 2019-07-15 stsp 	while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
  717 3ce1b845 2019-07-15 stsp 		switch (ch) {
  718 3ce1b845 2019-07-15 stsp 		case 'b':
  719 3ce1b845 2019-07-15 stsp 			branch_name = optarg;
  720 3ce1b845 2019-07-15 stsp 			break;
  721 3ce1b845 2019-07-15 stsp 		case 'm':
  722 3ce1b845 2019-07-15 stsp 			logmsg = strdup(optarg);
  723 3ce1b845 2019-07-15 stsp 			if (logmsg == NULL) {
  724 3ce1b845 2019-07-15 stsp 				error = got_error_from_errno("strdup");
  725 3ce1b845 2019-07-15 stsp 				goto done;
  726 3ce1b845 2019-07-15 stsp 			}
  727 3ce1b845 2019-07-15 stsp 			break;
  728 3ce1b845 2019-07-15 stsp 		case 'r':
  729 3ce1b845 2019-07-15 stsp 			repo_path = realpath(optarg, NULL);
  730 3ce1b845 2019-07-15 stsp 			if (repo_path == NULL) {
  731 9ba1d308 2019-10-21 stsp 				error = got_error_from_errno2("realpath",
  732 9ba1d308 2019-10-21 stsp 				    optarg);
  733 3ce1b845 2019-07-15 stsp 				goto done;
  734 3ce1b845 2019-07-15 stsp 			}
  735 3ce1b845 2019-07-15 stsp 			break;
  736 3ce1b845 2019-07-15 stsp 		case 'I':
  737 3ce1b845 2019-07-15 stsp 			if (optarg[0] == '\0')
  738 3ce1b845 2019-07-15 stsp 				break;
  739 3ce1b845 2019-07-15 stsp 			error = got_pathlist_insert(&pe, &ignores, optarg,
  740 3ce1b845 2019-07-15 stsp 			    NULL);
  741 3ce1b845 2019-07-15 stsp 			if (error)
  742 3ce1b845 2019-07-15 stsp 				goto done;
  743 3ce1b845 2019-07-15 stsp 			break;
  744 3ce1b845 2019-07-15 stsp 		default:
  745 b2b65d18 2019-08-22 stsp 			usage_import();
  746 3ce1b845 2019-07-15 stsp 			/* NOTREACHED */
  747 3ce1b845 2019-07-15 stsp 		}
  748 3ce1b845 2019-07-15 stsp 	}
  749 3ce1b845 2019-07-15 stsp 
  750 3ce1b845 2019-07-15 stsp 	argc -= optind;
  751 3ce1b845 2019-07-15 stsp 	argv += optind;
  752 3ce1b845 2019-07-15 stsp 
  753 3ce1b845 2019-07-15 stsp #ifndef PROFILE
  754 aba9c984 2019-09-08 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
  755 aba9c984 2019-09-08 stsp 	    "unveil",
  756 3ce1b845 2019-07-15 stsp 	    NULL) == -1)
  757 3ce1b845 2019-07-15 stsp 		err(1, "pledge");
  758 3ce1b845 2019-07-15 stsp #endif
  759 3ce1b845 2019-07-15 stsp 	if (argc != 1)
  760 3ce1b845 2019-07-15 stsp 		usage_import();
  761 2c7829a4 2019-06-17 stsp 
  762 3ce1b845 2019-07-15 stsp 	if (repo_path == NULL) {
  763 3ce1b845 2019-07-15 stsp 		repo_path = getcwd(NULL, 0);
  764 3ce1b845 2019-07-15 stsp 		if (repo_path == NULL)
  765 3ce1b845 2019-07-15 stsp 			return got_error_from_errno("getcwd");
  766 3ce1b845 2019-07-15 stsp 	}
  767 3ce1b845 2019-07-15 stsp 	got_path_strip_trailing_slashes(repo_path);
  768 c9956ddf 2019-09-08 stsp 	error = get_gitconfig_path(&gitconfig_path);
  769 c9956ddf 2019-09-08 stsp 	if (error)
  770 c9956ddf 2019-09-08 stsp 		goto done;
  771 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, gitconfig_path);
  772 3ce1b845 2019-07-15 stsp 	if (error)
  773 3ce1b845 2019-07-15 stsp 		goto done;
  774 aba9c984 2019-09-08 stsp 
  775 50b0790e 2020-09-11 stsp 	error = get_author(&author, repo, NULL);
  776 aba9c984 2019-09-08 stsp 	if (error)
  777 aba9c984 2019-09-08 stsp 		return error;
  778 e560b7e0 2019-11-28 stsp 
  779 e560b7e0 2019-11-28 stsp 	/*
  780 bd5895f3 2019-11-28 stsp 	 * Don't let the user create a branch name with a leading '-'.
  781 e560b7e0 2019-11-28 stsp 	 * While technically a valid reference name, this case is usually
  782 e560b7e0 2019-11-28 stsp 	 * an unintended typo.
  783 e560b7e0 2019-11-28 stsp 	 */
  784 bd5895f3 2019-11-28 stsp 	if (branch_name[0] == '-')
  785 bd5895f3 2019-11-28 stsp 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
  786 3ce1b845 2019-07-15 stsp 
  787 3ce1b845 2019-07-15 stsp 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
  788 3ce1b845 2019-07-15 stsp 		error = got_error_from_errno("asprintf");
  789 3ce1b845 2019-07-15 stsp 		goto done;
  790 3ce1b845 2019-07-15 stsp 	}
  791 3ce1b845 2019-07-15 stsp 
  792 3ce1b845 2019-07-15 stsp 	error = got_ref_open(&branch_ref, repo, refname, 0);
  793 3ce1b845 2019-07-15 stsp 	if (error) {
  794 3ce1b845 2019-07-15 stsp 		if (error->code != GOT_ERR_NOT_REF)
  795 3ce1b845 2019-07-15 stsp 			goto done;
  796 3ce1b845 2019-07-15 stsp 	} else {
  797 3ce1b845 2019-07-15 stsp 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
  798 3ce1b845 2019-07-15 stsp 		    "import target branch already exists");
  799 3ce1b845 2019-07-15 stsp 		goto done;
  800 3ce1b845 2019-07-15 stsp 	}
  801 3ce1b845 2019-07-15 stsp 
  802 3ce1b845 2019-07-15 stsp 	path_dir = realpath(argv[0], NULL);
  803 3ce1b845 2019-07-15 stsp 	if (path_dir == NULL) {
  804 9ba1d308 2019-10-21 stsp 		error = got_error_from_errno2("realpath", argv[0]);
  805 3ce1b845 2019-07-15 stsp 		goto done;
  806 3ce1b845 2019-07-15 stsp 	}
  807 3ce1b845 2019-07-15 stsp 	got_path_strip_trailing_slashes(path_dir);
  808 3ce1b845 2019-07-15 stsp 
  809 3ce1b845 2019-07-15 stsp 	/*
  810 3ce1b845 2019-07-15 stsp 	 * unveil(2) traverses exec(2); if an editor is used we have
  811 3ce1b845 2019-07-15 stsp 	 * to apply unveil after the log message has been written.
  812 3ce1b845 2019-07-15 stsp 	 */
  813 3ce1b845 2019-07-15 stsp 	if (logmsg == NULL || strlen(logmsg) == 0) {
  814 3ce1b845 2019-07-15 stsp 		error = get_editor(&editor);
  815 3ce1b845 2019-07-15 stsp 		if (error)
  816 3ce1b845 2019-07-15 stsp 			goto done;
  817 8e158b01 2019-09-22 stsp 		free(logmsg);
  818 ef293bdd 2019-10-21 stsp 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
  819 ef293bdd 2019-10-21 stsp 		    path_dir, refname);
  820 ef293bdd 2019-10-21 stsp 		if (error) {
  821 ef293bdd 2019-10-21 stsp 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
  822 ef293bdd 2019-10-21 stsp 			    logmsg_path != NULL)
  823 ef293bdd 2019-10-21 stsp 				preserve_logmsg = 1;
  824 3ce1b845 2019-07-15 stsp 			goto done;
  825 ef293bdd 2019-10-21 stsp 		}
  826 3ce1b845 2019-07-15 stsp 	}
  827 3ce1b845 2019-07-15 stsp 
  828 ef293bdd 2019-10-21 stsp 	if (unveil(path_dir, "r") != 0) {
  829 ef293bdd 2019-10-21 stsp 		error = got_error_from_errno2("unveil", path_dir);
  830 ef293bdd 2019-10-21 stsp 		if (logmsg_path)
  831 ef293bdd 2019-10-21 stsp 			preserve_logmsg = 1;
  832 3ce1b845 2019-07-15 stsp 		goto done;
  833 ef293bdd 2019-10-21 stsp 	}
  834 3ce1b845 2019-07-15 stsp 
  835 ef293bdd 2019-10-21 stsp 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
  836 ef293bdd 2019-10-21 stsp 	if (error) {
  837 ef293bdd 2019-10-21 stsp 		if (logmsg_path)
  838 ef293bdd 2019-10-21 stsp 			preserve_logmsg = 1;
  839 ef293bdd 2019-10-21 stsp 		goto done;
  840 ef293bdd 2019-10-21 stsp 	}
  841 ef293bdd 2019-10-21 stsp 
  842 3ce1b845 2019-07-15 stsp 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
  843 84792843 2019-08-09 stsp 	    author, &ignores, repo, import_progress, NULL);
  844 ef293bdd 2019-10-21 stsp 	if (error) {
  845 ef293bdd 2019-10-21 stsp 		if (logmsg_path)
  846 ef293bdd 2019-10-21 stsp 			preserve_logmsg = 1;
  847 3ce1b845 2019-07-15 stsp 		goto done;
  848 ef293bdd 2019-10-21 stsp 	}
  849 3ce1b845 2019-07-15 stsp 
  850 3ce1b845 2019-07-15 stsp 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
  851 ef293bdd 2019-10-21 stsp 	if (error) {
  852 ef293bdd 2019-10-21 stsp 		if (logmsg_path)
  853 ef293bdd 2019-10-21 stsp 			preserve_logmsg = 1;
  854 3ce1b845 2019-07-15 stsp 		goto done;
  855 ef293bdd 2019-10-21 stsp 	}
  856 3ce1b845 2019-07-15 stsp 
  857 3ce1b845 2019-07-15 stsp 	error = got_ref_write(branch_ref, repo);
  858 ef293bdd 2019-10-21 stsp 	if (error) {
  859 ef293bdd 2019-10-21 stsp 		if (logmsg_path)
  860 ef293bdd 2019-10-21 stsp 			preserve_logmsg = 1;
  861 3ce1b845 2019-07-15 stsp 		goto done;
  862 ef293bdd 2019-10-21 stsp 	}
  863 3ce1b845 2019-07-15 stsp 
  864 3ce1b845 2019-07-15 stsp 	error = got_object_id_str(&id_str, new_commit_id);
  865 ef293bdd 2019-10-21 stsp 	if (error) {
  866 ef293bdd 2019-10-21 stsp 		if (logmsg_path)
  867 ef293bdd 2019-10-21 stsp 			preserve_logmsg = 1;
  868 3ce1b845 2019-07-15 stsp 		goto done;
  869 ef293bdd 2019-10-21 stsp 	}
  870 3ce1b845 2019-07-15 stsp 
  871 3ce1b845 2019-07-15 stsp 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
  872 3ce1b845 2019-07-15 stsp 	if (error) {
  873 ef293bdd 2019-10-21 stsp 		if (error->code != GOT_ERR_NOT_REF) {
  874 ef293bdd 2019-10-21 stsp 			if (logmsg_path)
  875 ef293bdd 2019-10-21 stsp 				preserve_logmsg = 1;
  876 3ce1b845 2019-07-15 stsp 			goto done;
  877 ef293bdd 2019-10-21 stsp 		}
  878 3ce1b845 2019-07-15 stsp 
  879 3ce1b845 2019-07-15 stsp 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
  880 3ce1b845 2019-07-15 stsp 		    branch_ref);
  881 ef293bdd 2019-10-21 stsp 		if (error) {
  882 ef293bdd 2019-10-21 stsp 			if (logmsg_path)
  883 ef293bdd 2019-10-21 stsp 				preserve_logmsg = 1;
  884 3ce1b845 2019-07-15 stsp 			goto done;
  885 ef293bdd 2019-10-21 stsp 		}
  886 3ce1b845 2019-07-15 stsp 
  887 3ce1b845 2019-07-15 stsp 		error = got_ref_write(head_ref, repo);
  888 ef293bdd 2019-10-21 stsp 		if (error) {
  889 ef293bdd 2019-10-21 stsp 			if (logmsg_path)
  890 ef293bdd 2019-10-21 stsp 				preserve_logmsg = 1;
  891 3ce1b845 2019-07-15 stsp 			goto done;
  892 ef293bdd 2019-10-21 stsp 		}
  893 3ce1b845 2019-07-15 stsp 	}
  894 3ce1b845 2019-07-15 stsp 
  895 3ce1b845 2019-07-15 stsp 	printf("Created branch %s with commit %s\n",
  896 3ce1b845 2019-07-15 stsp 	    got_ref_get_name(branch_ref), id_str);
  897 2c7829a4 2019-06-17 stsp done:
  898 ef293bdd 2019-10-21 stsp 	if (preserve_logmsg) {
  899 ef293bdd 2019-10-21 stsp 		fprintf(stderr, "%s: log message preserved in %s\n",
  900 ef293bdd 2019-10-21 stsp 		    getprogname(), logmsg_path);
  901 ef293bdd 2019-10-21 stsp 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
  902 ef293bdd 2019-10-21 stsp 		error = got_error_from_errno2("unlink", logmsg_path);
  903 8e158b01 2019-09-22 stsp 	free(logmsg);
  904 ef293bdd 2019-10-21 stsp 	free(logmsg_path);
  905 2c7829a4 2019-06-17 stsp 	free(repo_path);
  906 3ce1b845 2019-07-15 stsp 	free(editor);
  907 3ce1b845 2019-07-15 stsp 	free(refname);
  908 3ce1b845 2019-07-15 stsp 	free(new_commit_id);
  909 3ce1b845 2019-07-15 stsp 	free(id_str);
  910 aba9c984 2019-09-08 stsp 	free(author);
  911 c9956ddf 2019-09-08 stsp 	free(gitconfig_path);
  912 3ce1b845 2019-07-15 stsp 	if (branch_ref)
  913 3ce1b845 2019-07-15 stsp 		got_ref_close(branch_ref);
  914 3ce1b845 2019-07-15 stsp 	if (head_ref)
  915 3ce1b845 2019-07-15 stsp 		got_ref_close(head_ref);
  916 2c7829a4 2019-06-17 stsp 	return error;
  917 93658fb9 2020-03-18 stsp }
  918 93658fb9 2020-03-18 stsp 
  919 93658fb9 2020-03-18 stsp __dead static void
  920 93658fb9 2020-03-18 stsp usage_clone(void)
  921 93658fb9 2020-03-18 stsp {
  922 13f12b09 2020-03-21 stsp 	fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
  923 0e4002ca 2020-03-21 stsp 	    "[-R reference] repository-url [directory]\n", getprogname());
  924 93658fb9 2020-03-18 stsp 	exit(1);
  925 93658fb9 2020-03-18 stsp }
  926 892ac3b6 2020-03-18 stsp 
  927 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
  928 892ac3b6 2020-03-18 stsp 	char last_scaled_size[FMT_SCALED_STRSIZE];
  929 892ac3b6 2020-03-18 stsp 	int last_p_indexed;
  930 892ac3b6 2020-03-18 stsp 	int last_p_resolved;
  931 68999b92 2020-03-18 stsp 	int verbosity;
  932 04d9a9ec 2020-09-24 stsp 
  933 04d9a9ec 2020-09-24 stsp 	struct got_repository *repo;
  934 04d9a9ec 2020-09-24 stsp 
  935 04d9a9ec 2020-09-24 stsp 	int create_configs;
  936 04d9a9ec 2020-09-24 stsp 	int configs_created;
  937 04d9a9ec 2020-09-24 stsp 	struct {
  938 04d9a9ec 2020-09-24 stsp 		struct got_pathlist_head *symrefs;
  939 04d9a9ec 2020-09-24 stsp 		struct got_pathlist_head *wanted_branches;
  940 99495ddb 2021-01-10 stsp 		struct got_pathlist_head *wanted_refs;
  941 04d9a9ec 2020-09-24 stsp 		const char *proto;
  942 04d9a9ec 2020-09-24 stsp 		const char *host;
  943 04d9a9ec 2020-09-24 stsp 		const char *port;
  944 04d9a9ec 2020-09-24 stsp 		const char *remote_repo_path;
  945 04d9a9ec 2020-09-24 stsp 		const char *git_url;
  946 04d9a9ec 2020-09-24 stsp 		int fetch_all_branches;
  947 04d9a9ec 2020-09-24 stsp 		int mirror_references;
  948 04d9a9ec 2020-09-24 stsp 	} config_info;
  949 892ac3b6 2020-03-18 stsp };
  950 93658fb9 2020-03-18 stsp 
  951 04d9a9ec 2020-09-24 stsp /* XXX forward declaration */
  952 93658fb9 2020-03-18 stsp static const struct got_error *
  953 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
  954 04d9a9ec 2020-09-24 stsp     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
  955 04d9a9ec 2020-09-24 stsp     int mirror_references, struct got_pathlist_head *symrefs,
  956 99495ddb 2021-01-10 stsp     struct got_pathlist_head *wanted_branches,
  957 99495ddb 2021-01-10 stsp     struct got_pathlist_head *wanted_refs, struct got_repository *repo);
  958 04d9a9ec 2020-09-24 stsp 
  959 04d9a9ec 2020-09-24 stsp static const struct got_error *
  960 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
  961 668a20f6 2020-03-18 stsp     int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
  962 531c3985 2020-03-18 stsp {
  963 04d9a9ec 2020-09-24 stsp 	const struct got_error *err = NULL;
  964 892ac3b6 2020-03-18 stsp 	struct got_fetch_progress_arg *a = arg;
  965 892ac3b6 2020-03-18 stsp 	char scaled_size[FMT_SCALED_STRSIZE];
  966 892ac3b6 2020-03-18 stsp 	int p_indexed, p_resolved;
  967 892ac3b6 2020-03-18 stsp 	int print_size = 0, print_indexed = 0, print_resolved = 0;
  968 04d9a9ec 2020-09-24 stsp 
  969 04d9a9ec 2020-09-24 stsp 	/*
  970 04d9a9ec 2020-09-24 stsp 	 * In order to allow a failed clone to be resumed with 'got fetch'
  971 04d9a9ec 2020-09-24 stsp 	 * we try to create configuration files as soon as possible.
  972 04d9a9ec 2020-09-24 stsp 	 * Once the server has sent information about its default branch
  973 04d9a9ec 2020-09-24 stsp 	 * we have all required information.
  974 04d9a9ec 2020-09-24 stsp 	 */
  975 04d9a9ec 2020-09-24 stsp 	if (a->create_configs && !a->configs_created &&
  976 04d9a9ec 2020-09-24 stsp 	    !TAILQ_EMPTY(a->config_info.symrefs)) {
  977 04d9a9ec 2020-09-24 stsp 		err = create_config_files(a->config_info.proto,
  978 62d463ca 2020-10-20 naddy 		    a->config_info.host, a->config_info.port,
  979 62d463ca 2020-10-20 naddy 		    a->config_info.remote_repo_path,
  980 62d463ca 2020-10-20 naddy 		    a->config_info.git_url,
  981 62d463ca 2020-10-20 naddy 		    a->config_info.fetch_all_branches,
  982 62d463ca 2020-10-20 naddy 		    a->config_info.mirror_references,
  983 62d463ca 2020-10-20 naddy 		    a->config_info.symrefs,
  984 99495ddb 2021-01-10 stsp 		    a->config_info.wanted_branches,
  985 99495ddb 2021-01-10 stsp 		    a->config_info.wanted_refs, a->repo);
  986 04d9a9ec 2020-09-24 stsp 		if (err)
  987 04d9a9ec 2020-09-24 stsp 			return err;
  988 04d9a9ec 2020-09-24 stsp 		a->configs_created = 1;
  989 04d9a9ec 2020-09-24 stsp 	}
  990 b2409d58 2020-03-18 stsp 
  991 68999b92 2020-03-18 stsp 	if (a->verbosity < 0)
  992 68999b92 2020-03-18 stsp 		return NULL;
  993 68999b92 2020-03-18 stsp 
  994 fd843b58 2020-03-18 stsp 	if (message && message[0] != '\0') {
  995 d2cdc636 2020-03-18 stsp 		printf("\rserver: %s", message);
  996 892ac3b6 2020-03-18 stsp 		fflush(stdout);
  997 12d1281e 2020-03-19 stsp 		return NULL;
  998 b2409d58 2020-03-18 stsp 	}
  999 b2409d58 2020-03-18 stsp 
 1000 b2409d58 2020-03-18 stsp 	if (packfile_size > 0 || nobj_indexed > 0) {
 1001 892ac3b6 2020-03-18 stsp 		if (fmt_scaled(packfile_size, scaled_size) == 0 &&
 1002 892ac3b6 2020-03-18 stsp 		    (a->last_scaled_size[0] == '\0' ||
 1003 892ac3b6 2020-03-18 stsp 		    strcmp(scaled_size, a->last_scaled_size)) != 0) {
 1004 892ac3b6 2020-03-18 stsp 			print_size = 1;
 1005 892ac3b6 2020-03-18 stsp 			if (strlcpy(a->last_scaled_size, scaled_size,
 1006 892ac3b6 2020-03-18 stsp 			    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
 1007 892ac3b6 2020-03-18 stsp 				return got_error(GOT_ERR_NO_SPACE);
 1008 892ac3b6 2020-03-18 stsp 		}
 1009 61cc1a7a 2020-03-18 stsp 		if (nobj_indexed > 0) {
 1010 892ac3b6 2020-03-18 stsp 			p_indexed = (nobj_indexed * 100) / nobj_total;
 1011 892ac3b6 2020-03-18 stsp 			if (p_indexed != a->last_p_indexed) {
 1012 892ac3b6 2020-03-18 stsp 				a->last_p_indexed = p_indexed;
 1013 892ac3b6 2020-03-18 stsp 				print_indexed = 1;
 1014 892ac3b6 2020-03-18 stsp 				print_size = 1;
 1015 892ac3b6 2020-03-18 stsp 			}
 1016 61cc1a7a 2020-03-18 stsp 		}
 1017 61cc1a7a 2020-03-18 stsp 		if (nobj_resolved > 0) {
 1018 892ac3b6 2020-03-18 stsp 			p_resolved = (nobj_resolved * 100) /
 1019 892ac3b6 2020-03-18 stsp 			    (nobj_total - nobj_loose);
 1020 892ac3b6 2020-03-18 stsp 			if (p_resolved != a->last_p_resolved) {
 1021 892ac3b6 2020-03-18 stsp 				a->last_p_resolved = p_resolved;
 1022 892ac3b6 2020-03-18 stsp 				print_resolved = 1;
 1023 892ac3b6 2020-03-18 stsp 				print_indexed = 1;
 1024 892ac3b6 2020-03-18 stsp 				print_size = 1;
 1025 892ac3b6 2020-03-18 stsp 			}
 1026 61cc1a7a 2020-03-18 stsp 		}
 1027 3168e5da 2020-09-10 stsp 
 1028 d2cdc636 2020-03-18 stsp 	}
 1029 892ac3b6 2020-03-18 stsp 	if (print_size || print_indexed || print_resolved)
 1030 892ac3b6 2020-03-18 stsp 		printf("\r");
 1031 892ac3b6 2020-03-18 stsp 	if (print_size)
 1032 892ac3b6 2020-03-18 stsp 		printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
 1033 d715f13e 2020-03-19 stsp 	if (print_indexed)
 1034 892ac3b6 2020-03-18 stsp 		printf("; indexing %d%%", p_indexed);
 1035 d715f13e 2020-03-19 stsp 	if (print_resolved)
 1036 892ac3b6 2020-03-18 stsp 		printf("; resolving deltas %d%%", p_resolved);
 1037 892ac3b6 2020-03-18 stsp 	if (print_size || print_indexed || print_resolved)
 1038 892ac3b6 2020-03-18 stsp 		fflush(stdout);
 1039 892ac3b6 2020-03-18 stsp 
 1040 531c3985 2020-03-18 stsp 	return NULL;
 1041 531c3985 2020-03-18 stsp }
 1042 531c3985 2020-03-18 stsp 
 1043 531c3985 2020-03-18 stsp static const struct got_error *
 1044 04d9a9ec 2020-09-24 stsp create_symref(const char *refname, struct got_reference *target_ref,
 1045 04d9a9ec 2020-09-24 stsp     int verbosity, struct got_repository *repo)
 1046 4ba14133 2020-03-20 stsp {
 1047 4ba14133 2020-03-20 stsp 	const struct got_error *err;
 1048 04d9a9ec 2020-09-24 stsp 	struct got_reference *head_symref;
 1049 4ba14133 2020-03-20 stsp 
 1050 04d9a9ec 2020-09-24 stsp 	err = got_ref_alloc_symref(&head_symref, refname, target_ref);
 1051 4ba14133 2020-03-20 stsp 	if (err)
 1052 4ba14133 2020-03-20 stsp 		return err;
 1053 4ba14133 2020-03-20 stsp 
 1054 04d9a9ec 2020-09-24 stsp 	err = got_ref_write(head_symref, repo);
 1055 6338a6a1 2020-03-21 stsp 	if (err == NULL && verbosity > 0) {
 1056 6338a6a1 2020-03-21 stsp 		printf("Created reference %s: %s\n", GOT_REF_HEAD,
 1057 6338a6a1 2020-03-21 stsp 		    got_ref_get_name(target_ref));
 1058 6338a6a1 2020-03-21 stsp 	}
 1059 04d9a9ec 2020-09-24 stsp 	got_ref_close(head_symref);
 1060 4ba14133 2020-03-20 stsp 	return err;
 1061 4ba14133 2020-03-20 stsp }
 1062 4ba14133 2020-03-20 stsp 
 1063 4ba14133 2020-03-20 stsp static const struct got_error *
 1064 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
 1065 41b0de12 2020-03-21 stsp     struct got_pathlist_head *refs)
 1066 41b0de12 2020-03-21 stsp {
 1067 41b0de12 2020-03-21 stsp 	const struct got_error *err;
 1068 41b0de12 2020-03-21 stsp 	struct got_pathlist_entry *pe;
 1069 41b0de12 2020-03-21 stsp 
 1070 41b0de12 2020-03-21 stsp 	TAILQ_FOREACH(pe, symrefs, entry) {
 1071 41b0de12 2020-03-21 stsp 		const char *refname = pe->path;
 1072 41b0de12 2020-03-21 stsp 		const char *targetref = pe->data;
 1073 41b0de12 2020-03-21 stsp 
 1074 41b0de12 2020-03-21 stsp 		printf("%s: %s\n", refname, targetref);
 1075 41b0de12 2020-03-21 stsp 	}
 1076 41b0de12 2020-03-21 stsp 
 1077 41b0de12 2020-03-21 stsp 	TAILQ_FOREACH(pe, refs, entry) {
 1078 41b0de12 2020-03-21 stsp 		const char *refname = pe->path;
 1079 41b0de12 2020-03-21 stsp 		struct got_object_id *id = pe->data;
 1080 41b0de12 2020-03-21 stsp 		char *id_str;
 1081 41b0de12 2020-03-21 stsp 
 1082 41b0de12 2020-03-21 stsp 		err = got_object_id_str(&id_str, id);
 1083 41b0de12 2020-03-21 stsp 		if (err)
 1084 41b0de12 2020-03-21 stsp 			return err;
 1085 41b0de12 2020-03-21 stsp 		printf("%s: %s\n", refname, id_str);
 1086 41b0de12 2020-03-21 stsp 		free(id_str);
 1087 41b0de12 2020-03-21 stsp 	}
 1088 41b0de12 2020-03-21 stsp 
 1089 41b0de12 2020-03-21 stsp 	return NULL;
 1090 6338a6a1 2020-03-21 stsp }
 1091 6338a6a1 2020-03-21 stsp 
 1092 6338a6a1 2020-03-21 stsp static const struct got_error *
 1093 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
 1094 6338a6a1 2020-03-21 stsp     int verbosity, struct got_repository *repo)
 1095 6338a6a1 2020-03-21 stsp {
 1096 6338a6a1 2020-03-21 stsp 	const struct got_error *err = NULL;
 1097 6338a6a1 2020-03-21 stsp 	struct got_reference *ref;
 1098 6338a6a1 2020-03-21 stsp 	char *id_str;
 1099 6338a6a1 2020-03-21 stsp 
 1100 6338a6a1 2020-03-21 stsp 	err = got_object_id_str(&id_str, id);
 1101 6338a6a1 2020-03-21 stsp 	if (err)
 1102 6338a6a1 2020-03-21 stsp 		return err;
 1103 6338a6a1 2020-03-21 stsp 
 1104 6338a6a1 2020-03-21 stsp 	err = got_ref_alloc(&ref, refname, id);
 1105 6338a6a1 2020-03-21 stsp 	if (err)
 1106 6338a6a1 2020-03-21 stsp 		goto done;
 1107 6338a6a1 2020-03-21 stsp 
 1108 6338a6a1 2020-03-21 stsp 	err = got_ref_write(ref, repo);
 1109 6338a6a1 2020-03-21 stsp 	got_ref_close(ref);
 1110 6338a6a1 2020-03-21 stsp 
 1111 6338a6a1 2020-03-21 stsp 	if (err == NULL && verbosity >= 0)
 1112 6338a6a1 2020-03-21 stsp 		printf("Created reference %s: %s\n", refname, id_str);
 1113 6338a6a1 2020-03-21 stsp done:
 1114 6338a6a1 2020-03-21 stsp 	free(id_str);
 1115 6338a6a1 2020-03-21 stsp 	return err;
 1116 0e4002ca 2020-03-21 stsp }
 1117 0e4002ca 2020-03-21 stsp 
 1118 0e4002ca 2020-03-21 stsp static int
 1119 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
 1120 0e4002ca 2020-03-21 stsp {
 1121 0e4002ca 2020-03-21 stsp 	if (strncmp(refname, "refs/", 5) != 0)
 1122 0e4002ca 2020-03-21 stsp 		return 0;
 1123 0e4002ca 2020-03-21 stsp 	refname += 5;
 1124 0e4002ca 2020-03-21 stsp 
 1125 0e4002ca 2020-03-21 stsp 	/*
 1126 0e4002ca 2020-03-21 stsp 	 * Prevent fetching of references that won't make any
 1127 0e4002ca 2020-03-21 stsp 	 * sense outside of the remote repository's context.
 1128 0e4002ca 2020-03-21 stsp 	 */
 1129 0e4002ca 2020-03-21 stsp 	if (strncmp(refname, "got/", 4) == 0)
 1130 0e4002ca 2020-03-21 stsp 		return 0;
 1131 0e4002ca 2020-03-21 stsp 	if (strncmp(refname, "remotes/", 8) == 0)
 1132 0e4002ca 2020-03-21 stsp 		return 0;
 1133 0e4002ca 2020-03-21 stsp 
 1134 0e4002ca 2020-03-21 stsp 	if (strncmp(wanted_ref, "refs/", 5) == 0)
 1135 0e4002ca 2020-03-21 stsp 		wanted_ref += 5;
 1136 0e4002ca 2020-03-21 stsp 
 1137 0e4002ca 2020-03-21 stsp 	/* Allow prefix match. */
 1138 0e4002ca 2020-03-21 stsp 	if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
 1139 0e4002ca 2020-03-21 stsp 		return 1;
 1140 0e4002ca 2020-03-21 stsp 
 1141 0e4002ca 2020-03-21 stsp 	/* Allow exact match. */
 1142 0e4002ca 2020-03-21 stsp 	return (strcmp(refname, wanted_ref) == 0);
 1143 41b0de12 2020-03-21 stsp }
 1144 41b0de12 2020-03-21 stsp 
 1145 0e4002ca 2020-03-21 stsp static int
 1146 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
 1147 0e4002ca 2020-03-21 stsp {
 1148 0e4002ca 2020-03-21 stsp 	struct got_pathlist_entry *pe;
 1149 0e4002ca 2020-03-21 stsp 
 1150 0e4002ca 2020-03-21 stsp 	TAILQ_FOREACH(pe, wanted_refs, entry) {
 1151 0e4002ca 2020-03-21 stsp 		if (match_wanted_ref(refname, pe->path))
 1152 0e4002ca 2020-03-21 stsp 			return 1;
 1153 0e4002ca 2020-03-21 stsp 	}
 1154 0e4002ca 2020-03-21 stsp 
 1155 0e4002ca 2020-03-21 stsp 	return 0;
 1156 0e4002ca 2020-03-21 stsp }
 1157 0e4002ca 2020-03-21 stsp 
 1158 41b0de12 2020-03-21 stsp static const struct got_error *
 1159 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
 1160 0e4002ca 2020-03-21 stsp     const char *remote_repo_name, int verbosity, struct got_repository *repo)
 1161 0e4002ca 2020-03-21 stsp {
 1162 0e4002ca 2020-03-21 stsp 	const struct got_error *err;
 1163 0e4002ca 2020-03-21 stsp 	char *remote_refname;
 1164 0e4002ca 2020-03-21 stsp 
 1165 0e4002ca 2020-03-21 stsp 	if (strncmp("refs/", refname, 5) == 0)
 1166 0e4002ca 2020-03-21 stsp 		refname += 5;
 1167 0e4002ca 2020-03-21 stsp 
 1168 0e4002ca 2020-03-21 stsp 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
 1169 0e4002ca 2020-03-21 stsp 	    remote_repo_name, refname) == -1)
 1170 0e4002ca 2020-03-21 stsp 		return got_error_from_errno("asprintf");
 1171 0e4002ca 2020-03-21 stsp 
 1172 0e4002ca 2020-03-21 stsp 	err = create_ref(remote_refname, id, verbosity, repo);
 1173 0e4002ca 2020-03-21 stsp 	free(remote_refname);
 1174 7c0b7f42 2020-09-24 stsp 	return err;
 1175 7c0b7f42 2020-09-24 stsp }
 1176 7c0b7f42 2020-09-24 stsp 
 1177 7c0b7f42 2020-09-24 stsp static const struct got_error *
 1178 7c0b7f42 2020-09-24 stsp create_gotconfig(const char *proto, const char *host, const char *port,
 1179 15d3c221 2021-01-05 stsp     const char *remote_repo_path, const char *default_branch,
 1180 0c8b29c5 2021-01-05 stsp     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
 1181 99495ddb 2021-01-10 stsp     struct got_pathlist_head *wanted_refs, int mirror_references,
 1182 99495ddb 2021-01-10 stsp     struct got_repository *repo)
 1183 7c0b7f42 2020-09-24 stsp {
 1184 7c0b7f42 2020-09-24 stsp 	const struct got_error *err = NULL;
 1185 7c0b7f42 2020-09-24 stsp 	char *gotconfig_path = NULL;
 1186 7c0b7f42 2020-09-24 stsp 	char *gotconfig = NULL;
 1187 7c0b7f42 2020-09-24 stsp 	FILE *gotconfig_file = NULL;
 1188 15d3c221 2021-01-05 stsp 	const char *branchname = NULL;
 1189 99495ddb 2021-01-10 stsp 	char *branches = NULL, *refs = NULL;
 1190 7c0b7f42 2020-09-24 stsp 	ssize_t n;
 1191 7c0b7f42 2020-09-24 stsp 
 1192 0c8b29c5 2021-01-05 stsp 	if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
 1193 132af4a5 2021-01-05 stsp 		struct got_pathlist_entry *pe;
 1194 132af4a5 2021-01-05 stsp 		TAILQ_FOREACH(pe, wanted_branches, entry) {
 1195 132af4a5 2021-01-05 stsp 			char *s;
 1196 132af4a5 2021-01-05 stsp 			branchname = pe->path;
 1197 132af4a5 2021-01-05 stsp 			if (strncmp(branchname, "refs/heads/", 11) == 0)
 1198 132af4a5 2021-01-05 stsp 				branchname += 11;
 1199 132af4a5 2021-01-05 stsp 			if (asprintf(&s, "%s\"%s\" ",
 1200 132af4a5 2021-01-05 stsp 			    branches ? branches : "", branchname) == -1) {
 1201 132af4a5 2021-01-05 stsp 				err = got_error_from_errno("asprintf");
 1202 132af4a5 2021-01-05 stsp 				goto done;
 1203 132af4a5 2021-01-05 stsp 			}
 1204 132af4a5 2021-01-05 stsp 			free(branches);
 1205 132af4a5 2021-01-05 stsp 			branches = s;
 1206 132af4a5 2021-01-05 stsp 		}
 1207 0c8b29c5 2021-01-05 stsp 	} else if (!fetch_all_branches && default_branch) {
 1208 15d3c221 2021-01-05 stsp 		branchname = default_branch;
 1209 15d3c221 2021-01-05 stsp 		if (strncmp(branchname, "refs/heads/", 11) == 0)
 1210 15d3c221 2021-01-05 stsp 			branchname += 11;
 1211 132af4a5 2021-01-05 stsp 		if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
 1212 132af4a5 2021-01-05 stsp 			err = got_error_from_errno("asprintf");
 1213 132af4a5 2021-01-05 stsp 			goto done;
 1214 99495ddb 2021-01-10 stsp 		}
 1215 99495ddb 2021-01-10 stsp 	}
 1216 99495ddb 2021-01-10 stsp 	if (!TAILQ_EMPTY(wanted_refs)) {
 1217 99495ddb 2021-01-10 stsp 		struct got_pathlist_entry *pe;
 1218 99495ddb 2021-01-10 stsp 		TAILQ_FOREACH(pe, wanted_refs, entry) {
 1219 99495ddb 2021-01-10 stsp 			char *s;
 1220 99495ddb 2021-01-10 stsp 			const char *refname = pe->path;
 1221 99495ddb 2021-01-10 stsp 			if (strncmp(refname, "refs/", 5) == 0)
 1222 99495ddb 2021-01-10 stsp 				branchname += 5;
 1223 99495ddb 2021-01-10 stsp 			if (asprintf(&s, "%s\"%s\" ",
 1224 99495ddb 2021-01-10 stsp 			    refs ? refs : "", refname) == -1) {
 1225 99495ddb 2021-01-10 stsp 				err = got_error_from_errno("asprintf");
 1226 99495ddb 2021-01-10 stsp 				goto done;
 1227 99495ddb 2021-01-10 stsp 			}
 1228 99495ddb 2021-01-10 stsp 			free(refs);
 1229 99495ddb 2021-01-10 stsp 			refs = s;
 1230 132af4a5 2021-01-05 stsp 		}
 1231 15d3c221 2021-01-05 stsp 	}
 1232 15d3c221 2021-01-05 stsp 
 1233 7c0b7f42 2020-09-24 stsp 	/* Create got.conf(5). */
 1234 7c0b7f42 2020-09-24 stsp 	gotconfig_path = got_repo_get_path_gotconfig(repo);
 1235 7c0b7f42 2020-09-24 stsp 	if (gotconfig_path == NULL) {
 1236 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno("got_repo_get_path_gotconfig");
 1237 7c0b7f42 2020-09-24 stsp 		goto done;
 1238 7c0b7f42 2020-09-24 stsp 	}
 1239 7c0b7f42 2020-09-24 stsp 	gotconfig_file = fopen(gotconfig_path, "a");
 1240 7c0b7f42 2020-09-24 stsp 	if (gotconfig_file == NULL) {
 1241 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno2("fopen", gotconfig_path);
 1242 7c0b7f42 2020-09-24 stsp 		goto done;
 1243 7c0b7f42 2020-09-24 stsp 	}
 1244 7c0b7f42 2020-09-24 stsp 	if (asprintf(&gotconfig,
 1245 7c0b7f42 2020-09-24 stsp 	    "remote \"%s\" {\n"
 1246 7c0b7f42 2020-09-24 stsp 	    "\tserver %s\n"
 1247 7c0b7f42 2020-09-24 stsp 	    "\tprotocol %s\n"
 1248 7c0b7f42 2020-09-24 stsp 	    "%s%s%s"
 1249 7c0b7f42 2020-09-24 stsp 	    "\trepository \"%s\"\n"
 1250 15d3c221 2021-01-05 stsp 	    "%s%s%s"
 1251 99495ddb 2021-01-10 stsp 	    "%s%s%s"
 1252 7c0b7f42 2020-09-24 stsp 	    "%s"
 1253 0c8b29c5 2021-01-05 stsp 	    "%s"
 1254 7c0b7f42 2020-09-24 stsp 	    "}\n",
 1255 7c0b7f42 2020-09-24 stsp 	    GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
 1256 7c0b7f42 2020-09-24 stsp 	    port ? "\tport " : "", port ? port : "", port ? "\n" : "",
 1257 132af4a5 2021-01-05 stsp 	    remote_repo_path, branches ? "\tbranch { " : "",
 1258 132af4a5 2021-01-05 stsp 	    branches ? branches : "", branches ? "}\n" : "", 
 1259 99495ddb 2021-01-10 stsp 	    refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "", 
 1260 0c8b29c5 2021-01-05 stsp 	    mirror_references ? "\tmirror-references yes\n" : "",
 1261 0c8b29c5 2021-01-05 stsp 	    fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
 1262 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno("asprintf");
 1263 7c0b7f42 2020-09-24 stsp 		goto done;
 1264 7c0b7f42 2020-09-24 stsp 	}
 1265 7c0b7f42 2020-09-24 stsp 	n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
 1266 7c0b7f42 2020-09-24 stsp 	if (n != strlen(gotconfig)) {
 1267 7c0b7f42 2020-09-24 stsp 		err = got_ferror(gotconfig_file, GOT_ERR_IO);
 1268 7c0b7f42 2020-09-24 stsp 		goto done;
 1269 7c0b7f42 2020-09-24 stsp 	}
 1270 7c0b7f42 2020-09-24 stsp 
 1271 7c0b7f42 2020-09-24 stsp done:
 1272 7c0b7f42 2020-09-24 stsp 	if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
 1273 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno2("fclose", gotconfig_path);
 1274 7c0b7f42 2020-09-24 stsp 	free(gotconfig_path);
 1275 132af4a5 2021-01-05 stsp 	free(branches);
 1276 7c0b7f42 2020-09-24 stsp 	return err;
 1277 7c0b7f42 2020-09-24 stsp }
 1278 7c0b7f42 2020-09-24 stsp 
 1279 7c0b7f42 2020-09-24 stsp static const struct got_error *
 1280 04d9a9ec 2020-09-24 stsp create_gitconfig(const char *git_url, const char *default_branch,
 1281 132af4a5 2021-01-05 stsp     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
 1282 99495ddb 2021-01-10 stsp     struct got_pathlist_head *wanted_refs, int mirror_references,
 1283 99495ddb 2021-01-10 stsp     struct got_repository *repo)
 1284 7c0b7f42 2020-09-24 stsp {
 1285 7c0b7f42 2020-09-24 stsp 	const struct got_error *err = NULL;
 1286 7c0b7f42 2020-09-24 stsp 	char *gitconfig_path = NULL;
 1287 7c0b7f42 2020-09-24 stsp 	char *gitconfig = NULL;
 1288 7c0b7f42 2020-09-24 stsp 	FILE *gitconfig_file = NULL;
 1289 99495ddb 2021-01-10 stsp 	char *branches = NULL, *refs = NULL;
 1290 56d0a753 2021-01-20 stsp 	const char *branchname;
 1291 7c0b7f42 2020-09-24 stsp 	ssize_t n;
 1292 7c0b7f42 2020-09-24 stsp 
 1293 7c0b7f42 2020-09-24 stsp 	/* Create a config file Git can understand. */
 1294 7c0b7f42 2020-09-24 stsp 	gitconfig_path = got_repo_get_path_gitconfig(repo);
 1295 7c0b7f42 2020-09-24 stsp 	if (gitconfig_path == NULL) {
 1296 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno("got_repo_get_path_gitconfig");
 1297 7c0b7f42 2020-09-24 stsp 		goto done;
 1298 7c0b7f42 2020-09-24 stsp 	}
 1299 7c0b7f42 2020-09-24 stsp 	gitconfig_file = fopen(gitconfig_path, "a");
 1300 7c0b7f42 2020-09-24 stsp 	if (gitconfig_file == NULL) {
 1301 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno2("fopen", gitconfig_path);
 1302 7c0b7f42 2020-09-24 stsp 		goto done;
 1303 7c0b7f42 2020-09-24 stsp 	}
 1304 56d0a753 2021-01-20 stsp 	if (fetch_all_branches) {
 1305 56d0a753 2021-01-20 stsp 		if (mirror_references) {
 1306 56d0a753 2021-01-20 stsp 			if (asprintf(&branches,
 1307 56d0a753 2021-01-20 stsp 			    "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
 1308 56d0a753 2021-01-20 stsp 				err = got_error_from_errno("asprintf");
 1309 56d0a753 2021-01-20 stsp 				goto done;
 1310 56d0a753 2021-01-20 stsp 			}
 1311 56d0a753 2021-01-20 stsp 		} else if (asprintf(&branches,
 1312 56d0a753 2021-01-20 stsp 		    "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
 1313 7c0b7f42 2020-09-24 stsp 		    GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
 1314 7c0b7f42 2020-09-24 stsp 			err = got_error_from_errno("asprintf");
 1315 7c0b7f42 2020-09-24 stsp 			goto done;
 1316 132af4a5 2021-01-05 stsp 		}
 1317 132af4a5 2021-01-05 stsp 	} else if (!TAILQ_EMPTY(wanted_branches)) {
 1318 132af4a5 2021-01-05 stsp 		struct got_pathlist_entry *pe;
 1319 132af4a5 2021-01-05 stsp 		TAILQ_FOREACH(pe, wanted_branches, entry) {
 1320 132af4a5 2021-01-05 stsp 			char *s;
 1321 132af4a5 2021-01-05 stsp 			branchname = pe->path;
 1322 132af4a5 2021-01-05 stsp 			if (strncmp(branchname, "refs/heads/", 11) == 0)
 1323 132af4a5 2021-01-05 stsp 				branchname += 11;
 1324 56d0a753 2021-01-20 stsp 			if (mirror_references) {
 1325 56d0a753 2021-01-20 stsp 				if (asprintf(&s,
 1326 56d0a753 2021-01-20 stsp 				    "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
 1327 56d0a753 2021-01-20 stsp 				    branches ? branches : "",
 1328 56d0a753 2021-01-20 stsp 				    branchname, branchname) == -1) {
 1329 56d0a753 2021-01-20 stsp 					err = got_error_from_errno("asprintf");
 1330 56d0a753 2021-01-20 stsp 					goto done;
 1331 56d0a753 2021-01-20 stsp 				}
 1332 56d0a753 2021-01-20 stsp 			} else if (asprintf(&s,
 1333 56d0a753 2021-01-20 stsp 			    "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
 1334 132af4a5 2021-01-05 stsp 			    branches ? branches : "",
 1335 132af4a5 2021-01-05 stsp 			    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
 1336 132af4a5 2021-01-05 stsp 			    branchname) == -1) {
 1337 132af4a5 2021-01-05 stsp 				err = got_error_from_errno("asprintf");
 1338 132af4a5 2021-01-05 stsp 				goto done;
 1339 132af4a5 2021-01-05 stsp 			}
 1340 132af4a5 2021-01-05 stsp 			free(branches);
 1341 132af4a5 2021-01-05 stsp 			branches = s;
 1342 7c0b7f42 2020-09-24 stsp 		}
 1343 7c0b7f42 2020-09-24 stsp 	} else {
 1344 7c0b7f42 2020-09-24 stsp 		/*
 1345 7c0b7f42 2020-09-24 stsp 		 * If the server specified a default branch, use just that one.
 1346 7c0b7f42 2020-09-24 stsp 		 * Otherwise fall back to fetching all branches on next fetch.
 1347 7c0b7f42 2020-09-24 stsp 		 */
 1348 04d9a9ec 2020-09-24 stsp 		if (default_branch) {
 1349 04d9a9ec 2020-09-24 stsp 			branchname = default_branch;
 1350 7c0b7f42 2020-09-24 stsp 			if (strncmp(branchname, "refs/heads/", 11) == 0)
 1351 7c0b7f42 2020-09-24 stsp 				branchname += 11;
 1352 7c0b7f42 2020-09-24 stsp 		} else
 1353 7c0b7f42 2020-09-24 stsp 			branchname = "*"; /* fall back to all branches */
 1354 56d0a753 2021-01-20 stsp 		if (mirror_references) {
 1355 56d0a753 2021-01-20 stsp 			if (asprintf(&branches,
 1356 56d0a753 2021-01-20 stsp 			    "\tfetch = refs/heads/%s:refs/heads/%s\n",
 1357 56d0a753 2021-01-20 stsp 			    branchname, branchname) == -1) {
 1358 56d0a753 2021-01-20 stsp 				err = got_error_from_errno("asprintf");
 1359 56d0a753 2021-01-20 stsp 				goto done;
 1360 56d0a753 2021-01-20 stsp 			}
 1361 56d0a753 2021-01-20 stsp 		} else if (asprintf(&branches,
 1362 56d0a753 2021-01-20 stsp 		    "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
 1363 7c0b7f42 2020-09-24 stsp 		    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
 1364 7c0b7f42 2020-09-24 stsp 		    branchname) == -1) {
 1365 7c0b7f42 2020-09-24 stsp 			err = got_error_from_errno("asprintf");
 1366 7c0b7f42 2020-09-24 stsp 			goto done;
 1367 99495ddb 2021-01-10 stsp 		}
 1368 99495ddb 2021-01-10 stsp 	}
 1369 56d0a753 2021-01-20 stsp 	if (!TAILQ_EMPTY(wanted_refs)) {
 1370 99495ddb 2021-01-10 stsp 		struct got_pathlist_entry *pe;
 1371 99495ddb 2021-01-10 stsp 		TAILQ_FOREACH(pe, wanted_refs, entry) {
 1372 99495ddb 2021-01-10 stsp 			char *s;
 1373 99495ddb 2021-01-10 stsp 			const char *refname = pe->path;
 1374 99495ddb 2021-01-10 stsp 			if (strncmp(refname, "refs/", 5) == 0)
 1375 99495ddb 2021-01-10 stsp 				refname += 5;
 1376 56d0a753 2021-01-20 stsp 			if (mirror_references) {
 1377 56d0a753 2021-01-20 stsp 				if (asprintf(&s,
 1378 56d0a753 2021-01-20 stsp 				    "%s\tfetch = refs/%s:refs/%s\n",
 1379 56d0a753 2021-01-20 stsp 				    refs ? refs : "", refname, refname) == -1) {
 1380 56d0a753 2021-01-20 stsp 					err = got_error_from_errno("asprintf");
 1381 56d0a753 2021-01-20 stsp 					goto done;
 1382 56d0a753 2021-01-20 stsp 				}
 1383 56d0a753 2021-01-20 stsp 			} else if (asprintf(&s,
 1384 56d0a753 2021-01-20 stsp 			    "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
 1385 99495ddb 2021-01-10 stsp 			    refs ? refs : "",
 1386 99495ddb 2021-01-10 stsp 			    refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
 1387 99495ddb 2021-01-10 stsp 			    refname) == -1) {
 1388 99495ddb 2021-01-10 stsp 				err = got_error_from_errno("asprintf");
 1389 99495ddb 2021-01-10 stsp 				goto done;
 1390 99495ddb 2021-01-10 stsp 			}
 1391 99495ddb 2021-01-10 stsp 			free(refs);
 1392 99495ddb 2021-01-10 stsp 			refs = s;
 1393 7c0b7f42 2020-09-24 stsp 		}
 1394 132af4a5 2021-01-05 stsp 	}
 1395 99495ddb 2021-01-10 stsp 
 1396 132af4a5 2021-01-05 stsp 	if (asprintf(&gitconfig,
 1397 132af4a5 2021-01-05 stsp 	    "[remote \"%s\"]\n"
 1398 132af4a5 2021-01-05 stsp 	    "\turl = %s\n"
 1399 132af4a5 2021-01-05 stsp 	    "%s"
 1400 99495ddb 2021-01-10 stsp 	    "%s"
 1401 56d0a753 2021-01-20 stsp 	    "\tfetch = refs/tags/*:refs/tags/*\n",
 1402 132af4a5 2021-01-05 stsp 	    GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
 1403 56d0a753 2021-01-20 stsp 	    refs ? refs : "") == -1) {
 1404 132af4a5 2021-01-05 stsp 		err = got_error_from_errno("asprintf");
 1405 132af4a5 2021-01-05 stsp 		goto done;
 1406 7c0b7f42 2020-09-24 stsp 	}
 1407 7c0b7f42 2020-09-24 stsp 	n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
 1408 7c0b7f42 2020-09-24 stsp 	if (n != strlen(gitconfig)) {
 1409 7c0b7f42 2020-09-24 stsp 		err = got_ferror(gitconfig_file, GOT_ERR_IO);
 1410 7c0b7f42 2020-09-24 stsp 		goto done;
 1411 7c0b7f42 2020-09-24 stsp 	}
 1412 7c0b7f42 2020-09-24 stsp done:
 1413 7c0b7f42 2020-09-24 stsp 	if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
 1414 7c0b7f42 2020-09-24 stsp 		err = got_error_from_errno2("fclose", gitconfig_path);
 1415 7c0b7f42 2020-09-24 stsp 	free(gitconfig_path);
 1416 132af4a5 2021-01-05 stsp 	free(branches);
 1417 0e4002ca 2020-03-21 stsp 	return err;
 1418 0e4002ca 2020-03-21 stsp }
 1419 0e4002ca 2020-03-21 stsp 
 1420 0e4002ca 2020-03-21 stsp static const struct got_error *
 1421 04d9a9ec 2020-09-24 stsp create_config_files(const char *proto, const char *host, const char *port,
 1422 04d9a9ec 2020-09-24 stsp     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
 1423 04d9a9ec 2020-09-24 stsp     int mirror_references, struct got_pathlist_head *symrefs,
 1424 99495ddb 2021-01-10 stsp     struct got_pathlist_head *wanted_branches,
 1425 99495ddb 2021-01-10 stsp     struct got_pathlist_head *wanted_refs, struct got_repository *repo)
 1426 04d9a9ec 2020-09-24 stsp {
 1427 04d9a9ec 2020-09-24 stsp 	const struct got_error *err = NULL;
 1428 04d9a9ec 2020-09-24 stsp 	const char *default_branch = NULL;
 1429 04d9a9ec 2020-09-24 stsp 	struct got_pathlist_entry *pe;
 1430 04d9a9ec 2020-09-24 stsp 
 1431 04d9a9ec 2020-09-24 stsp 	/*
 1432 04d9a9ec 2020-09-24 stsp 	 * If we asked for a set of wanted branches then use the first
 1433 04d9a9ec 2020-09-24 stsp 	 * one of those.
 1434 04d9a9ec 2020-09-24 stsp 	 */
 1435 62d463ca 2020-10-20 naddy 	if (!TAILQ_EMPTY(wanted_branches)) {
 1436 04d9a9ec 2020-09-24 stsp 		pe = TAILQ_FIRST(wanted_branches);
 1437 04d9a9ec 2020-09-24 stsp 		default_branch = pe->path;
 1438 04d9a9ec 2020-09-24 stsp 	} else {
 1439 04d9a9ec 2020-09-24 stsp 		/* First HEAD ref listed by server is the default branch. */
 1440 04d9a9ec 2020-09-24 stsp 		TAILQ_FOREACH(pe, symrefs, entry) {
 1441 04d9a9ec 2020-09-24 stsp 			const char *refname = pe->path;
 1442 04d9a9ec 2020-09-24 stsp 			const char *target = pe->data;
 1443 04d9a9ec 2020-09-24 stsp 
 1444 04d9a9ec 2020-09-24 stsp 			if (strcmp(refname, GOT_REF_HEAD) != 0)
 1445 04d9a9ec 2020-09-24 stsp 				continue;
 1446 04d9a9ec 2020-09-24 stsp 
 1447 04d9a9ec 2020-09-24 stsp 			default_branch = target;
 1448 04d9a9ec 2020-09-24 stsp 			break;
 1449 04d9a9ec 2020-09-24 stsp 		}
 1450 04d9a9ec 2020-09-24 stsp 	}
 1451 04d9a9ec 2020-09-24 stsp 
 1452 04d9a9ec 2020-09-24 stsp 	/* Create got.conf(5). */
 1453 04d9a9ec 2020-09-24 stsp 	err = create_gotconfig(proto, host, port, remote_repo_path,
 1454 0c8b29c5 2021-01-05 stsp 	    default_branch, fetch_all_branches, wanted_branches,
 1455 99495ddb 2021-01-10 stsp 	    wanted_refs, mirror_references, repo);
 1456 04d9a9ec 2020-09-24 stsp 	if (err)
 1457 04d9a9ec 2020-09-24 stsp 		return err;
 1458 04d9a9ec 2020-09-24 stsp 
 1459 04d9a9ec 2020-09-24 stsp 	/* Create a config file Git can understand. */
 1460 04d9a9ec 2020-09-24 stsp 	return create_gitconfig(git_url, default_branch, fetch_all_branches,
 1461 99495ddb 2021-01-10 stsp 	    wanted_branches, wanted_refs, mirror_references, repo);
 1462 04d9a9ec 2020-09-24 stsp }
 1463 04d9a9ec 2020-09-24 stsp 
 1464 04d9a9ec 2020-09-24 stsp static const struct got_error *
 1465 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
 1466 93658fb9 2020-03-18 stsp {
 1467 39c64a6a 2020-03-18 stsp 	const struct got_error *error = NULL;
 1468 9df6f38b 2020-03-18 stsp 	const char *uri, *dirname;
 1469 09838ffc 2020-03-18 stsp 	char *proto, *host, *port, *repo_name, *server_path;
 1470 d9b4d0c0 2020-03-18 stsp 	char *default_destdir = NULL, *id_str = NULL;
 1471 a9c2d4c2 2020-09-24 stsp 	const char *repo_path;
 1472 bb64b798 2020-03-18 stsp 	struct got_repository *repo = NULL;
 1473 0e4002ca 2020-03-21 stsp 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
 1474 d9b4d0c0 2020-03-18 stsp 	struct got_pathlist_entry *pe;
 1475 d9b4d0c0 2020-03-18 stsp 	struct got_object_id *pack_hash = NULL;
 1476 9c52365f 2020-03-21 stsp 	int ch, fetchfd = -1, fetchstatus;
 1477 9c52365f 2020-03-21 stsp 	pid_t fetchpid = -1;
 1478 892ac3b6 2020-03-18 stsp 	struct got_fetch_progress_arg fpa;
 1479 b46f3e71 2020-03-18 stsp 	char *git_url = NULL;
 1480 659e7fbd 2020-03-20 stsp 	int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
 1481 41b0de12 2020-03-21 stsp 	int list_refs_only = 0;
 1482 93658fb9 2020-03-18 stsp 
 1483 d9b4d0c0 2020-03-18 stsp 	TAILQ_INIT(&refs);
 1484 d9b4d0c0 2020-03-18 stsp 	TAILQ_INIT(&symrefs);
 1485 4ba14133 2020-03-20 stsp 	TAILQ_INIT(&wanted_branches);
 1486 0e4002ca 2020-03-21 stsp 	TAILQ_INIT(&wanted_refs);
 1487 d9b4d0c0 2020-03-18 stsp 
 1488 0e4002ca 2020-03-21 stsp 	while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
 1489 93658fb9 2020-03-18 stsp 		switch (ch) {
 1490 659e7fbd 2020-03-20 stsp 		case 'a':
 1491 659e7fbd 2020-03-20 stsp 			fetch_all_branches = 1;
 1492 4ba14133 2020-03-20 stsp 			break;
 1493 4ba14133 2020-03-20 stsp 		case 'b':
 1494 4ba14133 2020-03-20 stsp 			error = got_pathlist_append(&wanted_branches,
 1495 4ba14133 2020-03-20 stsp 			    optarg, NULL);
 1496 4ba14133 2020-03-20 stsp 			if (error)
 1497 4ba14133 2020-03-20 stsp 				return error;
 1498 659e7fbd 2020-03-20 stsp 			break;
 1499 41b0de12 2020-03-21 stsp 		case 'l':
 1500 41b0de12 2020-03-21 stsp 			list_refs_only = 1;
 1501 41b0de12 2020-03-21 stsp 			break;
 1502 469dd726 2020-03-20 stsp 		case 'm':
 1503 469dd726 2020-03-20 stsp 			mirror_references = 1;
 1504 469dd726 2020-03-20 stsp 			break;
 1505 68999b92 2020-03-18 stsp 		case 'v':
 1506 68999b92 2020-03-18 stsp 			if (verbosity < 0)
 1507 68999b92 2020-03-18 stsp 				verbosity = 0;
 1508 68999b92 2020-03-18 stsp 			else if (verbosity < 3)
 1509 68999b92 2020-03-18 stsp 				verbosity++;
 1510 68999b92 2020-03-18 stsp 			break;
 1511 68999b92 2020-03-18 stsp 		case 'q':
 1512 68999b92 2020-03-18 stsp 			verbosity = -1;
 1513 68999b92 2020-03-18 stsp 			break;
 1514 0e4002ca 2020-03-21 stsp 		case 'R':
 1515 0e4002ca 2020-03-21 stsp 			error = got_pathlist_append(&wanted_refs,
 1516 0e4002ca 2020-03-21 stsp 			    optarg, NULL);
 1517 0e4002ca 2020-03-21 stsp 			if (error)
 1518 0e4002ca 2020-03-21 stsp 				return error;
 1519 0e4002ca 2020-03-21 stsp 			break;
 1520 93658fb9 2020-03-18 stsp 		default:
 1521 93658fb9 2020-03-18 stsp 			usage_clone();
 1522 93658fb9 2020-03-18 stsp 			break;
 1523 93658fb9 2020-03-18 stsp 		}
 1524 93658fb9 2020-03-18 stsp 	}
 1525 93658fb9 2020-03-18 stsp 	argc -= optind;
 1526 93658fb9 2020-03-18 stsp 	argv += optind;
 1527 39c64a6a 2020-03-18 stsp 
 1528 4ba14133 2020-03-20 stsp 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
 1529 ff69268e 2020-12-13 stsp 		option_conflict('a', 'b');
 1530 41b0de12 2020-03-21 stsp 	if (list_refs_only) {
 1531 41b0de12 2020-03-21 stsp 		if (!TAILQ_EMPTY(&wanted_branches))
 1532 ff69268e 2020-12-13 stsp 			option_conflict('l', 'b');
 1533 41b0de12 2020-03-21 stsp 		if (fetch_all_branches)
 1534 ff69268e 2020-12-13 stsp 			option_conflict('l', 'a');
 1535 41b0de12 2020-03-21 stsp 		if (mirror_references)
 1536 ff69268e 2020-12-13 stsp 			option_conflict('l', 'm');
 1537 0e4002ca 2020-03-21 stsp 		if (!TAILQ_EMPTY(&wanted_refs))
 1538 ff69268e 2020-12-13 stsp 			option_conflict('l', 'R');
 1539 41b0de12 2020-03-21 stsp 	}
 1540 4ba14133 2020-03-20 stsp 
 1541 93658fb9 2020-03-18 stsp 	uri = argv[0];
 1542 9df6f38b 2020-03-18 stsp 
 1543 9df6f38b 2020-03-18 stsp 	if (argc == 1)
 1544 93658fb9 2020-03-18 stsp 		dirname = NULL;
 1545 9df6f38b 2020-03-18 stsp 	else if (argc == 2)
 1546 93658fb9 2020-03-18 stsp 		dirname = argv[1];
 1547 93658fb9 2020-03-18 stsp 	else
 1548 93658fb9 2020-03-18 stsp 		usage_clone();
 1549 09838ffc 2020-03-18 stsp 
 1550 5e5da8c4 2021-09-05 stsp 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
 1551 4dbec0a8 2020-08-27 stsp 	    &repo_name, uri);
 1552 39c64a6a 2020-03-18 stsp 	if (error)
 1553 09f63084 2020-03-20 stsp 		goto done;
 1554 09f63084 2020-03-20 stsp 
 1555 09f63084 2020-03-20 stsp 	if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
 1556 09f63084 2020-03-20 stsp 	    host, port ? ":" : "", port ? port : "",
 1557 09f63084 2020-03-20 stsp 	    server_path[0] != '/' ? "/" : "", server_path) == -1) {
 1558 09f63084 2020-03-20 stsp 		error = got_error_from_errno("asprintf");
 1559 09838ffc 2020-03-18 stsp 		goto done;
 1560 09f63084 2020-03-20 stsp 	}
 1561 09838ffc 2020-03-18 stsp 
 1562 39c64a6a 2020-03-18 stsp 	if (strcmp(proto, "git") == 0) {
 1563 b46f3e71 2020-03-18 stsp #ifndef PROFILE
 1564 39c64a6a 2020-03-18 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 1565 39c64a6a 2020-03-18 stsp 		    "sendfd dns inet unveil", NULL) == -1)
 1566 39c64a6a 2020-03-18 stsp 			err(1, "pledge");
 1567 b46f3e71 2020-03-18 stsp #endif
 1568 39c64a6a 2020-03-18 stsp 	} else if (strcmp(proto, "git+ssh") == 0 ||
 1569 39c64a6a 2020-03-18 stsp 	    strcmp(proto, "ssh") == 0) {
 1570 b46f3e71 2020-03-18 stsp #ifndef PROFILE
 1571 39c64a6a 2020-03-18 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 1572 39c64a6a 2020-03-18 stsp 		    "sendfd unveil", NULL) == -1)
 1573 39c64a6a 2020-03-18 stsp 			err(1, "pledge");
 1574 b46f3e71 2020-03-18 stsp #endif
 1575 39c64a6a 2020-03-18 stsp 	} else if (strcmp(proto, "http") == 0 ||
 1576 39c64a6a 2020-03-18 stsp 	    strcmp(proto, "git+http") == 0) {
 1577 39c64a6a 2020-03-18 stsp 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
 1578 39c64a6a 2020-03-18 stsp 		goto done;
 1579 39c64a6a 2020-03-18 stsp 	} else {
 1580 39c64a6a 2020-03-18 stsp 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
 1581 39c64a6a 2020-03-18 stsp 		goto done;
 1582 39c64a6a 2020-03-18 stsp 	}
 1583 bb64b798 2020-03-18 stsp 	if (dirname == NULL) {
 1584 bb64b798 2020-03-18 stsp 		if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
 1585 39c64a6a 2020-03-18 stsp 			error = got_error_from_errno("asprintf");
 1586 bb64b798 2020-03-18 stsp 			goto done;
 1587 bb64b798 2020-03-18 stsp 		}
 1588 bb64b798 2020-03-18 stsp 		repo_path = default_destdir;
 1589 bb64b798 2020-03-18 stsp 	} else
 1590 bb64b798 2020-03-18 stsp 		repo_path = dirname;
 1591 bb64b798 2020-03-18 stsp 
 1592 41b0de12 2020-03-21 stsp 	if (!list_refs_only) {
 1593 41b0de12 2020-03-21 stsp 		error = got_path_mkdir(repo_path);
 1594 2751fe64 2020-09-24 stsp 		if (error &&
 1595 2751fe64 2020-09-24 stsp 		    (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
 1596 2751fe64 2020-09-24 stsp 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
 1597 41b0de12 2020-03-21 stsp 			goto done;
 1598 2751fe64 2020-09-24 stsp 		if (!got_path_dir_is_empty(repo_path)) {
 1599 2751fe64 2020-09-24 stsp 			error = got_error_path(repo_path,
 1600 2751fe64 2020-09-24 stsp 			    GOT_ERR_DIR_NOT_EMPTY);
 1601 41b0de12 2020-03-21 stsp 			goto done;
 1602 2751fe64 2020-09-24 stsp 		}
 1603 41b0de12 2020-03-21 stsp 	}
 1604 bb64b798 2020-03-18 stsp 
 1605 d65a88a2 2021-09-05 stsp 	error = got_dial_apply_unveil(proto);
 1606 d65a88a2 2021-09-05 stsp 	if (error)
 1607 d65a88a2 2021-09-05 stsp 		goto done;
 1608 d65a88a2 2021-09-05 stsp 
 1609 f535bcd4 2020-09-30 stsp 	error = apply_unveil(repo_path, 0, NULL);
 1610 ee448f5f 2020-03-18 stsp 	if (error)
 1611 ee448f5f 2020-03-18 stsp 		goto done;
 1612 f79e6490 2020-04-19 stsp 
 1613 f79e6490 2020-04-19 stsp 	if (verbosity >= 0)
 1614 f79e6490 2020-04-19 stsp 		printf("Connecting to %s%s%s\n", host,
 1615 f79e6490 2020-04-19 stsp 		    port ? ":" : "", port ? port : "");
 1616 ee448f5f 2020-03-18 stsp 
 1617 9c52365f 2020-03-21 stsp 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
 1618 9c52365f 2020-03-21 stsp 	    server_path, verbosity);
 1619 39c64a6a 2020-03-18 stsp 	if (error)
 1620 bb64b798 2020-03-18 stsp 		goto done;
 1621 bb64b798 2020-03-18 stsp 
 1622 2751fe64 2020-09-24 stsp 	if (!list_refs_only) {
 1623 2751fe64 2020-09-24 stsp 		error = got_repo_init(repo_path);
 1624 2751fe64 2020-09-24 stsp 		if (error)
 1625 2751fe64 2020-09-24 stsp 			goto done;
 1626 2751fe64 2020-09-24 stsp 		error = got_repo_open(&repo, repo_path, NULL);
 1627 2751fe64 2020-09-24 stsp 		if (error)
 1628 2751fe64 2020-09-24 stsp 			goto done;
 1629 2751fe64 2020-09-24 stsp 	}
 1630 2751fe64 2020-09-24 stsp 
 1631 892ac3b6 2020-03-18 stsp 	fpa.last_scaled_size[0] = '\0';
 1632 892ac3b6 2020-03-18 stsp 	fpa.last_p_indexed = -1;
 1633 892ac3b6 2020-03-18 stsp 	fpa.last_p_resolved = -1;
 1634 68999b92 2020-03-18 stsp 	fpa.verbosity = verbosity;
 1635 04d9a9ec 2020-09-24 stsp 	fpa.create_configs = 1;
 1636 04d9a9ec 2020-09-24 stsp 	fpa.configs_created = 0;
 1637 04d9a9ec 2020-09-24 stsp 	fpa.repo = repo;
 1638 04d9a9ec 2020-09-24 stsp 	fpa.config_info.symrefs = &symrefs;
 1639 04d9a9ec 2020-09-24 stsp 	fpa.config_info.wanted_branches = &wanted_branches;
 1640 99495ddb 2021-01-10 stsp 	fpa.config_info.wanted_refs = &wanted_refs;
 1641 04d9a9ec 2020-09-24 stsp 	fpa.config_info.proto = proto;
 1642 04d9a9ec 2020-09-24 stsp 	fpa.config_info.host = host;
 1643 04d9a9ec 2020-09-24 stsp 	fpa.config_info.port = port;
 1644 04d9a9ec 2020-09-24 stsp 	fpa.config_info.remote_repo_path = server_path;
 1645 04d9a9ec 2020-09-24 stsp 	fpa.config_info.git_url = git_url;
 1646 04d9a9ec 2020-09-24 stsp 	fpa.config_info.fetch_all_branches = fetch_all_branches;
 1647 04d9a9ec 2020-09-24 stsp 	fpa.config_info.mirror_references = mirror_references;
 1648 7848a0e1 2020-03-19 stsp 	error = got_fetch_pack(&pack_hash, &refs, &symrefs,
 1649 469dd726 2020-03-20 stsp 	    GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
 1650 0e4002ca 2020-03-21 stsp 	    fetch_all_branches, &wanted_branches, &wanted_refs,
 1651 0e4002ca 2020-03-21 stsp 	    list_refs_only, verbosity, fetchfd, repo,
 1652 0e4002ca 2020-03-21 stsp 	    fetch_progress, &fpa);
 1653 39c64a6a 2020-03-18 stsp 	if (error)
 1654 d9b4d0c0 2020-03-18 stsp 		goto done;
 1655 d9b4d0c0 2020-03-18 stsp 
 1656 41b0de12 2020-03-21 stsp 	if (list_refs_only) {
 1657 41b0de12 2020-03-21 stsp 		error = list_remote_refs(&symrefs, &refs);
 1658 41b0de12 2020-03-21 stsp 		goto done;
 1659 41b0de12 2020-03-21 stsp 	}
 1660 41b0de12 2020-03-21 stsp 
 1661 39c64a6a 2020-03-18 stsp 	error = got_object_id_str(&id_str, pack_hash);
 1662 39c64a6a 2020-03-18 stsp 	if (error)
 1663 d9b4d0c0 2020-03-18 stsp 		goto done;
 1664 68999b92 2020-03-18 stsp 	if (verbosity >= 0)
 1665 e69674d8 2020-03-19 stsp 		printf("\nFetched %s.pack\n", id_str);
 1666 d9b4d0c0 2020-03-18 stsp 	free(id_str);
 1667 d9b4d0c0 2020-03-18 stsp 
 1668 d9b4d0c0 2020-03-18 stsp 	/* Set up references provided with the pack file. */
 1669 d9b4d0c0 2020-03-18 stsp 	TAILQ_FOREACH(pe, &refs, entry) {
 1670 d9b4d0c0 2020-03-18 stsp 		const char *refname = pe->path;
 1671 d9b4d0c0 2020-03-18 stsp 		struct got_object_id *id = pe->data;
 1672 7ebc0570 2020-03-18 stsp 		char *remote_refname;
 1673 0e4002ca 2020-03-21 stsp 
 1674 0e4002ca 2020-03-21 stsp 		if (is_wanted_ref(&wanted_refs, refname) &&
 1675 0e4002ca 2020-03-21 stsp 		    !mirror_references) {
 1676 0e4002ca 2020-03-21 stsp 			error = create_wanted_ref(refname, id,
 1677 0e4002ca 2020-03-21 stsp 			    GOT_FETCH_DEFAULT_REMOTE_NAME,
 1678 0e4002ca 2020-03-21 stsp 			    verbosity - 1, repo);
 1679 0e4002ca 2020-03-21 stsp 			if (error)
 1680 0e4002ca 2020-03-21 stsp 				goto done;
 1681 0e4002ca 2020-03-21 stsp 			continue;
 1682 0e4002ca 2020-03-21 stsp 		}
 1683 668a20f6 2020-03-18 stsp 
 1684 6338a6a1 2020-03-21 stsp 		error = create_ref(refname, id, verbosity - 1, repo);
 1685 39c64a6a 2020-03-18 stsp 		if (error)
 1686 d9b4d0c0 2020-03-18 stsp 			goto done;
 1687 d9b4d0c0 2020-03-18 stsp 
 1688 469dd726 2020-03-20 stsp 		if (mirror_references)
 1689 469dd726 2020-03-20 stsp 			continue;
 1690 469dd726 2020-03-20 stsp 
 1691 7ebc0570 2020-03-18 stsp 		if (strncmp("refs/heads/", refname, 11) != 0)
 1692 7ebc0570 2020-03-18 stsp 			continue;
 1693 7ebc0570 2020-03-18 stsp 
 1694 7ebc0570 2020-03-18 stsp 		if (asprintf(&remote_refname,
 1695 7ebc0570 2020-03-18 stsp 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
 1696 7ebc0570 2020-03-18 stsp 		    refname + 11) == -1) {
 1697 7ebc0570 2020-03-18 stsp 			error = got_error_from_errno("asprintf");
 1698 7ebc0570 2020-03-18 stsp 			goto done;
 1699 7ebc0570 2020-03-18 stsp 		}
 1700 6338a6a1 2020-03-21 stsp 		error = create_ref(remote_refname, id, verbosity - 1, repo);
 1701 f298ae0f 2020-03-25 stsp 		free(remote_refname);
 1702 39c64a6a 2020-03-18 stsp 		if (error)
 1703 d9b4d0c0 2020-03-18 stsp 			goto done;
 1704 d9b4d0c0 2020-03-18 stsp 	}
 1705 d9b4d0c0 2020-03-18 stsp 
 1706 d9b4d0c0 2020-03-18 stsp 	/* Set the HEAD reference if the server provided one. */
 1707 d9b4d0c0 2020-03-18 stsp 	TAILQ_FOREACH(pe, &symrefs, entry) {
 1708 659e7fbd 2020-03-20 stsp 		struct got_reference *target_ref;
 1709 d9b4d0c0 2020-03-18 stsp 		const char *refname = pe->path;
 1710 d9b4d0c0 2020-03-18 stsp 		const char *target = pe->data;
 1711 f298ae0f 2020-03-25 stsp 		char *remote_refname = NULL, *remote_target = NULL;
 1712 d9b4d0c0 2020-03-18 stsp 
 1713 d9b4d0c0 2020-03-18 stsp 		if (strcmp(refname, GOT_REF_HEAD) != 0)
 1714 d9b4d0c0 2020-03-18 stsp 			continue;
 1715 d9b4d0c0 2020-03-18 stsp 
 1716 39c64a6a 2020-03-18 stsp 		error = got_ref_open(&target_ref, repo, target, 0);
 1717 39c64a6a 2020-03-18 stsp 		if (error) {
 1718 55330abe 2020-03-20 stsp 			if (error->code == GOT_ERR_NOT_REF) {
 1719 55330abe 2020-03-20 stsp 				error = NULL;
 1720 d9b4d0c0 2020-03-18 stsp 				continue;
 1721 55330abe 2020-03-20 stsp 			}
 1722 d9b4d0c0 2020-03-18 stsp 			goto done;
 1723 d9b4d0c0 2020-03-18 stsp 		}
 1724 d9b4d0c0 2020-03-18 stsp 
 1725 04d9a9ec 2020-09-24 stsp 		error = create_symref(refname, target_ref, verbosity, repo);
 1726 f298ae0f 2020-03-25 stsp 		got_ref_close(target_ref);
 1727 f298ae0f 2020-03-25 stsp 		if (error)
 1728 f298ae0f 2020-03-25 stsp 			goto done;
 1729 f298ae0f 2020-03-25 stsp 
 1730 f298ae0f 2020-03-25 stsp 		if (mirror_references)
 1731 f298ae0f 2020-03-25 stsp 			continue;
 1732 f298ae0f 2020-03-25 stsp 
 1733 f298ae0f 2020-03-25 stsp 		if (strncmp("refs/heads/", target, 11) != 0)
 1734 f298ae0f 2020-03-25 stsp 			continue;
 1735 f298ae0f 2020-03-25 stsp 
 1736 f298ae0f 2020-03-25 stsp 		if (asprintf(&remote_refname,
 1737 f298ae0f 2020-03-25 stsp 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
 1738 f298ae0f 2020-03-25 stsp 		    refname) == -1) {
 1739 f298ae0f 2020-03-25 stsp 			error = got_error_from_errno("asprintf");
 1740 f298ae0f 2020-03-25 stsp 			goto done;
 1741 f298ae0f 2020-03-25 stsp 		}
 1742 f298ae0f 2020-03-25 stsp 		if (asprintf(&remote_target,
 1743 f298ae0f 2020-03-25 stsp 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
 1744 f298ae0f 2020-03-25 stsp 		    target + 11) == -1) {
 1745 f298ae0f 2020-03-25 stsp 			error = got_error_from_errno("asprintf");
 1746 f298ae0f 2020-03-25 stsp 			free(remote_refname);
 1747 f298ae0f 2020-03-25 stsp 			goto done;
 1748 f298ae0f 2020-03-25 stsp 		}
 1749 f298ae0f 2020-03-25 stsp 		error = got_ref_open(&target_ref, repo, remote_target, 0);
 1750 f298ae0f 2020-03-25 stsp 		if (error) {
 1751 f298ae0f 2020-03-25 stsp 			free(remote_refname);
 1752 f298ae0f 2020-03-25 stsp 			free(remote_target);
 1753 f298ae0f 2020-03-25 stsp 			if (error->code == GOT_ERR_NOT_REF) {
 1754 f298ae0f 2020-03-25 stsp 				error = NULL;
 1755 f298ae0f 2020-03-25 stsp 				continue;
 1756 f298ae0f 2020-03-25 stsp 			}
 1757 f298ae0f 2020-03-25 stsp 			goto done;
 1758 f298ae0f 2020-03-25 stsp 		}
 1759 04d9a9ec 2020-09-24 stsp 		error = create_symref(remote_refname, target_ref,
 1760 04d9a9ec 2020-09-24 stsp 		    verbosity - 1, repo);
 1761 f298ae0f 2020-03-25 stsp 		free(remote_refname);
 1762 f298ae0f 2020-03-25 stsp 		free(remote_target);
 1763 d9b4d0c0 2020-03-18 stsp 		got_ref_close(target_ref);
 1764 39c64a6a 2020-03-18 stsp 		if (error)
 1765 d9b4d0c0 2020-03-18 stsp 			goto done;
 1766 4ba14133 2020-03-20 stsp 	}
 1767 4ba14133 2020-03-20 stsp 	if (pe == NULL) {
 1768 4ba14133 2020-03-20 stsp 		/*
 1769 4ba14133 2020-03-20 stsp 		 * We failed to set the HEAD reference. If we asked for
 1770 4ba14133 2020-03-20 stsp 		 * a set of wanted branches use the first of one of those
 1771 4ba14133 2020-03-20 stsp 		 * which could be fetched instead.
 1772 4ba14133 2020-03-20 stsp 		 */
 1773 62d463ca 2020-10-20 naddy 		TAILQ_FOREACH(pe, &wanted_branches, entry) {
 1774 4ba14133 2020-03-20 stsp 			const char *target = pe->path;
 1775 4ba14133 2020-03-20 stsp 			struct got_reference *target_ref;
 1776 d9b4d0c0 2020-03-18 stsp 
 1777 4ba14133 2020-03-20 stsp 			error = got_ref_open(&target_ref, repo, target, 0);
 1778 4ba14133 2020-03-20 stsp 			if (error) {
 1779 4ba14133 2020-03-20 stsp 				if (error->code == GOT_ERR_NOT_REF) {
 1780 4ba14133 2020-03-20 stsp 					error = NULL;
 1781 4ba14133 2020-03-20 stsp 					continue;
 1782 4ba14133 2020-03-20 stsp 				}
 1783 4ba14133 2020-03-20 stsp 				goto done;
 1784 4ba14133 2020-03-20 stsp 			}
 1785 4ba14133 2020-03-20 stsp 
 1786 04d9a9ec 2020-09-24 stsp 			error = create_symref(GOT_REF_HEAD, target_ref,
 1787 04d9a9ec 2020-09-24 stsp 			    verbosity, repo);
 1788 4ba14133 2020-03-20 stsp 			got_ref_close(target_ref);
 1789 4ba14133 2020-03-20 stsp 			if (error)
 1790 4ba14133 2020-03-20 stsp 				goto done;
 1791 4ba14133 2020-03-20 stsp 			break;
 1792 4ba14133 2020-03-20 stsp 		}
 1793 659e7fbd 2020-03-20 stsp 	}
 1794 659e7fbd 2020-03-20 stsp 
 1795 d715f13e 2020-03-19 stsp 	if (verbosity >= 0)
 1796 469dd726 2020-03-20 stsp 		printf("Created %s repository '%s'\n",
 1797 469dd726 2020-03-20 stsp 		    mirror_references ? "mirrored" : "cloned", repo_path);
 1798 09838ffc 2020-03-18 stsp done:
 1799 9c52365f 2020-03-21 stsp 	if (fetchpid > 0) {
 1800 9c52365f 2020-03-21 stsp 		if (kill(fetchpid, SIGTERM) == -1)
 1801 9c52365f 2020-03-21 stsp 			error = got_error_from_errno("kill");
 1802 9c52365f 2020-03-21 stsp 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
 1803 9c52365f 2020-03-21 stsp 			error = got_error_from_errno("waitpid");
 1804 9c52365f 2020-03-21 stsp 	}
 1805 39c64a6a 2020-03-18 stsp 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
 1806 39c64a6a 2020-03-18 stsp 		error = got_error_from_errno("close");
 1807 1d0f4054 2021-06-17 stsp 	if (repo) {
 1808 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 1809 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 1810 1d0f4054 2021-06-17 stsp 			error = close_err;
 1811 1d0f4054 2021-06-17 stsp 	}
 1812 d9b4d0c0 2020-03-18 stsp 	TAILQ_FOREACH(pe, &refs, entry) {
 1813 d9b4d0c0 2020-03-18 stsp 		free((void *)pe->path);
 1814 d9b4d0c0 2020-03-18 stsp 		free(pe->data);
 1815 d9b4d0c0 2020-03-18 stsp 	}
 1816 d9b4d0c0 2020-03-18 stsp 	got_pathlist_free(&refs);
 1817 d9b4d0c0 2020-03-18 stsp 	TAILQ_FOREACH(pe, &symrefs, entry) {
 1818 d9b4d0c0 2020-03-18 stsp 		free((void *)pe->path);
 1819 d9b4d0c0 2020-03-18 stsp 		free(pe->data);
 1820 d9b4d0c0 2020-03-18 stsp 	}
 1821 d9b4d0c0 2020-03-18 stsp 	got_pathlist_free(&symrefs);
 1822 4ba14133 2020-03-20 stsp 	got_pathlist_free(&wanted_branches);
 1823 0e4002ca 2020-03-21 stsp 	got_pathlist_free(&wanted_refs);
 1824 d9b4d0c0 2020-03-18 stsp 	free(pack_hash);
 1825 09838ffc 2020-03-18 stsp 	free(proto);
 1826 09838ffc 2020-03-18 stsp 	free(host);
 1827 09838ffc 2020-03-18 stsp 	free(port);
 1828 09838ffc 2020-03-18 stsp 	free(server_path);
 1829 09838ffc 2020-03-18 stsp 	free(repo_name);
 1830 bb64b798 2020-03-18 stsp 	free(default_destdir);
 1831 b46f3e71 2020-03-18 stsp 	free(git_url);
 1832 39c64a6a 2020-03-18 stsp 	return error;
 1833 7848a0e1 2020-03-19 stsp }
 1834 7848a0e1 2020-03-19 stsp 
 1835 7848a0e1 2020-03-19 stsp static const struct got_error *
 1836 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
 1837 db6d8ad8 2020-03-21 stsp     int replace_tags, int verbosity, struct got_repository *repo)
 1838 7848a0e1 2020-03-19 stsp {
 1839 7848a0e1 2020-03-19 stsp 	const struct got_error *err = NULL;
 1840 7848a0e1 2020-03-19 stsp 	char *new_id_str = NULL;
 1841 7848a0e1 2020-03-19 stsp 	struct got_object_id *old_id = NULL;
 1842 7848a0e1 2020-03-19 stsp 
 1843 7848a0e1 2020-03-19 stsp 	err = got_object_id_str(&new_id_str, new_id);
 1844 7848a0e1 2020-03-19 stsp 	if (err)
 1845 7848a0e1 2020-03-19 stsp 		goto done;
 1846 7848a0e1 2020-03-19 stsp 
 1847 db6d8ad8 2020-03-21 stsp 	if (!replace_tags &&
 1848 db6d8ad8 2020-03-21 stsp 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
 1849 88609724 2020-03-21 stsp 		err = got_ref_resolve(&old_id, repo, ref);
 1850 88609724 2020-03-21 stsp 		if (err)
 1851 88609724 2020-03-21 stsp 			goto done;
 1852 88609724 2020-03-21 stsp 		if (got_object_id_cmp(old_id, new_id) == 0)
 1853 88609724 2020-03-21 stsp 			goto done;
 1854 db6d8ad8 2020-03-21 stsp 		if (verbosity >= 0) {
 1855 db6d8ad8 2020-03-21 stsp 			printf("Rejecting update of existing tag %s: %s\n",
 1856 db6d8ad8 2020-03-21 stsp 			    got_ref_get_name(ref), new_id_str);
 1857 db6d8ad8 2020-03-21 stsp 		}
 1858 db6d8ad8 2020-03-21 stsp 		goto done;
 1859 db6d8ad8 2020-03-21 stsp 	}
 1860 db6d8ad8 2020-03-21 stsp 
 1861 7848a0e1 2020-03-19 stsp 	if (got_ref_is_symbolic(ref)) {
 1862 688f11b3 2020-03-21 stsp 		if (verbosity >= 0) {
 1863 e8a967e0 2020-03-21 stsp 			printf("Replacing reference %s: %s\n",
 1864 6338a6a1 2020-03-21 stsp 			    got_ref_get_name(ref),
 1865 6338a6a1 2020-03-21 stsp 			    got_ref_get_symref_target(ref));
 1866 688f11b3 2020-03-21 stsp 		}
 1867 e8a967e0 2020-03-21 stsp 		err = got_ref_change_symref_to_ref(ref, new_id);
 1868 7848a0e1 2020-03-19 stsp 		if (err)
 1869 7848a0e1 2020-03-19 stsp 			goto done;
 1870 e8a967e0 2020-03-21 stsp 		err = got_ref_write(ref, repo);
 1871 e8a967e0 2020-03-21 stsp 		if (err)
 1872 e8a967e0 2020-03-21 stsp 			goto done;
 1873 7848a0e1 2020-03-19 stsp 	} else {
 1874 7848a0e1 2020-03-19 stsp 		err = got_ref_resolve(&old_id, repo, ref);
 1875 7848a0e1 2020-03-19 stsp 		if (err)
 1876 7848a0e1 2020-03-19 stsp 			goto done;
 1877 6338a6a1 2020-03-21 stsp 		if (got_object_id_cmp(old_id, new_id) == 0)
 1878 6338a6a1 2020-03-21 stsp 			goto done;
 1879 6338a6a1 2020-03-21 stsp 
 1880 6338a6a1 2020-03-21 stsp 		err = got_ref_change_ref(ref, new_id);
 1881 6338a6a1 2020-03-21 stsp 		if (err)
 1882 6338a6a1 2020-03-21 stsp 			goto done;
 1883 6338a6a1 2020-03-21 stsp 		err = got_ref_write(ref, repo);
 1884 6338a6a1 2020-03-21 stsp 		if (err)
 1885 6338a6a1 2020-03-21 stsp 			goto done;
 1886 7848a0e1 2020-03-19 stsp 	}
 1887 6338a6a1 2020-03-21 stsp 
 1888 6338a6a1 2020-03-21 stsp 	if (verbosity >= 0)
 1889 f4d0e3fb 2020-05-15 stsp 		printf("Updated %s: %s\n", got_ref_get_name(ref),
 1890 6338a6a1 2020-03-21 stsp 		    new_id_str);
 1891 7848a0e1 2020-03-19 stsp done:
 1892 7848a0e1 2020-03-19 stsp 	free(old_id);
 1893 7848a0e1 2020-03-19 stsp 	free(new_id_str);
 1894 7848a0e1 2020-03-19 stsp 	return err;
 1895 2ab43947 2020-03-18 stsp }
 1896 f1bcca34 2020-03-25 stsp 
 1897 f1bcca34 2020-03-25 stsp static const struct got_error *
 1898 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
 1899 f1bcca34 2020-03-25 stsp     int verbosity, struct got_repository *repo)
 1900 f1bcca34 2020-03-25 stsp {
 1901 f1bcca34 2020-03-25 stsp 	const struct got_error *err = NULL, *unlock_err;
 1902 f1bcca34 2020-03-25 stsp 	struct got_reference *symref;
 1903 bcf34b0e 2020-03-26 stsp 	int symref_is_locked = 0;
 1904 f1bcca34 2020-03-25 stsp 
 1905 f1bcca34 2020-03-25 stsp 	err = got_ref_open(&symref, repo, refname, 1);
 1906 bcf34b0e 2020-03-26 stsp 	if (err) {
 1907 bcf34b0e 2020-03-26 stsp 		if (err->code != GOT_ERR_NOT_REF)
 1908 bcf34b0e 2020-03-26 stsp 			return err;
 1909 bcf34b0e 2020-03-26 stsp 		err = got_ref_alloc_symref(&symref, refname, target_ref);
 1910 bcf34b0e 2020-03-26 stsp 		if (err)
 1911 bcf34b0e 2020-03-26 stsp 			goto done;
 1912 2ab43947 2020-03-18 stsp 
 1913 bcf34b0e 2020-03-26 stsp 		err = got_ref_write(symref, repo);
 1914 bcf34b0e 2020-03-26 stsp 		if (err)
 1915 bcf34b0e 2020-03-26 stsp 			goto done;
 1916 f1bcca34 2020-03-25 stsp 
 1917 bcf34b0e 2020-03-26 stsp 		if (verbosity >= 0)
 1918 bcf34b0e 2020-03-26 stsp 			printf("Created reference %s: %s\n",
 1919 bcf34b0e 2020-03-26 stsp 			    got_ref_get_name(symref),
 1920 bcf34b0e 2020-03-26 stsp 			    got_ref_get_symref_target(symref));
 1921 bcf34b0e 2020-03-26 stsp 	} else {
 1922 bcf34b0e 2020-03-26 stsp 		symref_is_locked = 1;
 1923 f1bcca34 2020-03-25 stsp 
 1924 bcf34b0e 2020-03-26 stsp 		if (strcmp(got_ref_get_symref_target(symref),
 1925 bcf34b0e 2020-03-26 stsp 		    got_ref_get_name(target_ref)) == 0)
 1926 bcf34b0e 2020-03-26 stsp 			goto done;
 1927 bcf34b0e 2020-03-26 stsp 
 1928 bcf34b0e 2020-03-26 stsp 		err = got_ref_change_symref(symref,
 1929 bcf34b0e 2020-03-26 stsp 		    got_ref_get_name(target_ref));
 1930 bcf34b0e 2020-03-26 stsp 		if (err)
 1931 bcf34b0e 2020-03-26 stsp 			goto done;
 1932 bcf34b0e 2020-03-26 stsp 
 1933 bcf34b0e 2020-03-26 stsp 		err = got_ref_write(symref, repo);
 1934 bcf34b0e 2020-03-26 stsp 		if (err)
 1935 bcf34b0e 2020-03-26 stsp 			goto done;
 1936 bcf34b0e 2020-03-26 stsp 
 1937 bcf34b0e 2020-03-26 stsp 		if (verbosity >= 0)
 1938 f4d0e3fb 2020-05-15 stsp 			printf("Updated %s: %s\n", got_ref_get_name(symref),
 1939 bcf34b0e 2020-03-26 stsp 			    got_ref_get_symref_target(symref));
 1940 bcf34b0e 2020-03-26 stsp 
 1941 bcf34b0e 2020-03-26 stsp 	}
 1942 f1bcca34 2020-03-25 stsp done:
 1943 bcf34b0e 2020-03-26 stsp 	if (symref_is_locked) {
 1944 bcf34b0e 2020-03-26 stsp 		unlock_err = got_ref_unlock(symref);
 1945 bcf34b0e 2020-03-26 stsp 		if (unlock_err && err == NULL)
 1946 bcf34b0e 2020-03-26 stsp 			err = unlock_err;
 1947 bcf34b0e 2020-03-26 stsp 	}
 1948 f1bcca34 2020-03-25 stsp 	got_ref_close(symref);
 1949 f1bcca34 2020-03-25 stsp 	return err;
 1950 f1bcca34 2020-03-25 stsp }
 1951 f1bcca34 2020-03-25 stsp 
 1952 2ab43947 2020-03-18 stsp __dead static void
 1953 7848a0e1 2020-03-19 stsp usage_fetch(void)
 1954 7848a0e1 2020-03-19 stsp {
 1955 f21ec2f0 2020-03-21 stsp 	fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
 1956 161728eb 2021-07-24 stsp 	    "[-r repository-path] [-t] [-q] [-v] [-R reference] [-X] "
 1957 0e4002ca 2020-03-21 stsp 	    "[remote-repository-name]\n",
 1958 13f12b09 2020-03-21 stsp 	    getprogname());
 1959 7848a0e1 2020-03-19 stsp 	exit(1);
 1960 7848a0e1 2020-03-19 stsp }
 1961 7848a0e1 2020-03-19 stsp 
 1962 7848a0e1 2020-03-19 stsp static const struct got_error *
 1963 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
 1964 688f11b3 2020-03-21 stsp     int verbosity, struct got_repository *repo)
 1965 f21ec2f0 2020-03-21 stsp {
 1966 f21ec2f0 2020-03-21 stsp 	const struct got_error *err = NULL;
 1967 3789fd73 2020-03-26 stsp 	struct got_object_id *id = NULL;
 1968 3789fd73 2020-03-26 stsp 	char *id_str = NULL;
 1969 3789fd73 2020-03-26 stsp 
 1970 3789fd73 2020-03-26 stsp 	if (got_ref_is_symbolic(ref)) {
 1971 3789fd73 2020-03-26 stsp 		err = got_ref_delete(ref, repo);
 1972 3789fd73 2020-03-26 stsp 		if (err)
 1973 3789fd73 2020-03-26 stsp 			return err;
 1974 3789fd73 2020-03-26 stsp 		if (verbosity >= 0) {
 1975 f9d54ee6 2021-07-16 stsp 			printf("Deleted %s: %s\n",
 1976 3789fd73 2020-03-26 stsp 			    got_ref_get_name(ref),
 1977 3789fd73 2020-03-26 stsp 			    got_ref_get_symref_target(ref));
 1978 3789fd73 2020-03-26 stsp 		}
 1979 3789fd73 2020-03-26 stsp 	} else {
 1980 3789fd73 2020-03-26 stsp 		err = got_ref_resolve(&id, repo, ref);
 1981 3789fd73 2020-03-26 stsp 		if (err)
 1982 3789fd73 2020-03-26 stsp 			return err;
 1983 3789fd73 2020-03-26 stsp 		err = got_object_id_str(&id_str, id);
 1984 3789fd73 2020-03-26 stsp 		if (err)
 1985 3789fd73 2020-03-26 stsp 			goto done;
 1986 3168e5da 2020-09-10 stsp 
 1987 3789fd73 2020-03-26 stsp 		err = got_ref_delete(ref, repo);
 1988 3789fd73 2020-03-26 stsp 		if (err)
 1989 3789fd73 2020-03-26 stsp 			goto done;
 1990 3789fd73 2020-03-26 stsp 		if (verbosity >= 0) {
 1991 f9d54ee6 2021-07-16 stsp 			printf("Deleted %s: %s\n",
 1992 3789fd73 2020-03-26 stsp 			    got_ref_get_name(ref), id_str);
 1993 3789fd73 2020-03-26 stsp 		}
 1994 3789fd73 2020-03-26 stsp 	}
 1995 3789fd73 2020-03-26 stsp done:
 1996 3789fd73 2020-03-26 stsp 	free(id);
 1997 3789fd73 2020-03-26 stsp 	free(id_str);
 1998 3789fd73 2020-03-26 stsp 	return NULL;
 1999 3789fd73 2020-03-26 stsp }
 2000 3789fd73 2020-03-26 stsp 
 2001 3789fd73 2020-03-26 stsp static const struct got_error *
 2002 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
 2003 50b0790e 2020-09-11 stsp     struct got_pathlist_head *their_symrefs,
 2004 50b0790e 2020-09-11 stsp     const struct got_remote_repo *remote,
 2005 3789fd73 2020-03-26 stsp     int verbosity, struct got_repository *repo)
 2006 3789fd73 2020-03-26 stsp {
 2007 3789fd73 2020-03-26 stsp 	const struct got_error *err = NULL, *unlock_err;
 2008 f21ec2f0 2020-03-21 stsp 	struct got_reflist_head my_refs;
 2009 f21ec2f0 2020-03-21 stsp 	struct got_reflist_entry *re;
 2010 f21ec2f0 2020-03-21 stsp 	struct got_pathlist_entry *pe;
 2011 3789fd73 2020-03-26 stsp 	char *remote_namespace = NULL;
 2012 3789fd73 2020-03-26 stsp 	char *local_refname = NULL;
 2013 f21ec2f0 2020-03-21 stsp 
 2014 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&my_refs);
 2015 f21ec2f0 2020-03-21 stsp 
 2016 3789fd73 2020-03-26 stsp 	if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
 2017 3789fd73 2020-03-26 stsp 	    == -1)
 2018 3789fd73 2020-03-26 stsp 		return got_error_from_errno("asprintf");
 2019 3789fd73 2020-03-26 stsp 
 2020 f21ec2f0 2020-03-21 stsp 	err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
 2021 f21ec2f0 2020-03-21 stsp 	if (err)
 2022 3789fd73 2020-03-26 stsp 		goto done;
 2023 f21ec2f0 2020-03-21 stsp 
 2024 d9dff0e5 2020-12-26 stsp 	TAILQ_FOREACH(re, &my_refs, entry) {
 2025 f21ec2f0 2020-03-21 stsp 		const char *refname = got_ref_get_name(re->ref);
 2026 1b796c3f 2021-09-11 stsp 		const char *their_refname;
 2027 f21ec2f0 2020-03-21 stsp 
 2028 1b796c3f 2021-09-11 stsp 		if (remote->mirror_references) {
 2029 1b796c3f 2021-09-11 stsp 			their_refname = refname;
 2030 1b796c3f 2021-09-11 stsp 		} else {
 2031 3789fd73 2020-03-26 stsp 			if (strncmp(refname, remote_namespace,
 2032 3789fd73 2020-03-26 stsp 			    strlen(remote_namespace)) == 0) {
 2033 3789fd73 2020-03-26 stsp 				if (strcmp(refname + strlen(remote_namespace),
 2034 3789fd73 2020-03-26 stsp 				    GOT_REF_HEAD) == 0)
 2035 3789fd73 2020-03-26 stsp 					continue;
 2036 3789fd73 2020-03-26 stsp 				if (asprintf(&local_refname, "refs/heads/%s",
 2037 3789fd73 2020-03-26 stsp 				    refname + strlen(remote_namespace)) == -1) {
 2038 3789fd73 2020-03-26 stsp 					err = got_error_from_errno("asprintf");
 2039 3789fd73 2020-03-26 stsp 					goto done;
 2040 3789fd73 2020-03-26 stsp 				}
 2041 3789fd73 2020-03-26 stsp 			} else if (strncmp(refname, "refs/tags/", 10) != 0)
 2042 3789fd73 2020-03-26 stsp 				continue;
 2043 f21ec2f0 2020-03-21 stsp 
 2044 1b796c3f 2021-09-11 stsp 			their_refname = local_refname;
 2045 1b796c3f 2021-09-11 stsp 		}
 2046 1b796c3f 2021-09-11 stsp 	
 2047 f21ec2f0 2020-03-21 stsp 		TAILQ_FOREACH(pe, their_refs, entry) {
 2048 1b796c3f 2021-09-11 stsp 			if (strcmp(their_refname, pe->path) == 0)
 2049 f21ec2f0 2020-03-21 stsp 				break;
 2050 f21ec2f0 2020-03-21 stsp 		}
 2051 f21ec2f0 2020-03-21 stsp 		if (pe != NULL)
 2052 f21ec2f0 2020-03-21 stsp 			continue;
 2053 f21ec2f0 2020-03-21 stsp 
 2054 3789fd73 2020-03-26 stsp 		TAILQ_FOREACH(pe, their_symrefs, entry) {
 2055 1b796c3f 2021-09-11 stsp 			if (strcmp(their_refname, pe->path) == 0)
 2056 3789fd73 2020-03-26 stsp 				break;
 2057 3789fd73 2020-03-26 stsp 		}
 2058 3789fd73 2020-03-26 stsp 		if (pe != NULL)
 2059 3789fd73 2020-03-26 stsp 			continue;
 2060 f21ec2f0 2020-03-21 stsp 
 2061 3789fd73 2020-03-26 stsp 		err = delete_missing_ref(re->ref, verbosity, repo);
 2062 f21ec2f0 2020-03-21 stsp 		if (err)
 2063 f21ec2f0 2020-03-21 stsp 			break;
 2064 3789fd73 2020-03-26 stsp 
 2065 3789fd73 2020-03-26 stsp 		if (local_refname) {
 2066 3789fd73 2020-03-26 stsp 			struct got_reference *ref;
 2067 3789fd73 2020-03-26 stsp 			err = got_ref_open(&ref, repo, local_refname, 1);
 2068 3789fd73 2020-03-26 stsp 			if (err) {
 2069 3789fd73 2020-03-26 stsp 				if (err->code != GOT_ERR_NOT_REF)
 2070 3789fd73 2020-03-26 stsp 					break;
 2071 3789fd73 2020-03-26 stsp 				free(local_refname);
 2072 3789fd73 2020-03-26 stsp 				local_refname = NULL;
 2073 3789fd73 2020-03-26 stsp 				continue;
 2074 3789fd73 2020-03-26 stsp 			}
 2075 3789fd73 2020-03-26 stsp 			err = delete_missing_ref(ref, verbosity, repo);
 2076 3789fd73 2020-03-26 stsp 			if (err)
 2077 3789fd73 2020-03-26 stsp 				break;
 2078 3789fd73 2020-03-26 stsp 			unlock_err = got_ref_unlock(ref);
 2079 3789fd73 2020-03-26 stsp 			got_ref_close(ref);
 2080 3789fd73 2020-03-26 stsp 			if (unlock_err && err == NULL) {
 2081 3789fd73 2020-03-26 stsp 				err = unlock_err;
 2082 3789fd73 2020-03-26 stsp 				break;
 2083 3789fd73 2020-03-26 stsp 			}
 2084 3789fd73 2020-03-26 stsp 
 2085 3789fd73 2020-03-26 stsp 			free(local_refname);
 2086 3789fd73 2020-03-26 stsp 			local_refname = NULL;
 2087 6338a6a1 2020-03-21 stsp 		}
 2088 f21ec2f0 2020-03-21 stsp 	}
 2089 3789fd73 2020-03-26 stsp done:
 2090 3789fd73 2020-03-26 stsp 	free(remote_namespace);
 2091 3789fd73 2020-03-26 stsp 	free(local_refname);
 2092 0e4002ca 2020-03-21 stsp 	return err;
 2093 0e4002ca 2020-03-21 stsp }
 2094 0e4002ca 2020-03-21 stsp 
 2095 0e4002ca 2020-03-21 stsp static const struct got_error *
 2096 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
 2097 0e4002ca 2020-03-21 stsp     const char *remote_repo_name, int verbosity, struct got_repository *repo)
 2098 0e4002ca 2020-03-21 stsp {
 2099 9f142382 2020-03-21 stsp 	const struct got_error *err, *unlock_err;
 2100 0e4002ca 2020-03-21 stsp 	char *remote_refname;
 2101 0e4002ca 2020-03-21 stsp 	struct got_reference *ref;
 2102 0e4002ca 2020-03-21 stsp 
 2103 0e4002ca 2020-03-21 stsp 	if (strncmp("refs/", refname, 5) == 0)
 2104 0e4002ca 2020-03-21 stsp 		refname += 5;
 2105 0e4002ca 2020-03-21 stsp 
 2106 0e4002ca 2020-03-21 stsp 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
 2107 0e4002ca 2020-03-21 stsp 	    remote_repo_name, refname) == -1)
 2108 0e4002ca 2020-03-21 stsp 		return got_error_from_errno("asprintf");
 2109 f21ec2f0 2020-03-21 stsp 
 2110 9f142382 2020-03-21 stsp 	err = got_ref_open(&ref, repo, remote_refname, 1);
 2111 0e4002ca 2020-03-21 stsp 	if (err) {
 2112 0e4002ca 2020-03-21 stsp 		if (err->code != GOT_ERR_NOT_REF)
 2113 0e4002ca 2020-03-21 stsp 			goto done;
 2114 0e4002ca 2020-03-21 stsp 		err = create_ref(remote_refname, id, verbosity, repo);
 2115 0e4002ca 2020-03-21 stsp 	} else {
 2116 0e4002ca 2020-03-21 stsp 		err = update_ref(ref, id, 0, verbosity, repo);
 2117 9f142382 2020-03-21 stsp 		unlock_err = got_ref_unlock(ref);
 2118 9f142382 2020-03-21 stsp 		if (unlock_err && err == NULL)
 2119 9f142382 2020-03-21 stsp 			err = unlock_err;
 2120 0e4002ca 2020-03-21 stsp 		got_ref_close(ref);
 2121 0e4002ca 2020-03-21 stsp 	}
 2122 0e4002ca 2020-03-21 stsp done:
 2123 0e4002ca 2020-03-21 stsp 	free(remote_refname);
 2124 161728eb 2021-07-24 stsp 	return err;
 2125 161728eb 2021-07-24 stsp }
 2126 161728eb 2021-07-24 stsp 
 2127 161728eb 2021-07-24 stsp static const struct got_error *
 2128 161728eb 2021-07-24 stsp delete_ref(struct got_repository *repo, struct got_reference *ref)
 2129 161728eb 2021-07-24 stsp {
 2130 161728eb 2021-07-24 stsp 	const struct got_error *err = NULL;
 2131 161728eb 2021-07-24 stsp 	struct got_object_id *id = NULL;
 2132 161728eb 2021-07-24 stsp 	char *id_str = NULL;
 2133 161728eb 2021-07-24 stsp 	const char *target;
 2134 161728eb 2021-07-24 stsp 
 2135 161728eb 2021-07-24 stsp 	if (got_ref_is_symbolic(ref)) {
 2136 161728eb 2021-07-24 stsp 		target = got_ref_get_symref_target(ref);
 2137 161728eb 2021-07-24 stsp 	} else {
 2138 161728eb 2021-07-24 stsp 		err = got_ref_resolve(&id, repo, ref);
 2139 161728eb 2021-07-24 stsp 		if (err)
 2140 161728eb 2021-07-24 stsp 			goto done;
 2141 161728eb 2021-07-24 stsp 		err = got_object_id_str(&id_str, id);
 2142 161728eb 2021-07-24 stsp 		if (err)
 2143 161728eb 2021-07-24 stsp 			goto done;
 2144 161728eb 2021-07-24 stsp 		target = id_str;
 2145 161728eb 2021-07-24 stsp 	}
 2146 161728eb 2021-07-24 stsp 
 2147 161728eb 2021-07-24 stsp 	err = got_ref_delete(ref, repo);
 2148 161728eb 2021-07-24 stsp 	if (err)
 2149 161728eb 2021-07-24 stsp 		goto done;
 2150 161728eb 2021-07-24 stsp 
 2151 161728eb 2021-07-24 stsp 	printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
 2152 161728eb 2021-07-24 stsp done:
 2153 161728eb 2021-07-24 stsp 	free(id);
 2154 161728eb 2021-07-24 stsp 	free(id_str);
 2155 f21ec2f0 2020-03-21 stsp 	return err;
 2156 f21ec2f0 2020-03-21 stsp }
 2157 f21ec2f0 2020-03-21 stsp 
 2158 f21ec2f0 2020-03-21 stsp static const struct got_error *
 2159 161728eb 2021-07-24 stsp delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
 2160 161728eb 2021-07-24 stsp {
 2161 161728eb 2021-07-24 stsp 	const struct got_error *err = NULL;
 2162 161728eb 2021-07-24 stsp 	struct got_reflist_head refs;
 2163 161728eb 2021-07-24 stsp 	struct got_reflist_entry *re;
 2164 161728eb 2021-07-24 stsp 	char *prefix;
 2165 161728eb 2021-07-24 stsp 
 2166 161728eb 2021-07-24 stsp 	TAILQ_INIT(&refs);
 2167 161728eb 2021-07-24 stsp 
 2168 161728eb 2021-07-24 stsp 	if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
 2169 161728eb 2021-07-24 stsp 		err = got_error_from_errno("asprintf");
 2170 161728eb 2021-07-24 stsp 		goto done;
 2171 161728eb 2021-07-24 stsp 	}
 2172 161728eb 2021-07-24 stsp 	err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
 2173 161728eb 2021-07-24 stsp 	if (err)
 2174 161728eb 2021-07-24 stsp 		goto done;
 2175 161728eb 2021-07-24 stsp 
 2176 161728eb 2021-07-24 stsp 	TAILQ_FOREACH(re, &refs, entry)
 2177 161728eb 2021-07-24 stsp 		delete_ref(repo, re->ref);
 2178 161728eb 2021-07-24 stsp done:
 2179 161728eb 2021-07-24 stsp 	got_ref_list_free(&refs);
 2180 161728eb 2021-07-24 stsp 	return err;
 2181 161728eb 2021-07-24 stsp }
 2182 161728eb 2021-07-24 stsp 
 2183 161728eb 2021-07-24 stsp static const struct got_error *
 2184 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
 2185 7848a0e1 2020-03-19 stsp {
 2186 9f142382 2020-03-21 stsp 	const struct got_error *error = NULL, *unlock_err;
 2187 7848a0e1 2020-03-19 stsp 	char *cwd = NULL, *repo_path = NULL;
 2188 7848a0e1 2020-03-19 stsp 	const char *remote_name;
 2189 7848a0e1 2020-03-19 stsp 	char *proto = NULL, *host = NULL, *port = NULL;
 2190 7848a0e1 2020-03-19 stsp 	char *repo_name = NULL, *server_path = NULL;
 2191 50b0790e 2020-09-11 stsp 	const struct got_remote_repo *remotes, *remote = NULL;
 2192 7848a0e1 2020-03-19 stsp 	int nremotes;
 2193 7848a0e1 2020-03-19 stsp 	char *id_str = NULL;
 2194 7848a0e1 2020-03-19 stsp 	struct got_repository *repo = NULL;
 2195 7848a0e1 2020-03-19 stsp 	struct got_worktree *worktree = NULL;
 2196 50b0790e 2020-09-11 stsp 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
 2197 0e4002ca 2020-03-21 stsp 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
 2198 7848a0e1 2020-03-19 stsp 	struct got_pathlist_entry *pe;
 2199 7848a0e1 2020-03-19 stsp 	struct got_object_id *pack_hash = NULL;
 2200 9c52365f 2020-03-21 stsp 	int i, ch, fetchfd = -1, fetchstatus;
 2201 9c52365f 2020-03-21 stsp 	pid_t fetchpid = -1;
 2202 7848a0e1 2020-03-19 stsp 	struct got_fetch_progress_arg fpa;
 2203 41b0de12 2020-03-21 stsp 	int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
 2204 161728eb 2021-07-24 stsp 	int delete_refs = 0, replace_tags = 0, delete_remote = 0;
 2205 7848a0e1 2020-03-19 stsp 
 2206 7848a0e1 2020-03-19 stsp 	TAILQ_INIT(&refs);
 2207 7848a0e1 2020-03-19 stsp 	TAILQ_INIT(&symrefs);
 2208 4ba14133 2020-03-20 stsp 	TAILQ_INIT(&wanted_branches);
 2209 0e4002ca 2020-03-21 stsp 	TAILQ_INIT(&wanted_refs);
 2210 7848a0e1 2020-03-19 stsp 
 2211 161728eb 2021-07-24 stsp 	while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
 2212 7848a0e1 2020-03-19 stsp 		switch (ch) {
 2213 659e7fbd 2020-03-20 stsp 		case 'a':
 2214 659e7fbd 2020-03-20 stsp 			fetch_all_branches = 1;
 2215 4ba14133 2020-03-20 stsp 			break;
 2216 4ba14133 2020-03-20 stsp 		case 'b':
 2217 4ba14133 2020-03-20 stsp 			error = got_pathlist_append(&wanted_branches,
 2218 4ba14133 2020-03-20 stsp 			    optarg, NULL);
 2219 4ba14133 2020-03-20 stsp 			if (error)
 2220 4ba14133 2020-03-20 stsp 				return error;
 2221 41b0de12 2020-03-21 stsp 			break;
 2222 f21ec2f0 2020-03-21 stsp 		case 'd':
 2223 f21ec2f0 2020-03-21 stsp 			delete_refs = 1;
 2224 f21ec2f0 2020-03-21 stsp 			break;
 2225 41b0de12 2020-03-21 stsp 		case 'l':
 2226 41b0de12 2020-03-21 stsp 			list_refs_only = 1;
 2227 659e7fbd 2020-03-20 stsp 			break;
 2228 7848a0e1 2020-03-19 stsp 		case 'r':
 2229 7848a0e1 2020-03-19 stsp 			repo_path = realpath(optarg, NULL);
 2230 7848a0e1 2020-03-19 stsp 			if (repo_path == NULL)
 2231 7848a0e1 2020-03-19 stsp 				return got_error_from_errno2("realpath",
 2232 7848a0e1 2020-03-19 stsp 				    optarg);
 2233 7848a0e1 2020-03-19 stsp 			got_path_strip_trailing_slashes(repo_path);
 2234 7848a0e1 2020-03-19 stsp 			break;
 2235 db6d8ad8 2020-03-21 stsp 		case 't':
 2236 db6d8ad8 2020-03-21 stsp 			replace_tags = 1;
 2237 db6d8ad8 2020-03-21 stsp 			break;
 2238 7848a0e1 2020-03-19 stsp 		case 'v':
 2239 7848a0e1 2020-03-19 stsp 			if (verbosity < 0)
 2240 7848a0e1 2020-03-19 stsp 				verbosity = 0;
 2241 7848a0e1 2020-03-19 stsp 			else if (verbosity < 3)
 2242 7848a0e1 2020-03-19 stsp 				verbosity++;
 2243 7848a0e1 2020-03-19 stsp 			break;
 2244 7848a0e1 2020-03-19 stsp 		case 'q':
 2245 7848a0e1 2020-03-19 stsp 			verbosity = -1;
 2246 7848a0e1 2020-03-19 stsp 			break;
 2247 0e4002ca 2020-03-21 stsp 		case 'R':
 2248 0e4002ca 2020-03-21 stsp 			error = got_pathlist_append(&wanted_refs,
 2249 0e4002ca 2020-03-21 stsp 			    optarg, NULL);
 2250 0e4002ca 2020-03-21 stsp 			if (error)
 2251 0e4002ca 2020-03-21 stsp 				return error;
 2252 0e4002ca 2020-03-21 stsp 			break;
 2253 161728eb 2021-07-24 stsp 		case 'X':
 2254 161728eb 2021-07-24 stsp 			delete_remote = 1;
 2255 161728eb 2021-07-24 stsp 			break;
 2256 7848a0e1 2020-03-19 stsp 		default:
 2257 7848a0e1 2020-03-19 stsp 			usage_fetch();
 2258 7848a0e1 2020-03-19 stsp 			break;
 2259 7848a0e1 2020-03-19 stsp 		}
 2260 7848a0e1 2020-03-19 stsp 	}
 2261 7848a0e1 2020-03-19 stsp 	argc -= optind;
 2262 7848a0e1 2020-03-19 stsp 	argv += optind;
 2263 7848a0e1 2020-03-19 stsp 
 2264 4ba14133 2020-03-20 stsp 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
 2265 ff69268e 2020-12-13 stsp 		option_conflict('a', 'b');
 2266 41b0de12 2020-03-21 stsp 	if (list_refs_only) {
 2267 41b0de12 2020-03-21 stsp 		if (!TAILQ_EMPTY(&wanted_branches))
 2268 ff69268e 2020-12-13 stsp 			option_conflict('l', 'b');
 2269 ff69268e 2020-12-13 stsp 		if (fetch_all_branches)
 2270 ff69268e 2020-12-13 stsp 			option_conflict('l', 'a');
 2271 f21ec2f0 2020-03-21 stsp 		if (delete_refs)
 2272 ff69268e 2020-12-13 stsp 			option_conflict('l', 'd');
 2273 161728eb 2021-07-24 stsp 		if (delete_remote)
 2274 161728eb 2021-07-24 stsp 			option_conflict('l', 'X');
 2275 41b0de12 2020-03-21 stsp 	}
 2276 161728eb 2021-07-24 stsp 	if (delete_remote) {
 2277 161728eb 2021-07-24 stsp 		if (fetch_all_branches)
 2278 161728eb 2021-07-24 stsp 			option_conflict('X', 'a');
 2279 161728eb 2021-07-24 stsp 		if (!TAILQ_EMPTY(&wanted_branches))
 2280 161728eb 2021-07-24 stsp 			option_conflict('X', 'b');
 2281 161728eb 2021-07-24 stsp 		if (delete_refs)
 2282 161728eb 2021-07-24 stsp 			option_conflict('X', 'd');
 2283 161728eb 2021-07-24 stsp 		if (replace_tags)
 2284 161728eb 2021-07-24 stsp 			option_conflict('X', 't');
 2285 161728eb 2021-07-24 stsp 		if (!TAILQ_EMPTY(&wanted_refs))
 2286 161728eb 2021-07-24 stsp 			option_conflict('X', 'R');
 2287 161728eb 2021-07-24 stsp 	}
 2288 161728eb 2021-07-24 stsp 
 2289 161728eb 2021-07-24 stsp 	if (argc == 0) {
 2290 161728eb 2021-07-24 stsp 		if (delete_remote)
 2291 161728eb 2021-07-24 stsp 			errx(1, "-X option requires a remote name");
 2292 7848a0e1 2020-03-19 stsp 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
 2293 161728eb 2021-07-24 stsp 	} else if (argc == 1)
 2294 7848a0e1 2020-03-19 stsp 		remote_name = argv[0];
 2295 7848a0e1 2020-03-19 stsp 	else
 2296 7848a0e1 2020-03-19 stsp 		usage_fetch();
 2297 7848a0e1 2020-03-19 stsp 
 2298 7848a0e1 2020-03-19 stsp 	cwd = getcwd(NULL, 0);
 2299 7848a0e1 2020-03-19 stsp 	if (cwd == NULL) {
 2300 7848a0e1 2020-03-19 stsp 		error = got_error_from_errno("getcwd");
 2301 7848a0e1 2020-03-19 stsp 		goto done;
 2302 7848a0e1 2020-03-19 stsp 	}
 2303 7848a0e1 2020-03-19 stsp 
 2304 7848a0e1 2020-03-19 stsp 	if (repo_path == NULL) {
 2305 7848a0e1 2020-03-19 stsp 		error = got_worktree_open(&worktree, cwd);
 2306 7848a0e1 2020-03-19 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 2307 7848a0e1 2020-03-19 stsp 			goto done;
 2308 7848a0e1 2020-03-19 stsp 		else
 2309 7848a0e1 2020-03-19 stsp 			error = NULL;
 2310 7848a0e1 2020-03-19 stsp 		if (worktree) {
 2311 7848a0e1 2020-03-19 stsp 			repo_path =
 2312 7848a0e1 2020-03-19 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 2313 7848a0e1 2020-03-19 stsp 			if (repo_path == NULL)
 2314 7848a0e1 2020-03-19 stsp 				error = got_error_from_errno("strdup");
 2315 7848a0e1 2020-03-19 stsp 			if (error)
 2316 7848a0e1 2020-03-19 stsp 				goto done;
 2317 7848a0e1 2020-03-19 stsp 		} else {
 2318 7848a0e1 2020-03-19 stsp 			repo_path = strdup(cwd);
 2319 7848a0e1 2020-03-19 stsp 			if (repo_path == NULL) {
 2320 7848a0e1 2020-03-19 stsp 				error = got_error_from_errno("strdup");
 2321 7848a0e1 2020-03-19 stsp 				goto done;
 2322 7848a0e1 2020-03-19 stsp 			}
 2323 7848a0e1 2020-03-19 stsp 		}
 2324 7848a0e1 2020-03-19 stsp 	}
 2325 7848a0e1 2020-03-19 stsp 
 2326 7848a0e1 2020-03-19 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 2327 7848a0e1 2020-03-19 stsp 	if (error)
 2328 7848a0e1 2020-03-19 stsp 		goto done;
 2329 7848a0e1 2020-03-19 stsp 
 2330 161728eb 2021-07-24 stsp 	if (delete_remote) {
 2331 161728eb 2021-07-24 stsp 		error = delete_refs_for_remote(repo, remote_name);
 2332 161728eb 2021-07-24 stsp 		goto done; /* nothing else to do */
 2333 161728eb 2021-07-24 stsp 	}
 2334 161728eb 2021-07-24 stsp 
 2335 50b0790e 2020-09-11 stsp 	if (worktree) {
 2336 50b0790e 2020-09-11 stsp 		worktree_conf = got_worktree_get_gotconfig(worktree);
 2337 50b0790e 2020-09-11 stsp 		if (worktree_conf) {
 2338 50b0790e 2020-09-11 stsp 			got_gotconfig_get_remotes(&nremotes, &remotes,
 2339 50b0790e 2020-09-11 stsp 			    worktree_conf);
 2340 50b0790e 2020-09-11 stsp 			for (i = 0; i < nremotes; i++) {
 2341 54eb00d5 2020-10-20 stsp 				if (strcmp(remotes[i].name, remote_name) == 0) {
 2342 54eb00d5 2020-10-20 stsp 					remote = &remotes[i];
 2343 50b0790e 2020-09-11 stsp 					break;
 2344 54eb00d5 2020-10-20 stsp 				}
 2345 50b0790e 2020-09-11 stsp 			}
 2346 50b0790e 2020-09-11 stsp 		}
 2347 7848a0e1 2020-03-19 stsp 	}
 2348 50b0790e 2020-09-11 stsp 	if (remote == NULL) {
 2349 50b0790e 2020-09-11 stsp 		repo_conf = got_repo_get_gotconfig(repo);
 2350 50b0790e 2020-09-11 stsp 		if (repo_conf) {
 2351 50b0790e 2020-09-11 stsp 			got_gotconfig_get_remotes(&nremotes, &remotes,
 2352 50b0790e 2020-09-11 stsp 			    repo_conf);
 2353 50b0790e 2020-09-11 stsp 			for (i = 0; i < nremotes; i++) {
 2354 54eb00d5 2020-10-20 stsp 				if (strcmp(remotes[i].name, remote_name) == 0) {
 2355 54eb00d5 2020-10-20 stsp 					remote = &remotes[i];
 2356 50b0790e 2020-09-11 stsp 					break;
 2357 54eb00d5 2020-10-20 stsp 				}
 2358 50b0790e 2020-09-11 stsp 			}
 2359 50b0790e 2020-09-11 stsp 		}
 2360 50b0790e 2020-09-11 stsp 	}
 2361 50b0790e 2020-09-11 stsp 	if (remote == NULL) {
 2362 257add31 2020-09-09 stsp 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
 2363 257add31 2020-09-09 stsp 		for (i = 0; i < nremotes; i++) {
 2364 54eb00d5 2020-10-20 stsp 			if (strcmp(remotes[i].name, remote_name) == 0) {
 2365 54eb00d5 2020-10-20 stsp 				remote = &remotes[i];
 2366 257add31 2020-09-09 stsp 				break;
 2367 54eb00d5 2020-10-20 stsp 			}
 2368 257add31 2020-09-09 stsp 		}
 2369 7848a0e1 2020-03-19 stsp 	}
 2370 50b0790e 2020-09-11 stsp 	if (remote == NULL) {
 2371 50b0790e 2020-09-11 stsp 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
 2372 50b0790e 2020-09-11 stsp 		goto done;
 2373 b8adfa55 2020-09-25 stsp 	}
 2374 b8adfa55 2020-09-25 stsp 
 2375 0c8b29c5 2021-01-05 stsp 	if (TAILQ_EMPTY(&wanted_branches)) {
 2376 0c8b29c5 2021-01-05 stsp 		if (!fetch_all_branches)
 2377 0c8b29c5 2021-01-05 stsp 			fetch_all_branches = remote->fetch_all_branches;
 2378 6480c871 2021-08-30 stsp 		for (i = 0; i < remote->nfetch_branches; i++) {
 2379 b8adfa55 2020-09-25 stsp 			got_pathlist_append(&wanted_branches,
 2380 6480c871 2021-08-30 stsp 			    remote->fetch_branches[i], NULL);
 2381 99495ddb 2021-01-10 stsp 		}
 2382 99495ddb 2021-01-10 stsp 	}
 2383 99495ddb 2021-01-10 stsp 	if (TAILQ_EMPTY(&wanted_refs)) {
 2384 6480c871 2021-08-30 stsp 		for (i = 0; i < remote->nfetch_refs; i++) {
 2385 99495ddb 2021-01-10 stsp 			got_pathlist_append(&wanted_refs,
 2386 6480c871 2021-08-30 stsp 			    remote->fetch_refs[i], NULL);
 2387 b8adfa55 2020-09-25 stsp 		}
 2388 50b0790e 2020-09-11 stsp 	}
 2389 7848a0e1 2020-03-19 stsp 
 2390 5e5da8c4 2021-09-05 stsp 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
 2391 6480c871 2021-08-30 stsp 	    &repo_name, remote->fetch_url);
 2392 7848a0e1 2020-03-19 stsp 	if (error)
 2393 7848a0e1 2020-03-19 stsp 		goto done;
 2394 7848a0e1 2020-03-19 stsp 
 2395 7848a0e1 2020-03-19 stsp 	if (strcmp(proto, "git") == 0) {
 2396 7848a0e1 2020-03-19 stsp #ifndef PROFILE
 2397 7848a0e1 2020-03-19 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 2398 7848a0e1 2020-03-19 stsp 		    "sendfd dns inet unveil", NULL) == -1)
 2399 7848a0e1 2020-03-19 stsp 			err(1, "pledge");
 2400 7848a0e1 2020-03-19 stsp #endif
 2401 7848a0e1 2020-03-19 stsp 	} else if (strcmp(proto, "git+ssh") == 0 ||
 2402 7848a0e1 2020-03-19 stsp 	    strcmp(proto, "ssh") == 0) {
 2403 7848a0e1 2020-03-19 stsp #ifndef PROFILE
 2404 7848a0e1 2020-03-19 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 2405 7848a0e1 2020-03-19 stsp 		    "sendfd unveil", NULL) == -1)
 2406 7848a0e1 2020-03-19 stsp 			err(1, "pledge");
 2407 7848a0e1 2020-03-19 stsp #endif
 2408 7848a0e1 2020-03-19 stsp 	} else if (strcmp(proto, "http") == 0 ||
 2409 7848a0e1 2020-03-19 stsp 	    strcmp(proto, "git+http") == 0) {
 2410 7848a0e1 2020-03-19 stsp 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
 2411 7848a0e1 2020-03-19 stsp 		goto done;
 2412 7848a0e1 2020-03-19 stsp 	} else {
 2413 7848a0e1 2020-03-19 stsp 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
 2414 7848a0e1 2020-03-19 stsp 		goto done;
 2415 7848a0e1 2020-03-19 stsp 	}
 2416 7848a0e1 2020-03-19 stsp 
 2417 d65a88a2 2021-09-05 stsp 	error = got_dial_apply_unveil(proto);
 2418 d65a88a2 2021-09-05 stsp 	if (error)
 2419 d65a88a2 2021-09-05 stsp 		goto done;
 2420 d65a88a2 2021-09-05 stsp 
 2421 7848a0e1 2020-03-19 stsp 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
 2422 7848a0e1 2020-03-19 stsp 	if (error)
 2423 7848a0e1 2020-03-19 stsp 		goto done;
 2424 f79e6490 2020-04-19 stsp 
 2425 f79e6490 2020-04-19 stsp 	if (verbosity >= 0)
 2426 f79e6490 2020-04-19 stsp 		printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
 2427 f79e6490 2020-04-19 stsp 		    port ? ":" : "", port ? port : "");
 2428 7848a0e1 2020-03-19 stsp 
 2429 9c52365f 2020-03-21 stsp 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
 2430 9c52365f 2020-03-21 stsp 	    server_path, verbosity);
 2431 7848a0e1 2020-03-19 stsp 	if (error)
 2432 7848a0e1 2020-03-19 stsp 		goto done;
 2433 7848a0e1 2020-03-19 stsp 
 2434 7848a0e1 2020-03-19 stsp 	fpa.last_scaled_size[0] = '\0';
 2435 7848a0e1 2020-03-19 stsp 	fpa.last_p_indexed = -1;
 2436 7848a0e1 2020-03-19 stsp 	fpa.last_p_resolved = -1;
 2437 7848a0e1 2020-03-19 stsp 	fpa.verbosity = verbosity;
 2438 04d9a9ec 2020-09-24 stsp 	fpa.repo = repo;
 2439 04d9a9ec 2020-09-24 stsp 	fpa.create_configs = 0;
 2440 04d9a9ec 2020-09-24 stsp 	fpa.configs_created = 0;
 2441 04d9a9ec 2020-09-24 stsp 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
 2442 7848a0e1 2020-03-19 stsp 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
 2443 4ba14133 2020-03-20 stsp 	    remote->mirror_references, fetch_all_branches, &wanted_branches,
 2444 0e4002ca 2020-03-21 stsp 	    &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
 2445 0e4002ca 2020-03-21 stsp 	    fetch_progress, &fpa);
 2446 7848a0e1 2020-03-19 stsp 	if (error)
 2447 7848a0e1 2020-03-19 stsp 		goto done;
 2448 7848a0e1 2020-03-19 stsp 
 2449 41b0de12 2020-03-21 stsp 	if (list_refs_only) {
 2450 41b0de12 2020-03-21 stsp 		error = list_remote_refs(&symrefs, &refs);
 2451 41b0de12 2020-03-21 stsp 		goto done;
 2452 41b0de12 2020-03-21 stsp 	}
 2453 41b0de12 2020-03-21 stsp 
 2454 7848a0e1 2020-03-19 stsp 	if (pack_hash == NULL) {
 2455 7848a0e1 2020-03-19 stsp 		if (verbosity >= 0)
 2456 7848a0e1 2020-03-19 stsp 			printf("Already up-to-date\n");
 2457 bcf34b0e 2020-03-26 stsp 	} else if (verbosity >= 0) {
 2458 984065c8 2020-03-19 stsp 		error = got_object_id_str(&id_str, pack_hash);
 2459 984065c8 2020-03-19 stsp 		if (error)
 2460 984065c8 2020-03-19 stsp 			goto done;
 2461 e69674d8 2020-03-19 stsp 		printf("\nFetched %s.pack\n", id_str);
 2462 984065c8 2020-03-19 stsp 		free(id_str);
 2463 984065c8 2020-03-19 stsp 		id_str = NULL;
 2464 984065c8 2020-03-19 stsp 	}
 2465 7848a0e1 2020-03-19 stsp 
 2466 7848a0e1 2020-03-19 stsp 	/* Update references provided with the pack file. */
 2467 7848a0e1 2020-03-19 stsp 	TAILQ_FOREACH(pe, &refs, entry) {
 2468 7848a0e1 2020-03-19 stsp 		const char *refname = pe->path;
 2469 7848a0e1 2020-03-19 stsp 		struct got_object_id *id = pe->data;
 2470 7848a0e1 2020-03-19 stsp 		struct got_reference *ref;
 2471 7848a0e1 2020-03-19 stsp 		char *remote_refname;
 2472 7848a0e1 2020-03-19 stsp 
 2473 0e4002ca 2020-03-21 stsp 		if (is_wanted_ref(&wanted_refs, refname) &&
 2474 0e4002ca 2020-03-21 stsp 		    !remote->mirror_references) {
 2475 0e4002ca 2020-03-21 stsp 			error = update_wanted_ref(refname, id,
 2476 0e4002ca 2020-03-21 stsp 			    remote->name, verbosity, repo);
 2477 0e4002ca 2020-03-21 stsp 			if (error)
 2478 0e4002ca 2020-03-21 stsp 				goto done;
 2479 0e4002ca 2020-03-21 stsp 			continue;
 2480 0e4002ca 2020-03-21 stsp 		}
 2481 0e4002ca 2020-03-21 stsp 
 2482 1510c839 2020-03-20 stsp 		if (remote->mirror_references ||
 2483 1510c839 2020-03-20 stsp 		    strncmp("refs/tags/", refname, 10) == 0) {
 2484 9f142382 2020-03-21 stsp 			error = got_ref_open(&ref, repo, refname, 1);
 2485 7848a0e1 2020-03-19 stsp 			if (error) {
 2486 7848a0e1 2020-03-19 stsp 				if (error->code != GOT_ERR_NOT_REF)
 2487 7848a0e1 2020-03-19 stsp 					goto done;
 2488 6338a6a1 2020-03-21 stsp 				error = create_ref(refname, id, verbosity,
 2489 6338a6a1 2020-03-21 stsp 				    repo);
 2490 7848a0e1 2020-03-19 stsp 				if (error)
 2491 7848a0e1 2020-03-19 stsp 					goto done;
 2492 7848a0e1 2020-03-19 stsp 			} else {
 2493 db6d8ad8 2020-03-21 stsp 				error = update_ref(ref, id, replace_tags,
 2494 db6d8ad8 2020-03-21 stsp 				    verbosity, repo);
 2495 9f142382 2020-03-21 stsp 				unlock_err = got_ref_unlock(ref);
 2496 9f142382 2020-03-21 stsp 				if (unlock_err && error == NULL)
 2497 9f142382 2020-03-21 stsp 					error = unlock_err;
 2498 7848a0e1 2020-03-19 stsp 				got_ref_close(ref);
 2499 7848a0e1 2020-03-19 stsp 				if (error)
 2500 7848a0e1 2020-03-19 stsp 					goto done;
 2501 7848a0e1 2020-03-19 stsp 			}
 2502 7848a0e1 2020-03-19 stsp 		} else if (strncmp("refs/heads/", refname, 11) == 0) {
 2503 7848a0e1 2020-03-19 stsp 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
 2504 7848a0e1 2020-03-19 stsp 			    remote_name, refname + 11) == -1) {
 2505 7848a0e1 2020-03-19 stsp 				error = got_error_from_errno("asprintf");
 2506 7848a0e1 2020-03-19 stsp 				goto done;
 2507 7848a0e1 2020-03-19 stsp 			}
 2508 7848a0e1 2020-03-19 stsp 
 2509 9f142382 2020-03-21 stsp 			error = got_ref_open(&ref, repo, remote_refname, 1);
 2510 7848a0e1 2020-03-19 stsp 			if (error) {
 2511 7848a0e1 2020-03-19 stsp 				if (error->code != GOT_ERR_NOT_REF)
 2512 7848a0e1 2020-03-19 stsp 					goto done;
 2513 6338a6a1 2020-03-21 stsp 				error = create_ref(remote_refname, id, 
 2514 688f11b3 2020-03-21 stsp 				    verbosity, repo);
 2515 7848a0e1 2020-03-19 stsp 				if (error)
 2516 7848a0e1 2020-03-19 stsp 					goto done;
 2517 7848a0e1 2020-03-19 stsp 			} else {
 2518 db6d8ad8 2020-03-21 stsp 				error = update_ref(ref, id, replace_tags,
 2519 db6d8ad8 2020-03-21 stsp 				    verbosity, repo);
 2520 9f142382 2020-03-21 stsp 				unlock_err = got_ref_unlock(ref);
 2521 9f142382 2020-03-21 stsp 				if (unlock_err && error == NULL)
 2522 9f142382 2020-03-21 stsp 					error = unlock_err;
 2523 7848a0e1 2020-03-19 stsp 				got_ref_close(ref);
 2524 7848a0e1 2020-03-19 stsp 				if (error)
 2525 7848a0e1 2020-03-19 stsp 					goto done;
 2526 7848a0e1 2020-03-19 stsp 			}
 2527 2ec30c80 2020-03-20 stsp 
 2528 2ec30c80 2020-03-20 stsp 			/* Also create a local branch if none exists yet. */
 2529 9f142382 2020-03-21 stsp 			error = got_ref_open(&ref, repo, refname, 1);
 2530 2ec30c80 2020-03-20 stsp 			if (error) {
 2531 2ec30c80 2020-03-20 stsp 				if (error->code != GOT_ERR_NOT_REF)
 2532 2ec30c80 2020-03-20 stsp 					goto done;
 2533 6338a6a1 2020-03-21 stsp 				error = create_ref(refname, id, verbosity,
 2534 6338a6a1 2020-03-21 stsp 				    repo);
 2535 2ec30c80 2020-03-20 stsp 				if (error)
 2536 2ec30c80 2020-03-20 stsp 					goto done;
 2537 9f142382 2020-03-21 stsp 			} else {
 2538 9f142382 2020-03-21 stsp 				unlock_err = got_ref_unlock(ref);
 2539 9f142382 2020-03-21 stsp 				if (unlock_err && error == NULL)
 2540 9f142382 2020-03-21 stsp 					error = unlock_err;
 2541 2ec30c80 2020-03-20 stsp 				got_ref_close(ref);
 2542 9f142382 2020-03-21 stsp 			}
 2543 7848a0e1 2020-03-19 stsp 		}
 2544 7848a0e1 2020-03-19 stsp 	}
 2545 f1bcca34 2020-03-25 stsp 	if (delete_refs) {
 2546 3789fd73 2020-03-26 stsp 		error = delete_missing_refs(&refs, &symrefs, remote,
 2547 3789fd73 2020-03-26 stsp 		    verbosity, repo);
 2548 f1bcca34 2020-03-25 stsp 		if (error)
 2549 f1bcca34 2020-03-25 stsp 			goto done;
 2550 f1bcca34 2020-03-25 stsp 	}
 2551 f1bcca34 2020-03-25 stsp 
 2552 f1bcca34 2020-03-25 stsp 	if (!remote->mirror_references) {
 2553 f1bcca34 2020-03-25 stsp 		/* Update remote HEAD reference if the server provided one. */
 2554 f1bcca34 2020-03-25 stsp 		TAILQ_FOREACH(pe, &symrefs, entry) {
 2555 f1bcca34 2020-03-25 stsp 			struct got_reference *target_ref;
 2556 f1bcca34 2020-03-25 stsp 			const char *refname = pe->path;
 2557 f1bcca34 2020-03-25 stsp 			const char *target = pe->data;
 2558 f1bcca34 2020-03-25 stsp 			char *remote_refname = NULL, *remote_target = NULL;
 2559 f1bcca34 2020-03-25 stsp 
 2560 f1bcca34 2020-03-25 stsp 			if (strcmp(refname, GOT_REF_HEAD) != 0)
 2561 f1bcca34 2020-03-25 stsp 				continue;
 2562 f1bcca34 2020-03-25 stsp 
 2563 f1bcca34 2020-03-25 stsp 			if (strncmp("refs/heads/", target, 11) != 0)
 2564 f1bcca34 2020-03-25 stsp 				continue;
 2565 f1bcca34 2020-03-25 stsp 
 2566 f1bcca34 2020-03-25 stsp 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
 2567 f1bcca34 2020-03-25 stsp 			    remote->name, refname) == -1) {
 2568 f1bcca34 2020-03-25 stsp 				error = got_error_from_errno("asprintf");
 2569 f1bcca34 2020-03-25 stsp 				goto done;
 2570 f1bcca34 2020-03-25 stsp 			}
 2571 f1bcca34 2020-03-25 stsp 			if (asprintf(&remote_target, "refs/remotes/%s/%s",
 2572 f1bcca34 2020-03-25 stsp 			    remote->name, target + 11) == -1) {
 2573 f1bcca34 2020-03-25 stsp 				error = got_error_from_errno("asprintf");
 2574 f1bcca34 2020-03-25 stsp 				free(remote_refname);
 2575 f1bcca34 2020-03-25 stsp 				goto done;
 2576 f1bcca34 2020-03-25 stsp 			}
 2577 f1bcca34 2020-03-25 stsp 
 2578 f1bcca34 2020-03-25 stsp 			error = got_ref_open(&target_ref, repo, remote_target,
 2579 f1bcca34 2020-03-25 stsp 			    0);
 2580 f1bcca34 2020-03-25 stsp 			if (error) {
 2581 f1bcca34 2020-03-25 stsp 				free(remote_refname);
 2582 f1bcca34 2020-03-25 stsp 				free(remote_target);
 2583 f1bcca34 2020-03-25 stsp 				if (error->code == GOT_ERR_NOT_REF) {
 2584 f1bcca34 2020-03-25 stsp 					error = NULL;
 2585 f1bcca34 2020-03-25 stsp 					continue;
 2586 f1bcca34 2020-03-25 stsp 				}
 2587 f1bcca34 2020-03-25 stsp 				goto done;
 2588 f1bcca34 2020-03-25 stsp 			}
 2589 f1bcca34 2020-03-25 stsp 			error = update_symref(remote_refname, target_ref,
 2590 f1bcca34 2020-03-25 stsp 			    verbosity, repo);
 2591 f1bcca34 2020-03-25 stsp 			free(remote_refname);
 2592 f1bcca34 2020-03-25 stsp 			free(remote_target);
 2593 f1bcca34 2020-03-25 stsp 			got_ref_close(target_ref);
 2594 f1bcca34 2020-03-25 stsp 			if (error)
 2595 f1bcca34 2020-03-25 stsp 				goto done;
 2596 f1bcca34 2020-03-25 stsp 		}
 2597 f1bcca34 2020-03-25 stsp 	}
 2598 7848a0e1 2020-03-19 stsp done:
 2599 9c52365f 2020-03-21 stsp 	if (fetchpid > 0) {
 2600 9c52365f 2020-03-21 stsp 		if (kill(fetchpid, SIGTERM) == -1)
 2601 9c52365f 2020-03-21 stsp 			error = got_error_from_errno("kill");
 2602 9c52365f 2020-03-21 stsp 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
 2603 9c52365f 2020-03-21 stsp 			error = got_error_from_errno("waitpid");
 2604 9c52365f 2020-03-21 stsp 	}
 2605 7848a0e1 2020-03-19 stsp 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
 2606 7848a0e1 2020-03-19 stsp 		error = got_error_from_errno("close");
 2607 1d0f4054 2021-06-17 stsp 	if (repo) {
 2608 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 2609 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 2610 1d0f4054 2021-06-17 stsp 			error = close_err;
 2611 1d0f4054 2021-06-17 stsp 	}
 2612 7848a0e1 2020-03-19 stsp 	if (worktree)
 2613 7848a0e1 2020-03-19 stsp 		got_worktree_close(worktree);
 2614 7848a0e1 2020-03-19 stsp 	TAILQ_FOREACH(pe, &refs, entry) {
 2615 7848a0e1 2020-03-19 stsp 		free((void *)pe->path);
 2616 7848a0e1 2020-03-19 stsp 		free(pe->data);
 2617 7848a0e1 2020-03-19 stsp 	}
 2618 7848a0e1 2020-03-19 stsp 	got_pathlist_free(&refs);
 2619 7848a0e1 2020-03-19 stsp 	TAILQ_FOREACH(pe, &symrefs, entry) {
 2620 7848a0e1 2020-03-19 stsp 		free((void *)pe->path);
 2621 7848a0e1 2020-03-19 stsp 		free(pe->data);
 2622 7848a0e1 2020-03-19 stsp 	}
 2623 7848a0e1 2020-03-19 stsp 	got_pathlist_free(&symrefs);
 2624 4ba14133 2020-03-20 stsp 	got_pathlist_free(&wanted_branches);
 2625 0e4002ca 2020-03-21 stsp 	got_pathlist_free(&wanted_refs);
 2626 7848a0e1 2020-03-19 stsp 	free(id_str);
 2627 7848a0e1 2020-03-19 stsp 	free(cwd);
 2628 7848a0e1 2020-03-19 stsp 	free(repo_path);
 2629 7848a0e1 2020-03-19 stsp 	free(pack_hash);
 2630 7848a0e1 2020-03-19 stsp 	free(proto);
 2631 7848a0e1 2020-03-19 stsp 	free(host);
 2632 7848a0e1 2020-03-19 stsp 	free(port);
 2633 7848a0e1 2020-03-19 stsp 	free(server_path);
 2634 7848a0e1 2020-03-19 stsp 	free(repo_name);
 2635 7848a0e1 2020-03-19 stsp 	return error;
 2636 7848a0e1 2020-03-19 stsp }
 2637 7848a0e1 2020-03-19 stsp 
 2638 7848a0e1 2020-03-19 stsp 
 2639 7848a0e1 2020-03-19 stsp __dead static void
 2640 2ab43947 2020-03-18 stsp usage_checkout(void)
 2641 2ab43947 2020-03-18 stsp {
 2642 2ab43947 2020-03-18 stsp 	fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
 2643 4ad4a1ec 2021-09-13 tracey 	    "[-p prefix] [-q] repository-path [worktree-path]\n",
 2644 4ad4a1ec 2021-09-13 tracey 	    getprogname());
 2645 2ab43947 2020-03-18 stsp 	exit(1);
 2646 2ab43947 2020-03-18 stsp }
 2647 2ab43947 2020-03-18 stsp 
 2648 2ab43947 2020-03-18 stsp static void
 2649 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
 2650 2ab43947 2020-03-18 stsp {
 2651 2ab43947 2020-03-18 stsp 	fprintf(stderr, "%s: warning: could not create a reference "
 2652 2ab43947 2020-03-18 stsp 	    "to the work tree's base commit; the commit could be "
 2653 e6786710 2021-07-03 stsp 	    "garbage-collected by Git or 'gotadmin cleanup'; making the "
 2654 e6786710 2021-07-03 stsp 	    "repository writable and running 'got update' will prevent this\n",
 2655 2ab43947 2020-03-18 stsp 	    getprogname());
 2656 2ab43947 2020-03-18 stsp }
 2657 2ab43947 2020-03-18 stsp 
 2658 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
 2659 2ab43947 2020-03-18 stsp 	const char *worktree_path;
 2660 2ab43947 2020-03-18 stsp 	int had_base_commit_ref_error;
 2661 4ad4a1ec 2021-09-13 tracey 	int verbosity;
 2662 2ab43947 2020-03-18 stsp };
 2663 2ab43947 2020-03-18 stsp 
 2664 2ab43947 2020-03-18 stsp static const struct got_error *
 2665 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
 2666 2ab43947 2020-03-18 stsp {
 2667 2ab43947 2020-03-18 stsp 	struct got_checkout_progress_arg *a = arg;
 2668 2ab43947 2020-03-18 stsp 
 2669 2ab43947 2020-03-18 stsp 	/* Base commit bump happens silently. */
 2670 2ab43947 2020-03-18 stsp 	if (status == GOT_STATUS_BUMP_BASE)
 2671 2ab43947 2020-03-18 stsp 		return NULL;
 2672 2ab43947 2020-03-18 stsp 
 2673 2ab43947 2020-03-18 stsp 	if (status == GOT_STATUS_BASE_REF_ERR) {
 2674 2ab43947 2020-03-18 stsp 		a->had_base_commit_ref_error = 1;
 2675 2ab43947 2020-03-18 stsp 		return NULL;
 2676 2ab43947 2020-03-18 stsp 	}
 2677 2ab43947 2020-03-18 stsp 
 2678 2ab43947 2020-03-18 stsp 	while (path[0] == '/')
 2679 2ab43947 2020-03-18 stsp 		path++;
 2680 2ab43947 2020-03-18 stsp 
 2681 4ad4a1ec 2021-09-13 tracey 	if (a->verbosity >= 0)
 2682 4ad4a1ec 2021-09-13 tracey 		printf("%c  %s/%s\n", status, a->worktree_path, path);
 2683 4ad4a1ec 2021-09-13 tracey 
 2684 2ab43947 2020-03-18 stsp 	return NULL;
 2685 2ab43947 2020-03-18 stsp }
 2686 2ab43947 2020-03-18 stsp 
 2687 2ab43947 2020-03-18 stsp static const struct got_error *
 2688 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
 2689 2ab43947 2020-03-18 stsp {
 2690 2ab43947 2020-03-18 stsp 	if (sigint_received || sigpipe_received)
 2691 2ab43947 2020-03-18 stsp 		return got_error(GOT_ERR_CANCELLED);
 2692 2ab43947 2020-03-18 stsp 	return NULL;
 2693 2ab43947 2020-03-18 stsp }
 2694 2ab43947 2020-03-18 stsp 
 2695 2ab43947 2020-03-18 stsp static const struct got_error *
 2696 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
 2697 2ab43947 2020-03-18 stsp     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
 2698 2ab43947 2020-03-18 stsp     struct got_repository *repo)
 2699 2ab43947 2020-03-18 stsp {
 2700 2ab43947 2020-03-18 stsp 	const struct got_error *err = NULL;
 2701 2ab43947 2020-03-18 stsp 	struct got_object_id *yca_id;
 2702 2ab43947 2020-03-18 stsp 
 2703 2ab43947 2020-03-18 stsp 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
 2704 768705e3 2021-09-27 thomas 	    commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
 2705 2ab43947 2020-03-18 stsp 	if (err)
 2706 2ab43947 2020-03-18 stsp 		return err;
 2707 2ab43947 2020-03-18 stsp 
 2708 2ab43947 2020-03-18 stsp 	if (yca_id == NULL)
 2709 2ab43947 2020-03-18 stsp 		return got_error(GOT_ERR_ANCESTRY);
 2710 2ab43947 2020-03-18 stsp 
 2711 2ab43947 2020-03-18 stsp 	/*
 2712 2ab43947 2020-03-18 stsp 	 * Require a straight line of history between the target commit
 2713 2ab43947 2020-03-18 stsp 	 * and the work tree's base commit.
 2714 2ab43947 2020-03-18 stsp 	 *
 2715 2ab43947 2020-03-18 stsp 	 * Non-linear situations such as this require a rebase:
 2716 2ab43947 2020-03-18 stsp 	 *
 2717 2ab43947 2020-03-18 stsp 	 * (commit) D       F (base_commit)
 2718 2ab43947 2020-03-18 stsp 	 *           \     /
 2719 2ab43947 2020-03-18 stsp 	 *            C   E
 2720 2ab43947 2020-03-18 stsp 	 *             \ /
 2721 2ab43947 2020-03-18 stsp 	 *              B (yca)
 2722 2ab43947 2020-03-18 stsp 	 *              |
 2723 2ab43947 2020-03-18 stsp 	 *              A
 2724 2ab43947 2020-03-18 stsp 	 *
 2725 2ab43947 2020-03-18 stsp 	 * 'got update' only handles linear cases:
 2726 2ab43947 2020-03-18 stsp 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
 2727 2ab43947 2020-03-18 stsp 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
 2728 2ab43947 2020-03-18 stsp 	 */
 2729 2ab43947 2020-03-18 stsp 	if (allow_forwards_in_time_only) {
 2730 2ab43947 2020-03-18 stsp 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
 2731 2ab43947 2020-03-18 stsp 		return got_error(GOT_ERR_ANCESTRY);
 2732 2ab43947 2020-03-18 stsp 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
 2733 2ab43947 2020-03-18 stsp 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
 2734 2ab43947 2020-03-18 stsp 		return got_error(GOT_ERR_ANCESTRY);
 2735 2ab43947 2020-03-18 stsp 
 2736 2ab43947 2020-03-18 stsp 	free(yca_id);
 2737 2ab43947 2020-03-18 stsp 	return NULL;
 2738 2ab43947 2020-03-18 stsp }
 2739 2ab43947 2020-03-18 stsp 
 2740 2ab43947 2020-03-18 stsp static const struct got_error *
 2741 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
 2742 2ab43947 2020-03-18 stsp     struct got_reference *head_ref, struct got_object_id *yca_id,
 2743 2ab43947 2020-03-18 stsp     struct got_repository *repo)
 2744 2ab43947 2020-03-18 stsp {
 2745 2ab43947 2020-03-18 stsp 	const struct got_error *err = NULL;
 2746 2ab43947 2020-03-18 stsp 	struct got_commit_graph *graph = NULL;
 2747 2ab43947 2020-03-18 stsp 	struct got_object_id *head_commit_id = NULL;
 2748 2ab43947 2020-03-18 stsp 	int is_same_branch = 0;
 2749 2ab43947 2020-03-18 stsp 
 2750 2ab43947 2020-03-18 stsp 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
 2751 2ab43947 2020-03-18 stsp 	if (err)
 2752 2ab43947 2020-03-18 stsp 		goto done;
 2753 2ab43947 2020-03-18 stsp 
 2754 2ab43947 2020-03-18 stsp 	if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
 2755 2ab43947 2020-03-18 stsp 		is_same_branch = 1;
 2756 2ab43947 2020-03-18 stsp 		goto done;
 2757 2ab43947 2020-03-18 stsp 	}
 2758 2ab43947 2020-03-18 stsp 	if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
 2759 2ab43947 2020-03-18 stsp 		is_same_branch = 1;
 2760 2ab43947 2020-03-18 stsp 		goto done;
 2761 2ab43947 2020-03-18 stsp 	}
 2762 2ab43947 2020-03-18 stsp 
 2763 2ab43947 2020-03-18 stsp 	err = got_commit_graph_open(&graph, "/", 1);
 2764 2ab43947 2020-03-18 stsp 	if (err)
 2765 2ab43947 2020-03-18 stsp 		goto done;
 2766 2ab43947 2020-03-18 stsp 
 2767 2ab43947 2020-03-18 stsp 	err = got_commit_graph_iter_start(graph, head_commit_id, repo,
 2768 2ab43947 2020-03-18 stsp 	    check_cancelled, NULL);
 2769 2ab43947 2020-03-18 stsp 	if (err)
 2770 2ab43947 2020-03-18 stsp 		goto done;
 2771 2ab43947 2020-03-18 stsp 
 2772 2ab43947 2020-03-18 stsp 	for (;;) {
 2773 2ab43947 2020-03-18 stsp 		struct got_object_id *id;
 2774 2ab43947 2020-03-18 stsp 		err = got_commit_graph_iter_next(&id, graph, repo,
 2775 2ab43947 2020-03-18 stsp 		    check_cancelled, NULL);
 2776 2ab43947 2020-03-18 stsp 		if (err) {
 2777 2ab43947 2020-03-18 stsp 			if (err->code == GOT_ERR_ITER_COMPLETED)
 2778 2ab43947 2020-03-18 stsp 				err = NULL;
 2779 2ab43947 2020-03-18 stsp 			break;
 2780 2ab43947 2020-03-18 stsp 		}
 2781 2ab43947 2020-03-18 stsp 
 2782 2ab43947 2020-03-18 stsp 		if (id) {
 2783 2ab43947 2020-03-18 stsp 			if (yca_id && got_object_id_cmp(id, yca_id) == 0)
 2784 2ab43947 2020-03-18 stsp 				break;
 2785 2ab43947 2020-03-18 stsp 			if (got_object_id_cmp(id, commit_id) == 0) {
 2786 2ab43947 2020-03-18 stsp 				is_same_branch = 1;
 2787 2ab43947 2020-03-18 stsp 				break;
 2788 2ab43947 2020-03-18 stsp 			}
 2789 2ab43947 2020-03-18 stsp 		}
 2790 2ab43947 2020-03-18 stsp 	}
 2791 2ab43947 2020-03-18 stsp done:
 2792 2ab43947 2020-03-18 stsp 	if (graph)
 2793 2ab43947 2020-03-18 stsp 		got_commit_graph_close(graph);
 2794 2ab43947 2020-03-18 stsp 	free(head_commit_id);
 2795 2ab43947 2020-03-18 stsp 	if (!err && !is_same_branch)
 2796 2ab43947 2020-03-18 stsp 		err = got_error(GOT_ERR_ANCESTRY);
 2797 2ab43947 2020-03-18 stsp 	return err;
 2798 a367ff0f 2019-05-14 stsp }
 2799 8069f636 2019-01-12 stsp 
 2800 4ed7e80c 2018-05-20 stsp static const struct got_error *
 2801 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
 2802 4b6c9460 2020-03-05 stsp {
 2803 4b6c9460 2020-03-05 stsp 	static char msg[512];
 2804 4b6c9460 2020-03-05 stsp 	const char *branch_name;
 2805 4b6c9460 2020-03-05 stsp 
 2806 4b6c9460 2020-03-05 stsp 	if (got_ref_is_symbolic(ref))
 2807 4b6c9460 2020-03-05 stsp 		branch_name = got_ref_get_symref_target(ref);
 2808 4b6c9460 2020-03-05 stsp 	else
 2809 4b6c9460 2020-03-05 stsp 		branch_name = got_ref_get_name(ref);
 2810 4b6c9460 2020-03-05 stsp 
 2811 4b6c9460 2020-03-05 stsp 	if (strncmp("refs/heads/", branch_name, 11) == 0)
 2812 4b6c9460 2020-03-05 stsp 		branch_name += 11;
 2813 4b6c9460 2020-03-05 stsp 
 2814 4b6c9460 2020-03-05 stsp 	snprintf(msg, sizeof(msg),
 2815 4b6c9460 2020-03-05 stsp 	    "target commit is not contained in branch '%s'; "
 2816 4b6c9460 2020-03-05 stsp 	    "the branch to use must be specified with -b; "
 2817 4b6c9460 2020-03-05 stsp 	    "if necessary a new branch can be created for "
 2818 4b6c9460 2020-03-05 stsp 	    "this commit with 'got branch -c %s BRANCH_NAME'",
 2819 4b6c9460 2020-03-05 stsp 	    branch_name, commit_id_str);
 2820 4b6c9460 2020-03-05 stsp 
 2821 4b6c9460 2020-03-05 stsp 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
 2822 4b6c9460 2020-03-05 stsp }
 2823 4b6c9460 2020-03-05 stsp 
 2824 4b6c9460 2020-03-05 stsp static const struct got_error *
 2825 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
 2826 c09a553d 2018-03-12 stsp {
 2827 c09a553d 2018-03-12 stsp 	const struct got_error *error = NULL;
 2828 c09a553d 2018-03-12 stsp 	struct got_repository *repo = NULL;
 2829 08e5873e 2021-09-14 stsp 	struct got_reference *head_ref = NULL, *ref = NULL;
 2830 c09a553d 2018-03-12 stsp 	struct got_worktree *worktree = NULL;
 2831 c09a553d 2018-03-12 stsp 	char *repo_path = NULL;
 2832 c09a553d 2018-03-12 stsp 	char *worktree_path = NULL;
 2833 0bb8a95e 2018-03-12 stsp 	const char *path_prefix = "";
 2834 08e5873e 2021-09-14 stsp 	const char *branch_name = GOT_REF_HEAD, *refname = NULL;
 2835 8069f636 2019-01-12 stsp 	char *commit_id_str = NULL;
 2836 08e5873e 2021-09-14 stsp 	struct got_object_id *commit_id = NULL;
 2837 f0207f6a 2020-10-19 stsp 	char *cwd = NULL;
 2838 4ad4a1ec 2021-09-13 tracey 	int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
 2839 f2ea84fa 2019-07-27 stsp 	struct got_pathlist_head paths;
 2840 7f47418f 2019-12-20 stsp 	struct got_checkout_progress_arg cpa;
 2841 f2ea84fa 2019-07-27 stsp 
 2842 f2ea84fa 2019-07-27 stsp 	TAILQ_INIT(&paths);
 2843 c09a553d 2018-03-12 stsp 
 2844 4ad4a1ec 2021-09-13 tracey 	while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
 2845 0bb8a95e 2018-03-12 stsp 		switch (ch) {
 2846 08573d5b 2019-05-14 stsp 		case 'b':
 2847 08573d5b 2019-05-14 stsp 			branch_name = optarg;
 2848 08573d5b 2019-05-14 stsp 			break;
 2849 8069f636 2019-01-12 stsp 		case 'c':
 2850 8069f636 2019-01-12 stsp 			commit_id_str = strdup(optarg);
 2851 8069f636 2019-01-12 stsp 			if (commit_id_str == NULL)
 2852 638f9024 2019-05-13 stsp 				return got_error_from_errno("strdup");
 2853 bb51a5b4 2020-01-13 stsp 			break;
 2854 bb51a5b4 2020-01-13 stsp 		case 'E':
 2855 bb51a5b4 2020-01-13 stsp 			allow_nonempty = 1;
 2856 8069f636 2019-01-12 stsp 			break;
 2857 0bb8a95e 2018-03-12 stsp 		case 'p':
 2858 0bb8a95e 2018-03-12 stsp 			path_prefix = optarg;
 2859 0bb8a95e 2018-03-12 stsp 			break;
 2860 4ad4a1ec 2021-09-13 tracey 		case 'q':
 2861 4ad4a1ec 2021-09-13 tracey 			verbosity = -1;
 2862 4ad4a1ec 2021-09-13 tracey 			break;
 2863 0bb8a95e 2018-03-12 stsp 		default:
 2864 2deda0b9 2019-03-07 stsp 			usage_checkout();
 2865 0bb8a95e 2018-03-12 stsp 			/* NOTREACHED */
 2866 0bb8a95e 2018-03-12 stsp 		}
 2867 0bb8a95e 2018-03-12 stsp 	}
 2868 0bb8a95e 2018-03-12 stsp 
 2869 0bb8a95e 2018-03-12 stsp 	argc -= optind;
 2870 0bb8a95e 2018-03-12 stsp 	argv += optind;
 2871 0bb8a95e 2018-03-12 stsp 
 2872 6715a751 2018-03-16 stsp #ifndef PROFILE
 2873 68ed9ba5 2019-02-10 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 2874 68ed9ba5 2019-02-10 stsp 	    "unveil", NULL) == -1)
 2875 c09a553d 2018-03-12 stsp 		err(1, "pledge");
 2876 6715a751 2018-03-16 stsp #endif
 2877 0bb8a95e 2018-03-12 stsp 	if (argc == 1) {
 2878 c47340da 2020-09-20 stsp 		char *base, *dotgit;
 2879 f0207f6a 2020-10-19 stsp 		const char *path;
 2880 76089277 2018-04-01 stsp 		repo_path = realpath(argv[0], NULL);
 2881 76089277 2018-04-01 stsp 		if (repo_path == NULL)
 2882 638f9024 2019-05-13 stsp 			return got_error_from_errno2("realpath", argv[0]);
 2883 c09a553d 2018-03-12 stsp 		cwd = getcwd(NULL, 0);
 2884 76089277 2018-04-01 stsp 		if (cwd == NULL) {
 2885 638f9024 2019-05-13 stsp 			error = got_error_from_errno("getcwd");
 2886 76089277 2018-04-01 stsp 			goto done;
 2887 76089277 2018-04-01 stsp 		}
 2888 c47340da 2020-09-20 stsp 		if (path_prefix[0])
 2889 f0207f6a 2020-10-19 stsp 			path = path_prefix;
 2890 c47340da 2020-09-20 stsp 		else
 2891 f0207f6a 2020-10-19 stsp 			path = repo_path;
 2892 f0207f6a 2020-10-19 stsp 		error = got_path_basename(&base, path);
 2893 f0207f6a 2020-10-19 stsp 		if (error)
 2894 c47340da 2020-09-20 stsp 			goto done;
 2895 c09a553d 2018-03-12 stsp 		dotgit = strstr(base, ".git");
 2896 c09a553d 2018-03-12 stsp 		if (dotgit)
 2897 c09a553d 2018-03-12 stsp 			*dotgit = '\0';
 2898 c09a553d 2018-03-12 stsp 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
 2899 638f9024 2019-05-13 stsp 			error = got_error_from_errno("asprintf");
 2900 f0207f6a 2020-10-19 stsp 			free(base);
 2901 76089277 2018-04-01 stsp 			goto done;
 2902 c09a553d 2018-03-12 stsp 		}
 2903 f0207f6a 2020-10-19 stsp 		free(base);
 2904 0bb8a95e 2018-03-12 stsp 	} else if (argc == 2) {
 2905 76089277 2018-04-01 stsp 		repo_path = realpath(argv[0], NULL);
 2906 76089277 2018-04-01 stsp 		if (repo_path == NULL) {
 2907 638f9024 2019-05-13 stsp 			error = got_error_from_errno2("realpath", argv[0]);
 2908 76089277 2018-04-01 stsp 			goto done;
 2909 76089277 2018-04-01 stsp 		}
 2910 f7b38925 2018-04-01 stsp 		worktree_path = realpath(argv[1], NULL);
 2911 76089277 2018-04-01 stsp 		if (worktree_path == NULL) {
 2912 b4b3a7dd 2019-07-22 stsp 			if (errno != ENOENT) {
 2913 b4b3a7dd 2019-07-22 stsp 				error = got_error_from_errno2("realpath",
 2914 b4b3a7dd 2019-07-22 stsp 				    argv[1]);
 2915 b4b3a7dd 2019-07-22 stsp 				goto done;
 2916 b4b3a7dd 2019-07-22 stsp 			}
 2917 b4b3a7dd 2019-07-22 stsp 			worktree_path = strdup(argv[1]);
 2918 b4b3a7dd 2019-07-22 stsp 			if (worktree_path == NULL) {
 2919 b4b3a7dd 2019-07-22 stsp 				error = got_error_from_errno("strdup");
 2920 b4b3a7dd 2019-07-22 stsp 				goto done;
 2921 b4b3a7dd 2019-07-22 stsp 			}
 2922 76089277 2018-04-01 stsp 		}
 2923 c09a553d 2018-03-12 stsp 	} else
 2924 c09a553d 2018-03-12 stsp 		usage_checkout();
 2925 c09a553d 2018-03-12 stsp 
 2926 7fbaa4f3 2019-05-11 stsp 	got_path_strip_trailing_slashes(repo_path);
 2927 72151b04 2019-05-11 stsp 	got_path_strip_trailing_slashes(worktree_path);
 2928 13bfb272 2019-05-10 jcs 
 2929 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 2930 c09a553d 2018-03-12 stsp 	if (error != NULL)
 2931 c02c541e 2019-03-29 stsp 		goto done;
 2932 c02c541e 2019-03-29 stsp 
 2933 c530dc23 2019-07-23 stsp 	/* Pre-create work tree path for unveil(2) */
 2934 c530dc23 2019-07-23 stsp 	error = got_path_mkdir(worktree_path);
 2935 c530dc23 2019-07-23 stsp 	if (error) {
 2936 80c1b583 2019-08-07 stsp 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
 2937 80c1b583 2019-08-07 stsp 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
 2938 c530dc23 2019-07-23 stsp 			goto done;
 2939 bb51a5b4 2020-01-13 stsp 		if (!allow_nonempty &&
 2940 bb51a5b4 2020-01-13 stsp 		    !got_path_dir_is_empty(worktree_path)) {
 2941 c530dc23 2019-07-23 stsp 			error = got_error_path(worktree_path,
 2942 c530dc23 2019-07-23 stsp 			    GOT_ERR_DIR_NOT_EMPTY);
 2943 c530dc23 2019-07-23 stsp 			goto done;
 2944 c530dc23 2019-07-23 stsp 		}
 2945 c530dc23 2019-07-23 stsp 	}
 2946 c530dc23 2019-07-23 stsp 
 2947 c530dc23 2019-07-23 stsp 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
 2948 c02c541e 2019-03-29 stsp 	if (error)
 2949 c09a553d 2018-03-12 stsp 		goto done;
 2950 8069f636 2019-01-12 stsp 
 2951 08573d5b 2019-05-14 stsp 	error = got_ref_open(&head_ref, repo, branch_name, 0);
 2952 c09a553d 2018-03-12 stsp 	if (error != NULL)
 2953 c09a553d 2018-03-12 stsp 		goto done;
 2954 c09a553d 2018-03-12 stsp 
 2955 0bb8a95e 2018-03-12 stsp 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
 2956 d70b8e30 2018-12-27 stsp 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
 2957 c09a553d 2018-03-12 stsp 		goto done;
 2958 c09a553d 2018-03-12 stsp 
 2959 c09a553d 2018-03-12 stsp 	error = got_worktree_open(&worktree, worktree_path);
 2960 c09a553d 2018-03-12 stsp 	if (error != NULL)
 2961 c09a553d 2018-03-12 stsp 		goto done;
 2962 c09a553d 2018-03-12 stsp 
 2963 e5dc7198 2018-12-29 stsp 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
 2964 e5dc7198 2018-12-29 stsp 	    path_prefix);
 2965 e5dc7198 2018-12-29 stsp 	if (error != NULL)
 2966 e5dc7198 2018-12-29 stsp 		goto done;
 2967 e5dc7198 2018-12-29 stsp 	if (!same_path_prefix) {
 2968 49520a32 2018-12-29 stsp 		error = got_error(GOT_ERR_PATH_PREFIX);
 2969 49520a32 2018-12-29 stsp 		goto done;
 2970 49520a32 2018-12-29 stsp 	}
 2971 49520a32 2018-12-29 stsp 
 2972 8069f636 2019-01-12 stsp 	if (commit_id_str) {
 2973 84de9106 2020-12-26 stsp 		struct got_reflist_head refs;
 2974 d9dff0e5 2020-12-26 stsp 		TAILQ_INIT(&refs);
 2975 84de9106 2020-12-26 stsp 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
 2976 84de9106 2020-12-26 stsp 		    NULL);
 2977 84de9106 2020-12-26 stsp 		if (error)
 2978 84de9106 2020-12-26 stsp 			goto done;
 2979 71a27632 2020-01-15 stsp 		error = got_repo_match_object_id(&commit_id, NULL,
 2980 84de9106 2020-12-26 stsp 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 2981 84de9106 2020-12-26 stsp 		got_ref_list_free(&refs);
 2982 30837e32 2019-07-25 stsp 		if (error)
 2983 8069f636 2019-01-12 stsp 			goto done;
 2984 024e9686 2019-05-14 stsp 		error = check_linear_ancestry(commit_id,
 2985 3aef623b 2019-10-15 stsp 		    got_worktree_get_base_commit_id(worktree), 0, repo);
 2986 8069f636 2019-01-12 stsp 		if (error != NULL) {
 2987 8069f636 2019-01-12 stsp 			free(commit_id);
 2988 4b6c9460 2020-03-05 stsp 			if (error->code == GOT_ERR_ANCESTRY) {
 2989 4b6c9460 2020-03-05 stsp 				error = checkout_ancestry_error(
 2990 4b6c9460 2020-03-05 stsp 				    head_ref, commit_id_str);
 2991 4b6c9460 2020-03-05 stsp 			}
 2992 8069f636 2019-01-12 stsp 			goto done;
 2993 8069f636 2019-01-12 stsp 		}
 2994 a51a74b3 2019-07-27 stsp 		error = check_same_branch(commit_id, head_ref, NULL, repo);
 2995 4b6c9460 2020-03-05 stsp 		if (error) {
 2996 4b6c9460 2020-03-05 stsp 			if (error->code == GOT_ERR_ANCESTRY) {
 2997 4b6c9460 2020-03-05 stsp 				error = checkout_ancestry_error(
 2998 4b6c9460 2020-03-05 stsp 				    head_ref, commit_id_str);
 2999 4b6c9460 2020-03-05 stsp 			}
 3000 45d344f6 2019-05-14 stsp 			goto done;
 3001 4b6c9460 2020-03-05 stsp 		}
 3002 8069f636 2019-01-12 stsp 		error = got_worktree_set_base_commit_id(worktree, repo,
 3003 8069f636 2019-01-12 stsp 		    commit_id);
 3004 8069f636 2019-01-12 stsp 		if (error)
 3005 8069f636 2019-01-12 stsp 			goto done;
 3006 08e5873e 2021-09-14 stsp 		/* Expand potentially abbreviated commit ID string. */
 3007 08e5873e 2021-09-14 stsp 		free(commit_id_str);
 3008 08e5873e 2021-09-14 stsp 		error = got_object_id_str(&commit_id_str, commit_id);
 3009 08e5873e 2021-09-14 stsp 		if (error)
 3010 08e5873e 2021-09-14 stsp 			goto done;
 3011 08e5873e 2021-09-14 stsp 	} else {
 3012 08e5873e 2021-09-14 stsp 		commit_id = got_object_id_dup(
 3013 08e5873e 2021-09-14 stsp 		    got_worktree_get_base_commit_id(worktree));
 3014 08e5873e 2021-09-14 stsp 		if (commit_id == NULL) {
 3015 08e5873e 2021-09-14 stsp 			error = got_error_from_errno("got_object_id_dup");
 3016 08e5873e 2021-09-14 stsp 			goto done;
 3017 08e5873e 2021-09-14 stsp 		}
 3018 08e5873e 2021-09-14 stsp 		error = got_object_id_str(&commit_id_str, commit_id);
 3019 08e5873e 2021-09-14 stsp 		if (error)
 3020 08e5873e 2021-09-14 stsp 			goto done;
 3021 8069f636 2019-01-12 stsp 	}
 3022 8069f636 2019-01-12 stsp 
 3023 adc19d55 2019-07-28 stsp 	error = got_pathlist_append(&paths, "", NULL);
 3024 f2ea84fa 2019-07-27 stsp 	if (error)
 3025 f2ea84fa 2019-07-27 stsp 		goto done;
 3026 7f47418f 2019-12-20 stsp 	cpa.worktree_path = worktree_path;
 3027 7f47418f 2019-12-20 stsp 	cpa.had_base_commit_ref_error = 0;
 3028 4ad4a1ec 2021-09-13 tracey 	cpa.verbosity = verbosity;
 3029 f2ea84fa 2019-07-27 stsp 	error = got_worktree_checkout_files(worktree, &paths, repo,
 3030 7f47418f 2019-12-20 stsp 	    checkout_progress, &cpa, check_cancelled, NULL);
 3031 c09a553d 2018-03-12 stsp 	if (error != NULL)
 3032 c09a553d 2018-03-12 stsp 		goto done;
 3033 c09a553d 2018-03-12 stsp 
 3034 08e5873e 2021-09-14 stsp 	if (got_ref_is_symbolic(head_ref)) {
 3035 08e5873e 2021-09-14 stsp 		error = got_ref_resolve_symbolic(&ref, repo, head_ref);
 3036 08e5873e 2021-09-14 stsp 		if (error)
 3037 08e5873e 2021-09-14 stsp 			goto done;
 3038 08e5873e 2021-09-14 stsp 		refname = got_ref_get_name(ref);
 3039 08e5873e 2021-09-14 stsp 	} else
 3040 08e5873e 2021-09-14 stsp 		refname = got_ref_get_name(head_ref);
 3041 08e5873e 2021-09-14 stsp 	printf("Checked out %s: %s\n", refname, commit_id_str);
 3042 b65ae19a 2018-04-24 stsp 	printf("Now shut up and hack\n");
 3043 7f47418f 2019-12-20 stsp 	if (cpa.had_base_commit_ref_error)
 3044 7f47418f 2019-12-20 stsp 		show_worktree_base_ref_warning();
 3045 c09a553d 2018-03-12 stsp done:
 3046 08e5873e 2021-09-14 stsp 	if (head_ref)
 3047 08e5873e 2021-09-14 stsp 		got_ref_close(head_ref);
 3048 08e5873e 2021-09-14 stsp 	if (ref)
 3049 08e5873e 2021-09-14 stsp 		got_ref_close(ref);
 3050 f2ea84fa 2019-07-27 stsp 	got_pathlist_free(&paths);
 3051 8069f636 2019-01-12 stsp 	free(commit_id_str);
 3052 08e5873e 2021-09-14 stsp 	free(commit_id);
 3053 76089277 2018-04-01 stsp 	free(repo_path);
 3054 507dc3bb 2018-12-29 stsp 	free(worktree_path);
 3055 c47340da 2020-09-20 stsp 	free(cwd);
 3056 507dc3bb 2018-12-29 stsp 	return error;
 3057 9627c110 2020-04-18 stsp }
 3058 9627c110 2020-04-18 stsp 
 3059 9627c110 2020-04-18 stsp struct got_update_progress_arg {
 3060 9627c110 2020-04-18 stsp 	int did_something;
 3061 9627c110 2020-04-18 stsp 	int conflicts;
 3062 9627c110 2020-04-18 stsp 	int obstructed;
 3063 9627c110 2020-04-18 stsp 	int not_updated;
 3064 10604dce 2021-09-24 thomas 	int missing;
 3065 0ef68859 2021-09-28 thomas 	int not_deleted;
 3066 0ef68859 2021-09-28 thomas 	int unversioned;
 3067 4ad4a1ec 2021-09-13 tracey 	int verbosity;
 3068 9627c110 2020-04-18 stsp };
 3069 9627c110 2020-04-18 stsp 
 3070 9627c110 2020-04-18 stsp void
 3071 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
 3072 9627c110 2020-04-18 stsp {
 3073 9627c110 2020-04-18 stsp 	if (!upa->did_something)
 3074 9627c110 2020-04-18 stsp 		return;
 3075 9627c110 2020-04-18 stsp 
 3076 9627c110 2020-04-18 stsp 	if (upa->conflicts > 0)
 3077 9627c110 2020-04-18 stsp 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
 3078 9627c110 2020-04-18 stsp 	if (upa->obstructed > 0)
 3079 9627c110 2020-04-18 stsp 		printf("File paths obstructed by a non-regular file: %d\n",
 3080 9627c110 2020-04-18 stsp 		    upa->obstructed);
 3081 9627c110 2020-04-18 stsp 	if (upa->not_updated > 0)
 3082 9627c110 2020-04-18 stsp 		printf("Files not updated because of existing merge "
 3083 9627c110 2020-04-18 stsp 		    "conflicts: %d\n", upa->not_updated);
 3084 507dc3bb 2018-12-29 stsp }
 3085 507dc3bb 2018-12-29 stsp 
 3086 0ef68859 2021-09-28 thomas /*
 3087 0ef68859 2021-09-28 thomas  * The meaning of some status codes differs between merge-style operations and
 3088 0ef68859 2021-09-28 thomas  * update operations. For example, the ! status code means "file was missing"
 3089 0ef68859 2021-09-28 thomas  * if changes were merged into the work tree, and "missing file was restored"
 3090 0ef68859 2021-09-28 thomas  * if the work tree was updated. This function should be used by any operation
 3091 0ef68859 2021-09-28 thomas  * which merges changes into the work tree without updating the work tree.
 3092 0ef68859 2021-09-28 thomas  */
 3093 0ef68859 2021-09-28 thomas void
 3094 0ef68859 2021-09-28 thomas print_merge_progress_stats(struct got_update_progress_arg *upa)
 3095 0ef68859 2021-09-28 thomas {
 3096 0ef68859 2021-09-28 thomas 	if (!upa->did_something)
 3097 0ef68859 2021-09-28 thomas 		return;
 3098 0ef68859 2021-09-28 thomas 
 3099 0ef68859 2021-09-28 thomas 	if (upa->conflicts > 0)
 3100 0ef68859 2021-09-28 thomas 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
 3101 0ef68859 2021-09-28 thomas 	if (upa->obstructed > 0)
 3102 0ef68859 2021-09-28 thomas 		printf("File paths obstructed by a non-regular file: %d\n",
 3103 0ef68859 2021-09-28 thomas 		    upa->obstructed);
 3104 0ef68859 2021-09-28 thomas 	if (upa->missing > 0)
 3105 0ef68859 2021-09-28 thomas 		printf("Files which had incoming changes but could not be "
 3106 0ef68859 2021-09-28 thomas 		    "found in the work tree: %d\n", upa->missing);
 3107 0ef68859 2021-09-28 thomas 	if (upa->not_deleted > 0)
 3108 0ef68859 2021-09-28 thomas 		printf("Files not deleted due to differences in deleted "
 3109 0ef68859 2021-09-28 thomas 		    "content: %d\n", upa->not_deleted);
 3110 0ef68859 2021-09-28 thomas 	if (upa->unversioned > 0)
 3111 0ef68859 2021-09-28 thomas 		printf("Files not merged because an unversioned file was "
 3112 0ef68859 2021-09-28 thomas 		    "found in the work tree: %d\n", upa->unversioned);
 3113 0ef68859 2021-09-28 thomas }
 3114 0ef68859 2021-09-28 thomas 
 3115 507dc3bb 2018-12-29 stsp __dead static void
 3116 507dc3bb 2018-12-29 stsp usage_update(void)
 3117 507dc3bb 2018-12-29 stsp {
 3118 4ad4a1ec 2021-09-13 tracey 	fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
 3119 4ad4a1ec 2021-09-13 tracey 	    "[path ...]\n",
 3120 507dc3bb 2018-12-29 stsp 	    getprogname());
 3121 507dc3bb 2018-12-29 stsp 	exit(1);
 3122 507dc3bb 2018-12-29 stsp }
 3123 507dc3bb 2018-12-29 stsp 
 3124 1ee397ad 2019-07-12 stsp static const struct got_error *
 3125 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
 3126 507dc3bb 2018-12-29 stsp {
 3127 9627c110 2020-04-18 stsp 	struct got_update_progress_arg *upa = arg;
 3128 784955db 2019-01-12 stsp 
 3129 7f47418f 2019-12-20 stsp 	if (status == GOT_STATUS_EXISTS ||
 3130 7f47418f 2019-12-20 stsp 	    status == GOT_STATUS_BASE_REF_ERR)
 3131 1ee397ad 2019-07-12 stsp 		return NULL;
 3132 507dc3bb 2018-12-29 stsp 
 3133 9627c110 2020-04-18 stsp 	upa->did_something = 1;
 3134 a484d721 2019-06-10 stsp 
 3135 a484d721 2019-06-10 stsp 	/* Base commit bump happens silently. */
 3136 a484d721 2019-06-10 stsp 	if (status == GOT_STATUS_BUMP_BASE)
 3137 1ee397ad 2019-07-12 stsp 		return NULL;
 3138 a484d721 2019-06-10 stsp 
 3139 9627c110 2020-04-18 stsp 	if (status == GOT_STATUS_CONFLICT)
 3140 9627c110 2020-04-18 stsp 		upa->conflicts++;
 3141 9627c110 2020-04-18 stsp 	if (status == GOT_STATUS_OBSTRUCTED)
 3142 9627c110 2020-04-18 stsp 		upa->obstructed++;
 3143 9627c110 2020-04-18 stsp 	if (status == GOT_STATUS_CANNOT_UPDATE)
 3144 9627c110 2020-04-18 stsp 		upa->not_updated++;
 3145 10604dce 2021-09-24 thomas 	if (status == GOT_STATUS_MISSING)
 3146 10604dce 2021-09-24 thomas 		upa->missing++;
 3147 0ef68859 2021-09-28 thomas 	if (status == GOT_STATUS_CANNOT_DELETE)
 3148 0ef68859 2021-09-28 thomas 		upa->not_deleted++;
 3149 0ef68859 2021-09-28 thomas 	if (status == GOT_STATUS_UNVERSIONED)
 3150 0ef68859 2021-09-28 thomas 		upa->unversioned++;
 3151 9627c110 2020-04-18 stsp 
 3152 507dc3bb 2018-12-29 stsp 	while (path[0] == '/')
 3153 507dc3bb 2018-12-29 stsp 		path++;
 3154 4ad4a1ec 2021-09-13 tracey 	if (upa->verbosity >= 0)
 3155 4ad4a1ec 2021-09-13 tracey 		printf("%c  %s\n", status, path);
 3156 4ad4a1ec 2021-09-13 tracey 
 3157 1ee397ad 2019-07-12 stsp 	return NULL;
 3158 be7061eb 2018-12-30 stsp }
 3159 be7061eb 2018-12-30 stsp 
 3160 be7061eb 2018-12-30 stsp static const struct got_error *
 3161 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
 3162 a1fb16d8 2019-05-24 stsp     struct got_object_id *commit_id, struct got_worktree *worktree,
 3163 a1fb16d8 2019-05-24 stsp     struct got_repository *repo)
 3164 a1fb16d8 2019-05-24 stsp {
 3165 a1fb16d8 2019-05-24 stsp 	const struct got_error *err = NULL;
 3166 a1fb16d8 2019-05-24 stsp 	char *base_id_str;
 3167 a1fb16d8 2019-05-24 stsp 	int ref_has_moved = 0;
 3168 a1fb16d8 2019-05-24 stsp 
 3169 a1fb16d8 2019-05-24 stsp 	/* Trivial case: switching between two different references. */
 3170 a1fb16d8 2019-05-24 stsp 	if (strcmp(got_ref_get_name(head_ref),
 3171 a1fb16d8 2019-05-24 stsp 	    got_worktree_get_head_ref_name(worktree)) != 0) {
 3172 a1fb16d8 2019-05-24 stsp 		printf("Switching work tree from %s to %s\n",
 3173 a1fb16d8 2019-05-24 stsp 		    got_worktree_get_head_ref_name(worktree),
 3174 a1fb16d8 2019-05-24 stsp 		    got_ref_get_name(head_ref));
 3175 a1fb16d8 2019-05-24 stsp 		return got_worktree_set_head_ref(worktree, head_ref);
 3176 a1fb16d8 2019-05-24 stsp 	}
 3177 a1fb16d8 2019-05-24 stsp 
 3178 a1fb16d8 2019-05-24 stsp 	err = check_linear_ancestry(commit_id,
 3179 3aef623b 2019-10-15 stsp 	    got_worktree_get_base_commit_id(worktree), 0, repo);
 3180 a1fb16d8 2019-05-24 stsp 	if (err) {
 3181 a1fb16d8 2019-05-24 stsp 		if (err->code != GOT_ERR_ANCESTRY)
 3182 a1fb16d8 2019-05-24 stsp 			return err;
 3183 a1fb16d8 2019-05-24 stsp 		ref_has_moved = 1;
 3184 a1fb16d8 2019-05-24 stsp 	}
 3185 a1fb16d8 2019-05-24 stsp 	if (!ref_has_moved)
 3186 a1fb16d8 2019-05-24 stsp 		return NULL;
 3187 a1fb16d8 2019-05-24 stsp 
 3188 a1fb16d8 2019-05-24 stsp 	/* Switching to a rebased branch with the same reference name. */
 3189 a1fb16d8 2019-05-24 stsp 	err = got_object_id_str(&base_id_str,
 3190 a1fb16d8 2019-05-24 stsp 	    got_worktree_get_base_commit_id(worktree));
 3191 a1fb16d8 2019-05-24 stsp 	if (err)
 3192 a1fb16d8 2019-05-24 stsp 		return err;
 3193 a1fb16d8 2019-05-24 stsp 	printf("Reference %s now points at a different branch\n",
 3194 a1fb16d8 2019-05-24 stsp 	    got_worktree_get_head_ref_name(worktree));
 3195 a1fb16d8 2019-05-24 stsp 	printf("Switching work tree from %s to %s\n", base_id_str,
 3196 a1fb16d8 2019-05-24 stsp 	    got_worktree_get_head_ref_name(worktree));
 3197 0ebf8283 2019-07-24 stsp 	return NULL;
 3198 0ebf8283 2019-07-24 stsp }
 3199 0ebf8283 2019-07-24 stsp 
 3200 0ebf8283 2019-07-24 stsp static const struct got_error *
 3201 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
 3202 0ebf8283 2019-07-24 stsp {
 3203 0ebf8283 2019-07-24 stsp 	const struct got_error *err;
 3204 0ebf8283 2019-07-24 stsp 	int in_progress;
 3205 0ebf8283 2019-07-24 stsp 
 3206 0ebf8283 2019-07-24 stsp 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
 3207 0ebf8283 2019-07-24 stsp 	if (err)
 3208 0ebf8283 2019-07-24 stsp 		return err;
 3209 0ebf8283 2019-07-24 stsp 	if (in_progress)
 3210 0ebf8283 2019-07-24 stsp 		return got_error(GOT_ERR_REBASING);
 3211 0ebf8283 2019-07-24 stsp 
 3212 0ebf8283 2019-07-24 stsp 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
 3213 0ebf8283 2019-07-24 stsp 	if (err)
 3214 0ebf8283 2019-07-24 stsp 		return err;
 3215 0ebf8283 2019-07-24 stsp 	if (in_progress)
 3216 0ebf8283 2019-07-24 stsp 		return got_error(GOT_ERR_HISTEDIT_BUSY);
 3217 10604dce 2021-09-24 thomas 
 3218 10604dce 2021-09-24 thomas 	return NULL;
 3219 10604dce 2021-09-24 thomas }
 3220 10604dce 2021-09-24 thomas 
 3221 10604dce 2021-09-24 thomas static const struct got_error *
 3222 10604dce 2021-09-24 thomas check_merge_in_progress(struct got_worktree *worktree,
 3223 10604dce 2021-09-24 thomas     struct got_repository *repo)
 3224 10604dce 2021-09-24 thomas {
 3225 10604dce 2021-09-24 thomas 	const struct got_error *err;
 3226 10604dce 2021-09-24 thomas 	int in_progress;
 3227 10604dce 2021-09-24 thomas 
 3228 10604dce 2021-09-24 thomas 	err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
 3229 10604dce 2021-09-24 thomas 	if (err)
 3230 10604dce 2021-09-24 thomas 		return err;
 3231 10604dce 2021-09-24 thomas 	if (in_progress)
 3232 10604dce 2021-09-24 thomas 		return got_error(GOT_ERR_MERGE_BUSY);
 3233 0ebf8283 2019-07-24 stsp 
 3234 a1fb16d8 2019-05-24 stsp 	return NULL;
 3235 a5edda0a 2019-07-27 stsp }
 3236 a5edda0a 2019-07-27 stsp 
 3237 a5edda0a 2019-07-27 stsp static const struct got_error *
 3238 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
 3239 a5edda0a 2019-07-27 stsp     char *argv[], struct got_worktree *worktree)
 3240 a5edda0a 2019-07-27 stsp {
 3241 a0de39f3 2019-08-09 stsp 	const struct got_error *err = NULL;
 3242 a5edda0a 2019-07-27 stsp 	char *path;
 3243 f1417e9f 2021-10-12 thomas 	struct got_pathlist_entry *new;
 3244 a5edda0a 2019-07-27 stsp 	int i;
 3245 a5edda0a 2019-07-27 stsp 
 3246 a5edda0a 2019-07-27 stsp 	if (argc == 0) {
 3247 a5edda0a 2019-07-27 stsp 		path = strdup("");
 3248 a5edda0a 2019-07-27 stsp 		if (path == NULL)
 3249 a5edda0a 2019-07-27 stsp 			return got_error_from_errno("strdup");
 3250 adc19d55 2019-07-28 stsp 		return got_pathlist_append(paths, path, NULL);
 3251 a5edda0a 2019-07-27 stsp 	}
 3252 a5edda0a 2019-07-27 stsp 
 3253 a5edda0a 2019-07-27 stsp 	for (i = 0; i < argc; i++) {
 3254 a5edda0a 2019-07-27 stsp 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
 3255 a5edda0a 2019-07-27 stsp 		if (err)
 3256 a5edda0a 2019-07-27 stsp 			break;
 3257 f1417e9f 2021-10-12 thomas 		err = got_pathlist_insert(&new, paths, path, NULL);
 3258 f1417e9f 2021-10-12 thomas 		if (err || new == NULL /* duplicate */) {
 3259 a5edda0a 2019-07-27 stsp 			free(path);
 3260 f1417e9f 2021-10-12 thomas 			if (err)
 3261 f1417e9f 2021-10-12 thomas 				break;
 3262 a5edda0a 2019-07-27 stsp 		}
 3263 a5edda0a 2019-07-27 stsp 	}
 3264 a5edda0a 2019-07-27 stsp 
 3265 a5edda0a 2019-07-27 stsp 	return err;
 3266 a1fb16d8 2019-05-24 stsp }
 3267 a1fb16d8 2019-05-24 stsp 
 3268 a1fb16d8 2019-05-24 stsp static const struct got_error *
 3269 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
 3270 fa51e947 2020-03-27 stsp     const char *cmdname, const char *path)
 3271 fa51e947 2020-03-27 stsp {
 3272 fa51e947 2020-03-27 stsp 	const struct got_error *err;
 3273 fa51e947 2020-03-27 stsp 	struct got_repository *repo;
 3274 fa51e947 2020-03-27 stsp 	static char msg[512];
 3275 fa51e947 2020-03-27 stsp 
 3276 fa51e947 2020-03-27 stsp 	err = got_repo_open(&repo, path, NULL);
 3277 fa51e947 2020-03-27 stsp 	if (err)
 3278 fa51e947 2020-03-27 stsp 		return orig_err;
 3279 fa51e947 2020-03-27 stsp 
 3280 fa51e947 2020-03-27 stsp 	snprintf(msg, sizeof(msg),
 3281 fa51e947 2020-03-27 stsp 	    "'got %s' needs a work tree in addition to a git repository\n"
 3282 fa51e947 2020-03-27 stsp 	    "Work trees can be checked out from this Git repository with "
 3283 fa51e947 2020-03-27 stsp 	    "'got checkout'.\n"
 3284 fa51e947 2020-03-27 stsp 	    "The got(1) manual page contains more information.", cmdname);
 3285 fa51e947 2020-03-27 stsp 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
 3286 fa51e947 2020-03-27 stsp 	got_repo_close(repo);
 3287 fa51e947 2020-03-27 stsp 	return err;
 3288 fa51e947 2020-03-27 stsp }
 3289 fa51e947 2020-03-27 stsp 
 3290 fa51e947 2020-03-27 stsp static const struct got_error *
 3291 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
 3292 507dc3bb 2018-12-29 stsp {
 3293 507dc3bb 2018-12-29 stsp 	const struct got_error *error = NULL;
 3294 507dc3bb 2018-12-29 stsp 	struct got_repository *repo = NULL;
 3295 507dc3bb 2018-12-29 stsp 	struct got_worktree *worktree = NULL;
 3296 f2ea84fa 2019-07-27 stsp 	char *worktree_path = NULL;
 3297 507dc3bb 2018-12-29 stsp 	struct got_object_id *commit_id = NULL;
 3298 9c4b8182 2019-01-02 stsp 	char *commit_id_str = NULL;
 3299 024e9686 2019-05-14 stsp 	const char *branch_name = NULL;
 3300 024e9686 2019-05-14 stsp 	struct got_reference *head_ref = NULL;
 3301 f2ea84fa 2019-07-27 stsp 	struct got_pathlist_head paths;
 3302 f2ea84fa 2019-07-27 stsp 	struct got_pathlist_entry *pe;
 3303 4ad4a1ec 2021-09-13 tracey 	int ch, verbosity = 0;
 3304 9627c110 2020-04-18 stsp 	struct got_update_progress_arg upa;
 3305 507dc3bb 2018-12-29 stsp 
 3306 f2ea84fa 2019-07-27 stsp 	TAILQ_INIT(&paths);
 3307 f2ea84fa 2019-07-27 stsp 
 3308 4ad4a1ec 2021-09-13 tracey 	while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
 3309 507dc3bb 2018-12-29 stsp 		switch (ch) {
 3310 024e9686 2019-05-14 stsp 		case 'b':
 3311 024e9686 2019-05-14 stsp 			branch_name = optarg;
 3312 024e9686 2019-05-14 stsp 			break;
 3313 507dc3bb 2018-12-29 stsp 		case 'c':
 3314 9c4b8182 2019-01-02 stsp 			commit_id_str = strdup(optarg);
 3315 9c4b8182 2019-01-02 stsp 			if (commit_id_str == NULL)
 3316 638f9024 2019-05-13 stsp 				return got_error_from_errno("strdup");
 3317 4ad4a1ec 2021-09-13 tracey 			break;
 3318 4ad4a1ec 2021-09-13 tracey 		case 'q':
 3319 4ad4a1ec 2021-09-13 tracey 			verbosity = -1;
 3320 507dc3bb 2018-12-29 stsp 			break;
 3321 507dc3bb 2018-12-29 stsp 		default:
 3322 2deda0b9 2019-03-07 stsp 			usage_update();
 3323 507dc3bb 2018-12-29 stsp 			/* NOTREACHED */
 3324 507dc3bb 2018-12-29 stsp 		}
 3325 507dc3bb 2018-12-29 stsp 	}
 3326 507dc3bb 2018-12-29 stsp 
 3327 507dc3bb 2018-12-29 stsp 	argc -= optind;
 3328 507dc3bb 2018-12-29 stsp 	argv += optind;
 3329 507dc3bb 2018-12-29 stsp 
 3330 507dc3bb 2018-12-29 stsp #ifndef PROFILE
 3331 68ed9ba5 2019-02-10 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 3332 68ed9ba5 2019-02-10 stsp 	    "unveil", NULL) == -1)
 3333 507dc3bb 2018-12-29 stsp 		err(1, "pledge");
 3334 507dc3bb 2018-12-29 stsp #endif
 3335 c4cdcb68 2019-04-03 stsp 	worktree_path = getcwd(NULL, 0);
 3336 c4cdcb68 2019-04-03 stsp 	if (worktree_path == NULL) {
 3337 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 3338 c4cdcb68 2019-04-03 stsp 		goto done;
 3339 c4cdcb68 2019-04-03 stsp 	}
 3340 c4cdcb68 2019-04-03 stsp 	error = got_worktree_open(&worktree, worktree_path);
 3341 fa51e947 2020-03-27 stsp 	if (error) {
 3342 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 3343 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "update",
 3344 fa51e947 2020-03-27 stsp 			    worktree_path);
 3345 7d5807f4 2019-07-11 stsp 		goto done;
 3346 fa51e947 2020-03-27 stsp 	}
 3347 7d5807f4 2019-07-11 stsp 
 3348 0ebf8283 2019-07-24 stsp 	error = check_rebase_or_histedit_in_progress(worktree);
 3349 f2ea84fa 2019-07-27 stsp 	if (error)
 3350 f2ea84fa 2019-07-27 stsp 		goto done;
 3351 507dc3bb 2018-12-29 stsp 
 3352 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 3353 c9956ddf 2019-09-08 stsp 	    NULL);
 3354 507dc3bb 2018-12-29 stsp 	if (error != NULL)
 3355 507dc3bb 2018-12-29 stsp 		goto done;
 3356 507dc3bb 2018-12-29 stsp 
 3357 97430839 2019-03-11 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
 3358 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 3359 087fb88c 2019-08-04 stsp 	if (error)
 3360 087fb88c 2019-08-04 stsp 		goto done;
 3361 087fb88c 2019-08-04 stsp 
 3362 10604dce 2021-09-24 thomas 	error = check_merge_in_progress(worktree, repo);
 3363 10604dce 2021-09-24 thomas 	if (error)
 3364 10604dce 2021-09-24 thomas 		goto done;
 3365 10604dce 2021-09-24 thomas 
 3366 087fb88c 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
 3367 0266afb7 2019-01-04 stsp 	if (error)
 3368 0266afb7 2019-01-04 stsp 		goto done;
 3369 0266afb7 2019-01-04 stsp 
 3370 a1fb16d8 2019-05-24 stsp 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
 3371 a1fb16d8 2019-05-24 stsp 	    got_worktree_get_head_ref_name(worktree), 0);
 3372 024e9686 2019-05-14 stsp 	if (error != NULL)
 3373 024e9686 2019-05-14 stsp 		goto done;
 3374 507dc3bb 2018-12-29 stsp 	if (commit_id_str == NULL) {
 3375 507dc3bb 2018-12-29 stsp 		error = got_ref_resolve(&commit_id, repo, head_ref);
 3376 9c4b8182 2019-01-02 stsp 		if (error != NULL)
 3377 9c4b8182 2019-01-02 stsp 			goto done;
 3378 9c4b8182 2019-01-02 stsp 		error = got_object_id_str(&commit_id_str, commit_id);
 3379 507dc3bb 2018-12-29 stsp 		if (error != NULL)
 3380 507dc3bb 2018-12-29 stsp 			goto done;
 3381 507dc3bb 2018-12-29 stsp 	} else {
 3382 84de9106 2020-12-26 stsp 		struct got_reflist_head refs;
 3383 d9dff0e5 2020-12-26 stsp 		TAILQ_INIT(&refs);
 3384 84de9106 2020-12-26 stsp 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
 3385 84de9106 2020-12-26 stsp 		    NULL);
 3386 84de9106 2020-12-26 stsp 		if (error)
 3387 84de9106 2020-12-26 stsp 			goto done;
 3388 71a27632 2020-01-15 stsp 		error = got_repo_match_object_id(&commit_id, NULL,
 3389 84de9106 2020-12-26 stsp 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 3390 84de9106 2020-12-26 stsp 		got_ref_list_free(&refs);
 3391 04f57cb3 2019-07-25 stsp 		free(commit_id_str);
 3392 bb787f09 2019-07-25 stsp 		commit_id_str = NULL;
 3393 30837e32 2019-07-25 stsp 		if (error)
 3394 a297e751 2019-07-11 stsp 			goto done;
 3395 a297e751 2019-07-11 stsp 		error = got_object_id_str(&commit_id_str, commit_id);
 3396 a297e751 2019-07-11 stsp 		if (error)
 3397 507dc3bb 2018-12-29 stsp 			goto done;
 3398 507dc3bb 2018-12-29 stsp 	}
 3399 35c965b2 2018-12-29 stsp 
 3400 a1fb16d8 2019-05-24 stsp 	if (branch_name) {
 3401 024e9686 2019-05-14 stsp 		struct got_object_id *head_commit_id;
 3402 f2ea84fa 2019-07-27 stsp 		TAILQ_FOREACH(pe, &paths, entry) {
 3403 f2b16ada 2019-08-02 stsp 			if (pe->path_len == 0)
 3404 f2ea84fa 2019-07-27 stsp 				continue;
 3405 f2ea84fa 2019-07-27 stsp 			error = got_error_msg(GOT_ERR_BAD_PATH,
 3406 f2ea84fa 2019-07-27 stsp 			    "switching between branches requires that "
 3407 f2ea84fa 2019-07-27 stsp 			    "the entire work tree gets updated");
 3408 024e9686 2019-05-14 stsp 			goto done;
 3409 024e9686 2019-05-14 stsp 		}
 3410 024e9686 2019-05-14 stsp 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
 3411 024e9686 2019-05-14 stsp 		if (error)
 3412 024e9686 2019-05-14 stsp 			goto done;
 3413 3aef623b 2019-10-15 stsp 		error = check_linear_ancestry(commit_id, head_commit_id, 0,
 3414 3aef623b 2019-10-15 stsp 		    repo);
 3415 a367ff0f 2019-05-14 stsp 		free(head_commit_id);
 3416 024e9686 2019-05-14 stsp 		if (error != NULL)
 3417 024e9686 2019-05-14 stsp 			goto done;
 3418 a51a74b3 2019-07-27 stsp 		error = check_same_branch(commit_id, head_ref, NULL, repo);
 3419 a367ff0f 2019-05-14 stsp 		if (error)
 3420 a367ff0f 2019-05-14 stsp 			goto done;
 3421 a1fb16d8 2019-05-24 stsp 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
 3422 024e9686 2019-05-14 stsp 		if (error)
 3423 024e9686 2019-05-14 stsp 			goto done;
 3424 024e9686 2019-05-14 stsp 	} else {
 3425 024e9686 2019-05-14 stsp 		error = check_linear_ancestry(commit_id,
 3426 3aef623b 2019-10-15 stsp 		    got_worktree_get_base_commit_id(worktree), 0, repo);
 3427 a367ff0f 2019-05-14 stsp 		if (error != NULL) {
 3428 a367ff0f 2019-05-14 stsp 			if (error->code == GOT_ERR_ANCESTRY)
 3429 a367ff0f 2019-05-14 stsp 				error = got_error(GOT_ERR_BRANCH_MOVED);
 3430 024e9686 2019-05-14 stsp 			goto done;
 3431 a367ff0f 2019-05-14 stsp 		}
 3432 a51a74b3 2019-07-27 stsp 		error = check_same_branch(commit_id, head_ref, NULL, repo);
 3433 a367ff0f 2019-05-14 stsp 		if (error)
 3434 a367ff0f 2019-05-14 stsp 			goto done;
 3435 024e9686 2019-05-14 stsp 	}
 3436 507dc3bb 2018-12-29 stsp 
 3437 507dc3bb 2018-12-29 stsp 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
 3438 507dc3bb 2018-12-29 stsp 	    commit_id) != 0) {
 3439 507dc3bb 2018-12-29 stsp 		error = got_worktree_set_base_commit_id(worktree, repo,
 3440 507dc3bb 2018-12-29 stsp 		    commit_id);
 3441 507dc3bb 2018-12-29 stsp 		if (error)
 3442 507dc3bb 2018-12-29 stsp 			goto done;
 3443 507dc3bb 2018-12-29 stsp 	}
 3444 507dc3bb 2018-12-29 stsp 
 3445 9627c110 2020-04-18 stsp 	memset(&upa, 0, sizeof(upa));
 3446 4ad4a1ec 2021-09-13 tracey 	upa.verbosity = verbosity;
 3447 f2ea84fa 2019-07-27 stsp 	error = got_worktree_checkout_files(worktree, &paths, repo,
 3448 9627c110 2020-04-18 stsp 	    update_progress, &upa, check_cancelled, NULL);
 3449 507dc3bb 2018-12-29 stsp 	if (error != NULL)
 3450 507dc3bb 2018-12-29 stsp 		goto done;
 3451 9c4b8182 2019-01-02 stsp 
 3452 4f3c844b 2021-09-14 stsp 	if (upa.did_something) {
 3453 4f3c844b 2021-09-14 stsp 		printf("Updated to %s: %s\n",
 3454 4f3c844b 2021-09-14 stsp 		    got_worktree_get_head_ref_name(worktree), commit_id_str);
 3455 4f3c844b 2021-09-14 stsp 	} else
 3456 784955db 2019-01-12 stsp 		printf("Already up-to-date\n");
 3457 9627c110 2020-04-18 stsp 	print_update_progress_stats(&upa);
 3458 507dc3bb 2018-12-29 stsp done:
 3459 c09a553d 2018-03-12 stsp 	free(worktree_path);
 3460 f2ea84fa 2019-07-27 stsp 	TAILQ_FOREACH(pe, &paths, entry)
 3461 f2ea84fa 2019-07-27 stsp 		free((char *)pe->path);
 3462 f2ea84fa 2019-07-27 stsp 	got_pathlist_free(&paths);
 3463 507dc3bb 2018-12-29 stsp 	free(commit_id);
 3464 9c4b8182 2019-01-02 stsp 	free(commit_id_str);
 3465 c09a553d 2018-03-12 stsp 	return error;
 3466 c09a553d 2018-03-12 stsp }
 3467 c09a553d 2018-03-12 stsp 
 3468 f42b1b34 2018-03-12 stsp static const struct got_error *
 3469 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
 3470 63035f9f 2019-10-06 stsp     const char *path, int diff_context, int ignore_whitespace,
 3471 64453f7e 2020-11-21 stsp     int force_text_diff, struct got_repository *repo)
 3472 5c860e29 2018-03-12 stsp {
 3473 f42b1b34 2018-03-12 stsp 	const struct got_error *err = NULL;
 3474 44392932 2019-08-25 stsp 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
 3475 79109fed 2018-03-27 stsp 
 3476 44392932 2019-08-25 stsp 	if (blob_id1) {
 3477 44392932 2019-08-25 stsp 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
 3478 44392932 2019-08-25 stsp 		if (err)
 3479 44392932 2019-08-25 stsp 			goto done;
 3480 44392932 2019-08-25 stsp 	}
 3481 79109fed 2018-03-27 stsp 
 3482 44392932 2019-08-25 stsp 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
 3483 44392932 2019-08-25 stsp 	if (err)
 3484 44392932 2019-08-25 stsp 		goto done;
 3485 79109fed 2018-03-27 stsp 
 3486 44392932 2019-08-25 stsp 	while (path[0] == '/')
 3487 44392932 2019-08-25 stsp 		path++;
 3488 fe621944 2020-11-10 stsp 	err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
 3489 64453f7e 2020-11-21 stsp 	    diff_context, ignore_whitespace, force_text_diff, stdout);
 3490 44392932 2019-08-25 stsp done:
 3491 44392932 2019-08-25 stsp 	if (blob1)
 3492 44392932 2019-08-25 stsp 		got_object_blob_close(blob1);
 3493 44392932 2019-08-25 stsp 	got_object_blob_close(blob2);
 3494 44392932 2019-08-25 stsp 	return err;
 3495 44392932 2019-08-25 stsp }
 3496 44392932 2019-08-25 stsp 
 3497 44392932 2019-08-25 stsp static const struct got_error *
 3498 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
 3499 63035f9f 2019-10-06 stsp     const char *path, int diff_context, int ignore_whitespace,
 3500 64453f7e 2020-11-21 stsp     int force_text_diff, struct got_repository *repo)
 3501 44392932 2019-08-25 stsp {
 3502 44392932 2019-08-25 stsp 	const struct got_error *err = NULL;
 3503 44392932 2019-08-25 stsp 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
 3504 44392932 2019-08-25 stsp 	struct got_diff_blob_output_unidiff_arg arg;
 3505 44392932 2019-08-25 stsp 
 3506 44392932 2019-08-25 stsp 	if (tree_id1) {
 3507 44392932 2019-08-25 stsp 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
 3508 79109fed 2018-03-27 stsp 		if (err)
 3509 44392932 2019-08-25 stsp 			goto done;
 3510 79109fed 2018-03-27 stsp 	}
 3511 79109fed 2018-03-27 stsp 
 3512 44392932 2019-08-25 stsp 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
 3513 0f2b3dca 2018-12-22 stsp 	if (err)
 3514 0f2b3dca 2018-12-22 stsp 		goto done;
 3515 0f2b3dca 2018-12-22 stsp 
 3516 aaa13589 2019-06-01 stsp 	arg.diff_context = diff_context;
 3517 63035f9f 2019-10-06 stsp 	arg.ignore_whitespace = ignore_whitespace;
 3518 64453f7e 2020-11-21 stsp 	arg.force_text_diff = force_text_diff;
 3519 aaa13589 2019-06-01 stsp 	arg.outfile = stdout;
 3520 fe621944 2020-11-10 stsp 	arg.line_offsets = NULL;
 3521 fe621944 2020-11-10 stsp 	arg.nlines = 0;
 3522 44392932 2019-08-25 stsp 	while (path[0] == '/')
 3523 44392932 2019-08-25 stsp 		path++;
 3524 44392932 2019-08-25 stsp 	err = got_diff_tree(tree1, tree2, path, path, repo,
 3525 31b4484f 2019-07-27 stsp 	    got_diff_blob_output_unidiff, &arg, 1);
 3526 0f2b3dca 2018-12-22 stsp done:
 3527 79109fed 2018-03-27 stsp 	if (tree1)
 3528 79109fed 2018-03-27 stsp 		got_object_tree_close(tree1);
 3529 366e0a5f 2019-10-10 stsp 	if (tree2)
 3530 366e0a5f 2019-10-10 stsp 		got_object_tree_close(tree2);
 3531 44392932 2019-08-25 stsp 	return err;
 3532 44392932 2019-08-25 stsp }
 3533 44392932 2019-08-25 stsp 
 3534 44392932 2019-08-25 stsp static const struct got_error *
 3535 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
 3536 0208f208 2020-05-05 stsp     struct got_commit_object *commit, struct got_repository *repo)
 3537 0208f208 2020-05-05 stsp {
 3538 0208f208 2020-05-05 stsp 	const struct got_error *err = NULL;
 3539 0208f208 2020-05-05 stsp 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
 3540 0208f208 2020-05-05 stsp 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
 3541 0208f208 2020-05-05 stsp 	struct got_object_qid *qid;
 3542 0208f208 2020-05-05 stsp 
 3543 dbdddfee 2021-06-23 naddy 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
 3544 0208f208 2020-05-05 stsp 	if (qid != NULL) {
 3545 0208f208 2020-05-05 stsp 		struct got_commit_object *pcommit;
 3546 0208f208 2020-05-05 stsp 		err = got_object_open_as_commit(&pcommit, repo,
 3547 0208f208 2020-05-05 stsp 		    qid->id);
 3548 0208f208 2020-05-05 stsp 		if (err)
 3549 0208f208 2020-05-05 stsp 			return err;
 3550 0208f208 2020-05-05 stsp 
 3551 aa8b5dd0 2021-08-01 stsp 		tree_id1 = got_object_id_dup(
 3552 aa8b5dd0 2021-08-01 stsp 		    got_object_commit_get_tree_id(pcommit));
 3553 aa8b5dd0 2021-08-01 stsp 		if (tree_id1 == NULL) {
 3554 aa8b5dd0 2021-08-01 stsp 			got_object_commit_close(pcommit);
 3555 aa8b5dd0 2021-08-01 stsp 			return got_error_from_errno("got_object_id_dup");
 3556 aa8b5dd0 2021-08-01 stsp 		}
 3557 0208f208 2020-05-05 stsp 		got_object_commit_close(pcommit);
 3558 0208f208 2020-05-05 stsp 
 3559 0208f208 2020-05-05 stsp 	}
 3560 0208f208 2020-05-05 stsp 
 3561 0208f208 2020-05-05 stsp 	if (tree_id1) {
 3562 0208f208 2020-05-05 stsp 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
 3563 0208f208 2020-05-05 stsp 		if (err)
 3564 0208f208 2020-05-05 stsp 			goto done;
 3565 0208f208 2020-05-05 stsp 	}
 3566 0208f208 2020-05-05 stsp 
 3567 0208f208 2020-05-05 stsp 	tree_id2 = got_object_commit_get_tree_id(commit);
 3568 0208f208 2020-05-05 stsp 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
 3569 0208f208 2020-05-05 stsp 	if (err)
 3570 0208f208 2020-05-05 stsp 		goto done;
 3571 0208f208 2020-05-05 stsp 
 3572 0208f208 2020-05-05 stsp 	err = got_diff_tree(tree1, tree2, "", "", repo,
 3573 0208f208 2020-05-05 stsp 	    got_diff_tree_collect_changed_paths, paths, 0);
 3574 0208f208 2020-05-05 stsp done:
 3575 0208f208 2020-05-05 stsp 	if (tree1)
 3576 0208f208 2020-05-05 stsp 		got_object_tree_close(tree1);
 3577 0208f208 2020-05-05 stsp 	if (tree2)
 3578 0208f208 2020-05-05 stsp 		got_object_tree_close(tree2);
 3579 aa8b5dd0 2021-08-01 stsp 	free(tree_id1);
 3580 0208f208 2020-05-05 stsp 	return err;
 3581 0208f208 2020-05-05 stsp }
 3582 0208f208 2020-05-05 stsp 
 3583 0208f208 2020-05-05 stsp static const struct got_error *
 3584 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
 3585 44392932 2019-08-25 stsp     const char *path, int diff_context, struct got_repository *repo)
 3586 44392932 2019-08-25 stsp {
 3587 44392932 2019-08-25 stsp 	const struct got_error *err = NULL;
 3588 44392932 2019-08-25 stsp 	struct got_commit_object *pcommit = NULL;
 3589 44392932 2019-08-25 stsp 	char *id_str1 = NULL, *id_str2 = NULL;
 3590 44392932 2019-08-25 stsp 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
 3591 44392932 2019-08-25 stsp 	struct got_object_qid *qid;
 3592 44392932 2019-08-25 stsp 
 3593 dbdddfee 2021-06-23 naddy 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
 3594 44392932 2019-08-25 stsp 	if (qid != NULL) {
 3595 44392932 2019-08-25 stsp 		err = got_object_open_as_commit(&pcommit, repo,
 3596 44392932 2019-08-25 stsp 		    qid->id);
 3597 44392932 2019-08-25 stsp 		if (err)
 3598 44392932 2019-08-25 stsp 			return err;
 3599 44392932 2019-08-25 stsp 	}
 3600 44392932 2019-08-25 stsp 
 3601 44392932 2019-08-25 stsp 	if (path && path[0] != '\0') {
 3602 44392932 2019-08-25 stsp 		int obj_type;
 3603 44392932 2019-08-25 stsp 		err = got_object_id_by_path(&obj_id2, repo, id, path);
 3604 44392932 2019-08-25 stsp 		if (err)
 3605 44392932 2019-08-25 stsp 			goto done;
 3606 44392932 2019-08-25 stsp 		err = got_object_id_str(&id_str2, obj_id2);
 3607 44392932 2019-08-25 stsp 		if (err) {
 3608 44392932 2019-08-25 stsp 			free(obj_id2);
 3609 44392932 2019-08-25 stsp 			goto done;
 3610 44392932 2019-08-25 stsp 		}
 3611 44392932 2019-08-25 stsp 		if (pcommit) {
 3612 44392932 2019-08-25 stsp 			err = got_object_id_by_path(&obj_id1, repo,
 3613 44392932 2019-08-25 stsp 			    qid->id, path);
 3614 44392932 2019-08-25 stsp 			if (err) {
 3615 2e8c69d1 2020-05-04 stsp 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
 3616 2e8c69d1 2020-05-04 stsp 					free(obj_id2);
 3617 2e8c69d1 2020-05-04 stsp 					goto done;
 3618 2e8c69d1 2020-05-04 stsp 				}
 3619 2e8c69d1 2020-05-04 stsp 			} else {
 3620 2e8c69d1 2020-05-04 stsp 				err = got_object_id_str(&id_str1, obj_id1);
 3621 2e8c69d1 2020-05-04 stsp 				if (err) {
 3622 2e8c69d1 2020-05-04 stsp 					free(obj_id2);
 3623 2e8c69d1 2020-05-04 stsp 					goto done;
 3624 2e8c69d1 2020-05-04 stsp 				}
 3625 44392932 2019-08-25 stsp 			}
 3626 44392932 2019-08-25 stsp 		}
 3627 44392932 2019-08-25 stsp 		err = got_object_get_type(&obj_type, repo, obj_id2);
 3628 44392932 2019-08-25 stsp 		if (err) {
 3629 44392932 2019-08-25 stsp 			free(obj_id2);
 3630 44392932 2019-08-25 stsp 			goto done;
 3631 44392932 2019-08-25 stsp 		}
 3632 44392932 2019-08-25 stsp 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
 3633 44392932 2019-08-25 stsp 		switch (obj_type) {
 3634 44392932 2019-08-25 stsp 		case GOT_OBJ_TYPE_BLOB:
 3635 44392932 2019-08-25 stsp 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
 3636 64453f7e 2020-11-21 stsp 			    0, 0, repo);
 3637 44392932 2019-08-25 stsp 			break;
 3638 44392932 2019-08-25 stsp 		case GOT_OBJ_TYPE_TREE:
 3639 44392932 2019-08-25 stsp 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
 3640 64453f7e 2020-11-21 stsp 			    0, 0, repo);
 3641 44392932 2019-08-25 stsp 			break;
 3642 44392932 2019-08-25 stsp 		default:
 3643 44392932 2019-08-25 stsp 			err = got_error(GOT_ERR_OBJ_TYPE);
 3644 44392932 2019-08-25 stsp 			break;
 3645 44392932 2019-08-25 stsp 		}
 3646 44392932 2019-08-25 stsp 		free(obj_id1);
 3647 44392932 2019-08-25 stsp 		free(obj_id2);
 3648 44392932 2019-08-25 stsp 	} else {
 3649 44392932 2019-08-25 stsp 		obj_id2 = got_object_commit_get_tree_id(commit);
 3650 44392932 2019-08-25 stsp 		err = got_object_id_str(&id_str2, obj_id2);
 3651 44392932 2019-08-25 stsp 		if (err)
 3652 44392932 2019-08-25 stsp 			goto done;
 3653 579bd556 2020-10-24 stsp 		if (pcommit) {
 3654 579bd556 2020-10-24 stsp 			obj_id1 = got_object_commit_get_tree_id(pcommit);
 3655 579bd556 2020-10-24 stsp 			err = got_object_id_str(&id_str1, obj_id1);
 3656 579bd556 2020-10-24 stsp 			if (err)
 3657 579bd556 2020-10-24 stsp 				goto done;
 3658 579bd556 2020-10-24 stsp 		}
 3659 64453f7e 2020-11-21 stsp 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
 3660 64453f7e 2020-11-21 stsp 		    id_str2);
 3661 64453f7e 2020-11-21 stsp 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
 3662 64453f7e 2020-11-21 stsp 		    repo);
 3663 44392932 2019-08-25 stsp 	}
 3664 44392932 2019-08-25 stsp done:
 3665 0f2b3dca 2018-12-22 stsp 	free(id_str1);
 3666 0f2b3dca 2018-12-22 stsp 	free(id_str2);
 3667 44392932 2019-08-25 stsp 	if (pcommit)
 3668 44392932 2019-08-25 stsp 		got_object_commit_close(pcommit);
 3669 79109fed 2018-03-27 stsp 	return err;
 3670 79109fed 2018-03-27 stsp }
 3671 79109fed 2018-03-27 stsp 
 3672 4bb494d5 2018-06-16 stsp static char *
 3673 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
 3674 6c281f94 2018-06-11 stsp {
 3675 09867e48 2019-08-13 stsp 	struct tm mytm, *tm;
 3676 09867e48 2019-08-13 stsp 	char *p, *s;
 3677 09867e48 2019-08-13 stsp 
 3678 09867e48 2019-08-13 stsp 	tm = gmtime_r(time, &mytm);
 3679 09867e48 2019-08-13 stsp 	if (tm == NULL)
 3680 09867e48 2019-08-13 stsp 		return NULL;
 3681 09867e48 2019-08-13 stsp 	s = asctime_r(tm, datebuf);
 3682 09867e48 2019-08-13 stsp 	if (s == NULL)
 3683 09867e48 2019-08-13 stsp 		return NULL;
 3684 6c281f94 2018-06-11 stsp 	p = strchr(s, '\n');
 3685 6c281f94 2018-06-11 stsp 	if (p)
 3686 6c281f94 2018-06-11 stsp 		*p = '\0';
 3687 6c281f94 2018-06-11 stsp 	return s;
 3688 6c281f94 2018-06-11 stsp }
 3689 dc424a06 2019-08-07 stsp 
 3690 6841bf13 2019-11-29 kn static const struct got_error *
 3691 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
 3692 6841bf13 2019-11-29 kn     struct got_commit_object *commit, regex_t *regex)
 3693 6841bf13 2019-11-29 kn {
 3694 6841bf13 2019-11-29 kn 	const struct got_error *err = NULL;
 3695 6841bf13 2019-11-29 kn 	regmatch_t regmatch;
 3696 6841bf13 2019-11-29 kn 	char *id_str = NULL, *logmsg = NULL;
 3697 6841bf13 2019-11-29 kn 
 3698 6841bf13 2019-11-29 kn 	*have_match = 0;
 3699 6841bf13 2019-11-29 kn 
 3700 6841bf13 2019-11-29 kn 	err = got_object_id_str(&id_str, id);
 3701 6841bf13 2019-11-29 kn 	if (err)
 3702 6841bf13 2019-11-29 kn 		return err;
 3703 6841bf13 2019-11-29 kn 
 3704 6841bf13 2019-11-29 kn 	err = got_object_commit_get_logmsg(&logmsg, commit);
 3705 6841bf13 2019-11-29 kn 	if (err)
 3706 6841bf13 2019-11-29 kn 		goto done;
 3707 6841bf13 2019-11-29 kn 
 3708 6841bf13 2019-11-29 kn 	if (regexec(regex, logmsg, 1, &regmatch, 0) == 0)
 3709 6841bf13 2019-11-29 kn 		*have_match = 1;
 3710 6841bf13 2019-11-29 kn done:
 3711 6841bf13 2019-11-29 kn 	free(id_str);
 3712 6841bf13 2019-11-29 kn 	free(logmsg);
 3713 6841bf13 2019-11-29 kn 	return err;
 3714 6841bf13 2019-11-29 kn }
 3715 6841bf13 2019-11-29 kn 
 3716 0208f208 2020-05-05 stsp static void
 3717 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
 3718 0208f208 2020-05-05 stsp     regex_t *regex)
 3719 0208f208 2020-05-05 stsp {
 3720 0208f208 2020-05-05 stsp 	regmatch_t regmatch;
 3721 0208f208 2020-05-05 stsp 	struct got_pathlist_entry *pe;
 3722 0208f208 2020-05-05 stsp 
 3723 0208f208 2020-05-05 stsp 	*have_match = 0;
 3724 0208f208 2020-05-05 stsp 
 3725 0208f208 2020-05-05 stsp 	TAILQ_FOREACH(pe, changed_paths, entry) {
 3726 0208f208 2020-05-05 stsp 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
 3727 0208f208 2020-05-05 stsp 			*have_match = 1;
 3728 0208f208 2020-05-05 stsp 			break;
 3729 0208f208 2020-05-05 stsp 		}
 3730 0208f208 2020-05-05 stsp 	}
 3731 0208f208 2020-05-05 stsp }
 3732 0208f208 2020-05-05 stsp 
 3733 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
 3734 6c281f94 2018-06-11 stsp 
 3735 888b7d99 2020-12-26 stsp static const struct got_error*
 3736 888b7d99 2020-12-26 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
 3737 888b7d99 2020-12-26 stsp     struct got_object_id *id, struct got_repository *repo)
 3738 888b7d99 2020-12-26 stsp {
 3739 888b7d99 2020-12-26 stsp 	static const struct got_error *err = NULL;
 3740 199a4027 2019-02-02 stsp 	struct got_reflist_entry *re;
 3741 888b7d99 2020-12-26 stsp 	char *s;
 3742 888b7d99 2020-12-26 stsp 	const char *name;
 3743 5c860e29 2018-03-12 stsp 
 3744 888b7d99 2020-12-26 stsp 	*refs_str = NULL;
 3745 888b7d99 2020-12-26 stsp 
 3746 d9dff0e5 2020-12-26 stsp 	TAILQ_FOREACH(re, refs, entry) {
 3747 a436ad14 2019-08-13 stsp 		struct got_tag_object *tag = NULL;
 3748 48cae60d 2020-09-22 stsp 		struct got_object_id *ref_id;
 3749 a436ad14 2019-08-13 stsp 		int cmp;
 3750 a436ad14 2019-08-13 stsp 
 3751 199a4027 2019-02-02 stsp 		name = got_ref_get_name(re->ref);
 3752 d9498b20 2019-02-05 stsp 		if (strcmp(name, GOT_REF_HEAD) == 0)
 3753 d9498b20 2019-02-05 stsp 			continue;
 3754 199a4027 2019-02-02 stsp 		if (strncmp(name, "refs/", 5) == 0)
 3755 199a4027 2019-02-02 stsp 			name += 5;
 3756 7143d404 2019-03-12 stsp 		if (strncmp(name, "got/", 4) == 0)
 3757 7143d404 2019-03-12 stsp 			continue;
 3758 e34f9ed6 2019-02-02 stsp 		if (strncmp(name, "heads/", 6) == 0)
 3759 e34f9ed6 2019-02-02 stsp 			name += 6;
 3760 4343a07f 2020-04-24 stsp 		if (strncmp(name, "remotes/", 8) == 0) {
 3761 141c2bff 2019-02-04 stsp 			name += 8;
 3762 4343a07f 2020-04-24 stsp 			s = strstr(name, "/" GOT_REF_HEAD);
 3763 4343a07f 2020-04-24 stsp 			if (s != NULL && s[strlen(s)] == '\0')
 3764 4343a07f 2020-04-24 stsp 				continue;
 3765 4343a07f 2020-04-24 stsp 		}
 3766 48cae60d 2020-09-22 stsp 		err = got_ref_resolve(&ref_id, repo, re->ref);
 3767 48cae60d 2020-09-22 stsp 		if (err)
 3768 888b7d99 2020-12-26 stsp 			break;
 3769 a436ad14 2019-08-13 stsp 		if (strncmp(name, "tags/", 5) == 0) {
 3770 48cae60d 2020-09-22 stsp 			err = got_object_open_as_tag(&tag, repo, ref_id);
 3771 5d844a1e 2019-08-13 stsp 			if (err) {
 3772 48cae60d 2020-09-22 stsp 				if (err->code != GOT_ERR_OBJ_TYPE) {
 3773 48cae60d 2020-09-22 stsp 					free(ref_id);
 3774 888b7d99 2020-12-26 stsp 					break;
 3775 48cae60d 2020-09-22 stsp 				}
 3776 5d844a1e 2019-08-13 stsp 				/* Ref points at something other than a tag. */
 3777 5d844a1e 2019-08-13 stsp 				err = NULL;
 3778 5d844a1e 2019-08-13 stsp 				tag = NULL;
 3779 5d844a1e 2019-08-13 stsp 			}
 3780 a436ad14 2019-08-13 stsp 		}
 3781 a436ad14 2019-08-13 stsp 		cmp = got_object_id_cmp(tag ?
 3782 48cae60d 2020-09-22 stsp 		    got_object_tag_get_object_id(tag) : ref_id, id);
 3783 48cae60d 2020-09-22 stsp 		free(ref_id);
 3784 a436ad14 2019-08-13 stsp 		if (tag)
 3785 a436ad14 2019-08-13 stsp 			got_object_tag_close(tag);
 3786 a436ad14 2019-08-13 stsp 		if (cmp != 0)
 3787 a436ad14 2019-08-13 stsp 			continue;
 3788 888b7d99 2020-12-26 stsp 		s = *refs_str;
 3789 888b7d99 2020-12-26 stsp 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
 3790 888b7d99 2020-12-26 stsp 		    s ? ", " : "", name) == -1) {
 3791 638f9024 2019-05-13 stsp 			err = got_error_from_errno("asprintf");
 3792 199a4027 2019-02-02 stsp 			free(s);
 3793 888b7d99 2020-12-26 stsp 			*refs_str = NULL;
 3794 888b7d99 2020-12-26 stsp 			break;
 3795 199a4027 2019-02-02 stsp 		}
 3796 199a4027 2019-02-02 stsp 		free(s);
 3797 199a4027 2019-02-02 stsp 	}
 3798 888b7d99 2020-12-26 stsp 
 3799 888b7d99 2020-12-26 stsp 	return err;
 3800 888b7d99 2020-12-26 stsp }
 3801 888b7d99 2020-12-26 stsp 
 3802 888b7d99 2020-12-26 stsp static const struct got_error *
 3803 888b7d99 2020-12-26 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
 3804 888b7d99 2020-12-26 stsp     struct got_repository *repo, const char *path,
 3805 888b7d99 2020-12-26 stsp     struct got_pathlist_head *changed_paths, int show_patch,
 3806 e600f124 2021-03-21 stsp     int diff_context, struct got_reflist_object_id_map *refs_idmap,
 3807 e600f124 2021-03-21 stsp     const char *custom_refs_str)
 3808 888b7d99 2020-12-26 stsp {
 3809 888b7d99 2020-12-26 stsp 	const struct got_error *err = NULL;
 3810 888b7d99 2020-12-26 stsp 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
 3811 888b7d99 2020-12-26 stsp 	char datebuf[26];
 3812 888b7d99 2020-12-26 stsp 	time_t committer_time;
 3813 888b7d99 2020-12-26 stsp 	const char *author, *committer;
 3814 888b7d99 2020-12-26 stsp 	char *refs_str = NULL;
 3815 888b7d99 2020-12-26 stsp 
 3816 832c249c 2018-06-10 stsp 	err = got_object_id_str(&id_str, id);
 3817 8bf5b3c9 2018-03-17 stsp 	if (err)
 3818 8bf5b3c9 2018-03-17 stsp 		return err;
 3819 788c352e 2018-06-16 stsp 
 3820 e600f124 2021-03-21 stsp 	if (custom_refs_str == NULL) {
 3821 e600f124 2021-03-21 stsp 		struct got_reflist_head *refs;
 3822 e600f124 2021-03-21 stsp 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
 3823 e600f124 2021-03-21 stsp 		if (refs) {
 3824 e600f124 2021-03-21 stsp 			err = build_refs_str(&refs_str, refs, id, repo);
 3825 e600f124 2021-03-21 stsp 			if (err)
 3826 e600f124 2021-03-21 stsp 				goto done;
 3827 e600f124 2021-03-21 stsp 		}
 3828 888b7d99 2020-12-26 stsp 	}
 3829 888b7d99 2020-12-26 stsp 
 3830 dc424a06 2019-08-07 stsp 	printf(GOT_COMMIT_SEP_STR);
 3831 e600f124 2021-03-21 stsp 	if (custom_refs_str)
 3832 e600f124 2021-03-21 stsp 		printf("commit %s (%s)\n", id_str, custom_refs_str); 
 3833 e600f124 2021-03-21 stsp 	else
 3834 e600f124 2021-03-21 stsp 		printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
 3835 e600f124 2021-03-21 stsp 		    refs_str ? refs_str : "", refs_str ? ")" : "");
 3836 832c249c 2018-06-10 stsp 	free(id_str);
 3837 d3d493d7 2019-02-21 stsp 	id_str = NULL;
 3838 d3d493d7 2019-02-21 stsp 	free(refs_str);
 3839 d3d493d7 2019-02-21 stsp 	refs_str = NULL;
 3840 45d799e2 2018-12-23 stsp 	printf("from: %s\n", got_object_commit_get_author(commit));
 3841 45d799e2 2018-12-23 stsp 	committer_time = got_object_commit_get_committer_time(commit);
 3842 45d799e2 2018-12-23 stsp 	datestr = get_datestr(&committer_time, datebuf);
 3843 09867e48 2019-08-13 stsp 	if (datestr)
 3844 09867e48 2019-08-13 stsp 		printf("date: %s UTC\n", datestr);
 3845 45d799e2 2018-12-23 stsp 	author = got_object_commit_get_author(commit);
 3846 45d799e2 2018-12-23 stsp 	committer = got_object_commit_get_committer(commit);
 3847 45d799e2 2018-12-23 stsp 	if (strcmp(author, committer) != 0)
 3848 45d799e2 2018-12-23 stsp 		printf("via: %s\n", committer);
 3849 45d799e2 2018-12-23 stsp 	if (got_object_commit_get_nparents(commit) > 1) {
 3850 45d799e2 2018-12-23 stsp 		const struct got_object_id_queue *parent_ids;
 3851 79f35eb3 2018-06-11 stsp 		struct got_object_qid *qid;
 3852 3fe1abad 2018-06-10 stsp 		int n = 1;
 3853 45d799e2 2018-12-23 stsp 		parent_ids = got_object_commit_get_parent_ids(commit);
 3854 dbdddfee 2021-06-23 naddy 		STAILQ_FOREACH(qid, parent_ids, entry) {
 3855 79f35eb3 2018-06-11 stsp 			err = got_object_id_str(&id_str, qid->id);
 3856 a0603db2 2018-06-10 stsp 			if (err)
 3857 888b7d99 2020-12-26 stsp 				goto done;
 3858 3fe1abad 2018-06-10 stsp 			printf("parent %d: %s\n", n++, id_str);
 3859 a0603db2 2018-06-10 stsp 			free(id_str);
 3860 888b7d99 2020-12-26 stsp 			id_str = NULL;
 3861 a0603db2 2018-06-10 stsp 		}
 3862 a0603db2 2018-06-10 stsp 	}
 3863 832c249c 2018-06-10 stsp 
 3864 5943eee2 2019-08-13 stsp 	err = got_object_commit_get_logmsg(&logmsg0, commit);
 3865 5943eee2 2019-08-13 stsp 	if (err)
 3866 888b7d99 2020-12-26 stsp 		goto done;
 3867 8bf5b3c9 2018-03-17 stsp 
 3868 621015ac 2018-07-23 stsp 	logmsg = logmsg0;
 3869 832c249c 2018-06-10 stsp 	do {
 3870 832c249c 2018-06-10 stsp 		line = strsep(&logmsg, "\n");
 3871 832c249c 2018-06-10 stsp 		if (line)
 3872 832c249c 2018-06-10 stsp 			printf(" %s\n", line);
 3873 832c249c 2018-06-10 stsp 	} while (line);
 3874 621015ac 2018-07-23 stsp 	free(logmsg0);
 3875 832c249c 2018-06-10 stsp 
 3876 0208f208 2020-05-05 stsp 	if (changed_paths) {
 3877 0208f208 2020-05-05 stsp 		struct got_pathlist_entry *pe;
 3878 0208f208 2020-05-05 stsp 		TAILQ_FOREACH(pe, changed_paths, entry) {
 3879 0208f208 2020-05-05 stsp 			struct got_diff_changed_path *cp = pe->data;
 3880 0208f208 2020-05-05 stsp 			printf(" %c  %s\n", cp->status, pe->path);
 3881 0208f208 2020-05-05 stsp 		}
 3882 0208f208 2020-05-05 stsp 		printf("\n");
 3883 0208f208 2020-05-05 stsp 	}
 3884 971751ac 2018-03-27 stsp 	if (show_patch) {
 3885 44392932 2019-08-25 stsp 		err = print_patch(commit, id, path, diff_context, repo);
 3886 971751ac 2018-03-27 stsp 		if (err == 0)
 3887 971751ac 2018-03-27 stsp 			printf("\n");
 3888 971751ac 2018-03-27 stsp 	}
 3889 07862c20 2018-09-15 stsp 
 3890 cbe7f848 2019-02-11 stsp 	if (fflush(stdout) != 0 && err == NULL)
 3891 638f9024 2019-05-13 stsp 		err = got_error_from_errno("fflush");
 3892 888b7d99 2020-12-26 stsp done:
 3893 888b7d99 2020-12-26 stsp 	free(id_str);
 3894 888b7d99 2020-12-26 stsp 	free(refs_str);
 3895 07862c20 2018-09-15 stsp 	return err;
 3896 f42b1b34 2018-03-12 stsp }
 3897 5c860e29 2018-03-12 stsp 
 3898 f42b1b34 2018-03-12 stsp static const struct got_error *
 3899 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
 3900 0208f208 2020-05-05 stsp     struct got_repository *repo, const char *path, int show_changed_paths,
 3901 0208f208 2020-05-05 stsp     int show_patch, const char *search_pattern, int diff_context, int limit,
 3902 888b7d99 2020-12-26 stsp     int log_branches, int reverse_display_order,
 3903 888b7d99 2020-12-26 stsp     struct got_reflist_object_id_map *refs_idmap)
 3904 f42b1b34 2018-03-12 stsp {
 3905 f42b1b34 2018-03-12 stsp 	const struct got_error *err;
 3906 372ccdbb 2018-06-10 stsp 	struct got_commit_graph *graph;
 3907 6841bf13 2019-11-29 kn 	regex_t regex;
 3908 6841bf13 2019-11-29 kn 	int have_match;
 3909 dbec59df 2020-04-18 stsp 	struct got_object_id_queue reversed_commits;
 3910 dbec59df 2020-04-18 stsp 	struct got_object_qid *qid;
 3911 dbec59df 2020-04-18 stsp 	struct got_commit_object *commit;
 3912 0208f208 2020-05-05 stsp 	struct got_pathlist_head changed_paths;
 3913 0208f208 2020-05-05 stsp 	struct got_pathlist_entry *pe;
 3914 dbec59df 2020-04-18 stsp 
 3915 dbdddfee 2021-06-23 naddy 	STAILQ_INIT(&reversed_commits);
 3916 0208f208 2020-05-05 stsp 	TAILQ_INIT(&changed_paths);
 3917 372ccdbb 2018-06-10 stsp 
 3918 ccecc9fd 2020-04-18 stsp 	if (search_pattern && regcomp(&regex, search_pattern,
 3919 ccecc9fd 2020-04-18 stsp 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
 3920 6841bf13 2019-11-29 kn 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
 3921 6841bf13 2019-11-29 kn 
 3922 48c8c60d 2020-01-27 stsp 	err = got_commit_graph_open(&graph, path, !log_branches);
 3923 f42b1b34 2018-03-12 stsp 	if (err)
 3924 f42b1b34 2018-03-12 stsp 		return err;
 3925 6fb7cd11 2019-08-22 stsp 	err = got_commit_graph_iter_start(graph, root_id, repo,
 3926 6fb7cd11 2019-08-22 stsp 	    check_cancelled, NULL);
 3927 372ccdbb 2018-06-10 stsp 	if (err)
 3928 fcc85cad 2018-07-22 stsp 		goto done;
 3929 656b1f76 2019-05-11 jcs 	for (;;) {
 3930 372ccdbb 2018-06-10 stsp 		struct got_object_id *id;
 3931 8bf5b3c9 2018-03-17 stsp 
 3932 84453469 2018-11-11 stsp 		if (sigint_received || sigpipe_received)
 3933 84453469 2018-11-11 stsp 			break;
 3934 84453469 2018-11-11 stsp 
 3935 ee780d5c 2020-01-04 stsp 		err = got_commit_graph_iter_next(&id, graph, repo,
 3936 ee780d5c 2020-01-04 stsp 		    check_cancelled, NULL);
 3937 372ccdbb 2018-06-10 stsp 		if (err) {
 3938 ee780d5c 2020-01-04 stsp 			if (err->code == GOT_ERR_ITER_COMPLETED)
 3939 9ba79e04 2018-06-11 stsp 				err = NULL;
 3940 ee780d5c 2020-01-04 stsp 			break;
 3941 7e665116 2018-04-02 stsp 		}
 3942 b43fbaa0 2018-06-11 stsp 		if (id == NULL)
 3943 7e665116 2018-04-02 stsp 			break;
 3944 b43fbaa0 2018-06-11 stsp 
 3945 f8e900f3 2018-06-11 stsp 		err = got_object_open_as_commit(&commit, repo, id);
 3946 b43fbaa0 2018-06-11 stsp 		if (err)
 3947 fcc85cad 2018-07-22 stsp 			break;
 3948 6841bf13 2019-11-29 kn 
 3949 502b9684 2020-07-31 stsp 		if (show_changed_paths && !reverse_display_order) {
 3950 0208f208 2020-05-05 stsp 			err = get_changed_paths(&changed_paths, commit, repo);
 3951 0208f208 2020-05-05 stsp 			if (err)
 3952 0208f208 2020-05-05 stsp 				break;
 3953 0208f208 2020-05-05 stsp 		}
 3954 0208f208 2020-05-05 stsp 
 3955 6841bf13 2019-11-29 kn 		if (search_pattern) {
 3956 6841bf13 2019-11-29 kn 			err = match_logmsg(&have_match, id, commit, &regex);
 3957 6841bf13 2019-11-29 kn 			if (err) {
 3958 6841bf13 2019-11-29 kn 				got_object_commit_close(commit);
 3959 6841bf13 2019-11-29 kn 				break;
 3960 6841bf13 2019-11-29 kn 			}
 3961 0208f208 2020-05-05 stsp 			if (have_match == 0 && show_changed_paths)
 3962 0208f208 2020-05-05 stsp 				match_changed_paths(&have_match,
 3963 0208f208 2020-05-05 stsp 				    &changed_paths, &regex);
 3964 6841bf13 2019-11-29 kn 			if (have_match == 0) {
 3965 6841bf13 2019-11-29 kn 				got_object_commit_close(commit);
 3966 0208f208 2020-05-05 stsp 				TAILQ_FOREACH(pe, &changed_paths, entry) {
 3967 0208f208 2020-05-05 stsp 					free((char *)pe->path);
 3968 0208f208 2020-05-05 stsp 					free(pe->data);
 3969 0208f208 2020-05-05 stsp 				}
 3970 0208f208 2020-05-05 stsp 				got_pathlist_free(&changed_paths);
 3971 6841bf13 2019-11-29 kn 				continue;
 3972 6841bf13 2019-11-29 kn 			}
 3973 6841bf13 2019-11-29 kn 		}
 3974 6841bf13 2019-11-29 kn 
 3975 dbec59df 2020-04-18 stsp 		if (reverse_display_order) {
 3976 dbec59df 2020-04-18 stsp 			err = got_object_qid_alloc(&qid, id);
 3977 dbec59df 2020-04-18 stsp 			if (err)
 3978 dbec59df 2020-04-18 stsp 				break;
 3979 dbdddfee 2021-06-23 naddy 			STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
 3980 dbec59df 2020-04-18 stsp 			got_object_commit_close(commit);
 3981 dbec59df 2020-04-18 stsp 		} else {
 3982 0208f208 2020-05-05 stsp 			err = print_commit(commit, id, repo, path,
 3983 0208f208 2020-05-05 stsp 			    show_changed_paths ? &changed_paths : NULL,
 3984 e600f124 2021-03-21 stsp 			    show_patch, diff_context, refs_idmap, NULL);
 3985 dbec59df 2020-04-18 stsp 			got_object_commit_close(commit);
 3986 dbec59df 2020-04-18 stsp 			if (err)
 3987 dbec59df 2020-04-18 stsp 				break;
 3988 dbec59df 2020-04-18 stsp 		}
 3989 dbec59df 2020-04-18 stsp 		if ((limit && --limit == 0) ||
 3990 dbec59df 2020-04-18 stsp 		    (end_id && got_object_id_cmp(id, end_id) == 0))
 3991 7e665116 2018-04-02 stsp 			break;
 3992 0208f208 2020-05-05 stsp 
 3993 0208f208 2020-05-05 stsp 		TAILQ_FOREACH(pe, &changed_paths, entry) {
 3994 0208f208 2020-05-05 stsp 			free((char *)pe->path);
 3995 0208f208 2020-05-05 stsp 			free(pe->data);
 3996 0208f208 2020-05-05 stsp 		}
 3997 0208f208 2020-05-05 stsp 		got_pathlist_free(&changed_paths);
 3998 31cedeaf 2018-09-15 stsp 	}
 3999 dbec59df 2020-04-18 stsp 	if (reverse_display_order) {
 4000 dbdddfee 2021-06-23 naddy 		STAILQ_FOREACH(qid, &reversed_commits, entry) {
 4001 dbec59df 2020-04-18 stsp 			err = got_object_open_as_commit(&commit, repo, qid->id);
 4002 dbec59df 2020-04-18 stsp 			if (err)
 4003 dbec59df 2020-04-18 stsp 				break;
 4004 502b9684 2020-07-31 stsp 			if (show_changed_paths) {
 4005 502b9684 2020-07-31 stsp 				err = get_changed_paths(&changed_paths,
 4006 502b9684 2020-07-31 stsp 				    commit, repo);
 4007 502b9684 2020-07-31 stsp 				if (err)
 4008 502b9684 2020-07-31 stsp 					break;
 4009 502b9684 2020-07-31 stsp 			}
 4010 dbec59df 2020-04-18 stsp 			err = print_commit(commit, qid->id, repo, path,
 4011 0208f208 2020-05-05 stsp 			    show_changed_paths ? &changed_paths : NULL,
 4012 e600f124 2021-03-21 stsp 			    show_patch, diff_context, refs_idmap, NULL);
 4013 dbec59df 2020-04-18 stsp 			got_object_commit_close(commit);
 4014 dbec59df 2020-04-18 stsp 			if (err)
 4015 dbec59df 2020-04-18 stsp 				break;
 4016 502b9684 2020-07-31 stsp 			TAILQ_FOREACH(pe, &changed_paths, entry) {
 4017 502b9684 2020-07-31 stsp 				free((char *)pe->path);
 4018 502b9684 2020-07-31 stsp 				free(pe->data);
 4019 502b9684 2020-07-31 stsp 			}
 4020 502b9684 2020-07-31 stsp 			got_pathlist_free(&changed_paths);
 4021 dbec59df 2020-04-18 stsp 		}
 4022 dbec59df 2020-04-18 stsp 	}
 4023 fcc85cad 2018-07-22 stsp done:
 4024 dbdddfee 2021-06-23 naddy 	while (!STAILQ_EMPTY(&reversed_commits)) {
 4025 dbdddfee 2021-06-23 naddy 		qid = STAILQ_FIRST(&reversed_commits);
 4026 dbdddfee 2021-06-23 naddy 		STAILQ_REMOVE_HEAD(&reversed_commits, entry);
 4027 dbec59df 2020-04-18 stsp 		got_object_qid_free(qid);
 4028 dbec59df 2020-04-18 stsp 	}
 4029 0208f208 2020-05-05 stsp 	TAILQ_FOREACH(pe, &changed_paths, entry) {
 4030 0208f208 2020-05-05 stsp 		free((char *)pe->path);
 4031 0208f208 2020-05-05 stsp 		free(pe->data);
 4032 0208f208 2020-05-05 stsp 	}
 4033 0208f208 2020-05-05 stsp 	got_pathlist_free(&changed_paths);
 4034 6841bf13 2019-11-29 kn 	if (search_pattern)
 4035 6841bf13 2019-11-29 kn 		regfree(&regex);
 4036 372ccdbb 2018-06-10 stsp 	got_commit_graph_close(graph);
 4037 f42b1b34 2018-03-12 stsp 	return err;
 4038 f42b1b34 2018-03-12 stsp }
 4039 5c860e29 2018-03-12 stsp 
 4040 4ed7e80c 2018-05-20 stsp __dead static void
 4041 6f3d1eb0 2018-03-12 stsp usage_log(void)
 4042 6f3d1eb0 2018-03-12 stsp {
 4043 d1fe46f9 2020-04-18 stsp 	fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
 4044 0208f208 2020-05-05 stsp 	    "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
 4045 0208f208 2020-05-05 stsp 	    "[-R] [path]\n", getprogname());
 4046 6f3d1eb0 2018-03-12 stsp 	exit(1);
 4047 b1ebc001 2019-08-13 stsp }
 4048 b1ebc001 2019-08-13 stsp 
 4049 b1ebc001 2019-08-13 stsp static int
 4050 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
 4051 b1ebc001 2019-08-13 stsp {
 4052 b1ebc001 2019-08-13 stsp 	const char *got_default_log_limit;
 4053 b1ebc001 2019-08-13 stsp 	long long n;
 4054 b1ebc001 2019-08-13 stsp 	const char *errstr;
 4055 b1ebc001 2019-08-13 stsp 
 4056 b1ebc001 2019-08-13 stsp 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
 4057 b1ebc001 2019-08-13 stsp 	if (got_default_log_limit == NULL)
 4058 b1ebc001 2019-08-13 stsp 		return 0;
 4059 b1ebc001 2019-08-13 stsp 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
 4060 b1ebc001 2019-08-13 stsp 	if (errstr != NULL)
 4061 b1ebc001 2019-08-13 stsp 		return 0;
 4062 b1ebc001 2019-08-13 stsp 	return n;
 4063 6f3d1eb0 2018-03-12 stsp }
 4064 6f3d1eb0 2018-03-12 stsp 
 4065 4ed7e80c 2018-05-20 stsp static const struct got_error *
 4066 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
 4067 f42b1b34 2018-03-12 stsp {
 4068 f42b1b34 2018-03-12 stsp 	const struct got_error *error;
 4069 04ca23f4 2018-07-16 stsp 	struct got_repository *repo = NULL;
 4070 cffc0aa4 2019-02-05 stsp 	struct got_worktree *worktree = NULL;
 4071 d1fe46f9 2020-04-18 stsp 	struct got_object_id *start_id = NULL, *end_id = NULL;
 4072 04ca23f4 2018-07-16 stsp 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
 4073 d1fe46f9 2020-04-18 stsp 	const char *start_commit = NULL, *end_commit = NULL;
 4074 d1fe46f9 2020-04-18 stsp 	const char *search_pattern = NULL;
 4075 dc1edbfa 2019-11-29 kn 	int diff_context = -1, ch;
 4076 0208f208 2020-05-05 stsp 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
 4077 dbec59df 2020-04-18 stsp 	int reverse_display_order = 0;
 4078 64a96a6d 2018-04-01 stsp 	const char *errstr;
 4079 199a4027 2019-02-02 stsp 	struct got_reflist_head refs;
 4080 888b7d99 2020-12-26 stsp 	struct got_reflist_object_id_map *refs_idmap = NULL;
 4081 1b3893a2 2019-03-18 stsp 
 4082 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
 4083 5c860e29 2018-03-12 stsp 
 4084 6715a751 2018-03-16 stsp #ifndef PROFILE
 4085 6098196c 2019-01-04 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 4086 6098196c 2019-01-04 stsp 	    NULL)
 4087 ad242220 2018-09-08 stsp 	    == -1)
 4088 f42b1b34 2018-03-12 stsp 		err(1, "pledge");
 4089 6715a751 2018-03-16 stsp #endif
 4090 79109fed 2018-03-27 stsp 
 4091 b1ebc001 2019-08-13 stsp 	limit = get_default_log_limit();
 4092 b1ebc001 2019-08-13 stsp 
 4093 0208f208 2020-05-05 stsp 	while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
 4094 79109fed 2018-03-27 stsp 		switch (ch) {
 4095 79109fed 2018-03-27 stsp 		case 'p':
 4096 79109fed 2018-03-27 stsp 			show_patch = 1;
 4097 d142fc45 2018-04-01 stsp 			break;
 4098 0208f208 2020-05-05 stsp 		case 'P':
 4099 0208f208 2020-05-05 stsp 			show_changed_paths = 1;
 4100 0208f208 2020-05-05 stsp 			break;
 4101 d142fc45 2018-04-01 stsp 		case 'c':
 4102 d142fc45 2018-04-01 stsp 			start_commit = optarg;
 4103 64a96a6d 2018-04-01 stsp 			break;
 4104 c0cc5c62 2018-10-18 stsp 		case 'C':
 4105 4a8520aa 2018-10-18 stsp 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
 4106 4a8520aa 2018-10-18 stsp 			    &errstr);
 4107 c0cc5c62 2018-10-18 stsp 			if (errstr != NULL)
 4108 c0cc5c62 2018-10-18 stsp 				err(1, "-C option %s", errstr);
 4109 c0cc5c62 2018-10-18 stsp 			break;
 4110 64a96a6d 2018-04-01 stsp 		case 'l':
 4111 b1ebc001 2019-08-13 stsp 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
 4112 64a96a6d 2018-04-01 stsp 			if (errstr != NULL)
 4113 64a96a6d 2018-04-01 stsp 				err(1, "-l option %s", errstr);
 4114 cc54c501 2019-07-15 stsp 			break;
 4115 48c8c60d 2020-01-27 stsp 		case 'b':
 4116 48c8c60d 2020-01-27 stsp 			log_branches = 1;
 4117 a0603db2 2018-06-10 stsp 			break;
 4118 04ca23f4 2018-07-16 stsp 		case 'r':
 4119 04ca23f4 2018-07-16 stsp 			repo_path = realpath(optarg, NULL);
 4120 04ca23f4 2018-07-16 stsp 			if (repo_path == NULL)
 4121 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 4122 9ba1d308 2019-10-21 stsp 				    optarg);
 4123 7fbaa4f3 2019-05-11 stsp 			got_path_strip_trailing_slashes(repo_path);
 4124 04ca23f4 2018-07-16 stsp 			break;
 4125 dbec59df 2020-04-18 stsp 		case 'R':
 4126 dbec59df 2020-04-18 stsp 			reverse_display_order = 1;
 4127 dbec59df 2020-04-18 stsp 			break;
 4128 6841bf13 2019-11-29 kn 		case 's':
 4129 6841bf13 2019-11-29 kn 			search_pattern = optarg;
 4130 6841bf13 2019-11-29 kn 			break;
 4131 d1fe46f9 2020-04-18 stsp 		case 'x':
 4132 d1fe46f9 2020-04-18 stsp 			end_commit = optarg;
 4133 d1fe46f9 2020-04-18 stsp 			break;
 4134 79109fed 2018-03-27 stsp 		default:
 4135 2deda0b9 2019-03-07 stsp 			usage_log();
 4136 79109fed 2018-03-27 stsp 			/* NOTREACHED */
 4137 79109fed 2018-03-27 stsp 		}
 4138 79109fed 2018-03-27 stsp 	}
 4139 79109fed 2018-03-27 stsp 
 4140 79109fed 2018-03-27 stsp 	argc -= optind;
 4141 79109fed 2018-03-27 stsp 	argv += optind;
 4142 f42b1b34 2018-03-12 stsp 
 4143 dc1edbfa 2019-11-29 kn 	if (diff_context == -1)
 4144 dc1edbfa 2019-11-29 kn 		diff_context = 3;
 4145 dc1edbfa 2019-11-29 kn 	else if (!show_patch)
 4146 0429cd76 2020-09-15 naddy 		errx(1, "-C requires -p");
 4147 dc1edbfa 2019-11-29 kn 
 4148 04ca23f4 2018-07-16 stsp 	cwd = getcwd(NULL, 0);
 4149 04ca23f4 2018-07-16 stsp 	if (cwd == NULL) {
 4150 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 4151 04ca23f4 2018-07-16 stsp 		goto done;
 4152 04ca23f4 2018-07-16 stsp 	}
 4153 cffc0aa4 2019-02-05 stsp 
 4154 50f2fada 2020-04-24 stsp 	if (repo_path == NULL) {
 4155 50f2fada 2020-04-24 stsp 		error = got_worktree_open(&worktree, cwd);
 4156 50f2fada 2020-04-24 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 4157 50f2fada 2020-04-24 stsp 			goto done;
 4158 50f2fada 2020-04-24 stsp 		error = NULL;
 4159 50f2fada 2020-04-24 stsp 	}
 4160 cffc0aa4 2019-02-05 stsp 
 4161 603cdeb0 2020-10-22 stsp 	if (argc == 1) {
 4162 e7301579 2019-03-18 stsp 		if (worktree) {
 4163 e7301579 2019-03-18 stsp 			error = got_worktree_resolve_path(&path, worktree,
 4164 e7301579 2019-03-18 stsp 			    argv[0]);
 4165 e7301579 2019-03-18 stsp 			if (error)
 4166 e7301579 2019-03-18 stsp 				goto done;
 4167 e7301579 2019-03-18 stsp 		} else {
 4168 e7301579 2019-03-18 stsp 			path = strdup(argv[0]);
 4169 e7301579 2019-03-18 stsp 			if (path == NULL) {
 4170 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 4171 e7301579 2019-03-18 stsp 				goto done;
 4172 e7301579 2019-03-18 stsp 			}
 4173 e7301579 2019-03-18 stsp 		}
 4174 603cdeb0 2020-10-22 stsp 	} else if (argc != 0)
 4175 cbd1af7a 2019-03-18 stsp 		usage_log();
 4176 cbd1af7a 2019-03-18 stsp 
 4177 5486daa2 2019-05-11 stsp 	if (repo_path == NULL) {
 4178 5486daa2 2019-05-11 stsp 		repo_path = worktree ?
 4179 5486daa2 2019-05-11 stsp 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
 4180 5486daa2 2019-05-11 stsp 	}
 4181 04ca23f4 2018-07-16 stsp 	if (repo_path == NULL) {
 4182 638f9024 2019-05-13 stsp 		error = got_error_from_errno("strdup");
 4183 cffc0aa4 2019-02-05 stsp 		goto done;
 4184 04ca23f4 2018-07-16 stsp 	}
 4185 6098196c 2019-01-04 stsp 
 4186 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 4187 d7d4f210 2018-03-12 stsp 	if (error != NULL)
 4188 04ca23f4 2018-07-16 stsp 		goto done;
 4189 f42b1b34 2018-03-12 stsp 
 4190 c02c541e 2019-03-29 stsp 	error = apply_unveil(got_repo_get_path(repo), 1,
 4191 c530dc23 2019-07-23 stsp 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 4192 c02c541e 2019-03-29 stsp 	if (error)
 4193 c02c541e 2019-03-29 stsp 		goto done;
 4194 c02c541e 2019-03-29 stsp 
 4195 84de9106 2020-12-26 stsp 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
 4196 84de9106 2020-12-26 stsp 	if (error)
 4197 84de9106 2020-12-26 stsp 		goto done;
 4198 84de9106 2020-12-26 stsp 
 4199 888b7d99 2020-12-26 stsp 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
 4200 888b7d99 2020-12-26 stsp 	if (error)
 4201 888b7d99 2020-12-26 stsp 		goto done;
 4202 888b7d99 2020-12-26 stsp 
 4203 d142fc45 2018-04-01 stsp 	if (start_commit == NULL) {
 4204 3235492e 2018-04-01 stsp 		struct got_reference *head_ref;
 4205 d1fe46f9 2020-04-18 stsp 		struct got_commit_object *commit = NULL;
 4206 1cc14b9f 2019-05-14 stsp 		error = got_ref_open(&head_ref, repo,
 4207 1cc14b9f 2019-05-14 stsp 		    worktree ? got_worktree_get_head_ref_name(worktree)
 4208 1cc14b9f 2019-05-14 stsp 		    : GOT_REF_HEAD, 0);
 4209 3235492e 2018-04-01 stsp 		if (error != NULL)
 4210 d1fe46f9 2020-04-18 stsp 			goto done;
 4211 d1fe46f9 2020-04-18 stsp 		error = got_ref_resolve(&start_id, repo, head_ref);
 4212 3235492e 2018-04-01 stsp 		got_ref_close(head_ref);
 4213 3235492e 2018-04-01 stsp 		if (error != NULL)
 4214 d1fe46f9 2020-04-18 stsp 			goto done;
 4215 d1fe46f9 2020-04-18 stsp 		error = got_object_open_as_commit(&commit, repo,
 4216 d1fe46f9 2020-04-18 stsp 		    start_id);
 4217 d1fe46f9 2020-04-18 stsp 		if (error != NULL)
 4218 d1fe46f9 2020-04-18 stsp 			goto done;
 4219 d1fe46f9 2020-04-18 stsp 		got_object_commit_close(commit);
 4220 3235492e 2018-04-01 stsp 	} else {
 4221 7f9bfb31 2020-11-01 stsp 		error = got_repo_match_object_id(&start_id, NULL,
 4222 84de9106 2020-12-26 stsp 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 4223 d1fe46f9 2020-04-18 stsp 		if (error != NULL)
 4224 d1fe46f9 2020-04-18 stsp 			goto done;
 4225 3235492e 2018-04-01 stsp 	}
 4226 d1fe46f9 2020-04-18 stsp 	if (end_commit != NULL) {
 4227 7f9bfb31 2020-11-01 stsp 		error = got_repo_match_object_id(&end_id, NULL,
 4228 84de9106 2020-12-26 stsp 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 4229 d1fe46f9 2020-04-18 stsp 		if (error != NULL)
 4230 d1fe46f9 2020-04-18 stsp 			goto done;
 4231 d1fe46f9 2020-04-18 stsp 	}
 4232 04ca23f4 2018-07-16 stsp 
 4233 deeabeae 2019-08-27 stsp 	if (worktree) {
 4234 603cdeb0 2020-10-22 stsp 		/*
 4235 603cdeb0 2020-10-22 stsp 		 * If a path was specified on the command line it was resolved
 4236 603cdeb0 2020-10-22 stsp 		 * to a path in the work tree above. Prepend the work tree's
 4237 603cdeb0 2020-10-22 stsp 		 * path prefix to obtain the corresponding in-repository path.
 4238 603cdeb0 2020-10-22 stsp 		 */
 4239 603cdeb0 2020-10-22 stsp 		if (path) {
 4240 603cdeb0 2020-10-22 stsp 			const char *prefix;
 4241 603cdeb0 2020-10-22 stsp 			prefix = got_worktree_get_path_prefix(worktree);
 4242 603cdeb0 2020-10-22 stsp 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
 4243 603cdeb0 2020-10-22 stsp 			    (path[0] != '\0') ? "/" : "", path) == -1) {
 4244 603cdeb0 2020-10-22 stsp 				error = got_error_from_errno("asprintf");
 4245 603cdeb0 2020-10-22 stsp 				goto done;
 4246 603cdeb0 2020-10-22 stsp 			}
 4247 603cdeb0 2020-10-22 stsp 		}
 4248 deeabeae 2019-08-27 stsp 	} else
 4249 603cdeb0 2020-10-22 stsp 		error = got_repo_map_path(&in_repo_path, repo,
 4250 8fa913ec 2020-11-14 stsp 		    path ? path : "");
 4251 04ca23f4 2018-07-16 stsp 	if (error != NULL)
 4252 04ca23f4 2018-07-16 stsp 		goto done;
 4253 04ca23f4 2018-07-16 stsp 	if (in_repo_path) {
 4254 04ca23f4 2018-07-16 stsp 		free(path);
 4255 04ca23f4 2018-07-16 stsp 		path = in_repo_path;
 4256 04ca23f4 2018-07-16 stsp 	}
 4257 199a4027 2019-02-02 stsp 
 4258 603cdeb0 2020-10-22 stsp 	error = print_commits(start_id, end_id, repo, path ? path : "",
 4259 603cdeb0 2020-10-22 stsp 	    show_changed_paths, show_patch, search_pattern, diff_context,
 4260 888b7d99 2020-12-26 stsp 	    limit, log_branches, reverse_display_order, refs_idmap);
 4261 04ca23f4 2018-07-16 stsp done:
 4262 04ca23f4 2018-07-16 stsp 	free(path);
 4263 04ca23f4 2018-07-16 stsp 	free(repo_path);
 4264 04ca23f4 2018-07-16 stsp 	free(cwd);
 4265 cffc0aa4 2019-02-05 stsp 	if (worktree)
 4266 cffc0aa4 2019-02-05 stsp 		got_worktree_close(worktree);
 4267 ad242220 2018-09-08 stsp 	if (repo) {
 4268 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 4269 ad242220 2018-09-08 stsp 		if (error == NULL)
 4270 1d0f4054 2021-06-17 stsp 			error = close_err;
 4271 ad242220 2018-09-08 stsp 	}
 4272 888b7d99 2020-12-26 stsp 	if (refs_idmap)
 4273 888b7d99 2020-12-26 stsp 		got_reflist_object_id_map_free(refs_idmap);
 4274 e2e879a0 2019-03-11 stsp 	got_ref_list_free(&refs);
 4275 8bf5b3c9 2018-03-17 stsp 	return error;
 4276 5c860e29 2018-03-12 stsp }
 4277 5c860e29 2018-03-12 stsp 
 4278 4ed7e80c 2018-05-20 stsp __dead static void
 4279 3f8b7d6a 2018-04-01 stsp usage_diff(void)
 4280 3f8b7d6a 2018-04-01 stsp {
 4281 2777a004 2021-10-12 thomas 	fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
 4282 2777a004 2021-10-12 thomas 	    "[-r repository-path] [-s] [-w] [-P] "
 4283 2777a004 2021-10-12 thomas 	    "[object1 object2 | path ...]\n", getprogname());
 4284 3f8b7d6a 2018-04-01 stsp 	exit(1);
 4285 b00d56cd 2018-04-01 stsp }
 4286 b00d56cd 2018-04-01 stsp 
 4287 b72f483a 2019-02-05 stsp struct print_diff_arg {
 4288 b72f483a 2019-02-05 stsp 	struct got_repository *repo;
 4289 b72f483a 2019-02-05 stsp 	struct got_worktree *worktree;
 4290 b72f483a 2019-02-05 stsp 	int diff_context;
 4291 3fc0c068 2019-02-10 stsp 	const char *id_str;
 4292 3fc0c068 2019-02-10 stsp 	int header_shown;
 4293 98eaaa12 2019-08-03 stsp 	int diff_staged;
 4294 63035f9f 2019-10-06 stsp 	int ignore_whitespace;
 4295 64453f7e 2020-11-21 stsp 	int force_text_diff;
 4296 b72f483a 2019-02-05 stsp };
 4297 39449a05 2020-07-23 stsp 
 4298 39449a05 2020-07-23 stsp /*
 4299 39449a05 2020-07-23 stsp  * Create a file which contains the target path of a symlink so we can feed
 4300 39449a05 2020-07-23 stsp  * it as content to the diff engine.
 4301 39449a05 2020-07-23 stsp  */
 4302 39449a05 2020-07-23 stsp static const struct got_error *
 4303 39449a05 2020-07-23 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
 4304 39449a05 2020-07-23 stsp     const char *abspath)
 4305 39449a05 2020-07-23 stsp {
 4306 39449a05 2020-07-23 stsp 	const struct got_error *err = NULL;
 4307 39449a05 2020-07-23 stsp 	char target_path[PATH_MAX];
 4308 39449a05 2020-07-23 stsp 	ssize_t target_len, outlen;
 4309 39449a05 2020-07-23 stsp 
 4310 39449a05 2020-07-23 stsp 	*fd = -1;
 4311 39449a05 2020-07-23 stsp 
 4312 39449a05 2020-07-23 stsp 	if (dirfd != -1) {
 4313 39449a05 2020-07-23 stsp 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
 4314 39449a05 2020-07-23 stsp 		if (target_len == -1)
 4315 39449a05 2020-07-23 stsp 			return got_error_from_errno2("readlinkat", abspath);
 4316 39449a05 2020-07-23 stsp 	} else {
 4317 39449a05 2020-07-23 stsp 		target_len = readlink(abspath, target_path, PATH_MAX);
 4318 39449a05 2020-07-23 stsp 		if (target_len == -1)
 4319 39449a05 2020-07-23 stsp 			return got_error_from_errno2("readlink", abspath);
 4320 39449a05 2020-07-23 stsp 	}
 4321 39449a05 2020-07-23 stsp 
 4322 39449a05 2020-07-23 stsp 	*fd = got_opentempfd();
 4323 39449a05 2020-07-23 stsp 	if (*fd == -1)
 4324 39449a05 2020-07-23 stsp 		return got_error_from_errno("got_opentempfd");
 4325 39449a05 2020-07-23 stsp 
 4326 39449a05 2020-07-23 stsp 	outlen = write(*fd, target_path, target_len);
 4327 39449a05 2020-07-23 stsp 	if (outlen == -1) {
 4328 39449a05 2020-07-23 stsp 		err = got_error_from_errno("got_opentempfd");
 4329 39449a05 2020-07-23 stsp 		goto done;
 4330 39449a05 2020-07-23 stsp 	}
 4331 39449a05 2020-07-23 stsp 
 4332 39449a05 2020-07-23 stsp 	if (lseek(*fd, 0, SEEK_SET) == -1) {
 4333 39449a05 2020-07-23 stsp 		err = got_error_from_errno2("lseek", abspath);
 4334 39449a05 2020-07-23 stsp 		goto done;
 4335 39449a05 2020-07-23 stsp 	}
 4336 39449a05 2020-07-23 stsp done:
 4337 39449a05 2020-07-23 stsp 	if (err) {
 4338 39449a05 2020-07-23 stsp 		close(*fd);
 4339 39449a05 2020-07-23 stsp 		*fd = -1;
 4340 39449a05 2020-07-23 stsp 	}
 4341 39449a05 2020-07-23 stsp 	return err;
 4342 39449a05 2020-07-23 stsp }
 4343 b72f483a 2019-02-05 stsp 
 4344 4ed7e80c 2018-05-20 stsp static const struct got_error *
 4345 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
 4346 88d0e355 2019-08-03 stsp     const char *path, struct got_object_id *blob_id,
 4347 12463d8b 2019-12-13 stsp     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
 4348 12463d8b 2019-12-13 stsp     int dirfd, const char *de_name)
 4349 b72f483a 2019-02-05 stsp {
 4350 b72f483a 2019-02-05 stsp 	struct print_diff_arg *a = arg;
 4351 b72f483a 2019-02-05 stsp 	const struct got_error *err = NULL;
 4352 b72f483a 2019-02-05 stsp 	struct got_blob_object *blob1 = NULL;
 4353 12463d8b 2019-12-13 stsp 	int fd = -1;
 4354 b72f483a 2019-02-05 stsp 	FILE *f2 = NULL;
 4355 4ce46740 2019-08-08 stsp 	char *abspath = NULL, *label1 = NULL;
 4356 b72f483a 2019-02-05 stsp 	struct stat sb;
 4357 b72f483a 2019-02-05 stsp 
 4358 98eaaa12 2019-08-03 stsp 	if (a->diff_staged) {
 4359 98eaaa12 2019-08-03 stsp 		if (staged_status != GOT_STATUS_MODIFY &&
 4360 98eaaa12 2019-08-03 stsp 		    staged_status != GOT_STATUS_ADD &&
 4361 98eaaa12 2019-08-03 stsp 		    staged_status != GOT_STATUS_DELETE)
 4362 98eaaa12 2019-08-03 stsp 			return NULL;
 4363 98eaaa12 2019-08-03 stsp 	} else {
 4364 98eaaa12 2019-08-03 stsp 		if (staged_status == GOT_STATUS_DELETE)
 4365 98eaaa12 2019-08-03 stsp 			return NULL;
 4366 2a06fe5f 2019-08-24 stsp 		if (status == GOT_STATUS_NONEXISTENT)
 4367 2a06fe5f 2019-08-24 stsp 			return got_error_set_errno(ENOENT, path);
 4368 98eaaa12 2019-08-03 stsp 		if (status != GOT_STATUS_MODIFY &&
 4369 98eaaa12 2019-08-03 stsp 		    status != GOT_STATUS_ADD &&
 4370 98eaaa12 2019-08-03 stsp 		    status != GOT_STATUS_DELETE &&
 4371 98eaaa12 2019-08-03 stsp 		    status != GOT_STATUS_CONFLICT)
 4372 98eaaa12 2019-08-03 stsp 			return NULL;
 4373 98eaaa12 2019-08-03 stsp 	}
 4374 3fc0c068 2019-02-10 stsp 
 4375 3fc0c068 2019-02-10 stsp 	if (!a->header_shown) {
 4376 98eaaa12 2019-08-03 stsp 		printf("diff %s %s%s\n", a->id_str,
 4377 98eaaa12 2019-08-03 stsp 		    got_worktree_get_root_path(a->worktree),
 4378 98eaaa12 2019-08-03 stsp 		    a->diff_staged ? " (staged changes)" : "");
 4379 3fc0c068 2019-02-10 stsp 		a->header_shown = 1;
 4380 3fc0c068 2019-02-10 stsp 	}
 4381 b72f483a 2019-02-05 stsp 
 4382 98eaaa12 2019-08-03 stsp 	if (a->diff_staged) {
 4383 98eaaa12 2019-08-03 stsp 		const char *label1 = NULL, *label2 = NULL;
 4384 98eaaa12 2019-08-03 stsp 		switch (staged_status) {
 4385 98eaaa12 2019-08-03 stsp 		case GOT_STATUS_MODIFY:
 4386 98eaaa12 2019-08-03 stsp 			label1 = path;
 4387 98eaaa12 2019-08-03 stsp 			label2 = path;
 4388 98eaaa12 2019-08-03 stsp 			break;
 4389 98eaaa12 2019-08-03 stsp 		case GOT_STATUS_ADD:
 4390 98eaaa12 2019-08-03 stsp 			label2 = path;
 4391 98eaaa12 2019-08-03 stsp 			break;
 4392 98eaaa12 2019-08-03 stsp 		case GOT_STATUS_DELETE:
 4393 98eaaa12 2019-08-03 stsp 			label1 = path;
 4394 98eaaa12 2019-08-03 stsp 			break;
 4395 98eaaa12 2019-08-03 stsp 		default:
 4396 98eaaa12 2019-08-03 stsp 			return got_error(GOT_ERR_FILE_STATUS);
 4397 98eaaa12 2019-08-03 stsp 		}
 4398 fe621944 2020-11-10 stsp 		return got_diff_objects_as_blobs(NULL, NULL, blob_id,
 4399 fe621944 2020-11-10 stsp 		    staged_blob_id, label1, label2, a->diff_context,
 4400 64453f7e 2020-11-21 stsp 		    a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
 4401 98eaaa12 2019-08-03 stsp 	}
 4402 98eaaa12 2019-08-03 stsp 
 4403 408b4ebc 2019-08-03 stsp 	if (staged_status == GOT_STATUS_ADD ||
 4404 4ce46740 2019-08-08 stsp 	    staged_status == GOT_STATUS_MODIFY) {
 4405 4ce46740 2019-08-08 stsp 		char *id_str;
 4406 408b4ebc 2019-08-03 stsp 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
 4407 408b4ebc 2019-08-03 stsp 		    8192);
 4408 4ce46740 2019-08-08 stsp 		if (err)
 4409 4ce46740 2019-08-08 stsp 			goto done;
 4410 4ce46740 2019-08-08 stsp 		err = got_object_id_str(&id_str, staged_blob_id);
 4411 4ce46740 2019-08-08 stsp 		if (err)
 4412 4ce46740 2019-08-08 stsp 			goto done;
 4413 4ce46740 2019-08-08 stsp 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
 4414 4ce46740 2019-08-08 stsp 			err = got_error_from_errno("asprintf");
 4415 4ce46740 2019-08-08 stsp 			free(id_str);
 4416 4ce46740 2019-08-08 stsp 			goto done;
 4417 4ce46740 2019-08-08 stsp 		}
 4418 4ce46740 2019-08-08 stsp 		free(id_str);
 4419 4ce46740 2019-08-08 stsp 	} else if (status != GOT_STATUS_ADD) {
 4420 016a88dd 2019-05-13 stsp 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
 4421 4ce46740 2019-08-08 stsp 		if (err)
 4422 4ce46740 2019-08-08 stsp 			goto done;
 4423 4ce46740 2019-08-08 stsp 	}
 4424 d00136be 2019-03-26 stsp 
 4425 7154f6ce 2019-03-27 stsp 	if (status != GOT_STATUS_DELETE) {
 4426 2ec1f75b 2019-03-26 stsp 		if (asprintf(&abspath, "%s/%s",
 4427 2ec1f75b 2019-03-26 stsp 		    got_worktree_get_root_path(a->worktree), path) == -1) {
 4428 638f9024 2019-05-13 stsp 			err = got_error_from_errno("asprintf");
 4429 2ec1f75b 2019-03-26 stsp 			goto done;
 4430 2ec1f75b 2019-03-26 stsp 		}
 4431 b72f483a 2019-02-05 stsp 
 4432 12463d8b 2019-12-13 stsp 		if (dirfd != -1) {
 4433 12463d8b 2019-12-13 stsp 			fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
 4434 12463d8b 2019-12-13 stsp 			if (fd == -1) {
 4435 3dc1dc04 2021-09-27 thomas 				if (!got_err_open_nofollow_on_symlink()) { 
 4436 39449a05 2020-07-23 stsp 					err = got_error_from_errno2("openat",
 4437 39449a05 2020-07-23 stsp 					    abspath);
 4438 39449a05 2020-07-23 stsp 					goto done;
 4439 39449a05 2020-07-23 stsp 				}
 4440 39449a05 2020-07-23 stsp 				err = get_symlink_target_file(&fd, dirfd,
 4441 39449a05 2020-07-23 stsp 				    de_name, abspath);
 4442 39449a05 2020-07-23 stsp 				if (err)
 4443 39449a05 2020-07-23 stsp 					goto done;
 4444 12463d8b 2019-12-13 stsp 			}
 4445 12463d8b 2019-12-13 stsp 		} else {
 4446 12463d8b 2019-12-13 stsp 			fd = open(abspath, O_RDONLY | O_NOFOLLOW);
 4447 12463d8b 2019-12-13 stsp 			if (fd == -1) {
 4448 3dc1dc04 2021-09-27 thomas 				if (!got_err_open_nofollow_on_symlink()) {
 4449 39449a05 2020-07-23 stsp 					err = got_error_from_errno2("open",
 4450 39449a05 2020-07-23 stsp 					    abspath);
 4451 39449a05 2020-07-23 stsp 					goto done;
 4452 39449a05 2020-07-23 stsp 				}
 4453 39449a05 2020-07-23 stsp 				err = get_symlink_target_file(&fd, dirfd,
 4454 39449a05 2020-07-23 stsp 				    de_name, abspath);
 4455 39449a05 2020-07-23 stsp 				if (err)
 4456 39449a05 2020-07-23 stsp 					goto done;
 4457 12463d8b 2019-12-13 stsp 			}
 4458 12463d8b 2019-12-13 stsp 		}
 4459 12463d8b 2019-12-13 stsp 		if (fstat(fd, &sb) == -1) {
 4460 12463d8b 2019-12-13 stsp 			err = got_error_from_errno2("fstat", abspath);
 4461 2ec1f75b 2019-03-26 stsp 			goto done;
 4462 2ec1f75b 2019-03-26 stsp 		}
 4463 12463d8b 2019-12-13 stsp 		f2 = fdopen(fd, "r");
 4464 12463d8b 2019-12-13 stsp 		if (f2 == NULL) {
 4465 12463d8b 2019-12-13 stsp 			err = got_error_from_errno2("fdopen", abspath);
 4466 2ec1f75b 2019-03-26 stsp 			goto done;
 4467 2ec1f75b 2019-03-26 stsp 		}
 4468 12463d8b 2019-12-13 stsp 		fd = -1;
 4469 2ec1f75b 2019-03-26 stsp 	} else
 4470 2ec1f75b 2019-03-26 stsp 		sb.st_size = 0;
 4471 b72f483a 2019-02-05 stsp 
 4472 4ce46740 2019-08-08 stsp 	err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
 4473 64453f7e 2020-11-21 stsp 	    a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
 4474 b72f483a 2019-02-05 stsp done:
 4475 b72f483a 2019-02-05 stsp 	if (blob1)
 4476 b72f483a 2019-02-05 stsp 		got_object_blob_close(blob1);
 4477 12463d8b 2019-12-13 stsp 	if (f2 && fclose(f2) == EOF && err == NULL)
 4478 638f9024 2019-05-13 stsp 		err = got_error_from_errno("fclose");
 4479 12463d8b 2019-12-13 stsp 	if (fd != -1 && close(fd) == -1 && err == NULL)
 4480 12463d8b 2019-12-13 stsp 		err = got_error_from_errno("close");
 4481 b72f483a 2019-02-05 stsp 	free(abspath);
 4482 927df6b7 2019-02-10 stsp 	return err;
 4483 927df6b7 2019-02-10 stsp }
 4484 927df6b7 2019-02-10 stsp 
 4485 927df6b7 2019-02-10 stsp static const struct got_error *
 4486 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
 4487 b00d56cd 2018-04-01 stsp {
 4488 b00d56cd 2018-04-01 stsp 	const struct got_error *error;
 4489 b00d56cd 2018-04-01 stsp 	struct got_repository *repo = NULL;
 4490 b72f483a 2019-02-05 stsp 	struct got_worktree *worktree = NULL;
 4491 b72f483a 2019-02-05 stsp 	char *cwd = NULL, *repo_path = NULL;
 4492 cc8021af 2021-10-12 thomas 	const char *commit_args[2] = { NULL, NULL };
 4493 cc8021af 2021-10-12 thomas 	int ncommit_args = 0;
 4494 30f6c0c6 2021-10-08 thomas 	struct got_object_id *ids[2] = { NULL, NULL };
 4495 30f6c0c6 2021-10-08 thomas 	char *labels[2] = { NULL, NULL };
 4496 cc8021af 2021-10-12 thomas 	int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
 4497 30f6c0c6 2021-10-08 thomas 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
 4498 30f6c0c6 2021-10-08 thomas 	int force_text_diff = 0, force_path = 0, rflag = 0;
 4499 c0cc5c62 2018-10-18 stsp 	const char *errstr;
 4500 84de9106 2020-12-26 stsp 	struct got_reflist_head refs;
 4501 30f6c0c6 2021-10-08 thomas 	struct got_pathlist_head paths;
 4502 30f6c0c6 2021-10-08 thomas 	struct got_pathlist_entry *pe;
 4503 b00d56cd 2018-04-01 stsp 
 4504 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
 4505 30f6c0c6 2021-10-08 thomas 	TAILQ_INIT(&paths);
 4506 84de9106 2020-12-26 stsp 
 4507 b00d56cd 2018-04-01 stsp #ifndef PROFILE
 4508 25eccc22 2019-01-04 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 4509 25eccc22 2019-01-04 stsp 	    NULL) == -1)
 4510 b00d56cd 2018-04-01 stsp 		err(1, "pledge");
 4511 b00d56cd 2018-04-01 stsp #endif
 4512 b00d56cd 2018-04-01 stsp 
 4513 cc8021af 2021-10-12 thomas 	while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
 4514 b00d56cd 2018-04-01 stsp 		switch (ch) {
 4515 64453f7e 2020-11-21 stsp 		case 'a':
 4516 64453f7e 2020-11-21 stsp 			force_text_diff = 1;
 4517 64453f7e 2020-11-21 stsp 			break;
 4518 cc8021af 2021-10-12 thomas 		case 'c':
 4519 cc8021af 2021-10-12 thomas 			if (ncommit_args >= 2)
 4520 cc8021af 2021-10-12 thomas 				errx(1, "too many -c options used");
 4521 cc8021af 2021-10-12 thomas 			commit_args[ncommit_args++] = optarg;
 4522 cc8021af 2021-10-12 thomas 			break;
 4523 c0cc5c62 2018-10-18 stsp 		case 'C':
 4524 dfcab68b 2019-11-29 kn 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
 4525 dfcab68b 2019-11-29 kn 			    &errstr);
 4526 c0cc5c62 2018-10-18 stsp 			if (errstr != NULL)
 4527 c0cc5c62 2018-10-18 stsp 				err(1, "-C option %s", errstr);
 4528 c0cc5c62 2018-10-18 stsp 			break;
 4529 b72f483a 2019-02-05 stsp 		case 'r':
 4530 b72f483a 2019-02-05 stsp 			repo_path = realpath(optarg, NULL);
 4531 b72f483a 2019-02-05 stsp 			if (repo_path == NULL)
 4532 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 4533 9ba1d308 2019-10-21 stsp 				    optarg);
 4534 7fbaa4f3 2019-05-11 stsp 			got_path_strip_trailing_slashes(repo_path);
 4535 30f6c0c6 2021-10-08 thomas 			rflag = 1;
 4536 b72f483a 2019-02-05 stsp 			break;
 4537 98eaaa12 2019-08-03 stsp 		case 's':
 4538 98eaaa12 2019-08-03 stsp 			diff_staged = 1;
 4539 63035f9f 2019-10-06 stsp 			break;
 4540 63035f9f 2019-10-06 stsp 		case 'w':
 4541 63035f9f 2019-10-06 stsp 			ignore_whitespace = 1;
 4542 98eaaa12 2019-08-03 stsp 			break;
 4543 30f6c0c6 2021-10-08 thomas 		case 'P':
 4544 30f6c0c6 2021-10-08 thomas 			force_path = 1;
 4545 30f6c0c6 2021-10-08 thomas 			break;
 4546 b00d56cd 2018-04-01 stsp 		default:
 4547 2deda0b9 2019-03-07 stsp 			usage_diff();
 4548 b00d56cd 2018-04-01 stsp 			/* NOTREACHED */
 4549 b00d56cd 2018-04-01 stsp 		}
 4550 b00d56cd 2018-04-01 stsp 	}
 4551 b00d56cd 2018-04-01 stsp 
 4552 b00d56cd 2018-04-01 stsp 	argc -= optind;
 4553 b00d56cd 2018-04-01 stsp 	argv += optind;
 4554 b00d56cd 2018-04-01 stsp 
 4555 b72f483a 2019-02-05 stsp 	cwd = getcwd(NULL, 0);
 4556 b72f483a 2019-02-05 stsp 	if (cwd == NULL) {
 4557 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 4558 b72f483a 2019-02-05 stsp 		goto done;
 4559 b72f483a 2019-02-05 stsp 	}
 4560 30f6c0c6 2021-10-08 thomas 
 4561 30f6c0c6 2021-10-08 thomas 	if (repo_path == NULL) {
 4562 1f03b8da 2020-03-20 stsp 		error = got_worktree_open(&worktree, cwd);
 4563 30f6c0c6 2021-10-08 thomas 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 4564 1f03b8da 2020-03-20 stsp 			goto done;
 4565 30f6c0c6 2021-10-08 thomas 		else
 4566 30f6c0c6 2021-10-08 thomas 			error = NULL;
 4567 30f6c0c6 2021-10-08 thomas 		if (worktree) {
 4568 30f6c0c6 2021-10-08 thomas 			repo_path =
 4569 30f6c0c6 2021-10-08 thomas 			    strdup(got_worktree_get_repo_path(worktree));
 4570 30f6c0c6 2021-10-08 thomas 			if (repo_path == NULL) {
 4571 30f6c0c6 2021-10-08 thomas 				error = got_error_from_errno("strdup");
 4572 927df6b7 2019-02-10 stsp 				goto done;
 4573 30f6c0c6 2021-10-08 thomas 			}
 4574 927df6b7 2019-02-10 stsp 		} else {
 4575 30f6c0c6 2021-10-08 thomas 			repo_path = strdup(cwd);
 4576 1a1242a9 2021-04-01 kn 			if (repo_path == NULL) {
 4577 1a1242a9 2021-04-01 kn 				error = got_error_from_errno("strdup");
 4578 1a1242a9 2021-04-01 kn 				goto done;
 4579 30db809c 2019-06-05 stsp 			}
 4580 30db809c 2019-06-05 stsp 		}
 4581 30f6c0c6 2021-10-08 thomas 	}
 4582 b00d56cd 2018-04-01 stsp 
 4583 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 4584 76089277 2018-04-01 stsp 	free(repo_path);
 4585 b00d56cd 2018-04-01 stsp 	if (error != NULL)
 4586 b00d56cd 2018-04-01 stsp 		goto done;
 4587 cc8021af 2021-10-12 thomas 
 4588 cc8021af 2021-10-12 thomas 	if (rflag || worktree == NULL || ncommit_args > 0) {
 4589 cc8021af 2021-10-12 thomas 		if (force_path) {
 4590 cc8021af 2021-10-12 thomas 			error = got_error_msg(GOT_ERR_NOT_IMPL,
 4591 cc8021af 2021-10-12 thomas 			    "-P option can only be used when diffing "
 4592 cc8021af 2021-10-12 thomas 			    "a work tree");
 4593 cc8021af 2021-10-12 thomas 			goto done;
 4594 cc8021af 2021-10-12 thomas 		}
 4595 cc8021af 2021-10-12 thomas 		if (diff_staged) {
 4596 cc8021af 2021-10-12 thomas 			error = got_error_msg(GOT_ERR_NOT_IMPL,
 4597 cc8021af 2021-10-12 thomas 			    "-s option can only be used when diffing "
 4598 cc8021af 2021-10-12 thomas 			    "a work tree");
 4599 cc8021af 2021-10-12 thomas 			goto done;
 4600 cc8021af 2021-10-12 thomas 		}
 4601 cc8021af 2021-10-12 thomas 	}
 4602 b00d56cd 2018-04-01 stsp 
 4603 c02c541e 2019-03-29 stsp 	error = apply_unveil(got_repo_get_path(repo), 1,
 4604 c530dc23 2019-07-23 stsp 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 4605 c02c541e 2019-03-29 stsp 	if (error)
 4606 c02c541e 2019-03-29 stsp 		goto done;
 4607 c02c541e 2019-03-29 stsp 
 4608 cc8021af 2021-10-12 thomas 	if ((!force_path && argc == 2) || ncommit_args > 0) {
 4609 cc8021af 2021-10-12 thomas 		int obj_type = (ncommit_args > 0 ?
 4610 cc8021af 2021-10-12 thomas 		    GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
 4611 30f6c0c6 2021-10-08 thomas 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
 4612 30f6c0c6 2021-10-08 thomas 		    NULL);
 4613 30f6c0c6 2021-10-08 thomas 		if (error)
 4614 30f6c0c6 2021-10-08 thomas 			goto done;
 4615 cc8021af 2021-10-12 thomas 		for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
 4616 cc8021af 2021-10-12 thomas 			const char *arg;
 4617 cc8021af 2021-10-12 thomas 			if (ncommit_args > 0)
 4618 cc8021af 2021-10-12 thomas 				arg = commit_args[i];
 4619 cc8021af 2021-10-12 thomas 			else
 4620 cc8021af 2021-10-12 thomas 				arg = argv[i];
 4621 30f6c0c6 2021-10-08 thomas 			error = got_repo_match_object_id(&ids[i], &labels[i],
 4622 cc8021af 2021-10-12 thomas 			    arg, obj_type, &refs, repo);
 4623 30f6c0c6 2021-10-08 thomas 			if (error) {
 4624 30f6c0c6 2021-10-08 thomas 				if (error->code != GOT_ERR_NOT_REF &&
 4625 30f6c0c6 2021-10-08 thomas 				    error->code != GOT_ERR_NO_OBJ)
 4626 30f6c0c6 2021-10-08 thomas 					goto done;
 4627 cc8021af 2021-10-12 thomas 				if (ncommit_args > 0)
 4628 cc8021af 2021-10-12 thomas 					goto done;
 4629 30f6c0c6 2021-10-08 thomas 				error = NULL;
 4630 30f6c0c6 2021-10-08 thomas 				break;
 4631 30f6c0c6 2021-10-08 thomas 			}
 4632 30f6c0c6 2021-10-08 thomas 		}
 4633 30f6c0c6 2021-10-08 thomas 	}
 4634 30f6c0c6 2021-10-08 thomas 
 4635 cc8021af 2021-10-12 thomas 	if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
 4636 b72f483a 2019-02-05 stsp 		struct print_diff_arg arg;
 4637 b72f483a 2019-02-05 stsp 		char *id_str;
 4638 72ea6654 2019-07-27 stsp 
 4639 cc8021af 2021-10-12 thomas 		if (worktree == NULL) {
 4640 cc8021af 2021-10-12 thomas 			if (argc == 2 && ids[0] == NULL) {
 4641 cc8021af 2021-10-12 thomas 				error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
 4642 cc8021af 2021-10-12 thomas 				goto done;
 4643 cc8021af 2021-10-12 thomas 			} else if (argc == 2 && ids[1] == NULL) {
 4644 cc8021af 2021-10-12 thomas 				error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
 4645 cc8021af 2021-10-12 thomas 				goto done;
 4646 cc8021af 2021-10-12 thomas 			} else if (argc > 0) {
 4647 cc8021af 2021-10-12 thomas 				error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
 4648 cc8021af 2021-10-12 thomas 				    "%s", "specified paths cannot be resolved");
 4649 cc8021af 2021-10-12 thomas 				goto done;
 4650 cc8021af 2021-10-12 thomas 			} else {
 4651 cc8021af 2021-10-12 thomas 				error = got_error(GOT_ERR_NOT_WORKTREE);
 4652 cc8021af 2021-10-12 thomas 				goto done;
 4653 cc8021af 2021-10-12 thomas 			}
 4654 cc8021af 2021-10-12 thomas 		}
 4655 cc8021af 2021-10-12 thomas 
 4656 cc8021af 2021-10-12 thomas 		error = get_worktree_paths_from_argv(&paths, argc, argv,
 4657 cc8021af 2021-10-12 thomas 		    worktree);
 4658 cc8021af 2021-10-12 thomas 		if (error)
 4659 cc8021af 2021-10-12 thomas 			goto done;
 4660 cc8021af 2021-10-12 thomas 
 4661 b72f483a 2019-02-05 stsp 		error = got_object_id_str(&id_str,
 4662 b72f483a 2019-02-05 stsp 		    got_worktree_get_base_commit_id(worktree));
 4663 b72f483a 2019-02-05 stsp 		if (error)
 4664 b72f483a 2019-02-05 stsp 			goto done;
 4665 b72f483a 2019-02-05 stsp 		arg.repo = repo;
 4666 b72f483a 2019-02-05 stsp 		arg.worktree = worktree;
 4667 b72f483a 2019-02-05 stsp 		arg.diff_context = diff_context;
 4668 3fc0c068 2019-02-10 stsp 		arg.id_str = id_str;
 4669 3fc0c068 2019-02-10 stsp 		arg.header_shown = 0;
 4670 98eaaa12 2019-08-03 stsp 		arg.diff_staged = diff_staged;
 4671 63035f9f 2019-10-06 stsp 		arg.ignore_whitespace = ignore_whitespace;
 4672 64453f7e 2020-11-21 stsp 		arg.force_text_diff = force_text_diff;
 4673 b72f483a 2019-02-05 stsp 
 4674 f6343036 2021-06-22 stsp 		error = got_worktree_status(worktree, &paths, repo, 0,
 4675 f6343036 2021-06-22 stsp 		    print_diff, &arg, check_cancelled, NULL);
 4676 b72f483a 2019-02-05 stsp 		free(id_str);
 4677 b72f483a 2019-02-05 stsp 		goto done;
 4678 b72f483a 2019-02-05 stsp 	}
 4679 84de9106 2020-12-26 stsp 
 4680 cc8021af 2021-10-12 thomas 	if (ncommit_args == 1) {
 4681 cc8021af 2021-10-12 thomas 		struct got_commit_object *commit;
 4682 cc8021af 2021-10-12 thomas 		error = got_object_open_as_commit(&commit, repo, ids[0]);
 4683 cc8021af 2021-10-12 thomas 		if (error)
 4684 30f6c0c6 2021-10-08 thomas 			goto done;
 4685 b00d56cd 2018-04-01 stsp 
 4686 cc8021af 2021-10-12 thomas 		labels[1] = labels[0];
 4687 cc8021af 2021-10-12 thomas 		ids[1] = ids[0];
 4688 cc8021af 2021-10-12 thomas 		if (got_object_commit_get_nparents(commit) > 0) {
 4689 cc8021af 2021-10-12 thomas 			const struct got_object_id_queue *pids;
 4690 cc8021af 2021-10-12 thomas 			struct got_object_qid *pid;
 4691 cc8021af 2021-10-12 thomas 			pids = got_object_commit_get_parent_ids(commit);
 4692 cc8021af 2021-10-12 thomas 			pid = STAILQ_FIRST(pids);
 4693 cc8021af 2021-10-12 thomas 			ids[0] = got_object_id_dup(pid->id);
 4694 cc8021af 2021-10-12 thomas 			if (ids[0] == NULL) {
 4695 cc8021af 2021-10-12 thomas 				error = got_error_from_errno(
 4696 cc8021af 2021-10-12 thomas 				    "got_object_id_dup");
 4697 cc8021af 2021-10-12 thomas 				got_object_commit_close(commit);
 4698 cc8021af 2021-10-12 thomas 				goto done;
 4699 cc8021af 2021-10-12 thomas 			}
 4700 cc8021af 2021-10-12 thomas 			error = got_object_id_str(&labels[0], ids[0]);
 4701 cc8021af 2021-10-12 thomas 			if (error) {
 4702 cc8021af 2021-10-12 thomas 				got_object_commit_close(commit);
 4703 cc8021af 2021-10-12 thomas 				goto done;
 4704 cc8021af 2021-10-12 thomas 			}
 4705 cc8021af 2021-10-12 thomas 		} else {
 4706 cc8021af 2021-10-12 thomas 			ids[0] = NULL;
 4707 cc8021af 2021-10-12 thomas 			labels[0] = strdup("/dev/null");
 4708 cc8021af 2021-10-12 thomas 			if (labels[0] == NULL) {
 4709 cc8021af 2021-10-12 thomas 				error = got_error_from_errno("strdup");
 4710 cc8021af 2021-10-12 thomas 				got_object_commit_close(commit);
 4711 cc8021af 2021-10-12 thomas 				goto done;
 4712 cc8021af 2021-10-12 thomas 			}
 4713 cc8021af 2021-10-12 thomas 		}
 4714 cc8021af 2021-10-12 thomas 
 4715 cc8021af 2021-10-12 thomas 		got_object_commit_close(commit);
 4716 cc8021af 2021-10-12 thomas 	}
 4717 cc8021af 2021-10-12 thomas 
 4718 cc8021af 2021-10-12 thomas 	if (ncommit_args == 0 && argc > 2) {
 4719 cc8021af 2021-10-12 thomas 		error = got_error_msg(GOT_ERR_BAD_PATH,
 4720 cc8021af 2021-10-12 thomas 		    "path arguments cannot be used when diffing two objects");
 4721 0adb7196 2019-08-11 stsp 		goto done;
 4722 cc8021af 2021-10-12 thomas 	}
 4723 b00d56cd 2018-04-01 stsp 
 4724 cc8021af 2021-10-12 thomas 	if (ids[0]) {
 4725 cc8021af 2021-10-12 thomas 		error = got_object_get_type(&type1, repo, ids[0]);
 4726 cc8021af 2021-10-12 thomas 		if (error)
 4727 cc8021af 2021-10-12 thomas 			goto done;
 4728 cc8021af 2021-10-12 thomas 	}
 4729 cc8021af 2021-10-12 thomas 
 4730 30f6c0c6 2021-10-08 thomas 	error = got_object_get_type(&type2, repo, ids[1]);
 4731 15a94983 2018-12-23 stsp 	if (error)
 4732 15a94983 2018-12-23 stsp 		goto done;
 4733 cc8021af 2021-10-12 thomas 	if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
 4734 b00d56cd 2018-04-01 stsp 		error = got_error(GOT_ERR_OBJ_TYPE);
 4735 b00d56cd 2018-04-01 stsp 		goto done;
 4736 b00d56cd 2018-04-01 stsp 	}
 4737 cc8021af 2021-10-12 thomas 	if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
 4738 cc8021af 2021-10-12 thomas 		error = got_error_msg(GOT_ERR_OBJ_TYPE,
 4739 cc8021af 2021-10-12 thomas 		    "path arguments cannot be used when diffing blobs");
 4740 cc8021af 2021-10-12 thomas 		goto done;
 4741 cc8021af 2021-10-12 thomas 	}
 4742 b00d56cd 2018-04-01 stsp 
 4743 cc8021af 2021-10-12 thomas 	for (i = 0; ncommit_args > 0 && i < argc; i++) {
 4744 cc8021af 2021-10-12 thomas 		char *in_repo_path;
 4745 cc8021af 2021-10-12 thomas 		struct got_pathlist_entry *new;
 4746 cc8021af 2021-10-12 thomas 		if (worktree) {
 4747 cc8021af 2021-10-12 thomas 			const char *prefix;
 4748 cc8021af 2021-10-12 thomas 			char *p;
 4749 cc8021af 2021-10-12 thomas 			error = got_worktree_resolve_path(&p, worktree,
 4750 cc8021af 2021-10-12 thomas 			    argv[i]);
 4751 cc8021af 2021-10-12 thomas 			if (error)
 4752 cc8021af 2021-10-12 thomas 				goto done;
 4753 cc8021af 2021-10-12 thomas 			prefix = got_worktree_get_path_prefix(worktree);
 4754 cc8021af 2021-10-12 thomas 			while (prefix[0] == '/')
 4755 cc8021af 2021-10-12 thomas 				prefix++;
 4756 cc8021af 2021-10-12 thomas 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
 4757 cc8021af 2021-10-12 thomas 			    (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
 4758 cc8021af 2021-10-12 thomas 			    p) == -1) {
 4759 cc8021af 2021-10-12 thomas 				error = got_error_from_errno("asprintf");
 4760 cc8021af 2021-10-12 thomas 				free(p);
 4761 cc8021af 2021-10-12 thomas 				goto done;
 4762 cc8021af 2021-10-12 thomas 			}
 4763 cc8021af 2021-10-12 thomas 			free(p);
 4764 cc8021af 2021-10-12 thomas 		} else {
 4765 cc8021af 2021-10-12 thomas 			char *mapped_path, *s;
 4766 cc8021af 2021-10-12 thomas 			error = got_repo_map_path(&mapped_path, repo, argv[i]);
 4767 cc8021af 2021-10-12 thomas 			if (error)
 4768 cc8021af 2021-10-12 thomas 				goto done;
 4769 cc8021af 2021-10-12 thomas 			s = mapped_path;
 4770 cc8021af 2021-10-12 thomas 			while (s[0] == '/')
 4771 cc8021af 2021-10-12 thomas 				s++;
 4772 cc8021af 2021-10-12 thomas 			in_repo_path = strdup(s);
 4773 cc8021af 2021-10-12 thomas 			if (in_repo_path == NULL) {
 4774 cc8021af 2021-10-12 thomas 				error = got_error_from_errno("asprintf");
 4775 cc8021af 2021-10-12 thomas 				free(mapped_path);
 4776 cc8021af 2021-10-12 thomas 				goto done;
 4777 cc8021af 2021-10-12 thomas 			}
 4778 cc8021af 2021-10-12 thomas 			free(mapped_path);
 4779 cc8021af 2021-10-12 thomas 
 4780 cc8021af 2021-10-12 thomas 		}
 4781 cc8021af 2021-10-12 thomas 		error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
 4782 cc8021af 2021-10-12 thomas 		if (error || new == NULL /* duplicate */)
 4783 cc8021af 2021-10-12 thomas 			free(in_repo_path);
 4784 cc8021af 2021-10-12 thomas 		if (error)
 4785 cc8021af 2021-10-12 thomas 			goto done;
 4786 cc8021af 2021-10-12 thomas 	}
 4787 cc8021af 2021-10-12 thomas 
 4788 cc8021af 2021-10-12 thomas 	switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
 4789 b00d56cd 2018-04-01 stsp 	case GOT_OBJ_TYPE_BLOB:
 4790 30f6c0c6 2021-10-08 thomas 		error = got_diff_objects_as_blobs(NULL, NULL, ids[0], ids[1],
 4791 64453f7e 2020-11-21 stsp 		    NULL, NULL, diff_context, ignore_whitespace,
 4792 64453f7e 2020-11-21 stsp 		    force_text_diff, repo, stdout);
 4793 b00d56cd 2018-04-01 stsp 		break;
 4794 b00d56cd 2018-04-01 stsp 	case GOT_OBJ_TYPE_TREE:
 4795 30f6c0c6 2021-10-08 thomas 		error = got_diff_objects_as_trees(NULL, NULL, ids[0], ids[1],
 4796 cc8021af 2021-10-12 thomas 		    &paths, "", "", diff_context, ignore_whitespace,
 4797 cc8021af 2021-10-12 thomas 		    force_text_diff, repo, stdout);
 4798 b00d56cd 2018-04-01 stsp 		break;
 4799 b00d56cd 2018-04-01 stsp 	case GOT_OBJ_TYPE_COMMIT:
 4800 30f6c0c6 2021-10-08 thomas 		printf("diff %s %s\n", labels[0], labels[1]);
 4801 30f6c0c6 2021-10-08 thomas 		error = got_diff_objects_as_commits(NULL, NULL, ids[0], ids[1],
 4802 cc8021af 2021-10-12 thomas 		    &paths, diff_context, ignore_whitespace, force_text_diff,
 4803 cc8021af 2021-10-12 thomas 		    repo, stdout);
 4804 b00d56cd 2018-04-01 stsp 		break;
 4805 b00d56cd 2018-04-01 stsp 	default:
 4806 b00d56cd 2018-04-01 stsp 		error = got_error(GOT_ERR_OBJ_TYPE);
 4807 b00d56cd 2018-04-01 stsp 	}
 4808 b00d56cd 2018-04-01 stsp done:
 4809 30f6c0c6 2021-10-08 thomas 	free(labels[0]);
 4810 30f6c0c6 2021-10-08 thomas 	free(labels[1]);
 4811 30f6c0c6 2021-10-08 thomas 	free(ids[0]);
 4812 30f6c0c6 2021-10-08 thomas 	free(ids[1]);
 4813 b72f483a 2019-02-05 stsp 	if (worktree)
 4814 b72f483a 2019-02-05 stsp 		got_worktree_close(worktree);
 4815 ad242220 2018-09-08 stsp 	if (repo) {
 4816 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 4817 ad242220 2018-09-08 stsp 		if (error == NULL)
 4818 1d0f4054 2021-06-17 stsp 			error = close_err;
 4819 ad242220 2018-09-08 stsp 	}
 4820 30f6c0c6 2021-10-08 thomas 	TAILQ_FOREACH(pe, &paths, entry)
 4821 30f6c0c6 2021-10-08 thomas 		free((char *)pe->path);
 4822 30f6c0c6 2021-10-08 thomas 	got_pathlist_free(&paths);
 4823 84de9106 2020-12-26 stsp 	got_ref_list_free(&refs);
 4824 b00d56cd 2018-04-01 stsp 	return error;
 4825 404c43c4 2018-06-21 stsp }
 4826 404c43c4 2018-06-21 stsp 
 4827 404c43c4 2018-06-21 stsp __dead static void
 4828 404c43c4 2018-06-21 stsp usage_blame(void)
 4829 404c43c4 2018-06-21 stsp {
 4830 9270e621 2019-02-05 stsp 	fprintf(stderr,
 4831 9270e621 2019-02-05 stsp 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
 4832 404c43c4 2018-06-21 stsp 	    getprogname());
 4833 404c43c4 2018-06-21 stsp 	exit(1);
 4834 b00d56cd 2018-04-01 stsp }
 4835 b00d56cd 2018-04-01 stsp 
 4836 28315671 2019-08-14 stsp struct blame_line {
 4837 28315671 2019-08-14 stsp 	int annotated;
 4838 28315671 2019-08-14 stsp 	char *id_str;
 4839 82f6abb8 2019-08-14 stsp 	char *committer;
 4840 11db6024 2019-10-21 stsp 	char datebuf[11]; /* YYYY-MM-DD + NUL */
 4841 28315671 2019-08-14 stsp };
 4842 28315671 2019-08-14 stsp 
 4843 28315671 2019-08-14 stsp struct blame_cb_args {
 4844 28315671 2019-08-14 stsp 	struct blame_line *lines;
 4845 28315671 2019-08-14 stsp 	int nlines;
 4846 7ef28ff8 2019-08-14 stsp 	int nlines_prec;
 4847 28315671 2019-08-14 stsp 	int lineno_cur;
 4848 28315671 2019-08-14 stsp 	off_t *line_offsets;
 4849 28315671 2019-08-14 stsp 	FILE *f;
 4850 82f6abb8 2019-08-14 stsp 	struct got_repository *repo;
 4851 28315671 2019-08-14 stsp };
 4852 28315671 2019-08-14 stsp 
 4853 404c43c4 2018-06-21 stsp static const struct got_error *
 4854 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
 4855 28315671 2019-08-14 stsp {
 4856 28315671 2019-08-14 stsp 	const struct got_error *err = NULL;
 4857 28315671 2019-08-14 stsp 	struct blame_cb_args *a = arg;
 4858 28315671 2019-08-14 stsp 	struct blame_line *bline;
 4859 82f6abb8 2019-08-14 stsp 	char *line = NULL;
 4860 28315671 2019-08-14 stsp 	size_t linesize = 0;
 4861 82f6abb8 2019-08-14 stsp 	struct got_commit_object *commit = NULL;
 4862 28315671 2019-08-14 stsp 	off_t offset;
 4863 bcb49d15 2019-08-14 stsp 	struct tm tm;
 4864 bcb49d15 2019-08-14 stsp 	time_t committer_time;
 4865 28315671 2019-08-14 stsp 
 4866 28315671 2019-08-14 stsp 	if (nlines != a->nlines ||
 4867 28315671 2019-08-14 stsp 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
 4868 28315671 2019-08-14 stsp 		return got_error(GOT_ERR_RANGE);
 4869 28315671 2019-08-14 stsp 
 4870 28315671 2019-08-14 stsp 	if (sigint_received)
 4871 28315671 2019-08-14 stsp 		return got_error(GOT_ERR_ITER_COMPLETED);
 4872 28315671 2019-08-14 stsp 
 4873 2839f8b9 2019-08-18 stsp 	if (lineno == -1)
 4874 2839f8b9 2019-08-18 stsp 		return NULL; /* no change in this commit */
 4875 2839f8b9 2019-08-18 stsp 
 4876 28315671 2019-08-14 stsp 	/* Annotate this line. */
 4877 28315671 2019-08-14 stsp 	bline = &a->lines[lineno - 1];
 4878 28315671 2019-08-14 stsp 	if (bline->annotated)
 4879 28315671 2019-08-14 stsp 		return NULL;
 4880 28315671 2019-08-14 stsp 	err = got_object_id_str(&bline->id_str, id);
 4881 28315671 2019-08-14 stsp 	if (err)
 4882 28315671 2019-08-14 stsp 		return err;
 4883 82f6abb8 2019-08-14 stsp 
 4884 82f6abb8 2019-08-14 stsp 	err = got_object_open_as_commit(&commit, a->repo, id);
 4885 82f6abb8 2019-08-14 stsp 	if (err)
 4886 82f6abb8 2019-08-14 stsp 		goto done;
 4887 82f6abb8 2019-08-14 stsp 
 4888 82f6abb8 2019-08-14 stsp 	bline->committer = strdup(got_object_commit_get_committer(commit));
 4889 82f6abb8 2019-08-14 stsp 	if (bline->committer == NULL) {
 4890 82f6abb8 2019-08-14 stsp 		err = got_error_from_errno("strdup");
 4891 bcb49d15 2019-08-14 stsp 		goto done;
 4892 bcb49d15 2019-08-14 stsp 	}
 4893 bcb49d15 2019-08-14 stsp 
 4894 bcb49d15 2019-08-14 stsp 	committer_time = got_object_commit_get_committer_time(commit);
 4895 e385fc42 2021-08-30 stsp 	if (gmtime_r(&committer_time, &tm) == NULL)
 4896 e385fc42 2021-08-30 stsp 		return got_error_from_errno("gmtime_r");
 4897 6db9f7f6 2019-12-10 stsp 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
 4898 ec6d1a36 2021-03-21 jrick 	    &tm) == 0) {
 4899 bcb49d15 2019-08-14 stsp 		err = got_error(GOT_ERR_NO_SPACE);
 4900 82f6abb8 2019-08-14 stsp 		goto done;
 4901 82f6abb8 2019-08-14 stsp 	}
 4902 28315671 2019-08-14 stsp 	bline->annotated = 1;
 4903 28315671 2019-08-14 stsp 
 4904 28315671 2019-08-14 stsp 	/* Print lines annotated so far. */
 4905 28315671 2019-08-14 stsp 	bline = &a->lines[a->lineno_cur - 1];
 4906 28315671 2019-08-14 stsp 	if (!bline->annotated)
 4907 82f6abb8 2019-08-14 stsp 		goto done;
 4908 28315671 2019-08-14 stsp 
 4909 28315671 2019-08-14 stsp 	offset = a->line_offsets[a->lineno_cur - 1];
 4910 82f6abb8 2019-08-14 stsp 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
 4911 82f6abb8 2019-08-14 stsp 		err = got_error_from_errno("fseeko");
 4912 82f6abb8 2019-08-14 stsp 		goto done;
 4913 82f6abb8 2019-08-14 stsp 	}
 4914 28315671 2019-08-14 stsp 
 4915 28315671 2019-08-14 stsp 	while (bline->annotated) {
 4916 82f6abb8 2019-08-14 stsp 		char *smallerthan, *at, *nl, *committer;
 4917 82f6abb8 2019-08-14 stsp 		size_t len;
 4918 82f6abb8 2019-08-14 stsp 
 4919 500467ff 2019-09-25 hiltjo 		if (getline(&line, &linesize, a->f) == -1) {
 4920 28315671 2019-08-14 stsp 			if (ferror(a->f))
 4921 28315671 2019-08-14 stsp 				err = got_error_from_errno("getline");
 4922 28315671 2019-08-14 stsp 			break;
 4923 28315671 2019-08-14 stsp 		}
 4924 82f6abb8 2019-08-14 stsp 
 4925 82f6abb8 2019-08-14 stsp 		committer = bline->committer;
 4926 82f6abb8 2019-08-14 stsp 		smallerthan = strchr(committer, '<');
 4927 82f6abb8 2019-08-14 stsp 		if (smallerthan && smallerthan[1] != '\0')
 4928 82f6abb8 2019-08-14 stsp 			committer = smallerthan + 1;
 4929 82f6abb8 2019-08-14 stsp 		at = strchr(committer, '@');
 4930 82f6abb8 2019-08-14 stsp 		if (at)
 4931 82f6abb8 2019-08-14 stsp 			*at = '\0';
 4932 82f6abb8 2019-08-14 stsp 		len = strlen(committer);
 4933 82f6abb8 2019-08-14 stsp 		if (len >= 9)
 4934 82f6abb8 2019-08-14 stsp 			committer[8] = '\0';
 4935 28315671 2019-08-14 stsp 
 4936 28315671 2019-08-14 stsp 		nl = strchr(line, '\n');
 4937 28315671 2019-08-14 stsp 		if (nl)
 4938 28315671 2019-08-14 stsp 			*nl = '\0';
 4939 bcb49d15 2019-08-14 stsp 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
 4940 bcb49d15 2019-08-14 stsp 		    bline->id_str, bline->datebuf, committer, line);
 4941 28315671 2019-08-14 stsp 
 4942 28315671 2019-08-14 stsp 		a->lineno_cur++;
 4943 28315671 2019-08-14 stsp 		bline = &a->lines[a->lineno_cur - 1];
 4944 28315671 2019-08-14 stsp 	}
 4945 82f6abb8 2019-08-14 stsp done:
 4946 82f6abb8 2019-08-14 stsp 	if (commit)
 4947 82f6abb8 2019-08-14 stsp 		got_object_commit_close(commit);
 4948 28315671 2019-08-14 stsp 	free(line);
 4949 28315671 2019-08-14 stsp 	return err;
 4950 28315671 2019-08-14 stsp }
 4951 28315671 2019-08-14 stsp 
 4952 28315671 2019-08-14 stsp static const struct got_error *
 4953 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
 4954 404c43c4 2018-06-21 stsp {
 4955 404c43c4 2018-06-21 stsp 	const struct got_error *error;
 4956 404c43c4 2018-06-21 stsp 	struct got_repository *repo = NULL;
 4957 0c06baac 2019-02-05 stsp 	struct got_worktree *worktree = NULL;
 4958 66bea077 2018-08-02 stsp 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
 4959 0587e10c 2020-07-23 stsp 	char *link_target = NULL;
 4960 28315671 2019-08-14 stsp 	struct got_object_id *obj_id = NULL;
 4961 404c43c4 2018-06-21 stsp 	struct got_object_id *commit_id = NULL;
 4962 28315671 2019-08-14 stsp 	struct got_blob_object *blob = NULL;
 4963 404c43c4 2018-06-21 stsp 	char *commit_id_str = NULL;
 4964 28315671 2019-08-14 stsp 	struct blame_cb_args bca;
 4965 28315671 2019-08-14 stsp 	int ch, obj_type, i;
 4966 be659d10 2020-11-18 stsp 	off_t filesize;
 4967 90f3c347 2019-08-19 stsp 
 4968 90f3c347 2019-08-19 stsp 	memset(&bca, 0, sizeof(bca));
 4969 404c43c4 2018-06-21 stsp 
 4970 404c43c4 2018-06-21 stsp #ifndef PROFILE
 4971 36e2fb66 2019-01-04 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 4972 36e2fb66 2019-01-04 stsp 	    NULL) == -1)
 4973 404c43c4 2018-06-21 stsp 		err(1, "pledge");
 4974 404c43c4 2018-06-21 stsp #endif
 4975 404c43c4 2018-06-21 stsp 
 4976 66bea077 2018-08-02 stsp 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
 4977 404c43c4 2018-06-21 stsp 		switch (ch) {
 4978 404c43c4 2018-06-21 stsp 		case 'c':
 4979 404c43c4 2018-06-21 stsp 			commit_id_str = optarg;
 4980 404c43c4 2018-06-21 stsp 			break;
 4981 66bea077 2018-08-02 stsp 		case 'r':
 4982 66bea077 2018-08-02 stsp 			repo_path = realpath(optarg, NULL);
 4983 66bea077 2018-08-02 stsp 			if (repo_path == NULL)
 4984 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 4985 9ba1d308 2019-10-21 stsp 				    optarg);
 4986 7fbaa4f3 2019-05-11 stsp 			got_path_strip_trailing_slashes(repo_path);
 4987 66bea077 2018-08-02 stsp 			break;
 4988 404c43c4 2018-06-21 stsp 		default:
 4989 2deda0b9 2019-03-07 stsp 			usage_blame();
 4990 404c43c4 2018-06-21 stsp 			/* NOTREACHED */
 4991 404c43c4 2018-06-21 stsp 		}
 4992 404c43c4 2018-06-21 stsp 	}
 4993 404c43c4 2018-06-21 stsp 
 4994 404c43c4 2018-06-21 stsp 	argc -= optind;
 4995 404c43c4 2018-06-21 stsp 	argv += optind;
 4996 404c43c4 2018-06-21 stsp 
 4997 a39318fd 2018-08-02 stsp 	if (argc == 1)
 4998 404c43c4 2018-06-21 stsp 		path = argv[0];
 4999 a39318fd 2018-08-02 stsp 	else
 5000 404c43c4 2018-06-21 stsp 		usage_blame();
 5001 404c43c4 2018-06-21 stsp 
 5002 66bea077 2018-08-02 stsp 	cwd = getcwd(NULL, 0);
 5003 66bea077 2018-08-02 stsp 	if (cwd == NULL) {
 5004 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 5005 66bea077 2018-08-02 stsp 		goto done;
 5006 66bea077 2018-08-02 stsp 	}
 5007 66bea077 2018-08-02 stsp 	if (repo_path == NULL) {
 5008 0c06baac 2019-02-05 stsp 		error = got_worktree_open(&worktree, cwd);
 5009 0c06baac 2019-02-05 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 5010 66bea077 2018-08-02 stsp 			goto done;
 5011 0c06baac 2019-02-05 stsp 		else
 5012 0c06baac 2019-02-05 stsp 			error = NULL;
 5013 0c06baac 2019-02-05 stsp 		if (worktree) {
 5014 0c06baac 2019-02-05 stsp 			repo_path =
 5015 0c06baac 2019-02-05 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 5016 1f03b8da 2020-03-20 stsp 			if (repo_path == NULL) {
 5017 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 5018 1f03b8da 2020-03-20 stsp 				if (error)
 5019 1f03b8da 2020-03-20 stsp 					goto done;
 5020 1f03b8da 2020-03-20 stsp 			}
 5021 0c06baac 2019-02-05 stsp 		} else {
 5022 0c06baac 2019-02-05 stsp 			repo_path = strdup(cwd);
 5023 0c06baac 2019-02-05 stsp 			if (repo_path == NULL) {
 5024 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 5025 0c06baac 2019-02-05 stsp 				goto done;
 5026 0c06baac 2019-02-05 stsp 			}
 5027 66bea077 2018-08-02 stsp 		}
 5028 66bea077 2018-08-02 stsp 	}
 5029 36e2fb66 2019-01-04 stsp 
 5030 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 5031 c02c541e 2019-03-29 stsp 	if (error != NULL)
 5032 404c43c4 2018-06-21 stsp 		goto done;
 5033 404c43c4 2018-06-21 stsp 
 5034 0c06baac 2019-02-05 stsp 	if (worktree) {
 5035 6efaaa2d 2019-02-05 stsp 		const char *prefix = got_worktree_get_path_prefix(worktree);
 5036 01740607 2020-11-04 stsp 		char *p;
 5037 01740607 2020-11-04 stsp 
 5038 01740607 2020-11-04 stsp 		error = got_worktree_resolve_path(&p, worktree, path);
 5039 01740607 2020-11-04 stsp 		if (error)
 5040 01740607 2020-11-04 stsp 			goto done;
 5041 01740607 2020-11-04 stsp 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
 5042 01740607 2020-11-04 stsp 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
 5043 01740607 2020-11-04 stsp 		    p) == -1) {
 5044 638f9024 2019-05-13 stsp 			error = got_error_from_errno("asprintf");
 5045 01740607 2020-11-04 stsp 			free(p);
 5046 0c06baac 2019-02-05 stsp 			goto done;
 5047 0c06baac 2019-02-05 stsp 		}
 5048 0c06baac 2019-02-05 stsp 		free(p);
 5049 01740607 2020-11-04 stsp 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
 5050 0c06baac 2019-02-05 stsp 	} else {
 5051 01740607 2020-11-04 stsp 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
 5052 01740607 2020-11-04 stsp 		if (error)
 5053 01740607 2020-11-04 stsp 			goto done;
 5054 8fa913ec 2020-11-14 stsp 		error = got_repo_map_path(&in_repo_path, repo, path);
 5055 0c06baac 2019-02-05 stsp 	}
 5056 0c06baac 2019-02-05 stsp 	if (error)
 5057 66bea077 2018-08-02 stsp 		goto done;
 5058 66bea077 2018-08-02 stsp 
 5059 404c43c4 2018-06-21 stsp 	if (commit_id_str == NULL) {
 5060 404c43c4 2018-06-21 stsp 		struct got_reference *head_ref;
 5061 a0975128 2020-02-07 stsp 		error = got_ref_open(&head_ref, repo, worktree ?
 5062 a0975128 2020-02-07 stsp 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
 5063 404c43c4 2018-06-21 stsp 		if (error != NULL)
 5064 66bea077 2018-08-02 stsp 			goto done;
 5065 404c43c4 2018-06-21 stsp 		error = got_ref_resolve(&commit_id, repo, head_ref);
 5066 404c43c4 2018-06-21 stsp 		got_ref_close(head_ref);
 5067 404c43c4 2018-06-21 stsp 		if (error != NULL)
 5068 66bea077 2018-08-02 stsp 			goto done;
 5069 404c43c4 2018-06-21 stsp 	} else {
 5070 84de9106 2020-12-26 stsp 		struct got_reflist_head refs;
 5071 d9dff0e5 2020-12-26 stsp 		TAILQ_INIT(&refs);
 5072 84de9106 2020-12-26 stsp 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
 5073 84de9106 2020-12-26 stsp 		    NULL);
 5074 84de9106 2020-12-26 stsp 		if (error)
 5075 84de9106 2020-12-26 stsp 			goto done;
 5076 71a27632 2020-01-15 stsp 		error = got_repo_match_object_id(&commit_id, NULL,
 5077 84de9106 2020-12-26 stsp 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 5078 84de9106 2020-12-26 stsp 		got_ref_list_free(&refs);
 5079 30837e32 2019-07-25 stsp 		if (error)
 5080 66bea077 2018-08-02 stsp 			goto done;
 5081 404c43c4 2018-06-21 stsp 	}
 5082 404c43c4 2018-06-21 stsp 
 5083 0587e10c 2020-07-23 stsp 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
 5084 0587e10c 2020-07-23 stsp 	    commit_id, repo);
 5085 0587e10c 2020-07-23 stsp 	if (error)
 5086 0587e10c 2020-07-23 stsp 		goto done;
 5087 0587e10c 2020-07-23 stsp 
 5088 0587e10c 2020-07-23 stsp 	error = got_object_id_by_path(&obj_id, repo, commit_id,
 5089 0587e10c 2020-07-23 stsp 	    link_target ? link_target : in_repo_path);
 5090 28315671 2019-08-14 stsp 	if (error)
 5091 28315671 2019-08-14 stsp 		goto done;
 5092 28315671 2019-08-14 stsp 
 5093 28315671 2019-08-14 stsp 	error = got_object_get_type(&obj_type, repo, obj_id);
 5094 28315671 2019-08-14 stsp 	if (error)
 5095 28315671 2019-08-14 stsp 		goto done;
 5096 28315671 2019-08-14 stsp 
 5097 28315671 2019-08-14 stsp 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
 5098 eb59b6d4 2020-07-23 stsp 		error = got_error_path(link_target ? link_target : in_repo_path,
 5099 eb59b6d4 2020-07-23 stsp 		    GOT_ERR_OBJ_TYPE);
 5100 28315671 2019-08-14 stsp 		goto done;
 5101 28315671 2019-08-14 stsp 	}
 5102 28315671 2019-08-14 stsp 
 5103 28315671 2019-08-14 stsp 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
 5104 28315671 2019-08-14 stsp 	if (error)
 5105 28315671 2019-08-14 stsp 		goto done;
 5106 28315671 2019-08-14 stsp 	bca.f = got_opentemp();
 5107 28315671 2019-08-14 stsp 	if (bca.f == NULL) {
 5108 28315671 2019-08-14 stsp 		error = got_error_from_errno("got_opentemp");
 5109 28315671 2019-08-14 stsp 		goto done;
 5110 28315671 2019-08-14 stsp 	}
 5111 b02560ec 2019-08-19 stsp 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
 5112 28315671 2019-08-14 stsp 	    &bca.line_offsets, bca.f, blob);
 5113 7ef28ff8 2019-08-14 stsp 	if (error || bca.nlines == 0)
 5114 28315671 2019-08-14 stsp 		goto done;
 5115 28315671 2019-08-14 stsp 
 5116 b02560ec 2019-08-19 stsp 	/* Don't include \n at EOF in the blame line count. */
 5117 b02560ec 2019-08-19 stsp 	if (bca.line_offsets[bca.nlines - 1] == filesize)
 5118 b02560ec 2019-08-19 stsp 		bca.nlines--;
 5119 b02560ec 2019-08-19 stsp 
 5120 28315671 2019-08-14 stsp 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
 5121 28315671 2019-08-14 stsp 	if (bca.lines == NULL) {
 5122 28315671 2019-08-14 stsp 		error = got_error_from_errno("calloc");
 5123 28315671 2019-08-14 stsp 		goto done;
 5124 28315671 2019-08-14 stsp 	}
 5125 28315671 2019-08-14 stsp 	bca.lineno_cur = 1;
 5126 7ef28ff8 2019-08-14 stsp 	bca.nlines_prec = 0;
 5127 7ef28ff8 2019-08-14 stsp 	i = bca.nlines;
 5128 7ef28ff8 2019-08-14 stsp 	while (i > 0) {
 5129 7ef28ff8 2019-08-14 stsp 		i /= 10;
 5130 7ef28ff8 2019-08-14 stsp 		bca.nlines_prec++;
 5131 7ef28ff8 2019-08-14 stsp 	}
 5132 82f6abb8 2019-08-14 stsp 	bca.repo = repo;
 5133 7ef28ff8 2019-08-14 stsp 
 5134 0587e10c 2020-07-23 stsp 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
 5135 0587e10c 2020-07-23 stsp 	    repo, blame_cb, &bca, check_cancelled, NULL);
 5136 404c43c4 2018-06-21 stsp done:
 5137 66bea077 2018-08-02 stsp 	free(in_repo_path);
 5138 0587e10c 2020-07-23 stsp 	free(link_target);
 5139 66bea077 2018-08-02 stsp 	free(repo_path);
 5140 66bea077 2018-08-02 stsp 	free(cwd);
 5141 404c43c4 2018-06-21 stsp 	free(commit_id);
 5142 28315671 2019-08-14 stsp 	free(obj_id);
 5143 28315671 2019-08-14 stsp 	if (blob)
 5144 28315671 2019-08-14 stsp 		got_object_blob_close(blob);
 5145 0c06baac 2019-02-05 stsp 	if (worktree)
 5146 0c06baac 2019-02-05 stsp 		got_worktree_close(worktree);
 5147 ad242220 2018-09-08 stsp 	if (repo) {
 5148 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 5149 ad242220 2018-09-08 stsp 		if (error == NULL)
 5150 1d0f4054 2021-06-17 stsp 			error = close_err;
 5151 ad242220 2018-09-08 stsp 	}
 5152 3affba96 2019-09-22 stsp 	if (bca.lines) {
 5153 3affba96 2019-09-22 stsp 		for (i = 0; i < bca.nlines; i++) {
 5154 3affba96 2019-09-22 stsp 			struct blame_line *bline = &bca.lines[i];
 5155 3affba96 2019-09-22 stsp 			free(bline->id_str);
 5156 3affba96 2019-09-22 stsp 			free(bline->committer);
 5157 3affba96 2019-09-22 stsp 		}
 5158 3affba96 2019-09-22 stsp 		free(bca.lines);
 5159 28315671 2019-08-14 stsp 	}
 5160 28315671 2019-08-14 stsp 	free(bca.line_offsets);
 5161 28315671 2019-08-14 stsp 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
 5162 28315671 2019-08-14 stsp 		error = got_error_from_errno("fclose");
 5163 404c43c4 2018-06-21 stsp 	return error;
 5164 5de5890b 2018-10-18 stsp }
 5165 5de5890b 2018-10-18 stsp 
 5166 5de5890b 2018-10-18 stsp __dead static void
 5167 5de5890b 2018-10-18 stsp usage_tree(void)
 5168 5de5890b 2018-10-18 stsp {
 5169 c1669e2e 2019-01-09 stsp 	fprintf(stderr,
 5170 5d58be12 2020-05-17 stsp 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
 5171 5de5890b 2018-10-18 stsp 	    getprogname());
 5172 5de5890b 2018-10-18 stsp 	exit(1);
 5173 5de5890b 2018-10-18 stsp }
 5174 5de5890b 2018-10-18 stsp 
 5175 0d6c6ee3 2020-05-20 stsp static const struct got_error *
 5176 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
 5177 0d6c6ee3 2020-05-20 stsp     const char *root_path, struct got_repository *repo)
 5178 c1669e2e 2019-01-09 stsp {
 5179 0d6c6ee3 2020-05-20 stsp 	const struct got_error *err = NULL;
 5180 c1669e2e 2019-01-09 stsp 	int is_root_path = (strcmp(path, root_path) == 0);
 5181 848d6979 2019-08-12 stsp 	const char *modestr = "";
 5182 56e0773d 2019-11-28 stsp 	mode_t mode = got_tree_entry_get_mode(te);
 5183 0d6c6ee3 2020-05-20 stsp 	char *link_target = NULL;
 5184 5de5890b 2018-10-18 stsp 
 5185 c1669e2e 2019-01-09 stsp 	path += strlen(root_path);
 5186 c1669e2e 2019-01-09 stsp 	while (path[0] == '/')
 5187 c1669e2e 2019-01-09 stsp 		path++;
 5188 c1669e2e 2019-01-09 stsp 
 5189 63c5ca5d 2019-08-24 stsp 	if (got_object_tree_entry_is_submodule(te))
 5190 63c5ca5d 2019-08-24 stsp 		modestr = "$";
 5191 0d6c6ee3 2020-05-20 stsp 	else if (S_ISLNK(mode)) {
 5192 0d6c6ee3 2020-05-20 stsp 		int i;
 5193 0d6c6ee3 2020-05-20 stsp 
 5194 0d6c6ee3 2020-05-20 stsp 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
 5195 0d6c6ee3 2020-05-20 stsp 		if (err)
 5196 0d6c6ee3 2020-05-20 stsp 			return err;
 5197 0d6c6ee3 2020-05-20 stsp 		for (i = 0; i < strlen(link_target); i++) {
 5198 0d6c6ee3 2020-05-20 stsp 			if (!isprint((unsigned char)link_target[i]))
 5199 0d6c6ee3 2020-05-20 stsp 				link_target[i] = '?';
 5200 0d6c6ee3 2020-05-20 stsp 		}
 5201 0d6c6ee3 2020-05-20 stsp 
 5202 848d6979 2019-08-12 stsp 		modestr = "@";
 5203 0d6c6ee3 2020-05-20 stsp 	}
 5204 56e0773d 2019-11-28 stsp 	else if (S_ISDIR(mode))
 5205 848d6979 2019-08-12 stsp 		modestr = "/";
 5206 56e0773d 2019-11-28 stsp 	else if (mode & S_IXUSR)
 5207 848d6979 2019-08-12 stsp 		modestr = "*";
 5208 848d6979 2019-08-12 stsp 
 5209 0d6c6ee3 2020-05-20 stsp 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
 5210 0d6c6ee3 2020-05-20 stsp 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
 5211 0d6c6ee3 2020-05-20 stsp 	    link_target ? " -> ": "", link_target ? link_target : "");
 5212 0d6c6ee3 2020-05-20 stsp 
 5213 0d6c6ee3 2020-05-20 stsp 	free(link_target);
 5214 0d6c6ee3 2020-05-20 stsp 	return NULL;
 5215 c1669e2e 2019-01-09 stsp }
 5216 c1669e2e 2019-01-09 stsp 
 5217 5de5890b 2018-10-18 stsp static const struct got_error *
 5218 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
 5219 c1669e2e 2019-01-09 stsp     int show_ids, int recurse, const char *root_path,
 5220 c1669e2e 2019-01-09 stsp     struct got_repository *repo)
 5221 5de5890b 2018-10-18 stsp {
 5222 5de5890b 2018-10-18 stsp 	const struct got_error *err = NULL;
 5223 5de5890b 2018-10-18 stsp 	struct got_object_id *tree_id = NULL;
 5224 5de5890b 2018-10-18 stsp 	struct got_tree_object *tree = NULL;
 5225 56e0773d 2019-11-28 stsp 	int nentries, i;
 5226 5de5890b 2018-10-18 stsp 
 5227 5de5890b 2018-10-18 stsp 	err = got_object_id_by_path(&tree_id, repo, commit_id, path);
 5228 5de5890b 2018-10-18 stsp 	if (err)
 5229 5de5890b 2018-10-18 stsp 		goto done;
 5230 5de5890b 2018-10-18 stsp 
 5231 5de5890b 2018-10-18 stsp 	err = got_object_open_as_tree(&tree, repo, tree_id);
 5232 5de5890b 2018-10-18 stsp 	if (err)
 5233 5de5890b 2018-10-18 stsp 		goto done;
 5234 56e0773d 2019-11-28 stsp 	nentries = got_object_tree_get_nentries(tree);
 5235 56e0773d 2019-11-28 stsp 	for (i = 0; i < nentries; i++) {
 5236 56e0773d 2019-11-28 stsp 		struct got_tree_entry *te;
 5237 5de5890b 2018-10-18 stsp 		char *id = NULL;
 5238 84453469 2018-11-11 stsp 
 5239 84453469 2018-11-11 stsp 		if (sigint_received || sigpipe_received)
 5240 84453469 2018-11-11 stsp 			break;
 5241 84453469 2018-11-11 stsp 
 5242 56e0773d 2019-11-28 stsp 		te = got_object_tree_get_entry(tree, i);
 5243 5de5890b 2018-10-18 stsp 		if (show_ids) {
 5244 5de5890b 2018-10-18 stsp 			char *id_str;
 5245 56e0773d 2019-11-28 stsp 			err = got_object_id_str(&id_str,
 5246 56e0773d 2019-11-28 stsp 			    got_tree_entry_get_id(te));
 5247 5de5890b 2018-10-18 stsp 			if (err)
 5248 5de5890b 2018-10-18 stsp 				goto done;
 5249 5de5890b 2018-10-18 stsp 			if (asprintf(&id, "%s ", id_str) == -1) {
 5250 638f9024 2019-05-13 stsp 				err = got_error_from_errno("asprintf");
 5251 5de5890b 2018-10-18 stsp 				free(id_str);
 5252 5de5890b 2018-10-18 stsp 				goto done;
 5253 5de5890b 2018-10-18 stsp 			}
 5254 5de5890b 2018-10-18 stsp 			free(id_str);
 5255 5de5890b 2018-10-18 stsp 		}
 5256 0d6c6ee3 2020-05-20 stsp 		err = print_entry(te, id, path, root_path, repo);
 5257 5de5890b 2018-10-18 stsp 		free(id);
 5258 0d6c6ee3 2020-05-20 stsp 		if (err)
 5259 0d6c6ee3 2020-05-20 stsp 			goto done;
 5260 c1669e2e 2019-01-09 stsp 
 5261 56e0773d 2019-11-28 stsp 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
 5262 c1669e2e 2019-01-09 stsp 			char *child_path;
 5263 c1669e2e 2019-01-09 stsp 			if (asprintf(&child_path, "%s%s%s", path,
 5264 c1669e2e 2019-01-09 stsp 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
 5265 56e0773d 2019-11-28 stsp 			    got_tree_entry_get_name(te)) == -1) {
 5266 638f9024 2019-05-13 stsp 				err = got_error_from_errno("asprintf");
 5267 c1669e2e 2019-01-09 stsp 				goto done;
 5268 c1669e2e 2019-01-09 stsp 			}
 5269 c1669e2e 2019-01-09 stsp 			err = print_tree(child_path, commit_id, show_ids, 1,
 5270 c1669e2e 2019-01-09 stsp 			    root_path, repo);
 5271 c1669e2e 2019-01-09 stsp 			free(child_path);
 5272 c1669e2e 2019-01-09 stsp 			if (err)
 5273 c1669e2e 2019-01-09 stsp 				goto done;
 5274 c1669e2e 2019-01-09 stsp 		}
 5275 5de5890b 2018-10-18 stsp 	}
 5276 5de5890b 2018-10-18 stsp done:
 5277 5de5890b 2018-10-18 stsp 	if (tree)
 5278 5de5890b 2018-10-18 stsp 		got_object_tree_close(tree);
 5279 5de5890b 2018-10-18 stsp 	free(tree_id);
 5280 5de5890b 2018-10-18 stsp 	return err;
 5281 404c43c4 2018-06-21 stsp }
 5282 404c43c4 2018-06-21 stsp 
 5283 5de5890b 2018-10-18 stsp static const struct got_error *
 5284 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
 5285 5de5890b 2018-10-18 stsp {
 5286 5de5890b 2018-10-18 stsp 	const struct got_error *error;
 5287 5de5890b 2018-10-18 stsp 	struct got_repository *repo = NULL;
 5288 7a2c19d6 2019-02-05 stsp 	struct got_worktree *worktree = NULL;
 5289 4e0a20a4 2020-03-23 tracey 	const char *path, *refname = NULL;
 5290 7a2c19d6 2019-02-05 stsp 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
 5291 5de5890b 2018-10-18 stsp 	struct got_object_id *commit_id = NULL;
 5292 5de5890b 2018-10-18 stsp 	char *commit_id_str = NULL;
 5293 c1669e2e 2019-01-09 stsp 	int show_ids = 0, recurse = 0;
 5294 5de5890b 2018-10-18 stsp 	int ch;
 5295 5de5890b 2018-10-18 stsp 
 5296 5de5890b 2018-10-18 stsp #ifndef PROFILE
 5297 0f8d269b 2019-01-04 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 5298 0f8d269b 2019-01-04 stsp 	    NULL) == -1)
 5299 5de5890b 2018-10-18 stsp 		err(1, "pledge");
 5300 5de5890b 2018-10-18 stsp #endif
 5301 5de5890b 2018-10-18 stsp 
 5302 c1669e2e 2019-01-09 stsp 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
 5303 5de5890b 2018-10-18 stsp 		switch (ch) {
 5304 5de5890b 2018-10-18 stsp 		case 'c':
 5305 5de5890b 2018-10-18 stsp 			commit_id_str = optarg;
 5306 5de5890b 2018-10-18 stsp 			break;
 5307 5de5890b 2018-10-18 stsp 		case 'r':
 5308 5de5890b 2018-10-18 stsp 			repo_path = realpath(optarg, NULL);
 5309 5de5890b 2018-10-18 stsp 			if (repo_path == NULL)
 5310 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 5311 9ba1d308 2019-10-21 stsp 				    optarg);
 5312 7fbaa4f3 2019-05-11 stsp 			got_path_strip_trailing_slashes(repo_path);
 5313 5de5890b 2018-10-18 stsp 			break;
 5314 5de5890b 2018-10-18 stsp 		case 'i':
 5315 5de5890b 2018-10-18 stsp 			show_ids = 1;
 5316 5de5890b 2018-10-18 stsp 			break;
 5317 c1669e2e 2019-01-09 stsp 		case 'R':
 5318 c1669e2e 2019-01-09 stsp 			recurse = 1;
 5319 c1669e2e 2019-01-09 stsp 			break;
 5320 5de5890b 2018-10-18 stsp 		default:
 5321 2deda0b9 2019-03-07 stsp 			usage_tree();
 5322 5de5890b 2018-10-18 stsp 			/* NOTREACHED */
 5323 5de5890b 2018-10-18 stsp 		}
 5324 5de5890b 2018-10-18 stsp 	}
 5325 5de5890b 2018-10-18 stsp 
 5326 5de5890b 2018-10-18 stsp 	argc -= optind;
 5327 5de5890b 2018-10-18 stsp 	argv += optind;
 5328 5de5890b 2018-10-18 stsp 
 5329 5de5890b 2018-10-18 stsp 	if (argc == 1)
 5330 5de5890b 2018-10-18 stsp 		path = argv[0];
 5331 5de5890b 2018-10-18 stsp 	else if (argc > 1)
 5332 5de5890b 2018-10-18 stsp 		usage_tree();
 5333 5de5890b 2018-10-18 stsp 	else
 5334 7a2c19d6 2019-02-05 stsp 		path = NULL;
 5335 7a2c19d6 2019-02-05 stsp 
 5336 9bf7a39b 2019-02-05 stsp 	cwd = getcwd(NULL, 0);
 5337 9bf7a39b 2019-02-05 stsp 	if (cwd == NULL) {
 5338 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 5339 9bf7a39b 2019-02-05 stsp 		goto done;
 5340 9bf7a39b 2019-02-05 stsp 	}
 5341 5de5890b 2018-10-18 stsp 	if (repo_path == NULL) {
 5342 7a2c19d6 2019-02-05 stsp 		error = got_worktree_open(&worktree, cwd);
 5343 8994de28 2019-02-05 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 5344 7a2c19d6 2019-02-05 stsp 			goto done;
 5345 7a2c19d6 2019-02-05 stsp 		else
 5346 7a2c19d6 2019-02-05 stsp 			error = NULL;
 5347 7a2c19d6 2019-02-05 stsp 		if (worktree) {
 5348 7a2c19d6 2019-02-05 stsp 			repo_path =
 5349 7a2c19d6 2019-02-05 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 5350 7a2c19d6 2019-02-05 stsp 			if (repo_path == NULL)
 5351 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 5352 7a2c19d6 2019-02-05 stsp 			if (error)
 5353 7a2c19d6 2019-02-05 stsp 				goto done;
 5354 7a2c19d6 2019-02-05 stsp 		} else {
 5355 7a2c19d6 2019-02-05 stsp 			repo_path = strdup(cwd);
 5356 7a2c19d6 2019-02-05 stsp 			if (repo_path == NULL) {
 5357 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 5358 7a2c19d6 2019-02-05 stsp 				goto done;
 5359 7a2c19d6 2019-02-05 stsp 			}
 5360 5de5890b 2018-10-18 stsp 		}
 5361 5de5890b 2018-10-18 stsp 	}
 5362 5de5890b 2018-10-18 stsp 
 5363 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 5364 5de5890b 2018-10-18 stsp 	if (error != NULL)
 5365 c02c541e 2019-03-29 stsp 		goto done;
 5366 c02c541e 2019-03-29 stsp 
 5367 4fedbf4c 2020-11-07 stsp 	if (worktree) {
 5368 4fedbf4c 2020-11-07 stsp 		const char *prefix = got_worktree_get_path_prefix(worktree);
 5369 4fedbf4c 2020-11-07 stsp 		char *p;
 5370 5de5890b 2018-10-18 stsp 
 5371 4fedbf4c 2020-11-07 stsp 		if (path == NULL)
 5372 4fedbf4c 2020-11-07 stsp 			path = "";
 5373 4fedbf4c 2020-11-07 stsp 		error = got_worktree_resolve_path(&p, worktree, path);
 5374 4fedbf4c 2020-11-07 stsp 		if (error)
 5375 4fedbf4c 2020-11-07 stsp 			goto done;
 5376 4fedbf4c 2020-11-07 stsp 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
 5377 4fedbf4c 2020-11-07 stsp 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
 5378 4fedbf4c 2020-11-07 stsp 		    p) == -1) {
 5379 4fedbf4c 2020-11-07 stsp 			error = got_error_from_errno("asprintf");
 5380 9bf7a39b 2019-02-05 stsp 			free(p);
 5381 4fedbf4c 2020-11-07 stsp 			goto done;
 5382 4fedbf4c 2020-11-07 stsp 		}
 5383 4fedbf4c 2020-11-07 stsp 		free(p);
 5384 4fedbf4c 2020-11-07 stsp 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
 5385 4fedbf4c 2020-11-07 stsp 		if (error)
 5386 4fedbf4c 2020-11-07 stsp 			goto done;
 5387 4fedbf4c 2020-11-07 stsp 	} else {
 5388 4fedbf4c 2020-11-07 stsp 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
 5389 4fedbf4c 2020-11-07 stsp 		if (error)
 5390 4fedbf4c 2020-11-07 stsp 			goto done;
 5391 4fedbf4c 2020-11-07 stsp 		if (path == NULL)
 5392 9bf7a39b 2019-02-05 stsp 			path = "/";
 5393 8fa913ec 2020-11-14 stsp 		error = got_repo_map_path(&in_repo_path, repo, path);
 5394 9bf7a39b 2019-02-05 stsp 		if (error != NULL)
 5395 9bf7a39b 2019-02-05 stsp 			goto done;
 5396 9bf7a39b 2019-02-05 stsp 	}
 5397 5de5890b 2018-10-18 stsp 
 5398 5de5890b 2018-10-18 stsp 	if (commit_id_str == NULL) {
 5399 5de5890b 2018-10-18 stsp 		struct got_reference *head_ref;
 5400 4e0a20a4 2020-03-23 tracey 		if (worktree)
 5401 4e0a20a4 2020-03-23 tracey 			refname = got_worktree_get_head_ref_name(worktree);
 5402 4e0a20a4 2020-03-23 tracey 		else
 5403 4e0a20a4 2020-03-23 tracey 			refname = GOT_REF_HEAD;
 5404 4e0a20a4 2020-03-23 tracey 		error = got_ref_open(&head_ref, repo, refname, 0);
 5405 5de5890b 2018-10-18 stsp 		if (error != NULL)
 5406 5de5890b 2018-10-18 stsp 			goto done;
 5407 5de5890b 2018-10-18 stsp 		error = got_ref_resolve(&commit_id, repo, head_ref);
 5408 5de5890b 2018-10-18 stsp 		got_ref_close(head_ref);
 5409 5de5890b 2018-10-18 stsp 		if (error != NULL)
 5410 5de5890b 2018-10-18 stsp 			goto done;
 5411 5de5890b 2018-10-18 stsp 	} else {
 5412 84de9106 2020-12-26 stsp 		struct got_reflist_head refs;
 5413 d9dff0e5 2020-12-26 stsp 		TAILQ_INIT(&refs);
 5414 84de9106 2020-12-26 stsp 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
 5415 84de9106 2020-12-26 stsp 		    NULL);
 5416 84de9106 2020-12-26 stsp 		if (error)
 5417 84de9106 2020-12-26 stsp 			goto done;
 5418 71a27632 2020-01-15 stsp 		error = got_repo_match_object_id(&commit_id, NULL,
 5419 84de9106 2020-12-26 stsp 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 5420 84de9106 2020-12-26 stsp 		got_ref_list_free(&refs);
 5421 30837e32 2019-07-25 stsp 		if (error)
 5422 5de5890b 2018-10-18 stsp 			goto done;
 5423 5de5890b 2018-10-18 stsp 	}
 5424 5de5890b 2018-10-18 stsp 
 5425 c1669e2e 2019-01-09 stsp 	error = print_tree(in_repo_path, commit_id, show_ids, recurse,
 5426 c1669e2e 2019-01-09 stsp 	    in_repo_path, repo);
 5427 5de5890b 2018-10-18 stsp done:
 5428 5de5890b 2018-10-18 stsp 	free(in_repo_path);
 5429 5de5890b 2018-10-18 stsp 	free(repo_path);
 5430 5de5890b 2018-10-18 stsp 	free(cwd);
 5431 5de5890b 2018-10-18 stsp 	free(commit_id);
 5432 7a2c19d6 2019-02-05 stsp 	if (worktree)
 5433 7a2c19d6 2019-02-05 stsp 		got_worktree_close(worktree);
 5434 5de5890b 2018-10-18 stsp 	if (repo) {
 5435 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 5436 5de5890b 2018-10-18 stsp 		if (error == NULL)
 5437 1d0f4054 2021-06-17 stsp 			error = close_err;
 5438 5de5890b 2018-10-18 stsp 	}
 5439 5de5890b 2018-10-18 stsp 	return error;
 5440 5de5890b 2018-10-18 stsp }
 5441 5de5890b 2018-10-18 stsp 
 5442 6bad629b 2019-02-04 stsp __dead static void
 5443 6bad629b 2019-02-04 stsp usage_status(void)
 5444 6bad629b 2019-02-04 stsp {
 5445 00357e4d 2021-09-14 tracey 	fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
 5446 00357e4d 2021-09-14 tracey 	    "[-S status-codes] [path ...]\n", getprogname());
 5447 6bad629b 2019-02-04 stsp 	exit(1);
 5448 6bad629b 2019-02-04 stsp }
 5449 00357e4d 2021-09-14 tracey 
 5450 00357e4d 2021-09-14 tracey struct got_status_arg {
 5451 00357e4d 2021-09-14 tracey 	char *status_codes;
 5452 00357e4d 2021-09-14 tracey 	int suppress;
 5453 00357e4d 2021-09-14 tracey };
 5454 5c860e29 2018-03-12 stsp 
 5455 b72f483a 2019-02-05 stsp static const struct got_error *
 5456 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
 5457 88d0e355 2019-08-03 stsp     const char *path, struct got_object_id *blob_id,
 5458 12463d8b 2019-12-13 stsp     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
 5459 12463d8b 2019-12-13 stsp     int dirfd, const char *de_name)
 5460 6bad629b 2019-02-04 stsp {
 5461 00357e4d 2021-09-14 tracey 	struct got_status_arg *st = arg;
 5462 00357e4d 2021-09-14 tracey 
 5463 244725f2 2019-08-03 stsp 	if (status == staged_status && (status == GOT_STATUS_DELETE))
 5464 c363b2c1 2019-08-03 stsp 		status = GOT_STATUS_NO_CHANGE;
 5465 00357e4d 2021-09-14 tracey 	if (st != NULL && st->status_codes) {
 5466 00357e4d 2021-09-14 tracey 		size_t ncodes = strlen(st->status_codes);
 5467 00357e4d 2021-09-14 tracey 		int i, j = 0;
 5468 00357e4d 2021-09-14 tracey 
 5469 081470ac 2020-08-13 stsp 		for (i = 0; i < ncodes ; i++) {
 5470 00357e4d 2021-09-14 tracey 			if (st->suppress) {
 5471 00357e4d 2021-09-14 tracey 				if (status == st->status_codes[i] ||
 5472 00357e4d 2021-09-14 tracey 				    staged_status == st->status_codes[i]) {
 5473 00357e4d 2021-09-14 tracey 					j++;
 5474 00357e4d 2021-09-14 tracey 					continue;
 5475 00357e4d 2021-09-14 tracey 				}
 5476 00357e4d 2021-09-14 tracey 			} else {
 5477 00357e4d 2021-09-14 tracey 				if (status == st->status_codes[i] ||
 5478 00357e4d 2021-09-14 tracey 				    staged_status == st->status_codes[i])
 5479 00357e4d 2021-09-14 tracey 					break;
 5480 00357e4d 2021-09-14 tracey 			}
 5481 081470ac 2020-08-13 stsp 		}
 5482 00357e4d 2021-09-14 tracey 
 5483 00357e4d 2021-09-14 tracey 		if (st->suppress && j == 0)
 5484 00357e4d 2021-09-14 tracey 			goto print;
 5485 00357e4d 2021-09-14 tracey 
 5486 081470ac 2020-08-13 stsp 		if (i == ncodes)
 5487 081470ac 2020-08-13 stsp 			return NULL;
 5488 081470ac 2020-08-13 stsp 	}
 5489 00357e4d 2021-09-14 tracey print:
 5490 88d0e355 2019-08-03 stsp 	printf("%c%c %s\n", status, staged_status, path);
 5491 b72f483a 2019-02-05 stsp 	return NULL;
 5492 6bad629b 2019-02-04 stsp }
 5493 5c860e29 2018-03-12 stsp 
 5494 6bad629b 2019-02-04 stsp static const struct got_error *
 5495 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
 5496 6bad629b 2019-02-04 stsp {
 5497 6bad629b 2019-02-04 stsp 	const struct got_error *error = NULL;
 5498 6bad629b 2019-02-04 stsp 	struct got_repository *repo = NULL;
 5499 6bad629b 2019-02-04 stsp 	struct got_worktree *worktree = NULL;
 5500 00357e4d 2021-09-14 tracey 	struct got_status_arg st;
 5501 00357e4d 2021-09-14 tracey 	char *cwd = NULL;
 5502 72ea6654 2019-07-27 stsp 	struct got_pathlist_head paths;
 5503 a5edda0a 2019-07-27 stsp 	struct got_pathlist_entry *pe;
 5504 f6343036 2021-06-22 stsp 	int ch, i, no_ignores = 0;
 5505 5c860e29 2018-03-12 stsp 
 5506 72ea6654 2019-07-27 stsp 	TAILQ_INIT(&paths);
 5507 72ea6654 2019-07-27 stsp 
 5508 00357e4d 2021-09-14 tracey 	memset(&st, 0, sizeof(st));
 5509 00357e4d 2021-09-14 tracey 	st.status_codes = NULL;
 5510 00357e4d 2021-09-14 tracey 	st.suppress = 0;
 5511 00357e4d 2021-09-14 tracey 
 5512 00357e4d 2021-09-14 tracey 	while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
 5513 6bad629b 2019-02-04 stsp 		switch (ch) {
 5514 f6343036 2021-06-22 stsp 		case 'I':
 5515 f6343036 2021-06-22 stsp 			no_ignores = 1;
 5516 f6343036 2021-06-22 stsp 			break;
 5517 788d4a19 2021-09-14 stsp 		case 'S':
 5518 788d4a19 2021-09-14 stsp 			if (st.status_codes != NULL && st.suppress == 0)
 5519 788d4a19 2021-09-14 stsp 				option_conflict('S', 's');
 5520 788d4a19 2021-09-14 stsp 			st.suppress = 1;
 5521 788d4a19 2021-09-14 stsp 			/* fallthrough */
 5522 081470ac 2020-08-13 stsp 		case 's':
 5523 081470ac 2020-08-13 stsp 			for (i = 0; i < strlen(optarg); i++) {
 5524 081470ac 2020-08-13 stsp 				switch (optarg[i]) {
 5525 081470ac 2020-08-13 stsp 				case GOT_STATUS_MODIFY:
 5526 081470ac 2020-08-13 stsp 				case GOT_STATUS_ADD:
 5527 081470ac 2020-08-13 stsp 				case GOT_STATUS_DELETE:
 5528 081470ac 2020-08-13 stsp 				case GOT_STATUS_CONFLICT:
 5529 081470ac 2020-08-13 stsp 				case GOT_STATUS_MISSING:
 5530 081470ac 2020-08-13 stsp 				case GOT_STATUS_OBSTRUCTED:
 5531 081470ac 2020-08-13 stsp 				case GOT_STATUS_UNVERSIONED:
 5532 081470ac 2020-08-13 stsp 				case GOT_STATUS_MODE_CHANGE:
 5533 081470ac 2020-08-13 stsp 				case GOT_STATUS_NONEXISTENT:
 5534 081470ac 2020-08-13 stsp 					break;
 5535 081470ac 2020-08-13 stsp 				default:
 5536 081470ac 2020-08-13 stsp 					errx(1, "invalid status code '%c'",
 5537 081470ac 2020-08-13 stsp 					    optarg[i]);
 5538 081470ac 2020-08-13 stsp 				}
 5539 081470ac 2020-08-13 stsp 			}
 5540 788d4a19 2021-09-14 stsp 			if (ch == 's' && st.suppress)
 5541 b043307b 2021-09-14 stsp 				option_conflict('s', 'S');
 5542 00357e4d 2021-09-14 tracey 			st.status_codes = optarg;
 5543 081470ac 2020-08-13 stsp 			break;
 5544 5c860e29 2018-03-12 stsp 		default:
 5545 2deda0b9 2019-03-07 stsp 			usage_status();
 5546 6bad629b 2019-02-04 stsp 			/* NOTREACHED */
 5547 5c860e29 2018-03-12 stsp 		}
 5548 5c860e29 2018-03-12 stsp 	}
 5549 5c860e29 2018-03-12 stsp 
 5550 6bad629b 2019-02-04 stsp 	argc -= optind;
 5551 6bad629b 2019-02-04 stsp 	argv += optind;
 5552 5c860e29 2018-03-12 stsp 
 5553 6bad629b 2019-02-04 stsp #ifndef PROFILE
 5554 6bad629b 2019-02-04 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 5555 6bad629b 2019-02-04 stsp 	    NULL) == -1)
 5556 6bad629b 2019-02-04 stsp 		err(1, "pledge");
 5557 f42b1b34 2018-03-12 stsp #endif
 5558 927df6b7 2019-02-10 stsp 	cwd = getcwd(NULL, 0);
 5559 927df6b7 2019-02-10 stsp 	if (cwd == NULL) {
 5560 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 5561 927df6b7 2019-02-10 stsp 		goto done;
 5562 927df6b7 2019-02-10 stsp 	}
 5563 927df6b7 2019-02-10 stsp 
 5564 927df6b7 2019-02-10 stsp 	error = got_worktree_open(&worktree, cwd);
 5565 fa51e947 2020-03-27 stsp 	if (error) {
 5566 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 5567 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "status", cwd);
 5568 a5edda0a 2019-07-27 stsp 		goto done;
 5569 fa51e947 2020-03-27 stsp 	}
 5570 6bad629b 2019-02-04 stsp 
 5571 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 5572 c9956ddf 2019-09-08 stsp 	    NULL);
 5573 6bad629b 2019-02-04 stsp 	if (error != NULL)
 5574 6bad629b 2019-02-04 stsp 		goto done;
 5575 6bad629b 2019-02-04 stsp 
 5576 d0eebce4 2019-03-11 stsp 	error = apply_unveil(got_repo_get_path(repo), 1,
 5577 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 5578 087fb88c 2019-08-04 stsp 	if (error)
 5579 087fb88c 2019-08-04 stsp 		goto done;
 5580 087fb88c 2019-08-04 stsp 
 5581 087fb88c 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
 5582 6bad629b 2019-02-04 stsp 	if (error)
 5583 6bad629b 2019-02-04 stsp 		goto done;
 5584 6bad629b 2019-02-04 stsp 
 5585 f6343036 2021-06-22 stsp 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
 5586 00357e4d 2021-09-14 tracey 	    print_status, &st, check_cancelled, NULL);
 5587 6bad629b 2019-02-04 stsp done:
 5588 a5edda0a 2019-07-27 stsp 	TAILQ_FOREACH(pe, &paths, entry)
 5589 a5edda0a 2019-07-27 stsp 		free((char *)pe->path);
 5590 72ea6654 2019-07-27 stsp 	got_pathlist_free(&paths);
 5591 927df6b7 2019-02-10 stsp 	free(cwd);
 5592 d0eebce4 2019-03-11 stsp 	return error;
 5593 d0eebce4 2019-03-11 stsp }
 5594 d0eebce4 2019-03-11 stsp 
 5595 d0eebce4 2019-03-11 stsp __dead static void
 5596 d0eebce4 2019-03-11 stsp usage_ref(void)
 5597 d0eebce4 2019-03-11 stsp {
 5598 d0eebce4 2019-03-11 stsp 	fprintf(stderr,
 5599 2bf0fa54 2021-11-20 thomas 	    "usage: %s ref [-r repository] [-l] [-t] [-c object] "
 5600 2bf0fa54 2021-11-20 thomas 	        "[-s reference] [-d] [name]\n",
 5601 d0eebce4 2019-03-11 stsp 	    getprogname());
 5602 d0eebce4 2019-03-11 stsp 	exit(1);
 5603 d0eebce4 2019-03-11 stsp }
 5604 d0eebce4 2019-03-11 stsp 
 5605 d0eebce4 2019-03-11 stsp static const struct got_error *
 5606 2bf0fa54 2021-11-20 thomas list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
 5607 d0eebce4 2019-03-11 stsp {
 5608 d0eebce4 2019-03-11 stsp 	static const struct got_error *err = NULL;
 5609 d0eebce4 2019-03-11 stsp 	struct got_reflist_head refs;
 5610 d0eebce4 2019-03-11 stsp 	struct got_reflist_entry *re;
 5611 d0eebce4 2019-03-11 stsp 
 5612 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
 5613 2bf0fa54 2021-11-20 thomas 	err = got_ref_list(&refs, repo, refname, sort_by_time ?
 5614 2bf0fa54 2021-11-20 thomas 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
 5615 2bf0fa54 2021-11-20 thomas 	    repo);
 5616 d0eebce4 2019-03-11 stsp 	if (err)
 5617 d0eebce4 2019-03-11 stsp 		return err;
 5618 d0eebce4 2019-03-11 stsp 
 5619 d9dff0e5 2020-12-26 stsp 	TAILQ_FOREACH(re, &refs, entry) {
 5620 d0eebce4 2019-03-11 stsp 		char *refstr;
 5621 d0eebce4 2019-03-11 stsp 		refstr = got_ref_to_str(re->ref);
 5622 d0eebce4 2019-03-11 stsp 		if (refstr == NULL)
 5623 638f9024 2019-05-13 stsp 			return got_error_from_errno("got_ref_to_str");
 5624 d0eebce4 2019-03-11 stsp 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
 5625 d0eebce4 2019-03-11 stsp 		free(refstr);
 5626 d0eebce4 2019-03-11 stsp 	}
 5627 d0eebce4 2019-03-11 stsp 
 5628 e2e879a0 2019-03-11 stsp 	got_ref_list_free(&refs);
 5629 d0eebce4 2019-03-11 stsp 	return NULL;
 5630 d0eebce4 2019-03-11 stsp }
 5631 d0eebce4 2019-03-11 stsp 
 5632 d0eebce4 2019-03-11 stsp static const struct got_error *
 5633 161728eb 2021-07-24 stsp delete_ref_by_name(struct got_repository *repo, const char *refname)
 5634 d0eebce4 2019-03-11 stsp {
 5635 161728eb 2021-07-24 stsp 	const struct got_error *err;
 5636 d0eebce4 2019-03-11 stsp 	struct got_reference *ref;
 5637 d0eebce4 2019-03-11 stsp 
 5638 2f17228e 2019-05-12 stsp 	err = got_ref_open(&ref, repo, refname, 0);
 5639 d0eebce4 2019-03-11 stsp 	if (err)
 5640 d0eebce4 2019-03-11 stsp 		return err;
 5641 993f033b 2021-07-16 stsp 
 5642 161728eb 2021-07-24 stsp 	err = delete_ref(repo, ref);
 5643 d0eebce4 2019-03-11 stsp 	got_ref_close(ref);
 5644 d0eebce4 2019-03-11 stsp 	return err;
 5645 d0eebce4 2019-03-11 stsp }
 5646 d0eebce4 2019-03-11 stsp 
 5647 d0eebce4 2019-03-11 stsp static const struct got_error *
 5648 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
 5649 d0eebce4 2019-03-11 stsp {
 5650 d0eebce4 2019-03-11 stsp 	const struct got_error *err = NULL;
 5651 d0eebce4 2019-03-11 stsp 	struct got_object_id *id;
 5652 d0eebce4 2019-03-11 stsp 	struct got_reference *ref = NULL;
 5653 d1644381 2019-07-14 stsp 
 5654 d1644381 2019-07-14 stsp 	/*
 5655 bd5895f3 2019-11-28 stsp 	 * Don't let the user create a reference name with a leading '-'.
 5656 d1644381 2019-07-14 stsp 	 * While technically a valid reference name, this case is usually
 5657 d1644381 2019-07-14 stsp 	 * an unintended typo.
 5658 d1644381 2019-07-14 stsp 	 */
 5659 bd5895f3 2019-11-28 stsp 	if (refname[0] == '-')
 5660 bd5895f3 2019-11-28 stsp 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
 5661 d0eebce4 2019-03-11 stsp 
 5662 dd88155e 2019-06-29 stsp 	err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
 5663 dd88155e 2019-06-29 stsp 	    repo);
 5664 d83d9d5c 2019-05-13 stsp 	if (err) {
 5665 d83d9d5c 2019-05-13 stsp 		struct got_reference *target_ref;
 5666 d0eebce4 2019-03-11 stsp 
 5667 d83d9d5c 2019-05-13 stsp 		if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
 5668 d83d9d5c 2019-05-13 stsp 			return err;
 5669 d83d9d5c 2019-05-13 stsp 		err = got_ref_open(&target_ref, repo, target, 0);
 5670 d83d9d5c 2019-05-13 stsp 		if (err)
 5671 d83d9d5c 2019-05-13 stsp 			return err;
 5672 d83d9d5c 2019-05-13 stsp 		err = got_ref_resolve(&id, repo, target_ref);
 5673 d83d9d5c 2019-05-13 stsp 		got_ref_close(target_ref);
 5674 d83d9d5c 2019-05-13 stsp 		if (err)
 5675 d83d9d5c 2019-05-13 stsp 			return err;
 5676 d83d9d5c 2019-05-13 stsp 	}
 5677 d83d9d5c 2019-05-13 stsp 
 5678 d0eebce4 2019-03-11 stsp 	err = got_ref_alloc(&ref, refname, id);
 5679 d0eebce4 2019-03-11 stsp 	if (err)
 5680 d0eebce4 2019-03-11 stsp 		goto done;
 5681 d0eebce4 2019-03-11 stsp 
 5682 d0eebce4 2019-03-11 stsp 	err = got_ref_write(ref, repo);
 5683 d0eebce4 2019-03-11 stsp done:
 5684 d0eebce4 2019-03-11 stsp 	if (ref)
 5685 d0eebce4 2019-03-11 stsp 		got_ref_close(ref);
 5686 d0eebce4 2019-03-11 stsp 	free(id);
 5687 d1c1ae5f 2019-08-12 stsp 	return err;
 5688 d1c1ae5f 2019-08-12 stsp }
 5689 d1c1ae5f 2019-08-12 stsp 
 5690 d1c1ae5f 2019-08-12 stsp static const struct got_error *
 5691 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
 5692 d1c1ae5f 2019-08-12 stsp {
 5693 d1c1ae5f 2019-08-12 stsp 	const struct got_error *err = NULL;
 5694 d1c1ae5f 2019-08-12 stsp 	struct got_reference *ref = NULL;
 5695 d1c1ae5f 2019-08-12 stsp 	struct got_reference *target_ref = NULL;
 5696 d1c1ae5f 2019-08-12 stsp 
 5697 d1c1ae5f 2019-08-12 stsp 	/*
 5698 bd5895f3 2019-11-28 stsp 	 * Don't let the user create a reference name with a leading '-'.
 5699 d1c1ae5f 2019-08-12 stsp 	 * While technically a valid reference name, this case is usually
 5700 d1c1ae5f 2019-08-12 stsp 	 * an unintended typo.
 5701 d1c1ae5f 2019-08-12 stsp 	 */
 5702 bd5895f3 2019-11-28 stsp 	if (refname[0] == '-')
 5703 bd5895f3 2019-11-28 stsp 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
 5704 d1c1ae5f 2019-08-12 stsp 
 5705 d1c1ae5f 2019-08-12 stsp 	err = got_ref_open(&target_ref, repo, target, 0);
 5706 d1c1ae5f 2019-08-12 stsp 	if (err)
 5707 d1c1ae5f 2019-08-12 stsp 		return err;
 5708 d1c1ae5f 2019-08-12 stsp 
 5709 d1c1ae5f 2019-08-12 stsp 	err = got_ref_alloc_symref(&ref, refname, target_ref);
 5710 d1c1ae5f 2019-08-12 stsp 	if (err)
 5711 d1c1ae5f 2019-08-12 stsp 		goto done;
 5712 d1c1ae5f 2019-08-12 stsp 
 5713 d1c1ae5f 2019-08-12 stsp 	err = got_ref_write(ref, repo);
 5714 d1c1ae5f 2019-08-12 stsp done:
 5715 d1c1ae5f 2019-08-12 stsp 	if (target_ref)
 5716 d1c1ae5f 2019-08-12 stsp 		got_ref_close(target_ref);
 5717 d1c1ae5f 2019-08-12 stsp 	if (ref)
 5718 d1c1ae5f 2019-08-12 stsp 		got_ref_close(ref);
 5719 d0eebce4 2019-03-11 stsp 	return err;
 5720 d0eebce4 2019-03-11 stsp }
 5721 d0eebce4 2019-03-11 stsp 
 5722 d0eebce4 2019-03-11 stsp static const struct got_error *
 5723 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
 5724 d0eebce4 2019-03-11 stsp {
 5725 d0eebce4 2019-03-11 stsp 	const struct got_error *error = NULL;
 5726 d0eebce4 2019-03-11 stsp 	struct got_repository *repo = NULL;
 5727 d0eebce4 2019-03-11 stsp 	struct got_worktree *worktree = NULL;
 5728 d0eebce4 2019-03-11 stsp 	char *cwd = NULL, *repo_path = NULL;
 5729 2bf0fa54 2021-11-20 thomas 	int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
 5730 b2070a3f 2020-03-22 stsp 	const char *obj_arg = NULL, *symref_target= NULL;
 5731 b2070a3f 2020-03-22 stsp 	char *refname = NULL;
 5732 d0eebce4 2019-03-11 stsp 
 5733 2bf0fa54 2021-11-20 thomas 	while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
 5734 d0eebce4 2019-03-11 stsp 		switch (ch) {
 5735 e31abbf2 2020-03-22 stsp 		case 'c':
 5736 e31abbf2 2020-03-22 stsp 			obj_arg = optarg;
 5737 e31abbf2 2020-03-22 stsp 			break;
 5738 d0eebce4 2019-03-11 stsp 		case 'd':
 5739 e31abbf2 2020-03-22 stsp 			do_delete = 1;
 5740 d0eebce4 2019-03-11 stsp 			break;
 5741 d0eebce4 2019-03-11 stsp 		case 'r':
 5742 d0eebce4 2019-03-11 stsp 			repo_path = realpath(optarg, NULL);
 5743 d0eebce4 2019-03-11 stsp 			if (repo_path == NULL)
 5744 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 5745 9ba1d308 2019-10-21 stsp 				    optarg);
 5746 7fbaa4f3 2019-05-11 stsp 			got_path_strip_trailing_slashes(repo_path);
 5747 d0eebce4 2019-03-11 stsp 			break;
 5748 d0eebce4 2019-03-11 stsp 		case 'l':
 5749 d0eebce4 2019-03-11 stsp 			do_list = 1;
 5750 d1c1ae5f 2019-08-12 stsp 			break;
 5751 d1c1ae5f 2019-08-12 stsp 		case 's':
 5752 e31abbf2 2020-03-22 stsp 			symref_target = optarg;
 5753 2bf0fa54 2021-11-20 thomas 			break;
 5754 2bf0fa54 2021-11-20 thomas 		case 't':
 5755 2bf0fa54 2021-11-20 thomas 			sort_by_time = 1;
 5756 d0eebce4 2019-03-11 stsp 			break;
 5757 d0eebce4 2019-03-11 stsp 		default:
 5758 d0eebce4 2019-03-11 stsp 			usage_ref();
 5759 d0eebce4 2019-03-11 stsp 			/* NOTREACHED */
 5760 d0eebce4 2019-03-11 stsp 		}
 5761 d0eebce4 2019-03-11 stsp 	}
 5762 d0eebce4 2019-03-11 stsp 
 5763 e31abbf2 2020-03-22 stsp 	if (obj_arg && do_list)
 5764 ff69268e 2020-12-13 stsp 		option_conflict('c', 'l');
 5765 ff69268e 2020-12-13 stsp 	if (obj_arg && do_delete)
 5766 ff69268e 2020-12-13 stsp 		option_conflict('c', 'd');
 5767 907f15e2 2020-03-22 stsp 	if (obj_arg && symref_target)
 5768 ff69268e 2020-12-13 stsp 		option_conflict('c', 's');
 5769 e31abbf2 2020-03-22 stsp 	if (symref_target && do_delete)
 5770 ff69268e 2020-12-13 stsp 		option_conflict('s', 'd');
 5771 e31abbf2 2020-03-22 stsp 	if (symref_target && do_list)
 5772 ff69268e 2020-12-13 stsp 		option_conflict('s', 'l');
 5773 e31abbf2 2020-03-22 stsp 	if (do_delete && do_list)
 5774 ff69268e 2020-12-13 stsp 		option_conflict('d', 'l');
 5775 2bf0fa54 2021-11-20 thomas 	if (sort_by_time && !do_list)
 5776 2bf0fa54 2021-11-20 thomas 		errx(1, "-t option requires -l option");
 5777 d0eebce4 2019-03-11 stsp 
 5778 d0eebce4 2019-03-11 stsp 	argc -= optind;
 5779 d0eebce4 2019-03-11 stsp 	argv += optind;
 5780 d0eebce4 2019-03-11 stsp 
 5781 e31abbf2 2020-03-22 stsp 	if (do_list) {
 5782 b2070a3f 2020-03-22 stsp 		if (argc != 0 && argc != 1)
 5783 d0eebce4 2019-03-11 stsp 			usage_ref();
 5784 b2070a3f 2020-03-22 stsp 		if (argc == 1) {
 5785 b2070a3f 2020-03-22 stsp 			refname = strdup(argv[0]);
 5786 b2070a3f 2020-03-22 stsp 			if (refname == NULL) {
 5787 b2070a3f 2020-03-22 stsp 				error = got_error_from_errno("strdup");
 5788 b2070a3f 2020-03-22 stsp 				goto done;
 5789 b2070a3f 2020-03-22 stsp 			}
 5790 b2070a3f 2020-03-22 stsp 		}
 5791 e31abbf2 2020-03-22 stsp 	} else {
 5792 e31abbf2 2020-03-22 stsp 		if (argc != 1)
 5793 e31abbf2 2020-03-22 stsp 			usage_ref();
 5794 b2070a3f 2020-03-22 stsp 		refname = strdup(argv[0]);
 5795 b2070a3f 2020-03-22 stsp 		if (refname == NULL) {
 5796 b2070a3f 2020-03-22 stsp 			error = got_error_from_errno("strdup");
 5797 b2070a3f 2020-03-22 stsp 			goto done;
 5798 b2070a3f 2020-03-22 stsp 		}
 5799 e31abbf2 2020-03-22 stsp 	}
 5800 b2070a3f 2020-03-22 stsp 
 5801 b2070a3f 2020-03-22 stsp 	if (refname)
 5802 b2070a3f 2020-03-22 stsp 		got_path_strip_trailing_slashes(refname);
 5803 d0eebce4 2019-03-11 stsp 
 5804 d0eebce4 2019-03-11 stsp #ifndef PROFILE
 5805 e0b57350 2019-03-12 stsp 	if (do_list) {
 5806 e0b57350 2019-03-12 stsp 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
 5807 e0b57350 2019-03-12 stsp 		    NULL) == -1)
 5808 e0b57350 2019-03-12 stsp 			err(1, "pledge");
 5809 e0b57350 2019-03-12 stsp 	} else {
 5810 e0b57350 2019-03-12 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 5811 e0b57350 2019-03-12 stsp 		    "sendfd unveil", NULL) == -1)
 5812 e0b57350 2019-03-12 stsp 			err(1, "pledge");
 5813 e0b57350 2019-03-12 stsp 	}
 5814 d0eebce4 2019-03-11 stsp #endif
 5815 d0eebce4 2019-03-11 stsp 	cwd = getcwd(NULL, 0);
 5816 d0eebce4 2019-03-11 stsp 	if (cwd == NULL) {
 5817 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 5818 d0eebce4 2019-03-11 stsp 		goto done;
 5819 d0eebce4 2019-03-11 stsp 	}
 5820 d0eebce4 2019-03-11 stsp 
 5821 d0eebce4 2019-03-11 stsp 	if (repo_path == NULL) {
 5822 d0eebce4 2019-03-11 stsp 		error = got_worktree_open(&worktree, cwd);
 5823 d0eebce4 2019-03-11 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 5824 d0eebce4 2019-03-11 stsp 			goto done;
 5825 d0eebce4 2019-03-11 stsp 		else
 5826 d0eebce4 2019-03-11 stsp 			error = NULL;
 5827 d0eebce4 2019-03-11 stsp 		if (worktree) {
 5828 d0eebce4 2019-03-11 stsp 			repo_path =
 5829 d0eebce4 2019-03-11 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 5830 d0eebce4 2019-03-11 stsp 			if (repo_path == NULL)
 5831 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 5832 d0eebce4 2019-03-11 stsp 			if (error)
 5833 d0eebce4 2019-03-11 stsp 				goto done;
 5834 d0eebce4 2019-03-11 stsp 		} else {
 5835 d0eebce4 2019-03-11 stsp 			repo_path = strdup(cwd);
 5836 d0eebce4 2019-03-11 stsp 			if (repo_path == NULL) {
 5837 638f9024 2019-05-13 stsp 				error = got_error_from_errno("strdup");
 5838 d0eebce4 2019-03-11 stsp 				goto done;
 5839 d0eebce4 2019-03-11 stsp 			}
 5840 d0eebce4 2019-03-11 stsp 		}
 5841 d0eebce4 2019-03-11 stsp 	}
 5842 d0eebce4 2019-03-11 stsp 
 5843 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 5844 d0eebce4 2019-03-11 stsp 	if (error != NULL)
 5845 d0eebce4 2019-03-11 stsp 		goto done;
 5846 d0eebce4 2019-03-11 stsp 
 5847 c02c541e 2019-03-29 stsp 	error = apply_unveil(got_repo_get_path(repo), do_list,
 5848 c530dc23 2019-07-23 stsp 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 5849 c02c541e 2019-03-29 stsp 	if (error)
 5850 c02c541e 2019-03-29 stsp 		goto done;
 5851 c02c541e 2019-03-29 stsp 
 5852 d0eebce4 2019-03-11 stsp 	if (do_list)
 5853 2bf0fa54 2021-11-20 thomas 		error = list_refs(repo, refname, sort_by_time);
 5854 e31abbf2 2020-03-22 stsp 	else if (do_delete)
 5855 161728eb 2021-07-24 stsp 		error = delete_ref_by_name(repo, refname);
 5856 e31abbf2 2020-03-22 stsp 	else if (symref_target)
 5857 e31abbf2 2020-03-22 stsp 		error = add_symref(repo, refname, symref_target);
 5858 e31abbf2 2020-03-22 stsp 	else {
 5859 e31abbf2 2020-03-22 stsp 		if (obj_arg == NULL)
 5860 e31abbf2 2020-03-22 stsp 			usage_ref();
 5861 e31abbf2 2020-03-22 stsp 		error = add_ref(repo, refname, obj_arg);
 5862 e31abbf2 2020-03-22 stsp 	}
 5863 4e759de4 2019-06-26 stsp done:
 5864 b2070a3f 2020-03-22 stsp 	free(refname);
 5865 1d0f4054 2021-06-17 stsp 	if (repo) {
 5866 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 5867 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 5868 1d0f4054 2021-06-17 stsp 			error = close_err;
 5869 1d0f4054 2021-06-17 stsp 	}
 5870 4e759de4 2019-06-26 stsp 	if (worktree)
 5871 4e759de4 2019-06-26 stsp 		got_worktree_close(worktree);
 5872 4e759de4 2019-06-26 stsp 	free(cwd);
 5873 4e759de4 2019-06-26 stsp 	free(repo_path);
 5874 4e759de4 2019-06-26 stsp 	return error;
 5875 4e759de4 2019-06-26 stsp }
 5876 4e759de4 2019-06-26 stsp 
 5877 4e759de4 2019-06-26 stsp __dead static void
 5878 4e759de4 2019-06-26 stsp usage_branch(void)
 5879 4e759de4 2019-06-26 stsp {
 5880 4e759de4 2019-06-26 stsp 	fprintf(stderr,
 5881 da76fce2 2020-02-24 stsp 	    "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
 5882 da76fce2 2020-02-24 stsp 	        "[name]\n", getprogname());
 5883 4e759de4 2019-06-26 stsp 	exit(1);
 5884 4e759de4 2019-06-26 stsp }
 5885 4e759de4 2019-06-26 stsp 
 5886 4e759de4 2019-06-26 stsp static const struct got_error *
 5887 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
 5888 4e99b47e 2019-10-04 stsp     struct got_reference *ref)
 5889 4e99b47e 2019-10-04 stsp {
 5890 4e99b47e 2019-10-04 stsp 	const struct got_error *err = NULL;
 5891 4e99b47e 2019-10-04 stsp 	const char *refname, *marker = "  ";
 5892 4e99b47e 2019-10-04 stsp 	char *refstr;
 5893 4e99b47e 2019-10-04 stsp 
 5894 4e99b47e 2019-10-04 stsp 	refname = got_ref_get_name(ref);
 5895 4e99b47e 2019-10-04 stsp 	if (worktree && strcmp(refname,
 5896 4e99b47e 2019-10-04 stsp 	    got_worktree_get_head_ref_name(worktree)) == 0) {
 5897 4e99b47e 2019-10-04 stsp 		struct got_object_id *id = NULL;
 5898 4e99b47e 2019-10-04 stsp 
 5899 4e99b47e 2019-10-04 stsp 		err = got_ref_resolve(&id, repo, ref);
 5900 4e99b47e 2019-10-04 stsp 		if (err)
 5901 4e99b47e 2019-10-04 stsp 			return err;
 5902 4e99b47e 2019-10-04 stsp 		if (got_object_id_cmp(id,
 5903 4e99b47e 2019-10-04 stsp 		    got_worktree_get_base_commit_id(worktree)) == 0)
 5904 4e99b47e 2019-10-04 stsp 			marker = "* ";
 5905 4e99b47e 2019-10-04 stsp 		else
 5906 4e99b47e 2019-10-04 stsp 			marker = "~ ";
 5907 4e99b47e 2019-10-04 stsp 		free(id);
 5908 4e99b47e 2019-10-04 stsp 	}
 5909 4e99b47e 2019-10-04 stsp 
 5910 4e99b47e 2019-10-04 stsp 	if (strncmp(refname, "refs/heads/", 11) == 0)
 5911 4e99b47e 2019-10-04 stsp 		refname += 11;
 5912 4e99b47e 2019-10-04 stsp 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
 5913 4e99b47e 2019-10-04 stsp 		refname += 18;
 5914 34d4e04c 2021-02-08 stsp 	if (strncmp(refname, "refs/remotes/", 13) == 0)
 5915 34d4e04c 2021-02-08 stsp 		refname += 13;
 5916 4e99b47e 2019-10-04 stsp 
 5917 4e99b47e 2019-10-04 stsp 	refstr = got_ref_to_str(ref);
 5918 4e99b47e 2019-10-04 stsp 	if (refstr == NULL)
 5919 4e99b47e 2019-10-04 stsp 		return got_error_from_errno("got_ref_to_str");
 5920 4e99b47e 2019-10-04 stsp 
 5921 4e99b47e 2019-10-04 stsp 	printf("%s%s: %s\n", marker, refname, refstr);
 5922 4e99b47e 2019-10-04 stsp 	free(refstr);
 5923 4e99b47e 2019-10-04 stsp 	return NULL;
 5924 4e99b47e 2019-10-04 stsp }
 5925 4e99b47e 2019-10-04 stsp 
 5926 4e99b47e 2019-10-04 stsp static const struct got_error *
 5927 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
 5928 ad89fa31 2019-10-04 stsp {
 5929 ad89fa31 2019-10-04 stsp 	const char *refname;
 5930 ad89fa31 2019-10-04 stsp 
 5931 ad89fa31 2019-10-04 stsp 	if (worktree == NULL)
 5932 ad89fa31 2019-10-04 stsp 		return got_error(GOT_ERR_NOT_WORKTREE);
 5933 ad89fa31 2019-10-04 stsp 
 5934 ad89fa31 2019-10-04 stsp 	refname = got_worktree_get_head_ref_name(worktree);
 5935 ad89fa31 2019-10-04 stsp 
 5936 ad89fa31 2019-10-04 stsp 	if (strncmp(refname, "refs/heads/", 11) == 0)
 5937 ad89fa31 2019-10-04 stsp 		refname += 11;
 5938 ad89fa31 2019-10-04 stsp 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
 5939 ad89fa31 2019-10-04 stsp 		refname += 18;
 5940 ad89fa31 2019-10-04 stsp 
 5941 ad89fa31 2019-10-04 stsp 	printf("%s\n", refname);
 5942 ad89fa31 2019-10-04 stsp 
 5943 ad89fa31 2019-10-04 stsp 	return NULL;
 5944 ad89fa31 2019-10-04 stsp }
 5945 ad89fa31 2019-10-04 stsp 
 5946 ad89fa31 2019-10-04 stsp static const struct got_error *
 5947 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
 5948 4e759de4 2019-06-26 stsp {
 5949 4e759de4 2019-06-26 stsp 	static const struct got_error *err = NULL;
 5950 4e759de4 2019-06-26 stsp 	struct got_reflist_head refs;
 5951 4e759de4 2019-06-26 stsp 	struct got_reflist_entry *re;
 5952 4e99b47e 2019-10-04 stsp 	struct got_reference *temp_ref = NULL;
 5953 4e99b47e 2019-10-04 stsp 	int rebase_in_progress, histedit_in_progress;
 5954 4e759de4 2019-06-26 stsp 
 5955 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
 5956 ba882ee3 2019-07-11 stsp 
 5957 4e99b47e 2019-10-04 stsp 	if (worktree) {
 5958 4e99b47e 2019-10-04 stsp 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
 5959 4e99b47e 2019-10-04 stsp 		    worktree);
 5960 4e99b47e 2019-10-04 stsp 		if (err)
 5961 4e99b47e 2019-10-04 stsp 			return err;
 5962 4e99b47e 2019-10-04 stsp 
 5963 4e99b47e 2019-10-04 stsp 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
 5964 4e99b47e 2019-10-04 stsp 		    worktree);
 5965 4e99b47e 2019-10-04 stsp 		if (err)
 5966 4e99b47e 2019-10-04 stsp 			return err;
 5967 4e99b47e 2019-10-04 stsp 
 5968 4e99b47e 2019-10-04 stsp 		if (rebase_in_progress || histedit_in_progress) {
 5969 4e99b47e 2019-10-04 stsp 			err = got_ref_open(&temp_ref, repo,
 5970 4e99b47e 2019-10-04 stsp 			    got_worktree_get_head_ref_name(worktree), 0);
 5971 4e99b47e 2019-10-04 stsp 			if (err)
 5972 4e99b47e 2019-10-04 stsp 				return err;
 5973 4e99b47e 2019-10-04 stsp 			list_branch(repo, worktree, temp_ref);
 5974 4e99b47e 2019-10-04 stsp 			got_ref_close(temp_ref);
 5975 4e99b47e 2019-10-04 stsp 		}
 5976 4e99b47e 2019-10-04 stsp 	}
 5977 4e99b47e 2019-10-04 stsp 
 5978 b8bad2ba 2019-08-23 stsp 	err = got_ref_list(&refs, repo, "refs/heads",
 5979 b8bad2ba 2019-08-23 stsp 	    got_ref_cmp_by_name, NULL);
 5980 4e759de4 2019-06-26 stsp 	if (err)
 5981 4e759de4 2019-06-26 stsp 		return err;
 5982 4e759de4 2019-06-26 stsp 
 5983 d9dff0e5 2020-12-26 stsp 	TAILQ_FOREACH(re, &refs, entry)
 5984 4e99b47e 2019-10-04 stsp 		list_branch(repo, worktree, re->ref);
 5985 4e759de4 2019-06-26 stsp 
 5986 4e759de4 2019-06-26 stsp 	got_ref_list_free(&refs);
 5987 34d4e04c 2021-02-08 stsp 
 5988 34d4e04c 2021-02-08 stsp 	err = got_ref_list(&refs, repo, "refs/remotes",
 5989 34d4e04c 2021-02-08 stsp 	    got_ref_cmp_by_name, NULL);
 5990 34d4e04c 2021-02-08 stsp 	if (err)
 5991 34d4e04c 2021-02-08 stsp 		return err;
 5992 34d4e04c 2021-02-08 stsp 
 5993 34d4e04c 2021-02-08 stsp 	TAILQ_FOREACH(re, &refs, entry)
 5994 34d4e04c 2021-02-08 stsp 		list_branch(repo, worktree, re->ref);
 5995 34d4e04c 2021-02-08 stsp 
 5996 34d4e04c 2021-02-08 stsp 	got_ref_list_free(&refs);
 5997 34d4e04c 2021-02-08 stsp 
 5998 4e759de4 2019-06-26 stsp 	return NULL;
 5999 4e759de4 2019-06-26 stsp }
 6000 4e759de4 2019-06-26 stsp 
 6001 4e759de4 2019-06-26 stsp static const struct got_error *
 6002 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
 6003 45cd4e47 2019-08-25 stsp     const char *branch_name)
 6004 4e759de4 2019-06-26 stsp {
 6005 4e759de4 2019-06-26 stsp 	const struct got_error *err = NULL;
 6006 45cd4e47 2019-08-25 stsp 	struct got_reference *ref = NULL;
 6007 2f1457c6 2021-08-27 stsp 	char *refname, *remote_refname = NULL;
 6008 4e759de4 2019-06-26 stsp 
 6009 2f1457c6 2021-08-27 stsp 	if (strncmp(branch_name, "refs/", 5) == 0)
 6010 2f1457c6 2021-08-27 stsp 		branch_name += 5;
 6011 2f1457c6 2021-08-27 stsp 	if (strncmp(branch_name, "heads/", 6) == 0)
 6012 2f1457c6 2021-08-27 stsp 		branch_name += 6;
 6013 2f1457c6 2021-08-27 stsp 	else if (strncmp(branch_name, "remotes/", 8) == 0)
 6014 2f1457c6 2021-08-27 stsp 		branch_name += 8;
 6015 2f1457c6 2021-08-27 stsp 
 6016 4e759de4 2019-06-26 stsp 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
 6017 4e759de4 2019-06-26 stsp 		return got_error_from_errno("asprintf");
 6018 4e759de4 2019-06-26 stsp 
 6019 2f1457c6 2021-08-27 stsp 	if (asprintf(&remote_refname, "refs/remotes/%s",
 6020 2f1457c6 2021-08-27 stsp 	    branch_name) == -1) {
 6021 2f1457c6 2021-08-27 stsp 		err = got_error_from_errno("asprintf");
 6022 4e759de4 2019-06-26 stsp 		goto done;
 6023 2f1457c6 2021-08-27 stsp 	}
 6024 4e759de4 2019-06-26 stsp 
 6025 2f1457c6 2021-08-27 stsp 	err = got_ref_open(&ref, repo, refname, 0);
 6026 2f1457c6 2021-08-27 stsp 	if (err) {
 6027 2f1457c6 2021-08-27 stsp 		const struct got_error *err2;
 6028 2f1457c6 2021-08-27 stsp 		if (err->code != GOT_ERR_NOT_REF)
 6029 2f1457c6 2021-08-27 stsp 			goto done;
 6030 2f1457c6 2021-08-27 stsp 		/*
 6031 2f1457c6 2021-08-27 stsp 		 * Keep 'err' intact such that if neither branch exists
 6032 2f1457c6 2021-08-27 stsp 		 * we report "refs/heads" rather than "refs/remotes" in
 6033 2f1457c6 2021-08-27 stsp 		 * our error message.
 6034 2f1457c6 2021-08-27 stsp 		 */
 6035 2f1457c6 2021-08-27 stsp 		err2 = got_ref_open(&ref, repo, remote_refname, 0);
 6036 2f1457c6 2021-08-27 stsp 		if (err2)
 6037 2f1457c6 2021-08-27 stsp 			goto done;
 6038 2f1457c6 2021-08-27 stsp 		err = NULL;
 6039 2f1457c6 2021-08-27 stsp 	}
 6040 2f1457c6 2021-08-27 stsp 
 6041 45cd4e47 2019-08-25 stsp 	if (worktree &&
 6042 45cd4e47 2019-08-25 stsp 	    strcmp(got_worktree_get_head_ref_name(worktree),
 6043 45cd4e47 2019-08-25 stsp 	    got_ref_get_name(ref)) == 0) {
 6044 45cd4e47 2019-08-25 stsp 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
 6045 45cd4e47 2019-08-25 stsp 		    "will not delete this work tree's current branch");
 6046 45cd4e47 2019-08-25 stsp 		goto done;
 6047 45cd4e47 2019-08-25 stsp 	}
 6048 45cd4e47 2019-08-25 stsp 
 6049 978a28a1 2021-09-04 naddy 	err = delete_ref(repo, ref);
 6050 4e759de4 2019-06-26 stsp done:
 6051 45cd4e47 2019-08-25 stsp 	if (ref)
 6052 45cd4e47 2019-08-25 stsp 		got_ref_close(ref);
 6053 4e759de4 2019-06-26 stsp 	free(refname);
 6054 2f1457c6 2021-08-27 stsp 	free(remote_refname);
 6055 4e759de4 2019-06-26 stsp 	return err;
 6056 4e759de4 2019-06-26 stsp }
 6057 4e759de4 2019-06-26 stsp 
 6058 4e759de4 2019-06-26 stsp static const struct got_error *
 6059 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
 6060 a74f7e83 2019-11-10 stsp     struct got_object_id *base_commit_id)
 6061 4e759de4 2019-06-26 stsp {
 6062 4e759de4 2019-06-26 stsp 	const struct got_error *err = NULL;
 6063 4e759de4 2019-06-26 stsp 	struct got_reference *ref = NULL;
 6064 4e759de4 2019-06-26 stsp 	char *base_refname = NULL, *refname = NULL;
 6065 d3f84d51 2019-07-11 stsp 
 6066 d3f84d51 2019-07-11 stsp 	/*
 6067 bd5895f3 2019-11-28 stsp 	 * Don't let the user create a branch name with a leading '-'.
 6068 d3f84d51 2019-07-11 stsp 	 * While technically a valid reference name, this case is usually
 6069 d3f84d51 2019-07-11 stsp 	 * an unintended typo.
 6070 d3f84d51 2019-07-11 stsp 	 */
 6071 bd5895f3 2019-11-28 stsp 	if (branch_name[0] == '-')
 6072 bd5895f3 2019-11-28 stsp 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
 6073 2f1457c6 2021-08-27 stsp 
 6074 2f1457c6 2021-08-27 stsp 	if (strncmp(branch_name, "refs/heads/", 11) == 0)
 6075 2f1457c6 2021-08-27 stsp 		branch_name += 11;
 6076 4e759de4 2019-06-26 stsp 
 6077 4e759de4 2019-06-26 stsp 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
 6078 62d463ca 2020-10-20 naddy 		err = got_error_from_errno("asprintf");
 6079 62d463ca 2020-10-20 naddy 		goto done;
 6080 4e759de4 2019-06-26 stsp 	}
 6081 4e759de4 2019-06-26 stsp 
 6082 4e759de4 2019-06-26 stsp 	err = got_ref_open(&ref, repo, refname, 0);
 6083 4e759de4 2019-06-26 stsp 	if (err == NULL) {
 6084 4e759de4 2019-06-26 stsp 		err = got_error(GOT_ERR_BRANCH_EXISTS);
 6085 4e759de4 2019-06-26 stsp 		goto done;
 6086 4e759de4 2019-06-26 stsp 	} else if (err->code != GOT_ERR_NOT_REF)
 6087 4e759de4 2019-06-26 stsp 		goto done;
 6088 4e759de4 2019-06-26 stsp 
 6089 a74f7e83 2019-11-10 stsp 	err = got_ref_alloc(&ref, refname, base_commit_id);
 6090 4e759de4 2019-06-26 stsp 	if (err)
 6091 4e759de4 2019-06-26 stsp 		goto done;
 6092 4e759de4 2019-06-26 stsp 
 6093 4e759de4 2019-06-26 stsp 	err = got_ref_write(ref, repo);
 6094 d0eebce4 2019-03-11 stsp done:
 6095 4e759de4 2019-06-26 stsp 	if (ref)
 6096 4e759de4 2019-06-26 stsp 		got_ref_close(ref);
 6097 4e759de4 2019-06-26 stsp 	free(base_refname);
 6098 4e759de4 2019-06-26 stsp 	free(refname);
 6099 4e759de4 2019-06-26 stsp 	return err;
 6100 4e759de4 2019-06-26 stsp }
 6101 4e759de4 2019-06-26 stsp 
 6102 4e759de4 2019-06-26 stsp static const struct got_error *
 6103 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
 6104 4e759de4 2019-06-26 stsp {
 6105 4e759de4 2019-06-26 stsp 	const struct got_error *error = NULL;
 6106 4e759de4 2019-06-26 stsp 	struct got_repository *repo = NULL;
 6107 4e759de4 2019-06-26 stsp 	struct got_worktree *worktree = NULL;
 6108 4e759de4 2019-06-26 stsp 	char *cwd = NULL, *repo_path = NULL;
 6109 da76fce2 2020-02-24 stsp 	int ch, do_list = 0, do_show = 0, do_update = 1;
 6110 a74f7e83 2019-11-10 stsp 	const char *delref = NULL, *commit_id_arg = NULL;
 6111 da76fce2 2020-02-24 stsp 	struct got_reference *ref = NULL;
 6112 da76fce2 2020-02-24 stsp 	struct got_pathlist_head paths;
 6113 da76fce2 2020-02-24 stsp 	struct got_pathlist_entry *pe;
 6114 da76fce2 2020-02-24 stsp 	struct got_object_id *commit_id = NULL;
 6115 da76fce2 2020-02-24 stsp 	char *commit_id_str = NULL;
 6116 4e759de4 2019-06-26 stsp 
 6117 da76fce2 2020-02-24 stsp 	TAILQ_INIT(&paths);
 6118 da76fce2 2020-02-24 stsp 
 6119 da76fce2 2020-02-24 stsp 	while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
 6120 4e759de4 2019-06-26 stsp 		switch (ch) {
 6121 a74f7e83 2019-11-10 stsp 		case 'c':
 6122 a74f7e83 2019-11-10 stsp 			commit_id_arg = optarg;
 6123 a74f7e83 2019-11-10 stsp 			break;
 6124 4e759de4 2019-06-26 stsp 		case 'd':
 6125 4e759de4 2019-06-26 stsp 			delref = optarg;
 6126 4e759de4 2019-06-26 stsp 			break;
 6127 4e759de4 2019-06-26 stsp 		case 'r':
 6128 4e759de4 2019-06-26 stsp 			repo_path = realpath(optarg, NULL);
 6129 4e759de4 2019-06-26 stsp 			if (repo_path == NULL)
 6130 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 6131 9ba1d308 2019-10-21 stsp 				    optarg);
 6132 4e759de4 2019-06-26 stsp 			got_path_strip_trailing_slashes(repo_path);
 6133 4e759de4 2019-06-26 stsp 			break;
 6134 4e759de4 2019-06-26 stsp 		case 'l':
 6135 4e759de4 2019-06-26 stsp 			do_list = 1;
 6136 da76fce2 2020-02-24 stsp 			break;
 6137 da76fce2 2020-02-24 stsp 		case 'n':
 6138 da76fce2 2020-02-24 stsp 			do_update = 0;
 6139 4e759de4 2019-06-26 stsp 			break;
 6140 4e759de4 2019-06-26 stsp 		default:
 6141 4e759de4 2019-06-26 stsp 			usage_branch();
 6142 4e759de4 2019-06-26 stsp 			/* NOTREACHED */
 6143 4e759de4 2019-06-26 stsp 		}
 6144 4e759de4 2019-06-26 stsp 	}
 6145 4e759de4 2019-06-26 stsp 
 6146 4e759de4 2019-06-26 stsp 	if (do_list && delref)
 6147 ff69268e 2020-12-13 stsp 		option_conflict('l', 'd');
 6148 4e759de4 2019-06-26 stsp 
 6149 4e759de4 2019-06-26 stsp 	argc -= optind;
 6150 4e759de4 2019-06-26 stsp 	argv += optind;
 6151 ad89fa31 2019-10-04 stsp 
 6152 ad89fa31 2019-10-04 stsp 	if (!do_list && !delref && argc == 0)
 6153 ad89fa31 2019-10-04 stsp 		do_show = 1;
 6154 4e759de4 2019-06-26 stsp 
 6155 a74f7e83 2019-11-10 stsp 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
 6156 a74f7e83 2019-11-10 stsp 		errx(1, "-c option can only be used when creating a branch");
 6157 a74f7e83 2019-11-10 stsp 
 6158 4e759de4 2019-06-26 stsp 	if (do_list || delref) {
 6159 4e759de4 2019-06-26 stsp 		if (argc > 0)
 6160 4e759de4 2019-06-26 stsp 			usage_branch();
 6161 a74f7e83 2019-11-10 stsp 	} else if (!do_show && argc != 1)
 6162 4e759de4 2019-06-26 stsp 		usage_branch();
 6163 4e759de4 2019-06-26 stsp 
 6164 4e759de4 2019-06-26 stsp #ifndef PROFILE
 6165 ad89fa31 2019-10-04 stsp 	if (do_list || do_show) {
 6166 4e759de4 2019-06-26 stsp 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
 6167 4e759de4 2019-06-26 stsp 		    NULL) == -1)
 6168 4e759de4 2019-06-26 stsp 			err(1, "pledge");
 6169 4e759de4 2019-06-26 stsp 	} else {
 6170 4e759de4 2019-06-26 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 6171 4e759de4 2019-06-26 stsp 		    "sendfd unveil", NULL) == -1)
 6172 4e759de4 2019-06-26 stsp 			err(1, "pledge");
 6173 4e759de4 2019-06-26 stsp 	}
 6174 4e759de4 2019-06-26 stsp #endif
 6175 4e759de4 2019-06-26 stsp 	cwd = getcwd(NULL, 0);
 6176 4e759de4 2019-06-26 stsp 	if (cwd == NULL) {
 6177 4e759de4 2019-06-26 stsp 		error = got_error_from_errno("getcwd");
 6178 4e759de4 2019-06-26 stsp 		goto done;
 6179 4e759de4 2019-06-26 stsp 	}
 6180 4e759de4 2019-06-26 stsp 
 6181 4e759de4 2019-06-26 stsp 	if (repo_path == NULL) {
 6182 4e759de4 2019-06-26 stsp 		error = got_worktree_open(&worktree, cwd);
 6183 4e759de4 2019-06-26 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 6184 4e759de4 2019-06-26 stsp 			goto done;
 6185 4e759de4 2019-06-26 stsp 		else
 6186 4e759de4 2019-06-26 stsp 			error = NULL;
 6187 4e759de4 2019-06-26 stsp 		if (worktree) {
 6188 4e759de4 2019-06-26 stsp 			repo_path =
 6189 4e759de4 2019-06-26 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 6190 4e759de4 2019-06-26 stsp 			if (repo_path == NULL)
 6191 4e759de4 2019-06-26 stsp 				error = got_error_from_errno("strdup");
 6192 4e759de4 2019-06-26 stsp 			if (error)
 6193 4e759de4 2019-06-26 stsp 				goto done;
 6194 4e759de4 2019-06-26 stsp 		} else {
 6195 4e759de4 2019-06-26 stsp 			repo_path = strdup(cwd);
 6196 4e759de4 2019-06-26 stsp 			if (repo_path == NULL) {
 6197 4e759de4 2019-06-26 stsp 				error = got_error_from_errno("strdup");
 6198 4e759de4 2019-06-26 stsp 				goto done;
 6199 4e759de4 2019-06-26 stsp 			}
 6200 4e759de4 2019-06-26 stsp 		}
 6201 4e759de4 2019-06-26 stsp 	}
 6202 4e759de4 2019-06-26 stsp 
 6203 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 6204 4e759de4 2019-06-26 stsp 	if (error != NULL)
 6205 4e759de4 2019-06-26 stsp 		goto done;
 6206 4e759de4 2019-06-26 stsp 
 6207 4e759de4 2019-06-26 stsp 	error = apply_unveil(got_repo_get_path(repo), do_list,
 6208 c530dc23 2019-07-23 stsp 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 6209 4e759de4 2019-06-26 stsp 	if (error)
 6210 4e759de4 2019-06-26 stsp 		goto done;
 6211 4e759de4 2019-06-26 stsp 
 6212 ad89fa31 2019-10-04 stsp 	if (do_show)
 6213 ad89fa31 2019-10-04 stsp 		error = show_current_branch(repo, worktree);
 6214 ad89fa31 2019-10-04 stsp 	else if (do_list)
 6215 ba882ee3 2019-07-11 stsp 		error = list_branches(repo, worktree);
 6216 4e759de4 2019-06-26 stsp 	else if (delref)
 6217 45cd4e47 2019-08-25 stsp 		error = delete_branch(repo, worktree, delref);
 6218 4e759de4 2019-06-26 stsp 	else {
 6219 84de9106 2020-12-26 stsp 		struct got_reflist_head refs;
 6220 d9dff0e5 2020-12-26 stsp 		TAILQ_INIT(&refs);
 6221 84de9106 2020-12-26 stsp 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
 6222 84de9106 2020-12-26 stsp 		    NULL);
 6223 84de9106 2020-12-26 stsp 		if (error)
 6224 84de9106 2020-12-26 stsp 			goto done;
 6225 a74f7e83 2019-11-10 stsp 		if (commit_id_arg == NULL)
 6226 a74f7e83 2019-11-10 stsp 			commit_id_arg = worktree ?
 6227 4e759de4 2019-06-26 stsp 			    got_worktree_get_head_ref_name(worktree) :
 6228 4e759de4 2019-06-26 stsp 			    GOT_REF_HEAD;
 6229 71a27632 2020-01-15 stsp 		error = got_repo_match_object_id(&commit_id, NULL,
 6230 84de9106 2020-12-26 stsp 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
 6231 84de9106 2020-12-26 stsp 		got_ref_list_free(&refs);
 6232 a74f7e83 2019-11-10 stsp 		if (error)
 6233 a74f7e83 2019-11-10 stsp 			goto done;
 6234 a74f7e83 2019-11-10 stsp 		error = add_branch(repo, argv[0], commit_id);
 6235 da76fce2 2020-02-24 stsp 		if (error)
 6236 da76fce2 2020-02-24 stsp 			goto done;
 6237 da76fce2 2020-02-24 stsp 		if (worktree && do_update) {
 6238 9627c110 2020-04-18 stsp 			struct got_update_progress_arg upa;
 6239 da76fce2 2020-02-24 stsp 			char *branch_refname = NULL;
 6240 da76fce2 2020-02-24 stsp 
 6241 da76fce2 2020-02-24 stsp 			error = got_object_id_str(&commit_id_str, commit_id);
 6242 da76fce2 2020-02-24 stsp 			if (error)
 6243 da76fce2 2020-02-24 stsp 				goto done;
 6244 da76fce2 2020-02-24 stsp 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
 6245 da76fce2 2020-02-24 stsp 			    worktree);
 6246 da76fce2 2020-02-24 stsp 			if (error)
 6247 da76fce2 2020-02-24 stsp 				goto done;
 6248 da76fce2 2020-02-24 stsp 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
 6249 da76fce2 2020-02-24 stsp 			    == -1) {
 6250 da76fce2 2020-02-24 stsp 				error = got_error_from_errno("asprintf");
 6251 da76fce2 2020-02-24 stsp 				goto done;
 6252 da76fce2 2020-02-24 stsp 			}
 6253 da76fce2 2020-02-24 stsp 			error = got_ref_open(&ref, repo, branch_refname, 0);
 6254 da76fce2 2020-02-24 stsp 			free(branch_refname);
 6255 da76fce2 2020-02-24 stsp 			if (error)
 6256 da76fce2 2020-02-24 stsp 				goto done;
 6257 da76fce2 2020-02-24 stsp 			error = switch_head_ref(ref, commit_id, worktree,
 6258 da76fce2 2020-02-24 stsp 			    repo);
 6259 da76fce2 2020-02-24 stsp 			if (error)
 6260 da76fce2 2020-02-24 stsp 				goto done;
 6261 da76fce2 2020-02-24 stsp 			error = got_worktree_set_base_commit_id(worktree, repo,
 6262 da76fce2 2020-02-24 stsp 			    commit_id);
 6263 da76fce2 2020-02-24 stsp 			if (error)
 6264 da76fce2 2020-02-24 stsp 				goto done;
 6265 9627c110 2020-04-18 stsp 			memset(&upa, 0, sizeof(upa));
 6266 da76fce2 2020-02-24 stsp 			error = got_worktree_checkout_files(worktree, &paths,
 6267 9627c110 2020-04-18 stsp 			    repo, update_progress, &upa, check_cancelled,
 6268 9627c110 2020-04-18 stsp 			    NULL);
 6269 da76fce2 2020-02-24 stsp 			if (error)
 6270 da76fce2 2020-02-24 stsp 				goto done;
 6271 4f3c844b 2021-09-14 stsp 			if (upa.did_something) {
 6272 4f3c844b 2021-09-14 stsp 				printf("Updated to %s: %s\n",
 6273 4f3c844b 2021-09-14 stsp 				    got_worktree_get_head_ref_name(worktree),
 6274 4f3c844b 2021-09-14 stsp 				    commit_id_str);
 6275 4f3c844b 2021-09-14 stsp 			}
 6276 9627c110 2020-04-18 stsp 			print_update_progress_stats(&upa);
 6277 da76fce2 2020-02-24 stsp 		}
 6278 4e759de4 2019-06-26 stsp 	}
 6279 4e759de4 2019-06-26 stsp done:
 6280 da76fce2 2020-02-24 stsp 	if (ref)
 6281 da76fce2 2020-02-24 stsp 		got_ref_close(ref);
 6282 1d0f4054 2021-06-17 stsp 	if (repo) {
 6283 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 6284 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 6285 1d0f4054 2021-06-17 stsp 			error = close_err;
 6286 1d0f4054 2021-06-17 stsp 	}
 6287 d0eebce4 2019-03-11 stsp 	if (worktree)
 6288 d0eebce4 2019-03-11 stsp 		got_worktree_close(worktree);
 6289 d0eebce4 2019-03-11 stsp 	free(cwd);
 6290 d0eebce4 2019-03-11 stsp 	free(repo_path);
 6291 da76fce2 2020-02-24 stsp 	free(commit_id);
 6292 da76fce2 2020-02-24 stsp 	free(commit_id_str);
 6293 da76fce2 2020-02-24 stsp 	TAILQ_FOREACH(pe, &paths, entry)
 6294 da76fce2 2020-02-24 stsp 		free((char *)pe->path);
 6295 da76fce2 2020-02-24 stsp 	got_pathlist_free(&paths);
 6296 d00136be 2019-03-26 stsp 	return error;
 6297 d00136be 2019-03-26 stsp }
 6298 d00136be 2019-03-26 stsp 
 6299 8e7bd50a 2019-08-22 stsp 
 6300 d00136be 2019-03-26 stsp __dead static void
 6301 8e7bd50a 2019-08-22 stsp usage_tag(void)
 6302 8e7bd50a 2019-08-22 stsp {
 6303 8e7bd50a 2019-08-22 stsp 	fprintf(stderr,
 6304 80106605 2020-02-24 stsp 	    "usage: %s tag [-c commit] [-r repository] [-l] "
 6305 80106605 2020-02-24 stsp 	        "[-m message] name\n", getprogname());
 6306 8e7bd50a 2019-08-22 stsp 	exit(1);
 6307 b8bad2ba 2019-08-23 stsp }
 6308 b8bad2ba 2019-08-23 stsp 
 6309 b8bad2ba 2019-08-23 stsp #if 0
 6310 b8bad2ba 2019-08-23 stsp static const struct got_error *
 6311 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
 6312 b8bad2ba 2019-08-23 stsp {
 6313 b8bad2ba 2019-08-23 stsp 	const struct got_error *err = NULL;
 6314 b8bad2ba 2019-08-23 stsp 	struct got_reflist_entry *re, *se, *new;
 6315 b8bad2ba 2019-08-23 stsp 	struct got_object_id *re_id, *se_id;
 6316 b8bad2ba 2019-08-23 stsp 	struct got_tag_object *re_tag, *se_tag;
 6317 b8bad2ba 2019-08-23 stsp 	time_t re_time, se_time;
 6318 b8bad2ba 2019-08-23 stsp 
 6319 dbdddfee 2021-06-23 naddy 	STAILQ_FOREACH(re, tags, entry) {
 6320 dbdddfee 2021-06-23 naddy 		se = STAILQ_FIRST(sorted);
 6321 b8bad2ba 2019-08-23 stsp 		if (se == NULL) {
 6322 b8bad2ba 2019-08-23 stsp 			err = got_reflist_entry_dup(&new, re);
 6323 b8bad2ba 2019-08-23 stsp 			if (err)
 6324 b8bad2ba 2019-08-23 stsp 				return err;
 6325 dbdddfee 2021-06-23 naddy 			STAILQ_INSERT_HEAD(sorted, new, entry);
 6326 b8bad2ba 2019-08-23 stsp 			continue;
 6327 b8bad2ba 2019-08-23 stsp 		} else {
 6328 b8bad2ba 2019-08-23 stsp 			err = got_ref_resolve(&re_id, repo, re->ref);
 6329 b8bad2ba 2019-08-23 stsp 			if (err)
 6330 b8bad2ba 2019-08-23 stsp 				break;
 6331 b8bad2ba 2019-08-23 stsp 			err = got_object_open_as_tag(&re_tag, repo, re_id);
 6332 b8bad2ba 2019-08-23 stsp 			free(re_id);
 6333 b8bad2ba 2019-08-23 stsp 			if (err)
 6334 b8bad2ba 2019-08-23 stsp 				break;
 6335 b8bad2ba 2019-08-23 stsp 			re_time = got_object_tag_get_tagger_time(re_tag);
 6336 b8bad2ba 2019-08-23 stsp 			got_object_tag_close(re_tag);
 6337 b8bad2ba 2019-08-23 stsp 		}
 6338 b8bad2ba 2019-08-23 stsp 
 6339 b8bad2ba 2019-08-23 stsp 		while (se) {
 6340 b8bad2ba 2019-08-23 stsp 			err = got_ref_resolve(&se_id, repo, re->ref);
 6341 b8bad2ba 2019-08-23 stsp 			if (err)
 6342 b8bad2ba 2019-08-23 stsp 				break;
 6343 b8bad2ba 2019-08-23 stsp 			err = got_object_open_as_tag(&se_tag, repo, se_id);
 6344 b8bad2ba 2019-08-23 stsp 			free(se_id);
 6345 b8bad2ba 2019-08-23 stsp 			if (err)
 6346 b8bad2ba 2019-08-23 stsp 				break;
 6347 b8bad2ba 2019-08-23 stsp 			se_time = got_object_tag_get_tagger_time(se_tag);
 6348 b8bad2ba 2019-08-23 stsp 			got_object_tag_close(se_tag);
 6349 b8bad2ba 2019-08-23 stsp 
 6350 b8bad2ba 2019-08-23 stsp 			if (se_time > re_time) {
 6351 b8bad2ba 2019-08-23 stsp 				err = got_reflist_entry_dup(&new, re);
 6352 b8bad2ba 2019-08-23 stsp 				if (err)
 6353 b8bad2ba 2019-08-23 stsp 					return err;
 6354 dbdddfee 2021-06-23 naddy 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
 6355 b8bad2ba 2019-08-23 stsp 				break;
 6356 b8bad2ba 2019-08-23 stsp 			}
 6357 dbdddfee 2021-06-23 naddy 			se = STAILQ_NEXT(se, entry);
 6358 b8bad2ba 2019-08-23 stsp 			continue;
 6359 b8bad2ba 2019-08-23 stsp 		}
 6360 b8bad2ba 2019-08-23 stsp 	}
 6361 b8bad2ba 2019-08-23 stsp done:
 6362 b8bad2ba 2019-08-23 stsp 	return err;
 6363 8e7bd50a 2019-08-22 stsp }
 6364 b8bad2ba 2019-08-23 stsp #endif
 6365 b8bad2ba 2019-08-23 stsp 
 6366 b8bad2ba 2019-08-23 stsp static const struct got_error *
 6367 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
 6368 8e7bd50a 2019-08-22 stsp {
 6369 8e7bd50a 2019-08-22 stsp 	static const struct got_error *err = NULL;
 6370 8e7bd50a 2019-08-22 stsp 	struct got_reflist_head refs;
 6371 8e7bd50a 2019-08-22 stsp 	struct got_reflist_entry *re;
 6372 8e7bd50a 2019-08-22 stsp 
 6373 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
 6374 8e7bd50a 2019-08-22 stsp 
 6375 d1f16636 2020-01-15 stsp 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
 6376 8e7bd50a 2019-08-22 stsp 	if (err)
 6377 8e7bd50a 2019-08-22 stsp 		return err;
 6378 8e7bd50a 2019-08-22 stsp 
 6379 d9dff0e5 2020-12-26 stsp 	TAILQ_FOREACH(re, &refs, entry) {
 6380 8e7bd50a 2019-08-22 stsp 		const char *refname;
 6381 8e7bd50a 2019-08-22 stsp 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
 6382 8e7bd50a 2019-08-22 stsp 		char datebuf[26];
 6383 d4efa91b 2020-01-14 stsp 		const char *tagger;
 6384 8e7bd50a 2019-08-22 stsp 		time_t tagger_time;
 6385 8e7bd50a 2019-08-22 stsp 		struct got_object_id *id;
 6386 8e7bd50a 2019-08-22 stsp 		struct got_tag_object *tag;
 6387 d4efa91b 2020-01-14 stsp 		struct got_commit_object *commit = NULL;
 6388 8e7bd50a 2019-08-22 stsp 
 6389 8e7bd50a 2019-08-22 stsp 		refname = got_ref_get_name(re->ref);
 6390 8e7bd50a 2019-08-22 stsp 		if (strncmp(refname, "refs/tags/", 10) != 0)
 6391 8e7bd50a 2019-08-22 stsp 			continue;
 6392 8e7bd50a 2019-08-22 stsp 		refname += 10;
 6393 8e7bd50a 2019-08-22 stsp 		refstr = got_ref_to_str(re->ref);
 6394 8e7bd50a 2019-08-22 stsp 		if (refstr == NULL) {
 6395 8e7bd50a 2019-08-22 stsp 			err = got_error_from_errno("got_ref_to_str");
 6396 8e7bd50a 2019-08-22 stsp 			break;
 6397 8e7bd50a 2019-08-22 stsp 		}
 6398 8e7bd50a 2019-08-22 stsp 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
 6399 8e7bd50a 2019-08-22 stsp 		free(refstr);
 6400 8e7bd50a 2019-08-22 stsp 
 6401 8e7bd50a 2019-08-22 stsp 		err = got_ref_resolve(&id, repo, re->ref);
 6402 8e7bd50a 2019-08-22 stsp 		if (err)
 6403 8e7bd50a 2019-08-22 stsp 			break;
 6404 8e7bd50a 2019-08-22 stsp 		err = got_object_open_as_tag(&tag, repo, id);
 6405 d4efa91b 2020-01-14 stsp 		if (err) {
 6406 d4efa91b 2020-01-14 stsp 			if (err->code != GOT_ERR_OBJ_TYPE) {
 6407 d4efa91b 2020-01-14 stsp 				free(id);
 6408 d4efa91b 2020-01-14 stsp 				break;
 6409 d4efa91b 2020-01-14 stsp 			}
 6410 d4efa91b 2020-01-14 stsp 			/* "lightweight" tag */
 6411 d4efa91b 2020-01-14 stsp 			err = got_object_open_as_commit(&commit, repo, id);
 6412 d4efa91b 2020-01-14 stsp 			if (err) {
 6413 d4efa91b 2020-01-14 stsp 				free(id);
 6414 d4efa91b 2020-01-14 stsp 				break;
 6415 d4efa91b 2020-01-14 stsp 			}
 6416 d4efa91b 2020-01-14 stsp 			tagger = got_object_commit_get_committer(commit);
 6417 d4efa91b 2020-01-14 stsp 			tagger_time =
 6418 d4efa91b 2020-01-14 stsp 			    got_object_commit_get_committer_time(commit);
 6419 d4efa91b 2020-01-14 stsp 			err = got_object_id_str(&id_str, id);
 6420 d4efa91b 2020-01-14 stsp 			free(id);
 6421 d4efa91b 2020-01-14 stsp 			if (err)
 6422 d4efa91b 2020-01-14 stsp 				break;
 6423 d4efa91b 2020-01-14 stsp 		} else {
 6424 d4efa91b 2020-01-14 stsp 			free(id);
 6425 d4efa91b 2020-01-14 stsp 			tagger = got_object_tag_get_tagger(tag);
 6426 d4efa91b 2020-01-14 stsp 			tagger_time = got_object_tag_get_tagger_time(tag);
 6427 d4efa91b 2020-01-14 stsp 			err = got_object_id_str(&id_str,
 6428 d4efa91b 2020-01-14 stsp 			    got_object_tag_get_object_id(tag));
 6429 d4efa91b 2020-01-14 stsp 			if (err)
 6430 d4efa91b 2020-01-14 stsp 				break;
 6431 d4efa91b 2020-01-14 stsp 		}
 6432 d4efa91b 2020-01-14 stsp 		printf("from: %s\n", tagger);
 6433 2417344c 2019-08-23 stsp 		datestr = get_datestr(&tagger_time, datebuf);
 6434 2417344c 2019-08-23 stsp 		if (datestr)
 6435 2417344c 2019-08-23 stsp 			printf("date: %s UTC\n", datestr);
 6436 d4efa91b 2020-01-14 stsp 		if (commit)
 6437 2417344c 2019-08-23 stsp 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
 6438 d4efa91b 2020-01-14 stsp 		else {
 6439 d4efa91b 2020-01-14 stsp 			switch (got_object_tag_get_object_type(tag)) {
 6440 d4efa91b 2020-01-14 stsp 			case GOT_OBJ_TYPE_BLOB:
 6441 d4efa91b 2020-01-14 stsp 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
 6442 d4efa91b 2020-01-14 stsp 				    id_str);
 6443 d4efa91b 2020-01-14 stsp 				break;
 6444 d4efa91b 2020-01-14 stsp 			case GOT_OBJ_TYPE_TREE:
 6445 d4efa91b 2020-01-14 stsp 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
 6446 d4efa91b 2020-01-14 stsp 				    id_str);
 6447 d4efa91b 2020-01-14 stsp 				break;
 6448 d4efa91b 2020-01-14 stsp 			case GOT_OBJ_TYPE_COMMIT:
 6449 d4efa91b 2020-01-14 stsp 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
 6450 d4efa91b 2020-01-14 stsp 				    id_str);
 6451 d4efa91b 2020-01-14 stsp 				break;
 6452 d4efa91b 2020-01-14 stsp 			case GOT_OBJ_TYPE_TAG:
 6453 d4efa91b 2020-01-14 stsp 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
 6454 d4efa91b 2020-01-14 stsp 				    id_str);
 6455 d4efa91b 2020-01-14 stsp 				break;
 6456 d4efa91b 2020-01-14 stsp 			default:
 6457 d4efa91b 2020-01-14 stsp 				break;
 6458 d4efa91b 2020-01-14 stsp 			}
 6459 8e7bd50a 2019-08-22 stsp 		}
 6460 8e7bd50a 2019-08-22 stsp 		free(id_str);
 6461 d4efa91b 2020-01-14 stsp 		if (commit) {
 6462 d4efa91b 2020-01-14 stsp 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
 6463 d4efa91b 2020-01-14 stsp 			if (err)
 6464 d4efa91b 2020-01-14 stsp 				break;
 6465 d4efa91b 2020-01-14 stsp 			got_object_commit_close(commit);
 6466 d4efa91b 2020-01-14 stsp 		} else {
 6467 d4efa91b 2020-01-14 stsp 			tagmsg0 = strdup(got_object_tag_get_message(tag));
 6468 d4efa91b 2020-01-14 stsp 			got_object_tag_close(tag);
 6469 d4efa91b 2020-01-14 stsp 			if (tagmsg0 == NULL) {
 6470 d4efa91b 2020-01-14 stsp 				err = got_error_from_errno("strdup");
 6471 d4efa91b 2020-01-14 stsp 				break;
 6472 d4efa91b 2020-01-14 stsp 			}
 6473 8e7bd50a 2019-08-22 stsp 		}
 6474 8e7bd50a 2019-08-22 stsp 
 6475 8e7bd50a 2019-08-22 stsp 		tagmsg = tagmsg0;
 6476 8e7bd50a 2019-08-22 stsp 		do {
 6477 8e7bd50a 2019-08-22 stsp 			line = strsep(&tagmsg, "\n");
 6478 8e7bd50a 2019-08-22 stsp 			if (line)
 6479 8e7bd50a 2019-08-22 stsp 				printf(" %s\n", line);
 6480 8e7bd50a 2019-08-22 stsp 		} while (line);
 6481 8e7bd50a 2019-08-22 stsp 		free(tagmsg0);
 6482 8e7bd50a 2019-08-22 stsp 	}
 6483 8e7bd50a 2019-08-22 stsp 
 6484 8e7bd50a 2019-08-22 stsp 	got_ref_list_free(&refs);
 6485 8e7bd50a 2019-08-22 stsp 	return NULL;
 6486 8e7bd50a 2019-08-22 stsp }
 6487 8e7bd50a 2019-08-22 stsp 
 6488 8e7bd50a 2019-08-22 stsp static const struct got_error *
 6489 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
 6490 62870f63 2019-08-22 stsp     const char *tag_name, const char *repo_path)
 6491 8e7bd50a 2019-08-22 stsp {
 6492 8e7bd50a 2019-08-22 stsp 	const struct got_error *err = NULL;
 6493 8e7bd50a 2019-08-22 stsp 	char *template = NULL, *initial_content = NULL;
 6494 f372d5cd 2019-10-21 stsp 	char *editor = NULL;
 6495 1601cb9f 2020-09-11 naddy 	int initial_content_len;
 6496 8e7bd50a 2019-08-22 stsp 	int fd = -1;
 6497 8e7bd50a 2019-08-22 stsp 
 6498 bb63914a 2020-02-17 stsp 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
 6499 8e7bd50a 2019-08-22 stsp 		err = got_error_from_errno("asprintf");
 6500 8e7bd50a 2019-08-22 stsp 		goto done;
 6501 8e7bd50a 2019-08-22 stsp 	}
 6502 8e7bd50a 2019-08-22 stsp 
 6503 1601cb9f 2020-09-11 naddy 	initial_content_len = asprintf(&initial_content,
 6504 1601cb9f 2020-09-11 naddy 	    "\n# tagging commit %s as %s\n",
 6505 1601cb9f 2020-09-11 naddy 	    commit_id_str, tag_name);
 6506 1601cb9f 2020-09-11 naddy 	if (initial_content_len == -1) {
 6507 8e7bd50a 2019-08-22 stsp 		err = got_error_from_errno("asprintf");
 6508 8e7bd50a 2019-08-22 stsp 		goto done;
 6509 8e7bd50a 2019-08-22 stsp 	}
 6510 8e7bd50a 2019-08-22 stsp 
 6511 f372d5cd 2019-10-21 stsp 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
 6512 8e7bd50a 2019-08-22 stsp 	if (err)
 6513 8e7bd50a 2019-08-22 stsp 		goto done;
 6514 8e7bd50a 2019-08-22 stsp 
 6515 97972933 2020-09-11 stsp 	if (write(fd, initial_content, initial_content_len) == -1) {
 6516 97972933 2020-09-11 stsp 		err = got_error_from_errno2("write", *tagmsg_path);
 6517 97972933 2020-09-11 stsp 		goto done;
 6518 97972933 2020-09-11 stsp 	}
 6519 8e7bd50a 2019-08-22 stsp 
 6520 8e7bd50a 2019-08-22 stsp 	err = get_editor(&editor);
 6521 8e7bd50a 2019-08-22 stsp 	if (err)
 6522 8e7bd50a 2019-08-22 stsp 		goto done;
 6523 bfa12d5e 2020-09-26 stsp 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
 6524 0d5bb276 2020-12-15 stsp 	    initial_content_len, 1);
 6525 8e7bd50a 2019-08-22 stsp done:
 6526 8e7bd50a 2019-08-22 stsp 	free(initial_content);
 6527 8e7bd50a 2019-08-22 stsp 	free(template);
 6528 8e7bd50a 2019-08-22 stsp 	free(editor);
 6529 8e7bd50a 2019-08-22 stsp 
 6530 97972933 2020-09-11 stsp 	if (fd != -1 && close(fd) == -1 && err == NULL)
 6531 97972933 2020-09-11 stsp 		err = got_error_from_errno2("close", *tagmsg_path);
 6532 97972933 2020-09-11 stsp 
 6533 8e7bd50a 2019-08-22 stsp 	/* Editor is done; we can now apply unveil(2) */
 6534 59f86c76 2020-09-11 stsp 	if (err == NULL)
 6535 8e7bd50a 2019-08-22 stsp 		err = apply_unveil(repo_path, 0, NULL);
 6536 59f86c76 2020-09-11 stsp 	if (err) {
 6537 59f86c76 2020-09-11 stsp 		free(*tagmsg);
 6538 59f86c76 2020-09-11 stsp 		*tagmsg = NULL;
 6539 8e7bd50a 2019-08-22 stsp 	}
 6540 8e7bd50a 2019-08-22 stsp 	return err;
 6541 8e7bd50a 2019-08-22 stsp }
 6542 8e7bd50a 2019-08-22 stsp 
 6543 8e7bd50a 2019-08-22 stsp static const struct got_error *
 6544 50b0790e 2020-09-11 stsp add_tag(struct got_repository *repo, struct got_worktree *worktree,
 6545 50b0790e 2020-09-11 stsp     const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
 6546 8e7bd50a 2019-08-22 stsp {
 6547 8e7bd50a 2019-08-22 stsp 	const struct got_error *err = NULL;
 6548 8e7bd50a 2019-08-22 stsp 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
 6549 8e7bd50a 2019-08-22 stsp 	char *label = NULL, *commit_id_str = NULL;
 6550 8e7bd50a 2019-08-22 stsp 	struct got_reference *ref = NULL;
 6551 aba9c984 2019-09-08 stsp 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
 6552 f372d5cd 2019-10-21 stsp 	char *tagmsg_path = NULL, *tag_id_str = NULL;
 6553 f372d5cd 2019-10-21 stsp 	int preserve_tagmsg = 0;
 6554 84de9106 2020-12-26 stsp 	struct got_reflist_head refs;
 6555 8e7bd50a 2019-08-22 stsp 
 6556 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
 6557 84de9106 2020-12-26 stsp 
 6558 8e7bd50a 2019-08-22 stsp 	/*
 6559 bd5895f3 2019-11-28 stsp 	 * Don't let the user create a tag name with a leading '-'.
 6560 8e7bd50a 2019-08-22 stsp 	 * While technically a valid reference name, this case is usually
 6561 8e7bd50a 2019-08-22 stsp 	 * an unintended typo.
 6562 8e7bd50a 2019-08-22 stsp 	 */
 6563 bd5895f3 2019-11-28 stsp 	if (tag_name[0] == '-')
 6564 bd5895f3 2019-11-28 stsp 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
 6565 8e7bd50a 2019-08-22 stsp 
 6566 50b0790e 2020-09-11 stsp 	err = get_author(&tagger, repo, worktree);
 6567 8e7bd50a 2019-08-22 stsp 	if (err)
 6568 8e7bd50a 2019-08-22 stsp 		return err;
 6569 8e7bd50a 2019-08-22 stsp 
 6570 84de9106 2020-12-26 stsp 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
 6571 84de9106 2020-12-26 stsp 	if (err)
 6572 84de9106 2020-12-26 stsp 		goto done;
 6573 84de9106 2020-12-26 stsp 
 6574 71a27632 2020-01-15 stsp 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
 6575 84de9106 2020-12-26 stsp 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
 6576 8e7bd50a 2019-08-22 stsp 	if (err)
 6577 8e7bd50a 2019-08-22 stsp 		goto done;
 6578 8e7bd50a 2019-08-22 stsp 
 6579 8e7bd50a 2019-08-22 stsp 	err = got_object_id_str(&commit_id_str, commit_id);
 6580 8e7bd50a 2019-08-22 stsp 	if (err)
 6581 8e7bd50a 2019-08-22 stsp 		goto done;
 6582 8e7bd50a 2019-08-22 stsp 
 6583 8e7bd50a 2019-08-22 stsp 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
 6584 8e7bd50a 2019-08-22 stsp 		refname = strdup(tag_name);
 6585 8e7bd50a 2019-08-22 stsp 		if (refname == NULL) {
 6586 62d463ca 2020-10-20 naddy 			err = got_error_from_errno("strdup");
 6587 62d463ca 2020-10-20 naddy 			goto done;
 6588 8e7bd50a 2019-08-22 stsp 		}
 6589 8e7bd50a 2019-08-22 stsp 		tag_name += 10;
 6590 8e7bd50a 2019-08-22 stsp 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
 6591 62d463ca 2020-10-20 naddy 		err = got_error_from_errno("asprintf");
 6592 62d463ca 2020-10-20 naddy 		goto done;
 6593 8e7bd50a 2019-08-22 stsp 	}
 6594 8e7bd50a 2019-08-22 stsp 
 6595 8e7bd50a 2019-08-22 stsp 	err = got_ref_open(&ref, repo, refname, 0);
 6596 8e7bd50a 2019-08-22 stsp 	if (err == NULL) {
 6597 8e7bd50a 2019-08-22 stsp 		err = got_error(GOT_ERR_TAG_EXISTS);
 6598 8e7bd50a 2019-08-22 stsp 		goto done;
 6599 8e7bd50a 2019-08-22 stsp 	} else if (err->code != GOT_ERR_NOT_REF)
 6600 8e7bd50a 2019-08-22 stsp 		goto done;
 6601 8e7bd50a 2019-08-22 stsp 
 6602 8e7bd50a 2019-08-22 stsp 	if (tagmsg_arg == NULL) {
 6603 f372d5cd 2019-10-21 stsp 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
 6604 62870f63 2019-08-22 stsp 		    tag_name, got_repo_get_path(repo));
 6605 f372d5cd 2019-10-21 stsp 		if (err) {
 6606 f372d5cd 2019-10-21 stsp 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
 6607 f372d5cd 2019-10-21 stsp 			    tagmsg_path != NULL)
 6608 f372d5cd 2019-10-21 stsp 				preserve_tagmsg = 1;
 6609 8e7bd50a 2019-08-22 stsp 			goto done;
 6610 f372d5cd 2019-10-21 stsp 		}
 6611 8e7bd50a 2019-08-22 stsp 	}
 6612 8e7bd50a 2019-08-22 stsp 
 6613 8e7bd50a 2019-08-22 stsp 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
 6614 8e7bd50a 2019-08-22 stsp 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
 6615 f372d5cd 2019-10-21 stsp 	if (err) {
 6616 f372d5cd 2019-10-21 stsp 		if (tagmsg_path)
 6617 f372d5cd 2019-10-21 stsp 			preserve_tagmsg = 1;
 6618 8e7bd50a 2019-08-22 stsp 		goto done;
 6619 f372d5cd 2019-10-21 stsp 	}
 6620 8e7bd50a 2019-08-22 stsp 
 6621 8e7bd50a 2019-08-22 stsp 	err = got_ref_alloc(&ref, refname, tag_id);
 6622 f372d5cd 2019-10-21 stsp 	if (err) {
 6623 f372d5cd 2019-10-21 stsp 		if (tagmsg_path)
 6624 f372d5cd 2019-10-21 stsp 			preserve_tagmsg = 1;
 6625 8e7bd50a 2019-08-22 stsp 		goto done;
 6626 f372d5cd 2019-10-21 stsp 	}
 6627 8e7bd50a 2019-08-22 stsp 
 6628 8e7bd50a 2019-08-22 stsp 	err = got_ref_write(ref, repo);
 6629 f372d5cd 2019-10-21 stsp 	if (err) {
 6630 f372d5cd 2019-10-21 stsp 		if (tagmsg_path)
 6631 f372d5cd 2019-10-21 stsp 			preserve_tagmsg = 1;
 6632 f372d5cd 2019-10-21 stsp 		goto done;
 6633 f372d5cd 2019-10-21 stsp 	}
 6634 8e7bd50a 2019-08-22 stsp 
 6635 f372d5cd 2019-10-21 stsp 	err = got_object_id_str(&tag_id_str, tag_id);
 6636 f372d5cd 2019-10-21 stsp 	if (err) {
 6637 f372d5cd 2019-10-21 stsp 		if (tagmsg_path)
 6638 f372d5cd 2019-10-21 stsp 			preserve_tagmsg = 1;
 6639 f372d5cd 2019-10-21 stsp 		goto done;
 6640 8e7bd50a 2019-08-22 stsp 	}
 6641 f372d5cd 2019-10-21 stsp 	printf("Created tag %s\n", tag_id_str);
 6642 8e7bd50a 2019-08-22 stsp done:
 6643 f372d5cd 2019-10-21 stsp 	if (preserve_tagmsg) {
 6644 f372d5cd 2019-10-21 stsp 		fprintf(stderr, "%s: tag message preserved in %s\n",
 6645 f372d5cd 2019-10-21 stsp 		    getprogname(), tagmsg_path);
 6646 f372d5cd 2019-10-21 stsp 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
 6647 f372d5cd 2019-10-21 stsp 		err = got_error_from_errno2("unlink", tagmsg_path);
 6648 f372d5cd 2019-10-21 stsp 	free(tag_id_str);
 6649 8e7bd50a 2019-08-22 stsp 	if (ref)
 6650 8e7bd50a 2019-08-22 stsp 		got_ref_close(ref);
 6651 8e7bd50a 2019-08-22 stsp 	free(commit_id);
 6652 8e7bd50a 2019-08-22 stsp 	free(commit_id_str);
 6653 8e7bd50a 2019-08-22 stsp 	free(refname);
 6654 8e7bd50a 2019-08-22 stsp 	free(tagmsg);
 6655 f372d5cd 2019-10-21 stsp 	free(tagmsg_path);
 6656 aba9c984 2019-09-08 stsp 	free(tagger);
 6657 84de9106 2020-12-26 stsp 	got_ref_list_free(&refs);
 6658 8e7bd50a 2019-08-22 stsp 	return err;
 6659 8e7bd50a 2019-08-22 stsp }
 6660 8e7bd50a 2019-08-22 stsp 
 6661 8e7bd50a 2019-08-22 stsp static const struct got_error *
 6662 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
 6663 8e7bd50a 2019-08-22 stsp {
 6664 8e7bd50a 2019-08-22 stsp 	const struct got_error *error = NULL;
 6665 8e7bd50a 2019-08-22 stsp 	struct got_repository *repo = NULL;
 6666 8e7bd50a 2019-08-22 stsp 	struct got_worktree *worktree = NULL;
 6667 8e7bd50a 2019-08-22 stsp 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
 6668 c9956ddf 2019-09-08 stsp 	char *gitconfig_path = NULL;
 6669 8e7bd50a 2019-08-22 stsp 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
 6670 8e7bd50a 2019-08-22 stsp 	int ch, do_list = 0;
 6671 8e7bd50a 2019-08-22 stsp 
 6672 80106605 2020-02-24 stsp 	while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
 6673 8e7bd50a 2019-08-22 stsp 		switch (ch) {
 6674 80106605 2020-02-24 stsp 		case 'c':
 6675 80106605 2020-02-24 stsp 			commit_id_arg = optarg;
 6676 80106605 2020-02-24 stsp 			break;
 6677 8e7bd50a 2019-08-22 stsp 		case 'm':
 6678 8e7bd50a 2019-08-22 stsp 			tagmsg = optarg;
 6679 8e7bd50a 2019-08-22 stsp 			break;
 6680 8e7bd50a 2019-08-22 stsp 		case 'r':
 6681 8e7bd50a 2019-08-22 stsp 			repo_path = realpath(optarg, NULL);
 6682 8e7bd50a 2019-08-22 stsp 			if (repo_path == NULL)
 6683 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
 6684 9ba1d308 2019-10-21 stsp 				    optarg);
 6685 8e7bd50a 2019-08-22 stsp 			got_path_strip_trailing_slashes(repo_path);
 6686 8e7bd50a 2019-08-22 stsp 			break;
 6687 8e7bd50a 2019-08-22 stsp 		case 'l':
 6688 8e7bd50a 2019-08-22 stsp 			do_list = 1;
 6689 8e7bd50a 2019-08-22 stsp 			break;
 6690 8e7bd50a 2019-08-22 stsp 		default:
 6691 8e7bd50a 2019-08-22 stsp 			usage_tag();
 6692 8e7bd50a 2019-08-22 stsp 			/* NOTREACHED */
 6693 8e7bd50a 2019-08-22 stsp 		}
 6694 8e7bd50a 2019-08-22 stsp 	}
 6695 8e7bd50a 2019-08-22 stsp 
 6696 8e7bd50a 2019-08-22 stsp 	argc -= optind;
 6697 8e7bd50a 2019-08-22 stsp 	argv += optind;
 6698 8e7bd50a 2019-08-22 stsp 
 6699 8e7bd50a 2019-08-22 stsp 	if (do_list) {
 6700 80106605 2020-02-24 stsp 		if (commit_id_arg != NULL)
 6701 775ce909 2020-03-22 stsp 			errx(1,
 6702 775ce909 2020-03-22 stsp 			    "-c option can only be used when creating a tag");
 6703 8e7bd50a 2019-08-22 stsp 		if (tagmsg)
 6704 ff69268e 2020-12-13 stsp 			option_conflict('l', 'm');
 6705 8e7bd50a 2019-08-22 stsp 		if (argc > 0)
 6706 8e7bd50a 2019-08-22 stsp 			usage_tag();
 6707 80106605 2020-02-24 stsp 	} else if (argc != 1)
 6708 8e7bd50a 2019-08-22 stsp 		usage_tag();
 6709 80106605 2020-02-24 stsp 
 6710 a2887370 2019-08-23 stsp 	tag_name = argv[0];
 6711 8e7bd50a 2019-08-22 stsp 
 6712 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
 6713 8e7bd50a 2019-08-22 stsp 	if (do_list) {
 6714 8e7bd50a 2019-08-22 stsp 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
 6715 8e7bd50a 2019-08-22 stsp 		    NULL) == -1)
 6716 8e7bd50a 2019-08-22 stsp 			err(1, "pledge");
 6717 8e7bd50a 2019-08-22 stsp 	} else {
 6718 8e7bd50a 2019-08-22 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 6719 8e7bd50a 2019-08-22 stsp 		    "sendfd unveil", NULL) == -1)
 6720 8e7bd50a 2019-08-22 stsp 			err(1, "pledge");
 6721 8e7bd50a 2019-08-22 stsp 	}
 6722 8e7bd50a 2019-08-22 stsp #endif
 6723 8e7bd50a 2019-08-22 stsp 	cwd = getcwd(NULL, 0);
 6724 8e7bd50a 2019-08-22 stsp 	if (cwd == NULL) {
 6725 8e7bd50a 2019-08-22 stsp 		error = got_error_from_errno("getcwd");
 6726 8e7bd50a 2019-08-22 stsp 		goto done;
 6727 8e7bd50a 2019-08-22 stsp 	}
 6728 8e7bd50a 2019-08-22 stsp 
 6729 8e7bd50a 2019-08-22 stsp 	if (repo_path == NULL) {
 6730 8e7bd50a 2019-08-22 stsp 		error = got_worktree_open(&worktree, cwd);
 6731 8e7bd50a 2019-08-22 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 6732 8e7bd50a 2019-08-22 stsp 			goto done;
 6733 8e7bd50a 2019-08-22 stsp 		else
 6734 8e7bd50a 2019-08-22 stsp 			error = NULL;
 6735 8e7bd50a 2019-08-22 stsp 		if (worktree) {
 6736 8e7bd50a 2019-08-22 stsp 			repo_path =
 6737 8e7bd50a 2019-08-22 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 6738 8e7bd50a 2019-08-22 stsp 			if (repo_path == NULL)
 6739 8e7bd50a 2019-08-22 stsp 				error = got_error_from_errno("strdup");
 6740 8e7bd50a 2019-08-22 stsp 			if (error)
 6741 8e7bd50a 2019-08-22 stsp 				goto done;
 6742 8e7bd50a 2019-08-22 stsp 		} else {
 6743 8e7bd50a 2019-08-22 stsp 			repo_path = strdup(cwd);
 6744 8e7bd50a 2019-08-22 stsp 			if (repo_path == NULL) {
 6745 8e7bd50a 2019-08-22 stsp 				error = got_error_from_errno("strdup");
 6746 8e7bd50a 2019-08-22 stsp 				goto done;
 6747 8e7bd50a 2019-08-22 stsp 			}
 6748 8e7bd50a 2019-08-22 stsp 		}
 6749 8e7bd50a 2019-08-22 stsp 	}
 6750 8e7bd50a 2019-08-22 stsp 
 6751 8e7bd50a 2019-08-22 stsp 	if (do_list) {
 6752 c9956ddf 2019-09-08 stsp 		error = got_repo_open(&repo, repo_path, NULL);
 6753 c9956ddf 2019-09-08 stsp 		if (error != NULL)
 6754 c9956ddf 2019-09-08 stsp 			goto done;
 6755 8e7bd50a 2019-08-22 stsp 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
 6756 8e7bd50a 2019-08-22 stsp 		if (error)
 6757 8e7bd50a 2019-08-22 stsp 			goto done;
 6758 8e7bd50a 2019-08-22 stsp 		error = list_tags(repo, worktree);
 6759 8e7bd50a 2019-08-22 stsp 	} else {
 6760 c9956ddf 2019-09-08 stsp 		error = get_gitconfig_path(&gitconfig_path);
 6761 c9956ddf 2019-09-08 stsp 		if (error)
 6762 c9956ddf 2019-09-08 stsp 			goto done;
 6763 c9956ddf 2019-09-08 stsp 		error = got_repo_open(&repo, repo_path, gitconfig_path);
 6764 c9956ddf 2019-09-08 stsp 		if (error != NULL)
 6765 c9956ddf 2019-09-08 stsp 			goto done;
 6766 c9956ddf 2019-09-08 stsp 
 6767 8e7bd50a 2019-08-22 stsp 		if (tagmsg) {
 6768 42a285e2 2020-10-01 stsp 			error = apply_unveil(got_repo_get_path(repo), 0, NULL);
 6769 8e7bd50a 2019-08-22 stsp 			if (error)
 6770 8e7bd50a 2019-08-22 stsp 				goto done;
 6771 8e7bd50a 2019-08-22 stsp 		}
 6772 8e7bd50a 2019-08-22 stsp 
 6773 8e7bd50a 2019-08-22 stsp 		if (commit_id_arg == NULL) {
 6774 8e7bd50a 2019-08-22 stsp 			struct got_reference *head_ref;
 6775 8e7bd50a 2019-08-22 stsp 			struct got_object_id *commit_id;
 6776 8e7bd50a 2019-08-22 stsp 			error = got_ref_open(&head_ref, repo,
 6777 8e7bd50a 2019-08-22 stsp 			    worktree ? got_worktree_get_head_ref_name(worktree)
 6778 8e7bd50a 2019-08-22 stsp 			    : GOT_REF_HEAD, 0);
 6779 8e7bd50a 2019-08-22 stsp 			if (error)
 6780 8e7bd50a 2019-08-22 stsp 				goto done;
 6781 8e7bd50a 2019-08-22 stsp 			error = got_ref_resolve(&commit_id, repo, head_ref);
 6782 8e7bd50a 2019-08-22 stsp 			got_ref_close(head_ref);
 6783 8e7bd50a 2019-08-22 stsp 			if (error)
 6784 8e7bd50a 2019-08-22 stsp 				goto done;
 6785 8e7bd50a 2019-08-22 stsp 			error = got_object_id_str(&commit_id_str, commit_id);
 6786 8e7bd50a 2019-08-22 stsp 			free(commit_id);
 6787 8e7bd50a 2019-08-22 stsp 			if (error)
 6788 8e7bd50a 2019-08-22 stsp 				goto done;
 6789 8e7bd50a 2019-08-22 stsp 		}
 6790 8e7bd50a 2019-08-22 stsp 
 6791 50b0790e 2020-09-11 stsp 		error = add_tag(repo, worktree, tag_name,
 6792 8e7bd50a 2019-08-22 stsp 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
 6793 8e7bd50a 2019-08-22 stsp 	}
 6794 8e7bd50a 2019-08-22 stsp done:
 6795 1d0f4054 2021-06-17 stsp 	if (repo) {
 6796 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 6797 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 6798 1d0f4054 2021-06-17 stsp 			error = close_err;
 6799 1d0f4054 2021-06-17 stsp 	}
 6800 8e7bd50a 2019-08-22 stsp 	if (worktree)
 6801 8e7bd50a 2019-08-22 stsp 		got_worktree_close(worktree);
 6802 8e7bd50a 2019-08-22 stsp 	free(cwd);
 6803 8e7bd50a 2019-08-22 stsp 	free(repo_path);
 6804 c9956ddf 2019-09-08 stsp 	free(gitconfig_path);
 6805 8e7bd50a 2019-08-22 stsp 	free(commit_id_str);
 6806 8e7bd50a 2019-08-22 stsp 	return error;
 6807 8e7bd50a 2019-08-22 stsp }
 6808 8e7bd50a 2019-08-22 stsp 
 6809 8e7bd50a 2019-08-22 stsp __dead static void
 6810 d00136be 2019-03-26 stsp usage_add(void)
 6811 d00136be 2019-03-26 stsp {
 6812 c29c428a 2019-12-16 stsp 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
 6813 022fae89 2019-12-06 tracey 	    getprogname());
 6814 d00136be 2019-03-26 stsp 	exit(1);
 6815 d00136be 2019-03-26 stsp }
 6816 d00136be 2019-03-26 stsp 
 6817 d00136be 2019-03-26 stsp static const struct got_error *
 6818 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
 6819 4e68cba3 2019-11-23 stsp {
 6820 4e68cba3 2019-11-23 stsp 	while (path[0] == '/')
 6821 4e68cba3 2019-11-23 stsp 		path++;
 6822 4e68cba3 2019-11-23 stsp 	printf("%c  %s\n", status, path);
 6823 4e68cba3 2019-11-23 stsp 	return NULL;
 6824 4e68cba3 2019-11-23 stsp }
 6825 4e68cba3 2019-11-23 stsp 
 6826 4e68cba3 2019-11-23 stsp static const struct got_error *
 6827 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
 6828 d00136be 2019-03-26 stsp {
 6829 d00136be 2019-03-26 stsp 	const struct got_error *error = NULL;
 6830 031a5338 2019-03-26 stsp 	struct got_repository *repo = NULL;
 6831 d00136be 2019-03-26 stsp 	struct got_worktree *worktree = NULL;
 6832 1dd54920 2019-05-11 stsp 	char *cwd = NULL;
 6833 1dd54920 2019-05-11 stsp 	struct got_pathlist_head paths;
 6834 1dd54920 2019-05-11 stsp 	struct got_pathlist_entry *pe;
 6835 022fae89 2019-12-06 tracey 	int ch, can_recurse = 0, no_ignores = 0;
 6836 1dd54920 2019-05-11 stsp 
 6837 1dd54920 2019-05-11 stsp 	TAILQ_INIT(&paths);
 6838 d00136be 2019-03-26 stsp 
 6839 022fae89 2019-12-06 tracey 	while ((ch = getopt(argc, argv, "IR")) != -1) {
 6840 d00136be 2019-03-26 stsp 		switch (ch) {
 6841 022fae89 2019-12-06 tracey 		case 'I':
 6842 022fae89 2019-12-06 tracey 			no_ignores = 1;
 6843 022fae89 2019-12-06 tracey 			break;
 6844 4e68cba3 2019-11-23 stsp 		case 'R':
 6845 4e68cba3 2019-11-23 stsp 			can_recurse = 1;
 6846 4e68cba3 2019-11-23 stsp 			break;
 6847 d00136be 2019-03-26 stsp 		default:
 6848 d00136be 2019-03-26 stsp 			usage_add();
 6849 d00136be 2019-03-26 stsp 			/* NOTREACHED */
 6850 d00136be 2019-03-26 stsp 		}
 6851 d00136be 2019-03-26 stsp 	}
 6852 d00136be 2019-03-26 stsp 
 6853 d00136be 2019-03-26 stsp 	argc -= optind;
 6854 d00136be 2019-03-26 stsp 	argv += optind;
 6855 d00136be 2019-03-26 stsp 
 6856 43012d58 2019-07-14 stsp #ifndef PROFILE
 6857 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 6858 43012d58 2019-07-14 stsp 	    NULL) == -1)
 6859 43012d58 2019-07-14 stsp 		err(1, "pledge");
 6860 43012d58 2019-07-14 stsp #endif
 6861 723c305c 2019-05-11 jcs 	if (argc < 1)
 6862 d00136be 2019-03-26 stsp 		usage_add();
 6863 d00136be 2019-03-26 stsp 
 6864 d00136be 2019-03-26 stsp 	cwd = getcwd(NULL, 0);
 6865 d00136be 2019-03-26 stsp 	if (cwd == NULL) {
 6866 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 6867 d00136be 2019-03-26 stsp 		goto done;
 6868 d00136be 2019-03-26 stsp 	}
 6869 723c305c 2019-05-11 jcs 
 6870 d00136be 2019-03-26 stsp 	error = got_worktree_open(&worktree, cwd);
 6871 fa51e947 2020-03-27 stsp 	if (error) {
 6872 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 6873 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "add", cwd);
 6874 d00136be 2019-03-26 stsp 		goto done;
 6875 fa51e947 2020-03-27 stsp 	}
 6876 d00136be 2019-03-26 stsp 
 6877 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 6878 c9956ddf 2019-09-08 stsp 	    NULL);
 6879 031a5338 2019-03-26 stsp 	if (error != NULL)
 6880 031a5338 2019-03-26 stsp 		goto done;
 6881 031a5338 2019-03-26 stsp 
 6882 031a5338 2019-03-26 stsp 	error = apply_unveil(got_repo_get_path(repo), 1,
 6883 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 6884 d00136be 2019-03-26 stsp 	if (error)
 6885 d00136be 2019-03-26 stsp 		goto done;
 6886 d00136be 2019-03-26 stsp 
 6887 6d022e97 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
 6888 6d022e97 2019-08-04 stsp 	if (error)
 6889 022fae89 2019-12-06 tracey 		goto done;
 6890 022fae89 2019-12-06 tracey 
 6891 4e68cba3 2019-11-23 stsp 	if (!can_recurse) {
 6892 4e68cba3 2019-11-23 stsp 		char *ondisk_path;
 6893 4e68cba3 2019-11-23 stsp 		struct stat sb;
 6894 4e68cba3 2019-11-23 stsp 		TAILQ_FOREACH(pe, &paths, entry) {
 6895 4e68cba3 2019-11-23 stsp 			if (asprintf(&ondisk_path, "%s/%s",
 6896 4e68cba3 2019-11-23 stsp 			    got_worktree_get_root_path(worktree),
 6897 62d463ca 2020-10-20 naddy 			    pe->path) == -1) {
 6898 4e68cba3 2019-11-23 stsp 				error = got_error_from_errno("asprintf");
 6899 4e68cba3 2019-11-23 stsp 				goto done;
 6900 4e68cba3 2019-11-23 stsp 			}
 6901 4e68cba3 2019-11-23 stsp 			if (lstat(ondisk_path, &sb) == -1) {
 6902 4e68cba3 2019-11-23 stsp 				if (errno == ENOENT) {
 6903 4e68cba3 2019-11-23 stsp 					free(ondisk_path);
 6904 4e68cba3 2019-11-23 stsp 					continue;
 6905 4e68cba3 2019-11-23 stsp 				}
 6906 4e68cba3 2019-11-23 stsp 				error = got_error_from_errno2("lstat",
 6907 4e68cba3 2019-11-23 stsp 				    ondisk_path);
 6908 4e68cba3 2019-11-23 stsp 				free(ondisk_path);
 6909 4e68cba3 2019-11-23 stsp 				goto done;
 6910 4e68cba3 2019-11-23 stsp 			}
 6911 4e68cba3 2019-11-23 stsp 			free(ondisk_path);
 6912 4e68cba3 2019-11-23 stsp 			if (S_ISDIR(sb.st_mode)) {
 6913 4e68cba3 2019-11-23 stsp 				error = got_error_msg(GOT_ERR_BAD_PATH,
 6914 4e68cba3 2019-11-23 stsp 				    "adding directories requires -R option");
 6915 4e68cba3 2019-11-23 stsp 				goto done;
 6916 4e68cba3 2019-11-23 stsp 			}
 6917 4e68cba3 2019-11-23 stsp 		}
 6918 4e68cba3 2019-11-23 stsp 	}
 6919 022fae89 2019-12-06 tracey 
 6920 4e68cba3 2019-11-23 stsp 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
 6921 022fae89 2019-12-06 tracey 	    NULL, repo, no_ignores);
 6922 d00136be 2019-03-26 stsp done:
 6923 1d0f4054 2021-06-17 stsp 	if (repo) {
 6924 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 6925 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 6926 1d0f4054 2021-06-17 stsp 			error = close_err;
 6927 1d0f4054 2021-06-17 stsp 	}
 6928 d00136be 2019-03-26 stsp 	if (worktree)
 6929 d00136be 2019-03-26 stsp 		got_worktree_close(worktree);
 6930 1dd54920 2019-05-11 stsp 	TAILQ_FOREACH(pe, &paths, entry)
 6931 1dd54920 2019-05-11 stsp 		free((char *)pe->path);
 6932 1dd54920 2019-05-11 stsp 	got_pathlist_free(&paths);
 6933 2ec1f75b 2019-03-26 stsp 	free(cwd);
 6934 2ec1f75b 2019-03-26 stsp 	return error;
 6935 2ec1f75b 2019-03-26 stsp }
 6936 2ec1f75b 2019-03-26 stsp 
 6937 2ec1f75b 2019-03-26 stsp __dead static void
 6938 648e4ef7 2019-07-09 stsp usage_remove(void)
 6939 2ec1f75b 2019-03-26 stsp {
 6940 766841c2 2020-08-13 stsp 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
 6941 766841c2 2020-08-13 stsp 	    "path ...\n", getprogname());
 6942 2ec1f75b 2019-03-26 stsp 	exit(1);
 6943 2a06fe5f 2019-08-24 stsp }
 6944 2a06fe5f 2019-08-24 stsp 
 6945 2a06fe5f 2019-08-24 stsp static const struct got_error *
 6946 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
 6947 f2a9dc41 2019-12-13 tracey     unsigned char staged_status, const char *path)
 6948 2a06fe5f 2019-08-24 stsp {
 6949 f2a9dc41 2019-12-13 tracey 	while (path[0] == '/')
 6950 f2a9dc41 2019-12-13 tracey 		path++;
 6951 2a06fe5f 2019-08-24 stsp 	if (status == GOT_STATUS_NONEXISTENT)
 6952 2a06fe5f 2019-08-24 stsp 		return NULL;
 6953 2a06fe5f 2019-08-24 stsp 	if (status == staged_status && (status == GOT_STATUS_DELETE))
 6954 2a06fe5f 2019-08-24 stsp 		status = GOT_STATUS_NO_CHANGE;
 6955 2a06fe5f 2019-08-24 stsp 	printf("%c%c %s\n", status, staged_status, path);
 6956 2a06fe5f 2019-08-24 stsp 	return NULL;
 6957 2ec1f75b 2019-03-26 stsp }
 6958 2ec1f75b 2019-03-26 stsp 
 6959 2ec1f75b 2019-03-26 stsp static const struct got_error *
 6960 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
 6961 2ec1f75b 2019-03-26 stsp {
 6962 2ec1f75b 2019-03-26 stsp 	const struct got_error *error = NULL;
 6963 2ec1f75b 2019-03-26 stsp 	struct got_worktree *worktree = NULL;
 6964 2ec1f75b 2019-03-26 stsp 	struct got_repository *repo = NULL;
 6965 766841c2 2020-08-13 stsp 	const char *status_codes = NULL;
 6966 17ed4618 2019-06-02 stsp 	char *cwd = NULL;
 6967 17ed4618 2019-06-02 stsp 	struct got_pathlist_head paths;
 6968 17ed4618 2019-06-02 stsp 	struct got_pathlist_entry *pe;
 6969 766841c2 2020-08-13 stsp 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
 6970 2ec1f75b 2019-03-26 stsp 
 6971 17ed4618 2019-06-02 stsp 	TAILQ_INIT(&paths);
 6972 17ed4618 2019-06-02 stsp 
 6973 766841c2 2020-08-13 stsp 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
 6974 2ec1f75b 2019-03-26 stsp 		switch (ch) {
 6975 2ec1f75b 2019-03-26 stsp 		case 'f':
 6976 2ec1f75b 2019-03-26 stsp 			delete_local_mods = 1;
 6977 2ec1f75b 2019-03-26 stsp 			break;
 6978 70e3e7f5 2019-12-13 tracey 		case 'k':
 6979 70e3e7f5 2019-12-13 tracey 			keep_on_disk = 1;
 6980 70e3e7f5 2019-12-13 tracey 			break;
 6981 f2a9dc41 2019-12-13 tracey 		case 'R':
 6982 f2a9dc41 2019-12-13 tracey 			can_recurse = 1;
 6983 f2a9dc41 2019-12-13 tracey 			break;
 6984 766841c2 2020-08-13 stsp 		case 's':
 6985 766841c2 2020-08-13 stsp 			for (i = 0; i < strlen(optarg); i++) {
 6986 766841c2 2020-08-13 stsp 				switch (optarg[i]) {
 6987 766841c2 2020-08-13 stsp 				case GOT_STATUS_MODIFY:
 6988 766841c2 2020-08-13 stsp 					delete_local_mods = 1;
 6989 766841c2 2020-08-13 stsp 					break;
 6990 766841c2 2020-08-13 stsp 				case GOT_STATUS_MISSING:
 6991 766841c2 2020-08-13 stsp 					break;
 6992 766841c2 2020-08-13 stsp 				default:
 6993 766841c2 2020-08-13 stsp 					errx(1, "invalid status code '%c'",
 6994 766841c2 2020-08-13 stsp 					    optarg[i]);
 6995 766841c2 2020-08-13 stsp 				}
 6996 766841c2 2020-08-13 stsp 			}
 6997 766841c2 2020-08-13 stsp 			status_codes = optarg;
 6998 766841c2 2020-08-13 stsp 			break;
 6999 2ec1f75b 2019-03-26 stsp 		default:
 7000 f2a9dc41 2019-12-13 tracey 			usage_remove();
 7001 2ec1f75b 2019-03-26 stsp 			/* NOTREACHED */
 7002 2ec1f75b 2019-03-26 stsp 		}
 7003 2ec1f75b 2019-03-26 stsp 	}
 7004 2ec1f75b 2019-03-26 stsp 
 7005 2ec1f75b 2019-03-26 stsp 	argc -= optind;
 7006 2ec1f75b 2019-03-26 stsp 	argv += optind;
 7007 2ec1f75b 2019-03-26 stsp 
 7008 43012d58 2019-07-14 stsp #ifndef PROFILE
 7009 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
 7010 43012d58 2019-07-14 stsp 	    NULL) == -1)
 7011 43012d58 2019-07-14 stsp 		err(1, "pledge");
 7012 43012d58 2019-07-14 stsp #endif
 7013 17ed4618 2019-06-02 stsp 	if (argc < 1)
 7014 648e4ef7 2019-07-09 stsp 		usage_remove();
 7015 2ec1f75b 2019-03-26 stsp 
 7016 2ec1f75b 2019-03-26 stsp 	cwd = getcwd(NULL, 0);
 7017 2ec1f75b 2019-03-26 stsp 	if (cwd == NULL) {
 7018 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 7019 2ec1f75b 2019-03-26 stsp 		goto done;
 7020 2ec1f75b 2019-03-26 stsp 	}
 7021 2ec1f75b 2019-03-26 stsp 	error = got_worktree_open(&worktree, cwd);
 7022 fa51e947 2020-03-27 stsp 	if (error) {
 7023 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 7024 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "remove", cwd);
 7025 2ec1f75b 2019-03-26 stsp 		goto done;
 7026 fa51e947 2020-03-27 stsp 	}
 7027 2ec1f75b 2019-03-26 stsp 
 7028 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 7029 c9956ddf 2019-09-08 stsp 	    NULL);
 7030 2af4a041 2019-05-11 jcs 	if (error)
 7031 2ec1f75b 2019-03-26 stsp 		goto done;
 7032 2ec1f75b 2019-03-26 stsp 
 7033 c2253644 2019-03-26 stsp 	error = apply_unveil(got_repo_get_path(repo), 1,
 7034 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 7035 2ec1f75b 2019-03-26 stsp 	if (error)
 7036 2ec1f75b 2019-03-26 stsp 		goto done;
 7037 2ec1f75b 2019-03-26 stsp 
 7038 6d022e97 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
 7039 6d022e97 2019-08-04 stsp 	if (error)
 7040 6d022e97 2019-08-04 stsp 		goto done;
 7041 17ed4618 2019-06-02 stsp 
 7042 f2a9dc41 2019-12-13 tracey 	if (!can_recurse) {
 7043 f2a9dc41 2019-12-13 tracey 		char *ondisk_path;
 7044 f2a9dc41 2019-12-13 tracey 		struct stat sb;
 7045 f2a9dc41 2019-12-13 tracey 		TAILQ_FOREACH(pe, &paths, entry) {
 7046 f2a9dc41 2019-12-13 tracey 			if (asprintf(&ondisk_path, "%s/%s",
 7047 f2a9dc41 2019-12-13 tracey 			    got_worktree_get_root_path(worktree),
 7048 62d463ca 2020-10-20 naddy 			    pe->path) == -1) {
 7049 f2a9dc41 2019-12-13 tracey 				error = got_error_from_errno("asprintf");
 7050 f2a9dc41 2019-12-13 tracey 				goto done;
 7051 f2a9dc41 2019-12-13 tracey 			}
 7052 f2a9dc41 2019-12-13 tracey 			if (lstat(ondisk_path, &sb) == -1) {
 7053 f2a9dc41 2019-12-13 tracey 				if (errno == ENOENT) {
 7054 f2a9dc41 2019-12-13 tracey 					free(ondisk_path);
 7055 f2a9dc41 2019-12-13 tracey 					continue;
 7056 f2a9dc41 2019-12-13 tracey 				}
 7057 f2a9dc41 2019-12-13 tracey 				error = got_error_from_errno2("lstat",
 7058 f2a9dc41 2019-12-13 tracey 				    ondisk_path);
 7059 f2a9dc41 2019-12-13 tracey 				free(ondisk_path);
 7060 f2a9dc41 2019-12-13 tracey 				goto done;
 7061 f2a9dc41 2019-12-13 tracey 			}
 7062 f2a9dc41 2019-12-13 tracey 			free(ondisk_path);
 7063 f2a9dc41 2019-12-13 tracey 			if (S_ISDIR(sb.st_mode)) {
 7064 f2a9dc41 2019-12-13 tracey 				error = got_error_msg(GOT_ERR_BAD_PATH,
 7065 f2a9dc41 2019-12-13 tracey 				    "removing directories requires -R option");
 7066 f2a9dc41 2019-12-13 tracey 				goto done;
 7067 f2a9dc41 2019-12-13 tracey 			}
 7068 f2a9dc41 2019-12-13 tracey 		}
 7069 f2a9dc41 2019-12-13 tracey 	}
 7070 f2a9dc41 2019-12-13 tracey 
 7071 17ed4618 2019-06-02 stsp 	error = got_worktree_schedule_delete(worktree, &paths,
 7072 766841c2 2020-08-13 stsp 	    delete_local_mods, status_codes, print_remove_status, NULL,
 7073 766841c2 2020-08-13 stsp 	    repo, keep_on_disk);
 7074 a129376b 2019-03-28 stsp done:
 7075 1d0f4054 2021-06-17 stsp 	if (repo) {
 7076 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 7077 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 7078 1d0f4054 2021-06-17 stsp 			error = close_err;
 7079 1d0f4054 2021-06-17 stsp 	}
 7080 a129376b 2019-03-28 stsp 	if (worktree)
 7081 a129376b 2019-03-28 stsp 		got_worktree_close(worktree);
 7082 17ed4618 2019-06-02 stsp 	TAILQ_FOREACH(pe, &paths, entry)
 7083 17ed4618 2019-06-02 stsp 		free((char *)pe->path);
 7084 17ed4618 2019-06-02 stsp 	got_pathlist_free(&paths);
 7085 a129376b 2019-03-28 stsp 	free(cwd);
 7086 a129376b 2019-03-28 stsp 	return error;
 7087 a129376b 2019-03-28 stsp }
 7088 a129376b 2019-03-28 stsp 
 7089 a129376b 2019-03-28 stsp __dead static void
 7090 a129376b 2019-03-28 stsp usage_revert(void)
 7091 a129376b 2019-03-28 stsp {
 7092 33aa809d 2019-08-08 stsp 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
 7093 33aa809d 2019-08-08 stsp 	    "path ...\n", getprogname());
 7094 a129376b 2019-03-28 stsp 	exit(1);
 7095 a129376b 2019-03-28 stsp }
 7096 a129376b 2019-03-28 stsp 
 7097 1ee397ad 2019-07-12 stsp static const struct got_error *
 7098 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
 7099 a129376b 2019-03-28 stsp {
 7100 fb9704af 2020-01-27 stsp 	if (status == GOT_STATUS_UNVERSIONED)
 7101 fb9704af 2020-01-27 stsp 		return NULL;
 7102 fb9704af 2020-01-27 stsp 
 7103 a129376b 2019-03-28 stsp 	while (path[0] == '/')
 7104 a129376b 2019-03-28 stsp 		path++;
 7105 a129376b 2019-03-28 stsp 	printf("%c  %s\n", status, path);
 7106 33aa809d 2019-08-08 stsp 	return NULL;
 7107 33aa809d 2019-08-08 stsp }
 7108 33aa809d 2019-08-08 stsp 
 7109 33aa809d 2019-08-08 stsp struct choose_patch_arg {
 7110 33aa809d 2019-08-08 stsp 	FILE *patch_script_file;
 7111 33aa809d 2019-08-08 stsp 	const char *action;
 7112 33aa809d 2019-08-08 stsp };
 7113 33aa809d 2019-08-08 stsp 
 7114 33aa809d 2019-08-08 stsp static const struct got_error *
 7115 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
 7116 33aa809d 2019-08-08 stsp     int nchanges, const char *action)
 7117 33aa809d 2019-08-08 stsp {
 7118 33aa809d 2019-08-08 stsp 	char *line = NULL;
 7119 33aa809d 2019-08-08 stsp 	size_t linesize = 0;
 7120 33aa809d 2019-08-08 stsp 	ssize_t linelen;
 7121 33aa809d 2019-08-08 stsp 
 7122 33aa809d 2019-08-08 stsp 	switch (status) {
 7123 33aa809d 2019-08-08 stsp 	case GOT_STATUS_ADD:
 7124 33aa809d 2019-08-08 stsp 		printf("A  %s\n%s this addition? [y/n] ", path, action);
 7125 33aa809d 2019-08-08 stsp 		break;
 7126 33aa809d 2019-08-08 stsp 	case GOT_STATUS_DELETE:
 7127 33aa809d 2019-08-08 stsp 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
 7128 33aa809d 2019-08-08 stsp 		break;
 7129 33aa809d 2019-08-08 stsp 	case GOT_STATUS_MODIFY:
 7130 33aa809d 2019-08-08 stsp 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
 7131 33aa809d 2019-08-08 stsp 			return got_error_from_errno("fseek");
 7132 33aa809d 2019-08-08 stsp 		printf(GOT_COMMIT_SEP_STR);
 7133 9516e7cb 2019-08-11 stsp 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
 7134 33aa809d 2019-08-08 stsp 			printf("%s", line);
 7135 33aa809d 2019-08-08 stsp 		if (ferror(patch_file))
 7136 33aa809d 2019-08-08 stsp 			return got_error_from_errno("getline");
 7137 33aa809d 2019-08-08 stsp 		printf(GOT_COMMIT_SEP_STR);
 7138 33aa809d 2019-08-08 stsp 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
 7139 33aa809d 2019-08-08 stsp 		    path, n, nchanges, action);
 7140 33aa809d 2019-08-08 stsp 		break;
 7141 33aa809d 2019-08-08 stsp 	default:
 7142 33aa809d 2019-08-08 stsp 		return got_error_path(path, GOT_ERR_FILE_STATUS);
 7143 33aa809d 2019-08-08 stsp 	}
 7144 33aa809d 2019-08-08 stsp 
 7145 33aa809d 2019-08-08 stsp 	return NULL;
 7146 33aa809d 2019-08-08 stsp }
 7147 33aa809d 2019-08-08 stsp 
 7148 33aa809d 2019-08-08 stsp static const struct got_error *
 7149 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
 7150 33aa809d 2019-08-08 stsp     FILE *patch_file, int n, int nchanges)
 7151 33aa809d 2019-08-08 stsp {
 7152 33aa809d 2019-08-08 stsp 	const struct got_error *err = NULL;
 7153 33aa809d 2019-08-08 stsp 	char *line = NULL;
 7154 33aa809d 2019-08-08 stsp 	size_t linesize = 0;
 7155 33aa809d 2019-08-08 stsp 	ssize_t linelen;
 7156 33aa809d 2019-08-08 stsp 	int resp = ' ';
 7157 33aa809d 2019-08-08 stsp 	struct choose_patch_arg *a = arg;
 7158 33aa809d 2019-08-08 stsp 
 7159 33aa809d 2019-08-08 stsp 	*choice = GOT_PATCH_CHOICE_NONE;
 7160 33aa809d 2019-08-08 stsp 
 7161 33aa809d 2019-08-08 stsp 	if (a->patch_script_file) {
 7162 33aa809d 2019-08-08 stsp 		char *nl;
 7163 33aa809d 2019-08-08 stsp 		err = show_change(status, path, patch_file, n, nchanges,
 7164 33aa809d 2019-08-08 stsp 		    a->action);
 7165 33aa809d 2019-08-08 stsp 		if (err)
 7166 33aa809d 2019-08-08 stsp 			return err;
 7167 33aa809d 2019-08-08 stsp 		linelen = getline(&line, &linesize, a->patch_script_file);
 7168 33aa809d 2019-08-08 stsp 		if (linelen == -1) {
 7169 33aa809d 2019-08-08 stsp 			if (ferror(a->patch_script_file))
 7170 33aa809d 2019-08-08 stsp 				return got_error_from_errno("getline");
 7171 33aa809d 2019-08-08 stsp 			return NULL;
 7172 33aa809d 2019-08-08 stsp 		}
 7173 33aa809d 2019-08-08 stsp 		nl = strchr(line, '\n');
 7174 33aa809d 2019-08-08 stsp 		if (nl)
 7175 33aa809d 2019-08-08 stsp 			*nl = '\0';
 7176 33aa809d 2019-08-08 stsp 		if (strcmp(line, "y") == 0) {
 7177 33aa809d 2019-08-08 stsp 			*choice = GOT_PATCH_CHOICE_YES;
 7178 33aa809d 2019-08-08 stsp 			printf("y\n");
 7179 33aa809d 2019-08-08 stsp 		} else if (strcmp(line, "n") == 0) {
 7180 33aa809d 2019-08-08 stsp 			*choice = GOT_PATCH_CHOICE_NO;
 7181 33aa809d 2019-08-08 stsp 			printf("n\n");
 7182 33aa809d 2019-08-08 stsp 		} else if (strcmp(line, "q") == 0 &&
 7183 33aa809d 2019-08-08 stsp 		    status == GOT_STATUS_MODIFY) {
 7184 33aa809d 2019-08-08 stsp 			*choice = GOT_PATCH_CHOICE_QUIT;
 7185 33aa809d 2019-08-08 stsp 			printf("q\n");
 7186 33aa809d 2019-08-08 stsp 		} else
 7187 33aa809d 2019-08-08 stsp 			printf("invalid response '%s'\n", line);
 7188 33aa809d 2019-08-08 stsp 		free(line);
 7189 33aa809d 2019-08-08 stsp 		return NULL;
 7190 33aa809d 2019-08-08 stsp 	}
 7191 33aa809d 2019-08-08 stsp 
 7192 33aa809d 2019-08-08 stsp 	while (resp != 'y' && resp != 'n' && resp != 'q') {
 7193 33aa809d 2019-08-08 stsp 		err = show_change(status, path, patch_file, n, nchanges,
 7194 33aa809d 2019-08-08 stsp 		    a->action);
 7195 33aa809d 2019-08-08 stsp 		if (err)
 7196 33aa809d 2019-08-08 stsp 			return err;
 7197 33aa809d 2019-08-08 stsp 		resp = getchar();
 7198 33aa809d 2019-08-08 stsp 		if (resp == '\n')
 7199 33aa809d 2019-08-08 stsp 			resp = getchar();
 7200 33aa809d 2019-08-08 stsp 		if (status == GOT_STATUS_MODIFY) {
 7201 33aa809d 2019-08-08 stsp 			if (resp != 'y' && resp != 'n' && resp != 'q') {
 7202 33aa809d 2019-08-08 stsp 				printf("invalid response '%c'\n", resp);
 7203 33aa809d 2019-08-08 stsp 				resp = ' ';
 7204 33aa809d 2019-08-08 stsp 			}
 7205 33aa809d 2019-08-08 stsp 		} else if (resp != 'y' && resp != 'n') {
 7206 33aa809d 2019-08-08 stsp 				printf("invalid response '%c'\n", resp);
 7207 33aa809d 2019-08-08 stsp 				resp = ' ';
 7208 33aa809d 2019-08-08 stsp 		}
 7209 33aa809d 2019-08-08 stsp 	}
 7210 33aa809d 2019-08-08 stsp 
 7211 33aa809d 2019-08-08 stsp 	if (resp == 'y')
 7212 33aa809d 2019-08-08 stsp 		*choice = GOT_PATCH_CHOICE_YES;
 7213 33aa809d 2019-08-08 stsp 	else if (resp == 'n')
 7214 33aa809d 2019-08-08 stsp 		*choice = GOT_PATCH_CHOICE_NO;
 7215 33aa809d 2019-08-08 stsp 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
 7216 33aa809d 2019-08-08 stsp 		*choice = GOT_PATCH_CHOICE_QUIT;
 7217 33aa809d 2019-08-08 stsp 
 7218 1ee397ad 2019-07-12 stsp 	return NULL;
 7219 a129376b 2019-03-28 stsp }
 7220 a129376b 2019-03-28 stsp 
 7221 33aa809d 2019-08-08 stsp 
 7222 a129376b 2019-03-28 stsp static const struct got_error *
 7223 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
 7224 a129376b 2019-03-28 stsp {
 7225 a129376b 2019-03-28 stsp 	const struct got_error *error = NULL;
 7226 a129376b 2019-03-28 stsp 	struct got_worktree *worktree = NULL;
 7227 a129376b 2019-03-28 stsp 	struct got_repository *repo = NULL;
 7228 a129376b 2019-03-28 stsp 	char *cwd = NULL, *path = NULL;
 7229 e20a8b6f 2019-06-04 stsp 	struct got_pathlist_head paths;
 7230 0f6d7415 2019-08-08 stsp 	struct got_pathlist_entry *pe;
 7231 33aa809d 2019-08-08 stsp 	int ch, can_recurse = 0, pflag = 0;
 7232 33aa809d 2019-08-08 stsp 	FILE *patch_script_file = NULL;
 7233 33aa809d 2019-08-08 stsp 	const char *patch_script_path = NULL;
 7234 33aa809d 2019-08-08 stsp 	struct choose_patch_arg cpa;
 7235 a129376b 2019-03-28 stsp 
 7236 e20a8b6f 2019-06-04 stsp 	TAILQ_INIT(&paths);
 7237 e20a8b6f 2019-06-04 stsp 
 7238 33aa809d 2019-08-08 stsp 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
 7239 a129376b 2019-03-28 stsp 		switch (ch) {
 7240 33aa809d 2019-08-08 stsp 		case 'p':
 7241 33aa809d 2019-08-08 stsp 			pflag = 1;
 7242 33aa809d 2019-08-08 stsp 			break;
 7243 33aa809d 2019-08-08 stsp 		case 'F':
 7244 33aa809d 2019-08-08 stsp 			patch_script_path = optarg;
 7245 33aa809d 2019-08-08 stsp 			break;
 7246 0f6d7415 2019-08-08 stsp 		case 'R':
 7247 0f6d7415 2019-08-08 stsp 			can_recurse = 1;
 7248 0f6d7415 2019-08-08 stsp 			break;
 7249 a129376b 2019-03-28 stsp 		default:
 7250 a129376b 2019-03-28 stsp 			usage_revert();
 7251 a129376b 2019-03-28 stsp 			/* NOTREACHED */
 7252 a129376b 2019-03-28 stsp 		}
 7253 a129376b 2019-03-28 stsp 	}
 7254 a129376b 2019-03-28 stsp 
 7255 a129376b 2019-03-28 stsp 	argc -= optind;
 7256 a129376b 2019-03-28 stsp 	argv += optind;
 7257 a129376b 2019-03-28 stsp 
 7258 43012d58 2019-07-14 stsp #ifndef PROFILE
 7259 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 7260 43012d58 2019-07-14 stsp 	    "unveil", NULL) == -1)
 7261 43012d58 2019-07-14 stsp 		err(1, "pledge");
 7262 43012d58 2019-07-14 stsp #endif
 7263 e20a8b6f 2019-06-04 stsp 	if (argc < 1)
 7264 a129376b 2019-03-28 stsp 		usage_revert();
 7265 33aa809d 2019-08-08 stsp 	if (patch_script_path && !pflag)
 7266 33aa809d 2019-08-08 stsp 		errx(1, "-F option can only be used together with -p option");
 7267 a129376b 2019-03-28 stsp 
 7268 a129376b 2019-03-28 stsp 	cwd = getcwd(NULL, 0);
 7269 a129376b 2019-03-28 stsp 	if (cwd == NULL) {
 7270 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 7271 a129376b 2019-03-28 stsp 		goto done;
 7272 a129376b 2019-03-28 stsp 	}
 7273 a129376b 2019-03-28 stsp 	error = got_worktree_open(&worktree, cwd);
 7274 fa51e947 2020-03-27 stsp 	if (error) {
 7275 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 7276 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "revert", cwd);
 7277 2ec1f75b 2019-03-26 stsp 		goto done;
 7278 fa51e947 2020-03-27 stsp 	}
 7279 a129376b 2019-03-28 stsp 
 7280 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 7281 c9956ddf 2019-09-08 stsp 	    NULL);
 7282 a129376b 2019-03-28 stsp 	if (error != NULL)
 7283 a129376b 2019-03-28 stsp 		goto done;
 7284 a129376b 2019-03-28 stsp 
 7285 33aa809d 2019-08-08 stsp 	if (patch_script_path) {
 7286 33aa809d 2019-08-08 stsp 		patch_script_file = fopen(patch_script_path, "r");
 7287 33aa809d 2019-08-08 stsp 		if (patch_script_file == NULL) {
 7288 33aa809d 2019-08-08 stsp 			error = got_error_from_errno2("fopen",
 7289 33aa809d 2019-08-08 stsp 			    patch_script_path);
 7290 33aa809d 2019-08-08 stsp 			goto done;
 7291 33aa809d 2019-08-08 stsp 		}
 7292 33aa809d 2019-08-08 stsp 	}
 7293 a129376b 2019-03-28 stsp 	error = apply_unveil(got_repo_get_path(repo), 1,
 7294 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 7295 a129376b 2019-03-28 stsp 	if (error)
 7296 a129376b 2019-03-28 stsp 		goto done;
 7297 a129376b 2019-03-28 stsp 
 7298 6d022e97 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
 7299 6d022e97 2019-08-04 stsp 	if (error)
 7300 6d022e97 2019-08-04 stsp 		goto done;
 7301 00db391e 2019-08-03 stsp 
 7302 0f6d7415 2019-08-08 stsp 	if (!can_recurse) {
 7303 0f6d7415 2019-08-08 stsp 		char *ondisk_path;
 7304 0f6d7415 2019-08-08 stsp 		struct stat sb;
 7305 0f6d7415 2019-08-08 stsp 		TAILQ_FOREACH(pe, &paths, entry) {
 7306 0f6d7415 2019-08-08 stsp 			if (asprintf(&ondisk_path, "%s/%s",
 7307 0f6d7415 2019-08-08 stsp 			    got_worktree_get_root_path(worktree),
 7308 62d463ca 2020-10-20 naddy 			    pe->path) == -1) {
 7309 0f6d7415 2019-08-08 stsp 				error = got_error_from_errno("asprintf");
 7310 0f6d7415 2019-08-08 stsp 				goto done;
 7311 0f6d7415 2019-08-08 stsp 			}
 7312 0f6d7415 2019-08-08 stsp 			if (lstat(ondisk_path, &sb) == -1) {
 7313 0f6d7415 2019-08-08 stsp 				if (errno == ENOENT) {
 7314 0f6d7415 2019-08-08 stsp 					free(ondisk_path);
 7315 0f6d7415 2019-08-08 stsp 					continue;
 7316 0f6d7415 2019-08-08 stsp 				}
 7317 0f6d7415 2019-08-08 stsp 				error = got_error_from_errno2("lstat",
 7318 0f6d7415 2019-08-08 stsp 				    ondisk_path);
 7319 0f6d7415 2019-08-08 stsp 				free(ondisk_path);
 7320 0f6d7415 2019-08-08 stsp 				goto done;
 7321 0f6d7415 2019-08-08 stsp 			}
 7322 0f6d7415 2019-08-08 stsp 			free(ondisk_path);
 7323 0f6d7415 2019-08-08 stsp 			if (S_ISDIR(sb.st_mode)) {
 7324 0f6d7415 2019-08-08 stsp 				error = got_error_msg(GOT_ERR_BAD_PATH,
 7325 0f6d7415 2019-08-08 stsp 				    "reverting directories requires -R option");
 7326 0f6d7415 2019-08-08 stsp 				goto done;
 7327 0f6d7415 2019-08-08 stsp 			}
 7328 0f6d7415 2019-08-08 stsp 		}
 7329 0f6d7415 2019-08-08 stsp 	}
 7330 0f6d7415 2019-08-08 stsp 
 7331 33aa809d 2019-08-08 stsp 	cpa.patch_script_file = patch_script_file;
 7332 33aa809d 2019-08-08 stsp 	cpa.action = "revert";
 7333 33aa809d 2019-08-08 stsp 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
 7334 33aa809d 2019-08-08 stsp 	    pflag ? choose_patch : NULL, &cpa, repo);
 7335 2ec1f75b 2019-03-26 stsp done:
 7336 33aa809d 2019-08-08 stsp 	if (patch_script_file && fclose(patch_script_file) == EOF &&
 7337 33aa809d 2019-08-08 stsp 	    error == NULL)
 7338 33aa809d 2019-08-08 stsp 		error = got_error_from_errno2("fclose", patch_script_path);
 7339 1d0f4054 2021-06-17 stsp 	if (repo) {
 7340 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 7341 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 7342 1d0f4054 2021-06-17 stsp 			error = close_err;
 7343 1d0f4054 2021-06-17 stsp 	}
 7344 2ec1f75b 2019-03-26 stsp 	if (worktree)
 7345 2ec1f75b 2019-03-26 stsp 		got_worktree_close(worktree);
 7346 2ec1f75b 2019-03-26 stsp 	free(path);
 7347 d00136be 2019-03-26 stsp 	free(cwd);
 7348 6bad629b 2019-02-04 stsp 	return error;
 7349 c4296144 2019-05-09 stsp }
 7350 c4296144 2019-05-09 stsp 
 7351 c4296144 2019-05-09 stsp __dead static void
 7352 c4296144 2019-05-09 stsp usage_commit(void)
 7353 c4296144 2019-05-09 stsp {
 7354 28cf319f 2021-01-28 stsp 	fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
 7355 28cf319f 2021-01-28 stsp 	    "[path ...]\n", getprogname());
 7356 c4296144 2019-05-09 stsp 	exit(1);
 7357 33ad4cbe 2019-05-12 jcs }
 7358 33ad4cbe 2019-05-12 jcs 
 7359 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
 7360 e2ba3d07 2019-05-13 stsp 	const char *cmdline_log;
 7361 28cf319f 2021-01-28 stsp 	const char *prepared_log;
 7362 28cf319f 2021-01-28 stsp 	int non_interactive;
 7363 e2ba3d07 2019-05-13 stsp 	const char *editor;
 7364 e0870e44 2019-05-13 stsp 	const char *worktree_path;
 7365 76d98825 2019-06-03 stsp 	const char *branch_name;
 7366 314a6357 2019-05-13 stsp 	const char *repo_path;
 7367 e0870e44 2019-05-13 stsp 	char *logmsg_path;
 7368 e2ba3d07 2019-05-13 stsp 
 7369 e2ba3d07 2019-05-13 stsp };
 7370 28cf319f 2021-01-28 stsp 
 7371 28cf319f 2021-01-28 stsp static const struct got_error *
 7372 28cf319f 2021-01-28 stsp read_prepared_logmsg(char **logmsg, const char *path)
 7373 28cf319f 2021-01-28 stsp {
 7374 28cf319f 2021-01-28 stsp 	const struct got_error *err = NULL;
 7375 28cf319f 2021-01-28 stsp 	FILE *f = NULL;
 7376 28cf319f 2021-01-28 stsp 	struct stat sb;
 7377 28cf319f 2021-01-28 stsp 	size_t r;
 7378 28cf319f 2021-01-28 stsp 
 7379 28cf319f 2021-01-28 stsp 	*logmsg = NULL;
 7380 28cf319f 2021-01-28 stsp 	memset(&sb, 0, sizeof(sb));
 7381 28cf319f 2021-01-28 stsp 
 7382 28cf319f 2021-01-28 stsp 	f = fopen(path, "r");
 7383 28cf319f 2021-01-28 stsp 	if (f == NULL)
 7384 28cf319f 2021-01-28 stsp 		return got_error_from_errno2("fopen", path);
 7385 28cf319f 2021-01-28 stsp 
 7386 28cf319f 2021-01-28 stsp 	if (fstat(fileno(f), &sb) == -1) {
 7387 28cf319f 2021-01-28 stsp 		err = got_error_from_errno2("fstat", path);
 7388 28cf319f 2021-01-28 stsp 		goto done;
 7389 28cf319f 2021-01-28 stsp 	}
 7390 28cf319f 2021-01-28 stsp 	if (sb.st_size == 0) {
 7391 28cf319f 2021-01-28 stsp 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
 7392 28cf319f 2021-01-28 stsp 		goto done;
 7393 28cf319f 2021-01-28 stsp 	}
 7394 28cf319f 2021-01-28 stsp 
 7395 28cf319f 2021-01-28 stsp 	*logmsg = malloc(sb.st_size + 1);
 7396 28cf319f 2021-01-28 stsp 	if (*logmsg == NULL) {
 7397 28cf319f 2021-01-28 stsp 		err = got_error_from_errno("malloc");
 7398 28cf319f 2021-01-28 stsp 		goto done;
 7399 28cf319f 2021-01-28 stsp 	}
 7400 28cf319f 2021-01-28 stsp 
 7401 28cf319f 2021-01-28 stsp 	r = fread(*logmsg, 1, sb.st_size, f);
 7402 28cf319f 2021-01-28 stsp 	if (r != sb.st_size) {
 7403 28cf319f 2021-01-28 stsp 		if (ferror(f))
 7404 28cf319f 2021-01-28 stsp 			err = got_error_from_errno2("fread", path);
 7405 28cf319f 2021-01-28 stsp 		else
 7406 28cf319f 2021-01-28 stsp 			err = got_error(GOT_ERR_IO);
 7407 28cf319f 2021-01-28 stsp 		goto done;
 7408 28cf319f 2021-01-28 stsp 	}
 7409 28cf319f 2021-01-28 stsp 	(*logmsg)[sb.st_size] = '\0';
 7410 28cf319f 2021-01-28 stsp done:
 7411 28cf319f 2021-01-28 stsp 	if (fclose(f) == EOF && err == NULL)
 7412 28cf319f 2021-01-28 stsp 		err = got_error_from_errno2("fclose", path);
 7413 28cf319f 2021-01-28 stsp 	if (err) {
 7414 28cf319f 2021-01-28 stsp 		free(*logmsg);
 7415 28cf319f 2021-01-28 stsp 		*logmsg = NULL;
 7416 28cf319f 2021-01-28 stsp 	}
 7417 28cf319f 2021-01-28 stsp 	return err;
 7418 28cf319f 2021-01-28 stsp 	
 7419 28cf319f 2021-01-28 stsp }
 7420 e0870e44 2019-05-13 stsp 
 7421 33ad4cbe 2019-05-12 jcs static const struct got_error *
 7422 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
 7423 33ad4cbe 2019-05-12 jcs     void *arg)
 7424 33ad4cbe 2019-05-12 jcs {
 7425 76d98825 2019-06-03 stsp 	char *initial_content = NULL;
 7426 33ad4cbe 2019-05-12 jcs 	struct got_pathlist_entry *pe;
 7427 33ad4cbe 2019-05-12 jcs 	const struct got_error *err = NULL;
 7428 e0870e44 2019-05-13 stsp 	char *template = NULL;
 7429 e2ba3d07 2019-05-13 stsp 	struct collect_commit_logmsg_arg *a = arg;
 7430 1601cb9f 2020-09-11 naddy 	int initial_content_len;
 7431 97972933 2020-09-11 stsp 	int fd = -1;
 7432 33ad4cbe 2019-05-12 jcs 	size_t len;
 7433 33ad4cbe 2019-05-12 jcs 
 7434 33ad4cbe 2019-05-12 jcs 	/* if a message was specified on the command line, just use it */
 7435 e2ba3d07 2019-05-13 stsp 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
 7436 e2ba3d07 2019-05-13 stsp 		len = strlen(a->cmdline_log) + 1;
 7437 33ad4cbe 2019-05-12 jcs 		*logmsg = malloc(len + 1);
 7438 9f42ff69 2019-05-13 stsp 		if (*logmsg == NULL)
 7439 638f9024 2019-05-13 stsp 			return got_error_from_errno("malloc");
 7440 e2ba3d07 2019-05-13 stsp 		strlcpy(*logmsg, a->cmdline_log, len);
 7441 33ad4cbe 2019-05-12 jcs 		return NULL;
 7442 28cf319f 2021-01-28 stsp 	} else if (a->prepared_log != NULL && a->non_interactive)
 7443 28cf319f 2021-01-28 stsp 		return read_prepared_logmsg(logmsg, a->prepared_log);
 7444 33ad4cbe 2019-05-12 jcs 
 7445 e0870e44 2019-05-13 stsp 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
 7446 76d98825 2019-06-03 stsp 		return got_error_from_errno("asprintf");
 7447 76d98825 2019-06-03 stsp 
 7448 28cf319f 2021-01-28 stsp 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
 7449 28cf319f 2021-01-28 stsp 	if (err)
 7450 28cf319f 2021-01-28 stsp 		goto done;
 7451 28cf319f 2021-01-28 stsp 
 7452 28cf319f 2021-01-28 stsp 	if (a->prepared_log) {
 7453 28cf319f 2021-01-28 stsp 		char *msg;
 7454 28cf319f 2021-01-28 stsp 		err = read_prepared_logmsg(&msg, a->prepared_log);
 7455 28cf319f 2021-01-28 stsp 		if (err)
 7456 28cf319f 2021-01-28 stsp 			goto done;
 7457 28cf319f 2021-01-28 stsp 		if (write(fd, msg, strlen(msg)) == -1) {
 7458 28cf319f 2021-01-28 stsp 			err = got_error_from_errno2("write", a->logmsg_path);
 7459 28cf319f 2021-01-28 stsp 			free(msg);
 7460 28cf319f 2021-01-28 stsp 			goto done;
 7461 28cf319f 2021-01-28 stsp 		}
 7462 28cf319f 2021-01-28 stsp 		free(msg);
 7463 28cf319f 2021-01-28 stsp 	}
 7464 28cf319f 2021-01-28 stsp 
 7465 1601cb9f 2020-09-11 naddy 	initial_content_len = asprintf(&initial_content,
 7466 76d98825 2019-06-03 stsp 	    "\n# changes to be committed on branch %s:\n",
 7467 1601cb9f 2020-09-11 naddy 	    a->branch_name);
 7468 28cf319f 2021-01-28 stsp 	if (initial_content_len == -1) {
 7469 28cf319f 2021-01-28 stsp 		err = got_error_from_errno("asprintf");
 7470 e0870e44 2019-05-13 stsp 		goto done;
 7471 28cf319f 2021-01-28 stsp 	}
 7472 33ad4cbe 2019-05-12 jcs 
 7473 97972933 2020-09-11 stsp 	if (write(fd, initial_content, initial_content_len) == -1) {
 7474 97972933 2020-09-11 stsp 		err = got_error_from_errno2("write", a->logmsg_path);
 7475 97972933 2020-09-11 stsp 		goto done;
 7476 97972933 2020-09-11 stsp 	}
 7477 33ad4cbe 2019-05-12 jcs 
 7478 33ad4cbe 2019-05-12 jcs 	TAILQ_FOREACH(pe, commitable_paths, entry) {
 7479 33ad4cbe 2019-05-12 jcs 		struct got_commitable *ct = pe->data;
 7480 8656d6c4 2019-05-20 stsp 		dprintf(fd, "#  %c  %s\n",
 7481 8656d6c4 2019-05-20 stsp 		    got_commitable_get_status(ct),
 7482 8656d6c4 2019-05-20 stsp 		    got_commitable_get_path(ct));
 7483 33ad4cbe 2019-05-12 jcs 	}
 7484 33ad4cbe 2019-05-12 jcs 
 7485 bfa12d5e 2020-09-26 stsp 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
 7486 28cf319f 2021-01-28 stsp 	    initial_content_len, a->prepared_log ? 0 : 1);
 7487 33ad4cbe 2019-05-12 jcs done:
 7488 76d98825 2019-06-03 stsp 	free(initial_content);
 7489 e0870e44 2019-05-13 stsp 	free(template);
 7490 314a6357 2019-05-13 stsp 
 7491 97972933 2020-09-11 stsp 	if (fd != -1 && close(fd) == -1 && err == NULL)
 7492 97972933 2020-09-11 stsp 		err = got_error_from_errno2("close", a->logmsg_path);
 7493 97972933 2020-09-11 stsp 
 7494 314a6357 2019-05-13 stsp 	/* Editor is done; we can now apply unveil(2) */
 7495 59f86c76 2020-09-11 stsp 	if (err == NULL)
 7496 c530dc23 2019-07-23 stsp 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
 7497 59f86c76 2020-09-11 stsp 	if (err) {
 7498 59f86c76 2020-09-11 stsp 		free(*logmsg);
 7499 59f86c76 2020-09-11 stsp 		*logmsg = NULL;
 7500 3ce1b845 2019-07-15 stsp 	}
 7501 33ad4cbe 2019-05-12 jcs 	return err;
 7502 6bad629b 2019-02-04 stsp }
 7503 c4296144 2019-05-09 stsp 
 7504 c4296144 2019-05-09 stsp static const struct got_error *
 7505 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
 7506 c4296144 2019-05-09 stsp {
 7507 c4296144 2019-05-09 stsp 	const struct got_error *error = NULL;
 7508 c4296144 2019-05-09 stsp 	struct got_worktree *worktree = NULL;
 7509 c4296144 2019-05-09 stsp 	struct got_repository *repo = NULL;
 7510 5c1e53bc 2019-07-28 stsp 	char *cwd = NULL, *id_str = NULL;
 7511 c4296144 2019-05-09 stsp 	struct got_object_id *id = NULL;
 7512 33ad4cbe 2019-05-12 jcs 	const char *logmsg = NULL;
 7513 28cf319f 2021-01-28 stsp 	char *prepared_logmsg = NULL;
 7514 aba9c984 2019-09-08 stsp 	struct collect_commit_logmsg_arg cl_arg;
 7515 c9956ddf 2019-09-08 stsp 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
 7516 7266f21f 2019-10-21 stsp 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
 7517 10604dce 2021-09-24 thomas 	int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
 7518 5c1e53bc 2019-07-28 stsp 	struct got_pathlist_head paths;
 7519 5c1e53bc 2019-07-28 stsp 
 7520 5c1e53bc 2019-07-28 stsp 	TAILQ_INIT(&paths);
 7521 6ac5a73c 2019-08-08 stsp 	cl_arg.logmsg_path = NULL;
 7522 c4296144 2019-05-09 stsp 
 7523 28cf319f 2021-01-28 stsp 	while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
 7524 c4296144 2019-05-09 stsp 		switch (ch) {
 7525 28cf319f 2021-01-28 stsp 		case 'F':
 7526 28cf319f 2021-01-28 stsp 			if (logmsg != NULL)
 7527 28cf319f 2021-01-28 stsp 				option_conflict('F', 'm');
 7528 28cf319f 2021-01-28 stsp 			prepared_logmsg = realpath(optarg, NULL);
 7529 28cf319f 2021-01-28 stsp 			if (prepared_logmsg == NULL)
 7530 28cf319f 2021-01-28 stsp 				return got_error_from_errno2("realpath",
 7531 28cf319f 2021-01-28 stsp 				    optarg);
 7532 28cf319f 2021-01-28 stsp 			break;
 7533 c4296144 2019-05-09 stsp 		case 'm':
 7534 28cf319f 2021-01-28 stsp 			if (prepared_logmsg)
 7535 28cf319f 2021-01-28 stsp 				option_conflict('m', 'F');
 7536 c4296144 2019-05-09 stsp 			logmsg = optarg;
 7537 28cf319f 2021-01-28 stsp 			break;
 7538 28cf319f 2021-01-28 stsp 		case 'N':
 7539 28cf319f 2021-01-28 stsp 			non_interactive = 1;
 7540 c4296144 2019-05-09 stsp 			break;
 7541 35213c7c 2020-07-23 stsp 		case 'S':
 7542 35213c7c 2020-07-23 stsp 			allow_bad_symlinks = 1;
 7543 35213c7c 2020-07-23 stsp 			break;
 7544 c4296144 2019-05-09 stsp 		default:
 7545 c4296144 2019-05-09 stsp 			usage_commit();
 7546 c4296144 2019-05-09 stsp 			/* NOTREACHED */
 7547 c4296144 2019-05-09 stsp 		}
 7548 c4296144 2019-05-09 stsp 	}
 7549 c4296144 2019-05-09 stsp 
 7550 c4296144 2019-05-09 stsp 	argc -= optind;
 7551 c4296144 2019-05-09 stsp 	argv += optind;
 7552 c4296144 2019-05-09 stsp 
 7553 43012d58 2019-07-14 stsp #ifndef PROFILE
 7554 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 7555 43012d58 2019-07-14 stsp 	    "unveil", NULL) == -1)
 7556 43012d58 2019-07-14 stsp 		err(1, "pledge");
 7557 43012d58 2019-07-14 stsp #endif
 7558 c4296144 2019-05-09 stsp 	cwd = getcwd(NULL, 0);
 7559 c4296144 2019-05-09 stsp 	if (cwd == NULL) {
 7560 638f9024 2019-05-13 stsp 		error = got_error_from_errno("getcwd");
 7561 c4296144 2019-05-09 stsp 		goto done;
 7562 c4296144 2019-05-09 stsp 	}
 7563 c4296144 2019-05-09 stsp 	error = got_worktree_open(&worktree, cwd);
 7564 fa51e947 2020-03-27 stsp 	if (error) {
 7565 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 7566 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "commit", cwd);
 7567 7d5807f4 2019-07-11 stsp 		goto done;
 7568 fa51e947 2020-03-27 stsp 	}
 7569 7d5807f4 2019-07-11 stsp 
 7570 a698f62e 2019-07-25 stsp 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
 7571 c4296144 2019-05-09 stsp 	if (error)
 7572 a698f62e 2019-07-25 stsp 		goto done;
 7573 a698f62e 2019-07-25 stsp 	if (rebase_in_progress) {
 7574 a698f62e 2019-07-25 stsp 		error = got_error(GOT_ERR_REBASING);
 7575 c4296144 2019-05-09 stsp 		goto done;
 7576 a698f62e 2019-07-25 stsp 	}
 7577 5c1e53bc 2019-07-28 stsp 
 7578 916f288c 2019-07-30 stsp 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
 7579 916f288c 2019-07-30 stsp 	    worktree);
 7580 5c1e53bc 2019-07-28 stsp 	if (error)
 7581 5c1e53bc 2019-07-28 stsp 		goto done;
 7582 c4296144 2019-05-09 stsp 
 7583 c9956ddf 2019-09-08 stsp 	error = get_gitconfig_path(&gitconfig_path);
 7584 c9956ddf 2019-09-08 stsp 	if (error)
 7585 c9956ddf 2019-09-08 stsp 		goto done;
 7586 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 7587 c9956ddf 2019-09-08 stsp 	    gitconfig_path);
 7588 c4296144 2019-05-09 stsp 	if (error != NULL)
 7589 c4296144 2019-05-09 stsp 		goto done;
 7590 c4296144 2019-05-09 stsp 
 7591 10604dce 2021-09-24 thomas 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
 7592 10604dce 2021-09-24 thomas 	if (error)
 7593 10604dce 2021-09-24 thomas 		goto done;
 7594 10604dce 2021-09-24 thomas 	if (merge_in_progress) {
 7595 10604dce 2021-09-24 thomas 		error = got_error(GOT_ERR_MERGE_BUSY);
 7596 10604dce 2021-09-24 thomas 		goto done;
 7597 10604dce 2021-09-24 thomas 	}
 7598 10604dce 2021-09-24 thomas 
 7599 50b0790e 2020-09-11 stsp 	error = get_author(&author, repo, worktree);
 7600 aba9c984 2019-09-08 stsp 	if (error)
 7601 aba9c984 2019-09-08 stsp 		return error;
 7602 aba9c984 2019-09-08 stsp 
 7603 314a6357 2019-05-13 stsp 	/*
 7604 314a6357 2019-05-13 stsp 	 * unveil(2) traverses exec(2); if an editor is used we have
 7605 314a6357 2019-05-13 stsp 	 * to apply unveil after the log message has been written.
 7606 314a6357 2019-05-13 stsp 	 */
 7607 314a6357 2019-05-13 stsp 	if (logmsg == NULL || strlen(logmsg) == 0)
 7608 314a6357 2019-05-13 stsp 		error = get_editor(&editor);
 7609 314a6357 2019-05-13 stsp 	else
 7610 314a6357 2019-05-13 stsp 		error = apply_unveil(got_repo_get_path(repo), 0,
 7611 c530dc23 2019-07-23 stsp 		    got_worktree_get_root_path(worktree));
 7612 c4296144 2019-05-09 stsp 	if (error)
 7613 c4296144 2019-05-09 stsp 		goto done;
 7614 c4296144 2019-05-09 stsp 
 7615 087fb88c 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
 7616 087fb88c 2019-08-04 stsp 	if (error)
 7617 087fb88c 2019-08-04 stsp 		goto done;
 7618 087fb88c 2019-08-04 stsp 
 7619 e2ba3d07 2019-05-13 stsp 	cl_arg.editor = editor;
 7620 e2ba3d07 2019-05-13 stsp 	cl_arg.cmdline_log = logmsg;
 7621 28cf319f 2021-01-28 stsp 	cl_arg.prepared_log = prepared_logmsg;
 7622 28cf319f 2021-01-28 stsp 	cl_arg.non_interactive = non_interactive;
 7623 e0870e44 2019-05-13 stsp 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
 7624 76d98825 2019-06-03 stsp 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
 7625 916f288c 2019-07-30 stsp 	if (!histedit_in_progress) {
 7626 916f288c 2019-07-30 stsp 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
 7627 916f288c 2019-07-30 stsp 			error = got_error(GOT_ERR_COMMIT_BRANCH);
 7628 916f288c 2019-07-30 stsp 			goto done;
 7629 916f288c 2019-07-30 stsp 		}
 7630 916f288c 2019-07-30 stsp 		cl_arg.branch_name += 11;
 7631 916f288c 2019-07-30 stsp 	}
 7632 314a6357 2019-05-13 stsp 	cl_arg.repo_path = got_repo_get_path(repo);
 7633 84792843 2019-08-09 stsp 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
 7634 35213c7c 2020-07-23 stsp 	    allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
 7635 35213c7c 2020-07-23 stsp 	    print_status, NULL, repo);
 7636 e0870e44 2019-05-13 stsp 	if (error) {
 7637 7266f21f 2019-10-21 stsp 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
 7638 7266f21f 2019-10-21 stsp 		    cl_arg.logmsg_path != NULL)
 7639 7266f21f 2019-10-21 stsp 			preserve_logmsg = 1;
 7640 c4296144 2019-05-09 stsp 		goto done;
 7641 e0870e44 2019-05-13 stsp 	}
 7642 c4296144 2019-05-09 stsp 
 7643 c4296144 2019-05-09 stsp 	error = got_object_id_str(&id_str, id);
 7644 c4296144 2019-05-09 stsp 	if (error)
 7645 c4296144 2019-05-09 stsp 		goto done;
 7646 a7648d7a 2019-06-02 stsp 	printf("Created commit %s\n", id_str);
 7647 c4296144 2019-05-09 stsp done:
 7648 7266f21f 2019-10-21 stsp 	if (preserve_logmsg) {
 7649 7266f21f 2019-10-21 stsp 		fprintf(stderr, "%s: log message preserved in %s\n",
 7650 7266f21f 2019-10-21 stsp 		    getprogname(), cl_arg.logmsg_path);
 7651 7266f21f 2019-10-21 stsp 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
 7652 7266f21f 2019-10-21 stsp 	    error == NULL)
 7653 7266f21f 2019-10-21 stsp 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
 7654 6ac5a73c 2019-08-08 stsp 	free(cl_arg.logmsg_path);
 7655 1d0f4054 2021-06-17 stsp 	if (repo) {
 7656 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 7657 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 7658 1d0f4054 2021-06-17 stsp 			error = close_err;
 7659 1d0f4054 2021-06-17 stsp 	}
 7660 c4296144 2019-05-09 stsp 	if (worktree)
 7661 c4296144 2019-05-09 stsp 		got_worktree_close(worktree);
 7662 c4296144 2019-05-09 stsp 	free(cwd);
 7663 c4296144 2019-05-09 stsp 	free(id_str);
 7664 c9956ddf 2019-09-08 stsp 	free(gitconfig_path);
 7665 e2ba3d07 2019-05-13 stsp 	free(editor);
 7666 aba9c984 2019-09-08 stsp 	free(author);
 7667 28cf319f 2021-01-28 stsp 	free(prepared_logmsg);
 7668 f8a36e22 2021-08-26 stsp 	return error;
 7669 f8a36e22 2021-08-26 stsp }
 7670 f8a36e22 2021-08-26 stsp 
 7671 f8a36e22 2021-08-26 stsp __dead static void
 7672 f8a36e22 2021-08-26 stsp usage_send(void)
 7673 f8a36e22 2021-08-26 stsp {
 7674 f8a36e22 2021-08-26 stsp 	fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
 7675 f8a36e22 2021-08-26 stsp 	    "[-r repository-path] [-t tag] [-T] [-q] [-v] "
 7676 f8a36e22 2021-08-26 stsp 	    "[remote-repository]\n", getprogname());
 7677 f8a36e22 2021-08-26 stsp 	exit(1);
 7678 f8a36e22 2021-08-26 stsp }
 7679 f8a36e22 2021-08-26 stsp 
 7680 f8a36e22 2021-08-26 stsp struct got_send_progress_arg {
 7681 f8a36e22 2021-08-26 stsp 	char last_scaled_packsize[FMT_SCALED_STRSIZE];
 7682 f8a36e22 2021-08-26 stsp 	int verbosity;
 7683 f8a36e22 2021-08-26 stsp 	int last_ncommits;
 7684 f8a36e22 2021-08-26 stsp 	int last_nobj_total;
 7685 f8a36e22 2021-08-26 stsp 	int last_p_deltify;
 7686 f8a36e22 2021-08-26 stsp 	int last_p_written;
 7687 f8a36e22 2021-08-26 stsp 	int last_p_sent;
 7688 f8a36e22 2021-08-26 stsp 	int printed_something;
 7689 f8a36e22 2021-08-26 stsp 	int sent_something;
 7690 f8a36e22 2021-08-26 stsp 	struct got_pathlist_head *delete_branches;
 7691 f8a36e22 2021-08-26 stsp };
 7692 f8a36e22 2021-08-26 stsp 
 7693 f8a36e22 2021-08-26 stsp static const struct got_error *
 7694 f8a36e22 2021-08-26 stsp send_progress(void *arg, off_t packfile_size, int ncommits, int nobj_total,
 7695 f8a36e22 2021-08-26 stsp     int nobj_deltify, int nobj_written, off_t bytes_sent, const char *refname,
 7696 f8a36e22 2021-08-26 stsp     int success)
 7697 f8a36e22 2021-08-26 stsp {
 7698 f8a36e22 2021-08-26 stsp 	struct got_send_progress_arg *a = arg;
 7699 f8a36e22 2021-08-26 stsp 	char scaled_packsize[FMT_SCALED_STRSIZE];
 7700 f8a36e22 2021-08-26 stsp 	char scaled_sent[FMT_SCALED_STRSIZE];
 7701 f8a36e22 2021-08-26 stsp 	int p_deltify = 0, p_written = 0, p_sent = 0;
 7702 f8a36e22 2021-08-26 stsp 	int print_searching = 0, print_total = 0;
 7703 f8a36e22 2021-08-26 stsp 	int print_deltify = 0, print_written = 0, print_sent = 0;
 7704 f8a36e22 2021-08-26 stsp 
 7705 f8a36e22 2021-08-26 stsp 	if (a->verbosity < 0)
 7706 f8a36e22 2021-08-26 stsp 		return NULL;
 7707 f8a36e22 2021-08-26 stsp 
 7708 f8a36e22 2021-08-26 stsp 	if (refname) {
 7709 f8a36e22 2021-08-26 stsp 		const char *status = success ? "accepted" : "rejected";
 7710 f8a36e22 2021-08-26 stsp 
 7711 f8a36e22 2021-08-26 stsp 		if (success) {
 7712 f8a36e22 2021-08-26 stsp 			struct got_pathlist_entry *pe;
 7713 f8a36e22 2021-08-26 stsp 			TAILQ_FOREACH(pe, a->delete_branches, entry) {
 7714 f8a36e22 2021-08-26 stsp 				const char *branchname = pe->path;
 7715 f8a36e22 2021-08-26 stsp 				if (got_path_cmp(branchname, refname,
 7716 f8a36e22 2021-08-26 stsp 				    strlen(branchname), strlen(refname)) == 0) {
 7717 f8a36e22 2021-08-26 stsp 					status = "deleted";
 7718 27b75514 2021-08-28 stsp 					a->sent_something = 1;
 7719 f8a36e22 2021-08-26 stsp 					break;
 7720 f8a36e22 2021-08-26 stsp 				}
 7721 f8a36e22 2021-08-26 stsp 			}
 7722 f8a36e22 2021-08-26 stsp 		}
 7723 f8a36e22 2021-08-26 stsp 
 7724 27b75514 2021-08-28 stsp 		if (a->printed_something)
 7725 27b75514 2021-08-28 stsp 			putchar('\n');
 7726 27b75514 2021-08-28 stsp 		printf("Server has %s %s", status, refname);
 7727 f8a36e22 2021-08-26 stsp 		a->printed_something = 1;
 7728 f8a36e22 2021-08-26 stsp 		return NULL;
 7729 f8a36e22 2021-08-26 stsp 	}
 7730 f8a36e22 2021-08-26 stsp 
 7731 f8a36e22 2021-08-26 stsp 	if (fmt_scaled(packfile_size, scaled_packsize) == -1)
 7732 f8a36e22 2021-08-26 stsp 		return got_error_from_errno("fmt_scaled");
 7733 f8a36e22 2021-08-26 stsp 	if (fmt_scaled(bytes_sent, scaled_sent) == -1)
 7734 f8a36e22 2021-08-26 stsp 		return got_error_from_errno("fmt_scaled");
 7735 f8a36e22 2021-08-26 stsp 
 7736 f8a36e22 2021-08-26 stsp 	if (a->last_ncommits != ncommits) {
 7737 f8a36e22 2021-08-26 stsp 		print_searching = 1;
 7738 f8a36e22 2021-08-26 stsp 		a->last_ncommits = ncommits;
 7739 f8a36e22 2021-08-26 stsp 	}
 7740 f8a36e22 2021-08-26 stsp 
 7741 f8a36e22 2021-08-26 stsp 	if (a->last_nobj_total != nobj_total) {
 7742 f8a36e22 2021-08-26 stsp 		print_searching = 1;
 7743 f8a36e22 2021-08-26 stsp 		print_total = 1;
 7744 f8a36e22 2021-08-26 stsp 		a->last_nobj_total = nobj_total;
 7745 f8a36e22 2021-08-26 stsp 	}
 7746 f8a36e22 2021-08-26 stsp 
 7747 f8a36e22 2021-08-26 stsp 	if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
 7748 f8a36e22 2021-08-26 stsp 	    strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
 7749 f8a36e22 2021-08-26 stsp 		if (strlcpy(a->last_scaled_packsize, scaled_packsize,
 7750 f8a36e22 2021-08-26 stsp 		    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
 7751 f8a36e22 2021-08-26 stsp 			return got_error(GOT_ERR_NO_SPACE);
 7752 f8a36e22 2021-08-26 stsp 	}
 7753 f8a36e22 2021-08-26 stsp 
 7754 f8a36e22 2021-08-26 stsp 	if (nobj_deltify > 0 || nobj_written > 0) {
 7755 f8a36e22 2021-08-26 stsp 		if (nobj_deltify > 0) {
 7756 f8a36e22 2021-08-26 stsp 			p_deltify = (nobj_deltify * 100) / nobj_total;
 7757 f8a36e22 2021-08-26 stsp 			if (p_deltify != a->last_p_deltify) {
 7758 f8a36e22 2021-08-26 stsp 				a->last_p_deltify = p_deltify;
 7759 f8a36e22 2021-08-26 stsp 				print_searching = 1;
 7760 f8a36e22 2021-08-26 stsp 				print_total = 1;
 7761 f8a36e22 2021-08-26 stsp 				print_deltify = 1;
 7762 f8a36e22 2021-08-26 stsp 			}
 7763 f8a36e22 2021-08-26 stsp 		}
 7764 f8a36e22 2021-08-26 stsp 		if (nobj_written > 0) {
 7765 f8a36e22 2021-08-26 stsp 			p_written = (nobj_written * 100) / nobj_total;
 7766 f8a36e22 2021-08-26 stsp 			if (p_written != a->last_p_written) {
 7767 f8a36e22 2021-08-26 stsp 				a->last_p_written = p_written;
 7768 f8a36e22 2021-08-26 stsp 				print_searching = 1;
 7769 f8a36e22 2021-08-26 stsp 				print_total = 1;
 7770 f8a36e22 2021-08-26 stsp 				print_deltify = 1;
 7771 f8a36e22 2021-08-26 stsp 				print_written = 1;
 7772 f8a36e22 2021-08-26 stsp 			}
 7773 f8a36e22 2021-08-26 stsp 		}
 7774 f8a36e22 2021-08-26 stsp 	}
 7775 f8a36e22 2021-08-26 stsp 
 7776 f8a36e22 2021-08-26 stsp 	if (bytes_sent > 0) {
 7777 f8a36e22 2021-08-26 stsp 		p_sent = (bytes_sent * 100) / packfile_size;
 7778 f8a36e22 2021-08-26 stsp 		if (p_sent != a->last_p_sent) {
 7779 f8a36e22 2021-08-26 stsp 			a->last_p_sent = p_sent;
 7780 f8a36e22 2021-08-26 stsp 			print_searching = 1;
 7781 f8a36e22 2021-08-26 stsp 			print_total = 1;
 7782 f8a36e22 2021-08-26 stsp 			print_deltify = 1;
 7783 f8a36e22 2021-08-26 stsp 			print_written = 1;
 7784 f8a36e22 2021-08-26 stsp 			print_sent = 1;
 7785 f8a36e22 2021-08-26 stsp 		}
 7786 f8a36e22 2021-08-26 stsp 		a->sent_something = 1;
 7787 f8a36e22 2021-08-26 stsp 	}
 7788 f8a36e22 2021-08-26 stsp 
 7789 f8a36e22 2021-08-26 stsp 	if (print_searching || print_total || print_deltify || print_written ||
 7790 f8a36e22 2021-08-26 stsp 	    print_sent)
 7791 f8a36e22 2021-08-26 stsp 		printf("\r");
 7792 f8a36e22 2021-08-26 stsp 	if (print_searching)
 7793 f8a36e22 2021-08-26 stsp 		printf("packing %d reference%s", ncommits,
 7794 f8a36e22 2021-08-26 stsp 		    ncommits == 1 ? "" : "s");
 7795 f8a36e22 2021-08-26 stsp 	if (print_total)
 7796 f8a36e22 2021-08-26 stsp 		printf("; %d object%s", nobj_total,
 7797 f8a36e22 2021-08-26 stsp 		    nobj_total == 1 ? "" : "s");
 7798 f8a36e22 2021-08-26 stsp 	if (print_deltify)
 7799 f8a36e22 2021-08-26 stsp 		printf("; deltify: %d%%", p_deltify);
 7800 f8a36e22 2021-08-26 stsp 	if (print_sent)
 7801 f8a36e22 2021-08-26 stsp 		printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE,
 7802 f8a36e22 2021-08-26 stsp 		    scaled_packsize, p_sent);
 7803 f8a36e22 2021-08-26 stsp 	else if (print_written)
 7804 f8a36e22 2021-08-26 stsp 		printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE,
 7805 f8a36e22 2021-08-26 stsp 		    scaled_packsize, p_written);
 7806 f8a36e22 2021-08-26 stsp 	if (print_searching || print_total || print_deltify ||
 7807 f8a36e22 2021-08-26 stsp 	    print_written || print_sent) {
 7808 f8a36e22 2021-08-26 stsp 		a->printed_something = 1;
 7809 f8a36e22 2021-08-26 stsp 		fflush(stdout);
 7810 f8a36e22 2021-08-26 stsp 	}
 7811 f8a36e22 2021-08-26 stsp 	return NULL;
 7812 f8a36e22 2021-08-26 stsp }
 7813 f8a36e22 2021-08-26 stsp 
 7814 f8a36e22 2021-08-26 stsp static const struct got_error *
 7815 f8a36e22 2021-08-26 stsp cmd_send(int argc, char *argv[])
 7816 f8a36e22 2021-08-26 stsp {
 7817 f8a36e22 2021-08-26 stsp 	const struct got_error *error = NULL;
 7818 f8a36e22 2021-08-26 stsp 	char *cwd = NULL, *repo_path = NULL;
 7819 f8a36e22 2021-08-26 stsp 	const char *remote_name;
 7820 f8a36e22 2021-08-26 stsp 	char *proto = NULL, *host = NULL, *port = NULL;
 7821 f8a36e22 2021-08-26 stsp 	char *repo_name = NULL, *server_path = NULL;
 7822 f8a36e22 2021-08-26 stsp 	const struct got_remote_repo *remotes, *remote = NULL;
 7823 f8a36e22 2021-08-26 stsp 	int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
 7824 f8a36e22 2021-08-26 stsp 	struct got_repository *repo = NULL;
 7825 f8a36e22 2021-08-26 stsp 	struct got_worktree *worktree = NULL;
 7826 f8a36e22 2021-08-26 stsp 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
 7827 f8a36e22 2021-08-26 stsp 	struct got_pathlist_head branches;
 7828 f8a36e22 2021-08-26 stsp 	struct got_pathlist_head tags;
 7829 f8a36e22 2021-08-26 stsp 	struct got_reflist_head all_branches;
 7830 f8a36e22 2021-08-26 stsp 	struct got_reflist_head all_tags;
 7831 f8a36e22 2021-08-26 stsp 	struct got_pathlist_head delete_args;
 7832 f8a36e22 2021-08-26 stsp 	struct got_pathlist_head delete_branches;
 7833 f8a36e22 2021-08-26 stsp 	struct got_reflist_entry *re;
 7834 f8a36e22 2021-08-26 stsp 	struct got_pathlist_entry *pe;
 7835 f8a36e22 2021-08-26 stsp 	int i, ch, sendfd = -1, sendstatus;
 7836 f8a36e22 2021-08-26 stsp 	pid_t sendpid = -1;
 7837 f8a36e22 2021-08-26 stsp 	struct got_send_progress_arg spa;
 7838 f8a36e22 2021-08-26 stsp 	int verbosity = 0, overwrite_refs = 0;
 7839 f8a36e22 2021-08-26 stsp 	int send_all_branches = 0, send_all_tags = 0;
 7840 f8a36e22 2021-08-26 stsp 	struct got_reference *ref = NULL;
 7841 f8a36e22 2021-08-26 stsp 
 7842 f8a36e22 2021-08-26 stsp 	TAILQ_INIT(&branches);
 7843 f8a36e22 2021-08-26 stsp 	TAILQ_INIT(&tags);
 7844 f8a36e22 2021-08-26 stsp 	TAILQ_INIT(&all_branches);
 7845 f8a36e22 2021-08-26 stsp 	TAILQ_INIT(&all_tags);
 7846 f8a36e22 2021-08-26 stsp 	TAILQ_INIT(&delete_args);
 7847 f8a36e22 2021-08-26 stsp 	TAILQ_INIT(&delete_branches);
 7848 f8a36e22 2021-08-26 stsp 
 7849 f8a36e22 2021-08-26 stsp 	while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
 7850 f8a36e22 2021-08-26 stsp 		switch (ch) {
 7851 f8a36e22 2021-08-26 stsp 		case 'a':
 7852 f8a36e22 2021-08-26 stsp 			send_all_branches = 1;
 7853 f8a36e22 2021-08-26 stsp 			break;
 7854 f8a36e22 2021-08-26 stsp 		case 'b':
 7855 f8a36e22 2021-08-26 stsp 			error = got_pathlist_append(&branches, optarg, NULL);
 7856 f8a36e22 2021-08-26 stsp 			if (error)
 7857 f8a36e22 2021-08-26 stsp 				return error;
 7858 f8a36e22 2021-08-26 stsp 			nbranches++;
 7859 f8a36e22 2021-08-26 stsp 			break;
 7860 f8a36e22 2021-08-26 stsp 		case 'd':
 7861 f8a36e22 2021-08-26 stsp 			error = got_pathlist_append(&delete_args, optarg, NULL);
 7862 f8a36e22 2021-08-26 stsp 			if (error)
 7863 f8a36e22 2021-08-26 stsp 				return error;
 7864 f8a36e22 2021-08-26 stsp 			break;
 7865 f8a36e22 2021-08-26 stsp 		case 'f':
 7866 f8a36e22 2021-08-26 stsp 			overwrite_refs = 1;
 7867 f8a36e22 2021-08-26 stsp 			break;
 7868 f8a36e22 2021-08-26 stsp 		case 'r':
 7869 f8a36e22 2021-08-26 stsp 			repo_path = realpath(optarg, NULL);
 7870 f8a36e22 2021-08-26 stsp 			if (repo_path == NULL)
 7871 f8a36e22 2021-08-26 stsp 				return got_error_from_errno2("realpath",
 7872 f8a36e22 2021-08-26 stsp 				    optarg);
 7873 f8a36e22 2021-08-26 stsp 			got_path_strip_trailing_slashes(repo_path);
 7874 f8a36e22 2021-08-26 stsp 			break;
 7875 f8a36e22 2021-08-26 stsp 		case 't':
 7876 f8a36e22 2021-08-26 stsp 			error = got_pathlist_append(&tags, optarg, NULL);
 7877 f8a36e22 2021-08-26 stsp 			if (error)
 7878 f8a36e22 2021-08-26 stsp 				return error;
 7879 f8a36e22 2021-08-26 stsp 			ntags++;
 7880 f8a36e22 2021-08-26 stsp 			break;
 7881 f8a36e22 2021-08-26 stsp 		case 'T':
 7882 f8a36e22 2021-08-26 stsp 			send_all_tags = 1;
 7883 f8a36e22 2021-08-26 stsp 			break;
 7884 f8a36e22 2021-08-26 stsp 		case 'v':
 7885 f8a36e22 2021-08-26 stsp 			if (verbosity < 0)
 7886 f8a36e22 2021-08-26 stsp 				verbosity = 0;
 7887 f8a36e22 2021-08-26 stsp 			else if (verbosity < 3)
 7888 f8a36e22 2021-08-26 stsp 				verbosity++;
 7889 f8a36e22 2021-08-26 stsp 			break;
 7890 f8a36e22 2021-08-26 stsp 		case 'q':
 7891 f8a36e22 2021-08-26 stsp 			verbosity = -1;
 7892 f8a36e22 2021-08-26 stsp 			break;
 7893 f8a36e22 2021-08-26 stsp 		default:
 7894 f8a36e22 2021-08-26 stsp 			usage_send();
 7895 f8a36e22 2021-08-26 stsp 			/* NOTREACHED */
 7896 f8a36e22 2021-08-26 stsp 		}
 7897 f8a36e22 2021-08-26 stsp 	}
 7898 f8a36e22 2021-08-26 stsp 	argc -= optind;
 7899 f8a36e22 2021-08-26 stsp 	argv += optind;
 7900 f8a36e22 2021-08-26 stsp 
 7901 f8a36e22 2021-08-26 stsp 	if (send_all_branches && !TAILQ_EMPTY(&branches))
 7902 f8a36e22 2021-08-26 stsp 		option_conflict('a', 'b');
 7903 f8a36e22 2021-08-26 stsp 	if (send_all_tags && !TAILQ_EMPTY(&tags))
 7904 f8a36e22 2021-08-26 stsp 		option_conflict('T', 't');
 7905 f8a36e22 2021-08-26 stsp 
 7906 f8a36e22 2021-08-26 stsp 
 7907 f8a36e22 2021-08-26 stsp 	if (argc == 0)
 7908 f8a36e22 2021-08-26 stsp 		remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
 7909 f8a36e22 2021-08-26 stsp 	else if (argc == 1)
 7910 f8a36e22 2021-08-26 stsp 		remote_name = argv[0];
 7911 f8a36e22 2021-08-26 stsp 	else
 7912 f8a36e22 2021-08-26 stsp 		usage_send();
 7913 f8a36e22 2021-08-26 stsp 
 7914 f8a36e22 2021-08-26 stsp 	cwd = getcwd(NULL, 0);
 7915 f8a36e22 2021-08-26 stsp 	if (cwd == NULL) {
 7916 f8a36e22 2021-08-26 stsp 		error = got_error_from_errno("getcwd");
 7917 f8a36e22 2021-08-26 stsp 		goto done;
 7918 f8a36e22 2021-08-26 stsp 	}
 7919 f8a36e22 2021-08-26 stsp 
 7920 f8a36e22 2021-08-26 stsp 	if (repo_path == NULL) {
 7921 f8a36e22 2021-08-26 stsp 		error = got_worktree_open(&worktree, cwd);
 7922 f8a36e22 2021-08-26 stsp 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 7923 f8a36e22 2021-08-26 stsp 			goto done;
 7924 f8a36e22 2021-08-26 stsp 		else
 7925 f8a36e22 2021-08-26 stsp 			error = NULL;
 7926 f8a36e22 2021-08-26 stsp 		if (worktree) {
 7927 f8a36e22 2021-08-26 stsp 			repo_path =
 7928 f8a36e22 2021-08-26 stsp 			    strdup(got_worktree_get_repo_path(worktree));
 7929 f8a36e22 2021-08-26 stsp 			if (repo_path == NULL)
 7930 f8a36e22 2021-08-26 stsp 				error = got_error_from_errno("strdup");
 7931 f8a36e22 2021-08-26 stsp 			if (error)
 7932 f8a36e22 2021-08-26 stsp 				goto done;
 7933 f8a36e22 2021-08-26 stsp 		} else {
 7934 f8a36e22 2021-08-26 stsp 			repo_path = strdup(cwd);
 7935 f8a36e22 2021-08-26 stsp 			if (repo_path == NULL) {
 7936 f8a36e22 2021-08-26 stsp 				error = got_error_from_errno("strdup");
 7937 f8a36e22 2021-08-26 stsp 				goto done;
 7938 f8a36e22 2021-08-26 stsp 			}
 7939 f8a36e22 2021-08-26 stsp 		}
 7940 f8a36e22 2021-08-26 stsp 	}
 7941 f8a36e22 2021-08-26 stsp 
 7942 f8a36e22 2021-08-26 stsp 	error = got_repo_open(&repo, repo_path, NULL);
 7943 f8a36e22 2021-08-26 stsp 	if (error)
 7944 f8a36e22 2021-08-26 stsp 		goto done;
 7945 f8a36e22 2021-08-26 stsp 
 7946 f8a36e22 2021-08-26 stsp 	if (worktree) {
 7947 f8a36e22 2021-08-26 stsp 		worktree_conf = got_worktree_get_gotconfig(worktree);
 7948 f8a36e22 2021-08-26 stsp 		if (worktree_conf) {
 7949 f8a36e22 2021-08-26 stsp 			got_gotconfig_get_remotes(&nremotes, &remotes,
 7950 f8a36e22 2021-08-26 stsp 			    worktree_conf);
 7951 f8a36e22 2021-08-26 stsp 			for (i = 0; i < nremotes; i++) {
 7952 f8a36e22 2021-08-26 stsp 				if (strcmp(remotes[i].name, remote_name) == 0) {
 7953 f8a36e22 2021-08-26 stsp 					remote = &remotes[i];
 7954 f8a36e22 2021-08-26 stsp 					break;
 7955 f8a36e22 2021-08-26 stsp 				}
 7956 f8a36e22 2021-08-26 stsp 			}
 7957 f8a36e22 2021-08-26 stsp 		}
 7958 f8a36e22 2021-08-26 stsp 	}
 7959 f8a36e22 2021-08-26 stsp 	if (remote == NULL) {
 7960 f8a36e22 2021-08-26 stsp 		repo_conf = got_repo_get_gotconfig(repo);
 7961 f8a36e22 2021-08-26 stsp 		if (repo_conf) {
 7962 f8a36e22 2021-08-26 stsp 			got_gotconfig_get_remotes(&nremotes, &remotes,
 7963 f8a36e22 2021-08-26 stsp 			    repo_conf);
 7964 f8a36e22 2021-08-26 stsp 			for (i = 0; i < nremotes; i++) {
 7965 f8a36e22 2021-08-26 stsp 				if (strcmp(remotes[i].name, remote_name) == 0) {
 7966 f8a36e22 2021-08-26 stsp 					remote = &remotes[i];
 7967 f8a36e22 2021-08-26 stsp 					break;
 7968 f8a36e22 2021-08-26 stsp 				}
 7969 f8a36e22 2021-08-26 stsp 			}
 7970 f8a36e22 2021-08-26 stsp 		}
 7971 f8a36e22 2021-08-26 stsp 	}
 7972 f8a36e22 2021-08-26 stsp 	if (remote == NULL) {
 7973 f8a36e22 2021-08-26 stsp 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
 7974 f8a36e22 2021-08-26 stsp 		for (i = 0; i < nremotes; i++) {
 7975 f8a36e22 2021-08-26 stsp 			if (strcmp(remotes[i].name, remote_name) == 0) {
 7976 f8a36e22 2021-08-26 stsp 				remote = &remotes[i];
 7977 f8a36e22 2021-08-26 stsp 				break;
 7978 f8a36e22 2021-08-26 stsp 			}
 7979 f8a36e22 2021-08-26 stsp 		}
 7980 f8a36e22 2021-08-26 stsp 	}
 7981 f8a36e22 2021-08-26 stsp 	if (remote == NULL) {
 7982 f8a36e22 2021-08-26 stsp 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
 7983 f8a36e22 2021-08-26 stsp 		goto done;
 7984 f8a36e22 2021-08-26 stsp 	}
 7985 f8a36e22 2021-08-26 stsp 
 7986 5e5da8c4 2021-09-05 stsp 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
 7987 6480c871 2021-08-30 stsp 	    &repo_name, remote->send_url);
 7988 f8a36e22 2021-08-26 stsp 	if (error)
 7989 f8a36e22 2021-08-26 stsp 		goto done;
 7990 f8a36e22 2021-08-26 stsp 
 7991 f8a36e22 2021-08-26 stsp 	if (strcmp(proto, "git") == 0) {
 7992 f8a36e22 2021-08-26 stsp #ifndef PROFILE
 7993 f8a36e22 2021-08-26 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 7994 f8a36e22 2021-08-26 stsp 		    "sendfd dns inet unveil", NULL) == -1)
 7995 f8a36e22 2021-08-26 stsp 			err(1, "pledge");
 7996 f8a36e22 2021-08-26 stsp #endif
 7997 f8a36e22 2021-08-26 stsp 	} else if (strcmp(proto, "git+ssh") == 0 ||
 7998 f8a36e22 2021-08-26 stsp 	    strcmp(proto, "ssh") == 0) {
 7999 f8a36e22 2021-08-26 stsp #ifndef PROFILE
 8000 f8a36e22 2021-08-26 stsp 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
 8001 f8a36e22 2021-08-26 stsp 		    "sendfd unveil", NULL) == -1)
 8002 f8a36e22 2021-08-26 stsp 			err(1, "pledge");
 8003 f8a36e22 2021-08-26 stsp #endif
 8004 f8a36e22 2021-08-26 stsp 	} else if (strcmp(proto, "http") == 0 ||
 8005 f8a36e22 2021-08-26 stsp 	    strcmp(proto, "git+http") == 0) {
 8006 f8a36e22 2021-08-26 stsp 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
 8007 f8a36e22 2021-08-26 stsp 		goto done;
 8008 f8a36e22 2021-08-26 stsp 	} else {
 8009 f8a36e22 2021-08-26 stsp 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
 8010 f8a36e22 2021-08-26 stsp 		goto done;
 8011 f8a36e22 2021-08-26 stsp 	}
 8012 f8a36e22 2021-08-26 stsp 
 8013 d65a88a2 2021-09-05 stsp 	error = got_dial_apply_unveil(proto);
 8014 d65a88a2 2021-09-05 stsp 	if (error)
 8015 d65a88a2 2021-09-05 stsp 		goto done;
 8016 d65a88a2 2021-09-05 stsp 
 8017 f8a36e22 2021-08-26 stsp 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
 8018 f8a36e22 2021-08-26 stsp 	if (error)
 8019 f8a36e22 2021-08-26 stsp 		goto done;
 8020 f8a36e22 2021-08-26 stsp 
 8021 f8a36e22 2021-08-26 stsp 	if (send_all_branches) {
 8022 f8a36e22 2021-08-26 stsp 		error = got_ref_list(&all_branches, repo, "refs/heads",
 8023 f8a36e22 2021-08-26 stsp 		    got_ref_cmp_by_name, NULL);
 8024 f8a36e22 2021-08-26 stsp 		if (error)
 8025 f8a36e22 2021-08-26 stsp 			goto done;
 8026 f8a36e22 2021-08-26 stsp 		TAILQ_FOREACH(re, &all_branches, entry) {
 8027 f8a36e22 2021-08-26 stsp 			const char *branchname = got_ref_get_name(re->ref);
 8028 f8a36e22 2021-08-26 stsp 			error = got_pathlist_append(&branches,
 8029 f8a36e22 2021-08-26 stsp 			    branchname, NULL);
 8030 f8a36e22 2021-08-26 stsp 			if (error)
 8031 f8a36e22 2021-08-26 stsp 				goto done;
 8032 f8a36e22 2021-08-26 stsp 			nbranches++;
 8033 f8a36e22 2021-08-26 stsp 		}
 8034 eac1df47 2021-09-01 stsp 	} else if (nbranches == 0) {
 8035 eac1df47 2021-09-01 stsp 		for (i = 0; i < remote->nsend_branches; i++) {
 8036 eac1df47 2021-09-01 stsp 			got_pathlist_append(&branches,
 8037 eac1df47 2021-09-01 stsp 			    remote->send_branches[i], NULL);
 8038 eac1df47 2021-09-01 stsp 		}
 8039 f8a36e22 2021-08-26 stsp 	}
 8040 f8a36e22 2021-08-26 stsp 
 8041 f8a36e22 2021-08-26 stsp 	if (send_all_tags) {
 8042 f8a36e22 2021-08-26 stsp 		error = got_ref_list(&all_tags, repo, "refs/tags",
 8043 f8a36e22 2021-08-26 stsp 		    got_ref_cmp_by_name, NULL);
 8044 f8a36e22 2021-08-26 stsp 		if (error)
 8045 f8a36e22 2021-08-26 stsp 			goto done;
 8046 f8a36e22 2021-08-26 stsp 		TAILQ_FOREACH(re, &all_tags, entry) {
 8047 f8a36e22 2021-08-26 stsp 			const char *tagname = got_ref_get_name(re->ref);
 8048 f8a36e22 2021-08-26 stsp 			error = got_pathlist_append(&tags,
 8049 f8a36e22 2021-08-26 stsp 			    tagname, NULL);
 8050 f8a36e22 2021-08-26 stsp 			if (error)
 8051 f8a36e22 2021-08-26 stsp 				goto done;
 8052 f8a36e22 2021-08-26 stsp 			ntags++;
 8053 f8a36e22 2021-08-26 stsp 		}
 8054 f8a36e22 2021-08-26 stsp 	}
 8055 f8a36e22 2021-08-26 stsp 
 8056 f8a36e22 2021-08-26 stsp 	/*
 8057 f8a36e22 2021-08-26 stsp 	 * To prevent accidents only branches in refs/heads/ can be deleted
 8058 f8a36e22 2021-08-26 stsp 	 * with 'got send -d'.
 8059 f8a36e22 2021-08-26 stsp 	 * Deleting anything else requires local repository access or Git.
 8060 f8a36e22 2021-08-26 stsp 	 */
 8061 f8a36e22 2021-08-26 stsp 	TAILQ_FOREACH(pe, &delete_args, entry) {
 8062 f8a36e22 2021-08-26 stsp 		const char *branchname = pe->path;
 8063 f8a36e22 2021-08-26 stsp 		char *s;
 8064 f8a36e22 2021-08-26 stsp 		struct got_pathlist_entry *new;
 8065 f8a36e22 2021-08-26 stsp 		if (strncmp(branchname, "refs/heads/", 11) == 0) {
 8066 f8a36e22 2021-08-26 stsp 			s = strdup(branchname);
 8067 f8a36e22 2021-08-26 stsp 			if (s == NULL) {
 8068 f8a36e22 2021-08-26 stsp 				error = got_error_from_errno("strdup");
 8069 f8a36e22 2021-08-26 stsp 				goto done;
 8070 f8a36e22 2021-08-26 stsp 			}
 8071 f8a36e22 2021-08-26 stsp 		} else {
 8072 f8a36e22 2021-08-26 stsp 			if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
 8073 f8a36e22 2021-08-26 stsp 				error = got_error_from_errno("asprintf");
 8074 f8a36e22 2021-08-26 stsp 				goto done;
 8075 f8a36e22 2021-08-26 stsp 			}
 8076 f8a36e22 2021-08-26 stsp 		}
 8077 f8a36e22 2021-08-26 stsp 		error = got_pathlist_insert(&new, &delete_branches, s, NULL);
 8078 f8a36e22 2021-08-26 stsp 		if (error || new == NULL /* duplicate */)
 8079 f8a36e22 2021-08-26 stsp 			free(s);
 8080 f8a36e22 2021-08-26 stsp 		if (error)
 8081 f8a36e22 2021-08-26 stsp 			goto done;
 8082 f8a36e22 2021-08-26 stsp 		ndelete_branches++;
 8083 f8a36e22 2021-08-26 stsp 	}
 8084 f8a36e22 2021-08-26 stsp 
 8085 f8a36e22 2021-08-26 stsp 	if (nbranches == 0 && ndelete_branches == 0) {
 8086 f8a36e22 2021-08-26 stsp 		struct got_reference *head_ref;
 8087 f8a36e22 2021-08-26 stsp 		if (worktree)
 8088 f8a36e22 2021-08-26 stsp 			error = got_ref_open(&head_ref, repo,
 8089 f8a36e22 2021-08-26 stsp 			    got_worktree_get_head_ref_name(worktree), 0);
 8090 f8a36e22 2021-08-26 stsp 		else
 8091 f8a36e22 2021-08-26 stsp 			error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
 8092 f8a36e22 2021-08-26 stsp 		if (error)
 8093 f8a36e22 2021-08-26 stsp 			goto done;
 8094 f8a36e22 2021-08-26 stsp 		if (got_ref_is_symbolic(head_ref)) {
 8095 f8a36e22 2021-08-26 stsp 			error = got_ref_resolve_symbolic(&ref, repo, head_ref);
 8096 f8a36e22 2021-08-26 stsp 			got_ref_close(head_ref);
 8097 f8a36e22 2021-08-26 stsp 			if (error)
 8098 f8a36e22 2021-08-26 stsp 				goto done;
 8099 f8a36e22 2021-08-26 stsp 		} else
 8100 f8a36e22 2021-08-26 stsp 			ref = head_ref;
 8101 f8a36e22 2021-08-26 stsp 		error = got_pathlist_append(&branches, got_ref_get_name(ref),
 8102 abc59930 2021-09-05 naddy 		    NULL);
 8103 f8a36e22 2021-08-26 stsp 		if (error)
 8104 f8a36e22 2021-08-26 stsp 			goto done;
 8105 f8a36e22 2021-08-26 stsp 		nbranches++;
 8106 f8a36e22 2021-08-26 stsp 	}
 8107 f8a36e22 2021-08-26 stsp 
 8108 f8a36e22 2021-08-26 stsp 	if (verbosity >= 0)
 8109 f8a36e22 2021-08-26 stsp 		printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
 8110 f8a36e22 2021-08-26 stsp 		    port ? ":" : "", port ? port : "");
 8111 f8a36e22 2021-08-26 stsp 
 8112 f8a36e22 2021-08-26 stsp 	error = got_send_connect(&sendpid, &sendfd, proto, host, port,
 8113 f8a36e22 2021-08-26 stsp 	    server_path, verbosity);
 8114 f8a36e22 2021-08-26 stsp 	if (error)
 8115 f8a36e22 2021-08-26 stsp 		goto done;
 8116 f8a36e22 2021-08-26 stsp 
 8117 f8a36e22 2021-08-26 stsp 	memset(&spa, 0, sizeof(spa));
 8118 f8a36e22 2021-08-26 stsp 	spa.last_scaled_packsize[0] = '\0';
 8119 f8a36e22 2021-08-26 stsp 	spa.last_p_deltify = -1;
 8120 f8a36e22 2021-08-26 stsp 	spa.last_p_written = -1;
 8121 f8a36e22 2021-08-26 stsp 	spa.verbosity = verbosity;
 8122 f8a36e22 2021-08-26 stsp 	spa.delete_branches = &delete_branches;
 8123 f8a36e22 2021-08-26 stsp 	error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
 8124 f8a36e22 2021-08-26 stsp 	    verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
 8125 f8a36e22 2021-08-26 stsp 	    check_cancelled, NULL);
 8126 f8a36e22 2021-08-26 stsp 	if (spa.printed_something)
 8127 f8a36e22 2021-08-26 stsp 		putchar('\n');
 8128 f8a36e22 2021-08-26 stsp 	if (error)
 8129 f8a36e22 2021-08-26 stsp 		goto done;
 8130 f8a36e22 2021-08-26 stsp 	if (!spa.sent_something && verbosity >= 0)
 8131 f8a36e22 2021-08-26 stsp 		printf("Already up-to-date\n");
 8132 f8a36e22 2021-08-26 stsp done:
 8133 f8a36e22 2021-08-26 stsp 	if (sendpid > 0) {
 8134 f8a36e22 2021-08-26 stsp 		if (kill(sendpid, SIGTERM) == -1)
 8135 f8a36e22 2021-08-26 stsp 			error = got_error_from_errno("kill");
 8136 f8a36e22 2021-08-26 stsp 		if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
 8137 f8a36e22 2021-08-26 stsp 			error = got_error_from_errno("waitpid");
 8138 f8a36e22 2021-08-26 stsp 	}
 8139 f8a36e22 2021-08-26 stsp 	if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
 8140 f8a36e22 2021-08-26 stsp 		error = got_error_from_errno("close");
 8141 f8a36e22 2021-08-26 stsp 	if (repo) {
 8142 f8a36e22 2021-08-26 stsp 		const struct got_error *close_err = got_repo_close(repo);
 8143 f8a36e22 2021-08-26 stsp 		if (error == NULL)
 8144 f8a36e22 2021-08-26 stsp 			error = close_err;
 8145 f8a36e22 2021-08-26 stsp 	}
 8146 f8a36e22 2021-08-26 stsp 	if (worktree)
 8147 f8a36e22 2021-08-26 stsp 		got_worktree_close(worktree);
 8148 f8a36e22 2021-08-26 stsp 	if (ref)
 8149 f8a36e22 2021-08-26 stsp 		got_ref_close(ref);
 8150 f8a36e22 2021-08-26 stsp 	got_pathlist_free(&branches);
 8151 f8a36e22 2021-08-26 stsp 	got_pathlist_free(&tags);
 8152 f8a36e22 2021-08-26 stsp 	got_ref_list_free(&all_branches);
 8153 f8a36e22 2021-08-26 stsp 	got_ref_list_free(&all_tags);
 8154 f8a36e22 2021-08-26 stsp 	got_pathlist_free(&delete_args);
 8155 f8a36e22 2021-08-26 stsp 	TAILQ_FOREACH(pe, &delete_branches, entry)
 8156 f8a36e22 2021-08-26 stsp 		free((char *)pe->path);
 8157 f8a36e22 2021-08-26 stsp 	got_pathlist_free(&delete_branches);
 8158 f8a36e22 2021-08-26 stsp 	free(cwd);
 8159 f8a36e22 2021-08-26 stsp 	free(repo_path);
 8160 f8a36e22 2021-08-26 stsp 	free(proto);
 8161 f8a36e22 2021-08-26 stsp 	free(host);
 8162 f8a36e22 2021-08-26 stsp 	free(port);
 8163 f8a36e22 2021-08-26 stsp 	free(server_path);
 8164 f8a36e22 2021-08-26 stsp 	free(repo_name);
 8165 234035bc 2019-06-01 stsp 	return error;
 8166 234035bc 2019-06-01 stsp }
 8167 234035bc 2019-06-01 stsp 
 8168 234035bc 2019-06-01 stsp __dead static void
 8169 234035bc 2019-06-01 stsp usage_cherrypick(void)
 8170 234035bc 2019-06-01 stsp {
 8171 234035bc 2019-06-01 stsp 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
 8172 234035bc 2019-06-01 stsp 	exit(1);
 8173 234035bc 2019-06-01 stsp }
 8174 234035bc 2019-06-01 stsp 
 8175 234035bc 2019-06-01 stsp static const struct got_error *
 8176 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
 8177 234035bc 2019-06-01 stsp {
 8178 234035bc 2019-06-01 stsp 	const struct got_error *error = NULL;
 8179 234035bc 2019-06-01 stsp 	struct got_worktree *worktree = NULL;
 8180 234035bc 2019-06-01 stsp 	struct got_repository *repo = NULL;
 8181 234035bc 2019-06-01 stsp 	char *cwd = NULL, *commit_id_str = NULL;
 8182 234035bc 2019-06-01 stsp 	struct got_object_id *commit_id = NULL;
 8183 234035bc 2019-06-01 stsp 	struct got_commit_object *commit = NULL;
 8184 234035bc 2019-06-01 stsp 	struct got_object_qid *pid;
 8185 9627c110 2020-04-18 stsp 	int ch;
 8186 9627c110 2020-04-18 stsp 	struct got_update_progress_arg upa;
 8187 234035bc 2019-06-01 stsp 
 8188 234035bc 2019-06-01 stsp 	while ((ch = getopt(argc, argv, "")) != -1) {
 8189 234035bc 2019-06-01 stsp 		switch (ch) {
 8190 234035bc 2019-06-01 stsp 		default:
 8191 234035bc 2019-06-01 stsp 			usage_cherrypick();
 8192 234035bc 2019-06-01 stsp 			/* NOTREACHED */
 8193 234035bc 2019-06-01 stsp 		}
 8194 234035bc 2019-06-01 stsp 	}
 8195 234035bc 2019-06-01 stsp 
 8196 234035bc 2019-06-01 stsp 	argc -= optind;
 8197 234035bc 2019-06-01 stsp 	argv += optind;
 8198 234035bc 2019-06-01 stsp 
 8199 43012d58 2019-07-14 stsp #ifndef PROFILE
 8200 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 8201 43012d58 2019-07-14 stsp 	    "unveil", NULL) == -1)
 8202 43012d58 2019-07-14 stsp 		err(1, "pledge");
 8203 43012d58 2019-07-14 stsp #endif
 8204 234035bc 2019-06-01 stsp 	if (argc != 1)
 8205 234035bc 2019-06-01 stsp 		usage_cherrypick();
 8206 234035bc 2019-06-01 stsp 
 8207 234035bc 2019-06-01 stsp 	cwd = getcwd(NULL, 0);
 8208 234035bc 2019-06-01 stsp 	if (cwd == NULL) {
 8209 234035bc 2019-06-01 stsp 		error = got_error_from_errno("getcwd");
 8210 234035bc 2019-06-01 stsp 		goto done;
 8211 234035bc 2019-06-01 stsp 	}
 8212 234035bc 2019-06-01 stsp 	error = got_worktree_open(&worktree, cwd);
 8213 fa51e947 2020-03-27 stsp 	if (error) {
 8214 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 8215 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "cherrypick",
 8216 fa51e947 2020-03-27 stsp 			    cwd);
 8217 234035bc 2019-06-01 stsp 		goto done;
 8218 fa51e947 2020-03-27 stsp 	}
 8219 234035bc 2019-06-01 stsp 
 8220 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 8221 c9956ddf 2019-09-08 stsp 	    NULL);
 8222 234035bc 2019-06-01 stsp 	if (error != NULL)
 8223 234035bc 2019-06-01 stsp 		goto done;
 8224 234035bc 2019-06-01 stsp 
 8225 234035bc 2019-06-01 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
 8226 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 8227 234035bc 2019-06-01 stsp 	if (error)
 8228 234035bc 2019-06-01 stsp 		goto done;
 8229 234035bc 2019-06-01 stsp 
 8230 dd88155e 2019-06-29 stsp 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
 8231 dd88155e 2019-06-29 stsp 	    GOT_OBJ_TYPE_COMMIT, repo);
 8232 234035bc 2019-06-01 stsp 	if (error != NULL) {
 8233 234035bc 2019-06-01 stsp 		struct got_reference *ref;
 8234 234035bc 2019-06-01 stsp 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
 8235 234035bc 2019-06-01 stsp 			goto done;
 8236 234035bc 2019-06-01 stsp 		error = got_ref_open(&ref, repo, argv[0], 0);
 8237 234035bc 2019-06-01 stsp 		if (error != NULL)
 8238 234035bc 2019-06-01 stsp 			goto done;
 8239 234035bc 2019-06-01 stsp 		error = got_ref_resolve(&commit_id, repo, ref);
 8240 234035bc 2019-06-01 stsp 		got_ref_close(ref);
 8241 234035bc 2019-06-01 stsp 		if (error != NULL)
 8242 234035bc 2019-06-01 stsp 			goto done;
 8243 234035bc 2019-06-01 stsp 	}
 8244 234035bc 2019-06-01 stsp 	error = got_object_id_str(&commit_id_str, commit_id);
 8245 234035bc 2019-06-01 stsp 	if (error)
 8246 234035bc 2019-06-01 stsp 		goto done;
 8247 234035bc 2019-06-01 stsp 
 8248 234035bc 2019-06-01 stsp 	error = got_object_open_as_commit(&commit, repo, commit_id);
 8249 234035bc 2019-06-01 stsp 	if (error)
 8250 234035bc 2019-06-01 stsp 		goto done;
 8251 dbdddfee 2021-06-23 naddy 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
 8252 9627c110 2020-04-18 stsp 	memset(&upa, 0, sizeof(upa));
 8253 03415a1a 2019-06-02 stsp 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
 8254 9627c110 2020-04-18 stsp 	    commit_id, repo, update_progress, &upa, check_cancelled,
 8255 03415a1a 2019-06-02 stsp 	    NULL);
 8256 234035bc 2019-06-01 stsp 	if (error != NULL)
 8257 234035bc 2019-06-01 stsp 		goto done;
 8258 234035bc 2019-06-01 stsp 
 8259 9627c110 2020-04-18 stsp 	if (upa.did_something)
 8260 a7648d7a 2019-06-02 stsp 		printf("Merged commit %s\n", commit_id_str);
 8261 0ef68859 2021-09-28 thomas 	print_merge_progress_stats(&upa);
 8262 234035bc 2019-06-01 stsp done:
 8263 234035bc 2019-06-01 stsp 	if (commit)
 8264 234035bc 2019-06-01 stsp 		got_object_commit_close(commit);
 8265 234035bc 2019-06-01 stsp 	free(commit_id_str);
 8266 234035bc 2019-06-01 stsp 	if (worktree)
 8267 234035bc 2019-06-01 stsp 		got_worktree_close(worktree);
 8268 1d0f4054 2021-06-17 stsp 	if (repo) {
 8269 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 8270 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 8271 1d0f4054 2021-06-17 stsp 			error = close_err;
 8272 1d0f4054 2021-06-17 stsp 	}
 8273 c4296144 2019-05-09 stsp 	return error;
 8274 c4296144 2019-05-09 stsp }
 8275 5ef14e63 2019-06-02 stsp 
 8276 5ef14e63 2019-06-02 stsp __dead static void
 8277 5ef14e63 2019-06-02 stsp usage_backout(void)
 8278 5ef14e63 2019-06-02 stsp {
 8279 5ef14e63 2019-06-02 stsp 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
 8280 5ef14e63 2019-06-02 stsp 	exit(1);
 8281 5ef14e63 2019-06-02 stsp }
 8282 5ef14e63 2019-06-02 stsp 
 8283 5ef14e63 2019-06-02 stsp static const struct got_error *
 8284 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
 8285 5ef14e63 2019-06-02 stsp {
 8286 5ef14e63 2019-06-02 stsp 	const struct got_error *error = NULL;
 8287 5ef14e63 2019-06-02 stsp 	struct got_worktree *worktree = NULL;
 8288 5ef14e63 2019-06-02 stsp 	struct got_repository *repo = NULL;
 8289 5ef14e63 2019-06-02 stsp 	char *cwd = NULL, *commit_id_str = NULL;
 8290 5ef14e63 2019-06-02 stsp 	struct got_object_id *commit_id = NULL;
 8291 5ef14e63 2019-06-02 stsp 	struct got_commit_object *commit = NULL;
 8292 5ef14e63 2019-06-02 stsp 	struct got_object_qid *pid;
 8293 9627c110 2020-04-18 stsp 	int ch;
 8294 9627c110 2020-04-18 stsp 	struct got_update_progress_arg upa;
 8295 5ef14e63 2019-06-02 stsp 
 8296 5ef14e63 2019-06-02 stsp 	while ((ch = getopt(argc, argv, "")) != -1) {
 8297 5ef14e63 2019-06-02 stsp 		switch (ch) {
 8298 5ef14e63 2019-06-02 stsp 		default:
 8299 5ef14e63 2019-06-02 stsp 			usage_backout();
 8300 5ef14e63 2019-06-02 stsp 			/* NOTREACHED */
 8301 5ef14e63 2019-06-02 stsp 		}
 8302 5ef14e63 2019-06-02 stsp 	}
 8303 5ef14e63 2019-06-02 stsp 
 8304 5ef14e63 2019-06-02 stsp 	argc -= optind;
 8305 5ef14e63 2019-06-02 stsp 	argv += optind;
 8306 5ef14e63 2019-06-02 stsp 
 8307 43012d58 2019-07-14 stsp #ifndef PROFILE
 8308 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 8309 43012d58 2019-07-14 stsp 	    "unveil", NULL) == -1)
 8310 43012d58 2019-07-14 stsp 		err(1, "pledge");
 8311 43012d58 2019-07-14 stsp #endif
 8312 5ef14e63 2019-06-02 stsp 	if (argc != 1)
 8313 5ef14e63 2019-06-02 stsp 		usage_backout();
 8314 5ef14e63 2019-06-02 stsp 
 8315 5ef14e63 2019-06-02 stsp 	cwd = getcwd(NULL, 0);
 8316 5ef14e63 2019-06-02 stsp 	if (cwd == NULL) {
 8317 5ef14e63 2019-06-02 stsp 		error = got_error_from_errno("getcwd");
 8318 5ef14e63 2019-06-02 stsp 		goto done;
 8319 5ef14e63 2019-06-02 stsp 	}
 8320 5ef14e63 2019-06-02 stsp 	error = got_worktree_open(&worktree, cwd);
 8321 fa51e947 2020-03-27 stsp 	if (error) {
 8322 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
 8323 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "backout", cwd);
 8324 5ef14e63 2019-06-02 stsp 		goto done;
 8325 fa51e947 2020-03-27 stsp 	}
 8326 5ef14e63 2019-06-02 stsp 
 8327 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
 8328 c9956ddf 2019-09-08 stsp 	    NULL);
 8329 5ef14e63 2019-06-02 stsp 	if (error != NULL)
 8330 5ef14e63 2019-06-02 stsp 		goto done;
 8331 5ef14e63 2019-06-02 stsp 
 8332 5ef14e63 2019-06-02 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
 8333 c530dc23 2019-07-23 stsp 	    got_worktree_get_root_path(worktree));
 8334 5ef14e63 2019-06-02 stsp 	if (error)
 8335 5ef14e63 2019-06-02 stsp 		goto done;
 8336 5ef14e63 2019-06-02 stsp 
 8337 dd88155e 2019-06-29 stsp 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
 8338 dd88155e 2019-06-29 stsp 	    GOT_OBJ_TYPE_COMMIT, repo);
 8339 5ef14e63 2019-06-02 stsp 	if (error != NULL) {
 8340 5ef14e63 2019-06-02 stsp 		struct got_reference *ref;
 8341 5ef14e63 2019-06-02 stsp 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
 8342 5ef14e63 2019-06-02 stsp 			goto done;
 8343 5ef14e63 2019-06-02 stsp 		error = got_ref_open(&ref, repo, argv[0], 0);
 8344 5ef14e63 2019-06-02 stsp 		if (error != NULL)
 8345 5ef14e63 2019-06-02 stsp 			goto done;
 8346 5ef14e63 2019-06-02 stsp 		error = got_ref_resolve(&commit_id, repo, ref);
 8347 5ef14e63 2019-06-02 stsp 		got_ref_close(ref);
 8348 5ef14e63 2019-06-02 stsp 		if (error != NULL)
 8349 5ef14e63 2019-06-02 stsp 			goto done;
 8350 5ef14e63 2019-06-02 stsp 	}
 8351 5ef14e63 2019-06-02 stsp 	error = got_object_id_str(&commit_id_str, commit_id);
 8352 5ef14e63 2019-06-02 stsp 	if (error)
 8353 5ef14e63 2019-06-02 stsp 		goto done;
 8354 5ef14e63 2019-06-02 stsp 
 8355 5ef14e63 2019-06-02 stsp 	error = got_object_open_as_commit(&commit, repo, commit_id);
 8356 5ef14e63 2019-06-02 stsp 	if (error)
 8357 5ef14e63 2019-06-02 stsp 		goto done;
 8358 dbdddfee 2021-06-23 naddy 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
 8359 5ef14e63 2019-06-02 stsp 	if (pid == NULL) {
 8360 5ef14e63 2019-06-02 stsp 		error = got_error(GOT_ERR_ROOT_COMMIT);
 8361 5ef14e63 2019-06-02 stsp 		goto done;
 8362 5ef14e63 2019-06-02 stsp 	}
 8363 5ef14e63 2019-06-02 stsp 
 8364 9627c110 2020-04-18 stsp 	memset(&upa, 0, sizeof(upa));
 8365 10604dce 2021-09-24 thomas 	error = got_worktree_merge_files(worktree, commit_id, pid->id,
 8366 10604dce 2021-09-24 thomas 	    repo, update_progress, &upa, check_cancelled, NULL);
 8367 5ef14e63 2019-06-02 stsp 	if (error != NULL)
 8368 5ef14e63 2019-06-02 stsp 		goto done;
 8369 5ef14e63 2019-06-02 stsp 
 8370 9627c110 2020-04-18 stsp 	if (upa.did_something)
 8371 a7648d7a 2019-06-02 stsp 		printf("Backed out commit %s\n", commit_id_str);
 8372 0ef68859 2021-09-28 thomas 	print_merge_progress_stats(&upa);
 8373 5ef14e63 2019-06-02 stsp done:
 8374 5ef14e63 2019-06-02 stsp 	if (commit)
 8375 5ef14e63 2019-06-02 stsp 		got_object_commit_close(commit);
 8376 5ef14e63 2019-06-02 stsp 	free(commit_id_str);
 8377 818c7501 2019-07-11 stsp 	if (worktree)
 8378 818c7501 2019-07-11 stsp 		got_worktree_close(worktree);
 8379 1d0f4054 2021-06-17 stsp 	if (repo) {
 8380 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 8381 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 8382 1d0f4054 2021-06-17 stsp 			error = close_err;
 8383 1d0f4054 2021-06-17 stsp 	}
 8384 818c7501 2019-07-11 stsp 	return error;
 8385 818c7501 2019-07-11 stsp }
 8386 818c7501 2019-07-11 stsp 
 8387 818c7501 2019-07-11 stsp __dead static void
 8388 818c7501 2019-07-11 stsp usage_rebase(void)
 8389 818c7501 2019-07-11 stsp {
 8390 643b85bc 2021-07-16 stsp 	fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
 8391 af54c8f8 2019-07-11 stsp 	    getprogname());
 8392 818c7501 2019-07-11 stsp 	exit(1);
 8393 0ebf8283 2019-07-24 stsp }
 8394 0ebf8283 2019-07-24 stsp 
 8395 0ebf8283 2019-07-24 stsp void
 8396 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
 8397 0ebf8283 2019-07-24 stsp {
 8398 0ebf8283 2019-07-24 stsp 	char *nl;
 8399 0ebf8283 2019-07-24 stsp 	size_t len;
 8400 0ebf8283 2019-07-24 stsp 
 8401 0ebf8283 2019-07-24 stsp 	len = strlen(logmsg);
 8402 0ebf8283 2019-07-24 stsp 	if (len > limit)
 8403 0ebf8283 2019-07-24 stsp 		len = limit;
 8404 0ebf8283 2019-07-24 stsp 	logmsg[len] = '\0';
 8405 0ebf8283 2019-07-24 stsp 	nl = strchr(logmsg, '\n');
 8406 0ebf8283 2019-07-24 stsp 	if (nl)
 8407 0ebf8283 2019-07-24 stsp 		*nl = '\0';
 8408 0ebf8283 2019-07-24 stsp }
 8409 0ebf8283 2019-07-24 stsp 
 8410 0ebf8283 2019-07-24 stsp static const struct got_error *
 8411 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
 8412 0ebf8283 2019-07-24 stsp {
 8413 5943eee2 2019-08-13 stsp 	const struct got_error *err;
 8414 5943eee2 2019-08-13 stsp 	char *logmsg0 = NULL;
 8415 5943eee2 2019-08-13 stsp 	const char *s;
 8416 0ebf8283 2019-07-24 stsp 
 8417 5943eee2 2019-08-13 stsp 	err = got_object_commit_get_logmsg(&logmsg0, commit);
 8418 5943eee2 2019-08-13 stsp 	if (err)
 8419 5943eee2 2019-08-13 stsp 		return err;
 8420 0ebf8283 2019-07-24 stsp 
 8421 5943eee2 2019-08-13 stsp 	s = logmsg0;
 8422 5943eee2 2019-08-13 stsp 	while (isspace((unsigned char)s[0]))
 8423 5943eee2 2019-08-13 stsp 		s++;
 8424 5943eee2 2019-08-13 stsp 
 8425 5943eee2 2019-08-13 stsp 	*logmsg = strdup(s);
 8426 5943eee2 2019-08-13 stsp 	if (*logmsg == NULL) {
 8427 5943eee2 2019-08-13 stsp 		err = got_error_from_errno("strdup");
 8428 5943eee2 2019-08-13 stsp 		goto done;
 8429 5943eee2 2019-08-13 stsp 	}
 8430 0ebf8283 2019-07-24 stsp 
 8431 0ebf8283 2019-07-24 stsp 	trim_logmsg(*logmsg, limit);
 8432 5943eee2 2019-08-13 stsp done:
 8433 5943eee2 2019-08-13 stsp 	free(logmsg0);
 8434 a0ea4fc0 2020-02-28 stsp 	return err;
 8435 a0ea4fc0 2020-02-28 stsp }
 8436 a0ea4fc0 2020-02-28 stsp 
 8437 a0ea4fc0 2020-02-28 stsp static const struct got_error *
 8438 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
 8439 a0ea4fc0 2020-02-28 stsp {
 8440 a0ea4fc0 2020-02-28 stsp 	const struct got_error *err;
 8441 a0ea4fc0 2020-02-28 stsp 	struct got_commit_object *commit = NULL;
 8442 a0ea4fc0 2020-02-28 stsp 	char *id_str = NULL, *logmsg = NULL;
 8443 a0ea4fc0 2020-02-28 stsp 
 8444 a0ea4fc0 2020-02-28 stsp 	err = got_object_open_as_commit(&commit, repo, id);
 8445 a0ea4fc0 2020-02-28 stsp 	if (err)
 8446 a0ea4fc0 2020-02-28 stsp 		return err;
 8447 a0ea4fc0 2020-02-28 stsp 
 8448 a0ea4fc0 2020-02-28 stsp 	err = got_object_id_str(&id_str, id);
 8449 a0ea4fc0 2020-02-28 stsp 	if (err)
 8450 a0ea4fc0 2020-02-28 stsp 		goto done;
 8451 a0ea4fc0 2020-02-28 stsp 
 8452 a0ea4fc0 2020-02-28 stsp 	id_str[12] = '\0';
 8453 a0ea4fc0 2020-02-28 stsp 
 8454 a0ea4fc0 2020-02-28 stsp 	err = get_short_logmsg(&logmsg, 42, commit);
 8455 a0ea4fc0 2020-02-28 stsp 	if (err)
 8456 a0ea4fc0 2020-02-28 stsp 		goto done;
 8457 a0ea4fc0 2020-02-28 stsp 
 8458 a0ea4fc0 2020-02-28 stsp 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
 8459 a0ea4fc0 2020-02-28 stsp done:
 8460 a0ea4fc0 2020-02-28 stsp 	free(id_str);
 8461 a0ea4fc0 2020-02-28 stsp 	got_object_commit_close(commit);
 8462 a0ea4fc0 2020-02-28 stsp 	free(logmsg);
 8463 5943eee2 2019-08-13 stsp 	return err;
 8464 818c7501 2019-07-11 stsp }
 8465 818c7501 2019-07-11 stsp 
 8466 818c7501 2019-07-11 stsp static const struct got_error *
 8467 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
 8468 818c7501 2019-07-11 stsp     struct got_object_id *old_id, struct got_object_id *new_id)
 8469 818c7501 2019-07-11 stsp {
 8470 818c7501 2019-07-11 stsp 	const struct got_error *err;
 8471 0ebf8283 2019-07-24 stsp 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
 8472 818c7501 2019-07-11 stsp 
 8473 818c7501 2019-07-11 stsp 	err = got_object_id_str(&old_id_str, old_id);
 8474 818c7501 2019-07-11 stsp 	if (err)
 8475 818c7501 2019-07-11 stsp 		goto done;
 8476 818c7501 2019-07-11 stsp 
 8477 ff0d2220 2019-07-11 stsp 	if (new_id) {
 8478 ff0d2220 2019-07-11 stsp 		err = got_object_id_str(&new_id_str, new_id);
 8479 ff0d2220 2019-07-11 stsp 		if (err)
 8480 ff0d2220 2019-07-11 stsp 			goto done;
 8481 ff0d2220 2019-07-11 stsp 	}
 8482 818c7501 2019-07-11 stsp 
 8483 818c7501 2019-07-11 stsp 	old_id_str[12] = '\0';
 8484 ff0d2220 2019-07-11 stsp 	if (new_id_str)
 8485 ff0d2220 2019-07-11 stsp 		new_id_str[12] = '\0';
 8486 0ebf8283 2019-07-24 stsp 
 8487 0ebf8283 2019-07-24 stsp 	err = get_short_logmsg(&logmsg, 42, commit);
 8488 0ebf8283 2019-07-24 stsp 	if (err)
 8489 0ebf8283 2019-07-24 stsp 		goto done;
 8490 0ebf8283 2019-07-24 stsp 
 8491 ff0d2220 2019-07-11 stsp 	printf("%s -> %s: %s\n", old_id_str,
 8492 ff0d2220 2019-07-11 stsp 	    new_id_str ? new_id_str : "no-op change", logmsg);
 8493 818c7501 2019-07-11 stsp done:
 8494 818c7501 2019-07-11 stsp 	free(old_id_str);
 8495 818c7501 2019-07-11 stsp 	free(new_id_str);
 8496 272a1371 2020-02-28 stsp 	free(logmsg);
 8497 818c7501 2019-07-11 stsp 	return err;
 8498 818c7501 2019-07-11 stsp }
 8499 818c7501 2019-07-11 stsp 
 8500 1ee397ad 2019-07-12 stsp static const struct got_error *
 8501 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
 8502 3e3a69f1 2019-07-25 stsp     struct got_reference *branch, struct got_reference *new_base_branch,
 8503 e600f124 2021-03-21 stsp     struct got_reference *tmp_branch, struct got_repository *repo,
 8504 e600f124 2021-03-21 stsp     int create_backup)
 8505 818c7501 2019-07-11 stsp {
 8506 818c7501 2019-07-11 stsp 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
 8507 3e3a69f1 2019-07-25 stsp 	return got_worktree_rebase_complete(worktree, fileindex,
 8508 e600f124 2021-03-21 stsp 	    new_base_branch, tmp_branch, branch, repo, create_backup);
 8509 818c7501 2019-07-11 stsp }
 8510 818c7501 2019-07-11 stsp 
 8511 818c7501 2019-07-11 stsp static const struct got_error *
 8512 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
 8513 3e3a69f1 2019-07-25 stsp     struct got_worktree *worktree, struct got_fileindex *fileindex,
 8514 3e3a69f1 2019-07-25 stsp     struct got_reference *tmp_branch,
 8515 0ebf8283 2019-07-24 stsp     struct got_object_id *commit_id, struct got_repository *repo)
 8516 ff0d2220 2019-07-11 stsp {
 8517 ff0d2220 2019-07-11 stsp 	const struct got_error *error;
 8518 ff0d2220 2019-07-11 stsp 	struct got_commit_object *commit;
 8519 ff0d2220 2019-07-11 stsp 	struct got_object_id *new_commit_id;
 8520 ff0d2220 2019-07-11 stsp 
 8521 ff0d2220 2019-07-11 stsp 	error = got_object_open_as_commit(&commit, repo, commit_id);
 8522 ff0d2220 2019-07-11 stsp 	if (error)
 8523 ff0d2220 2019-07-11 stsp 		return error;
 8524 ff0d2220 2019-07-11 stsp 
 8525 01757395 2019-07-12 stsp 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
 8526 3e3a69f1 2019-07-25 stsp 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
 8527 ff0d2220 2019-07-11 stsp 	if (error) {
 8528 ff0d2220 2019-07-11 stsp 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
 8529 ff0d2220 2019-07-11 stsp 			goto done;
 8530 ff0d2220 2019-07-11 stsp 		error = show_rebase_progress(commit, commit_id, NULL);
 8531 ff0d2220 2019-07-11 stsp 	} else {
 8532 ff0d2220 2019-07-11 stsp 		error = show_rebase_progress(commit, commit_id, new_commit_id);
 8533 ff0d2220 2019-07-11 stsp 		free(new_commit_id);
 8534 ff0d2220 2019-07-11 stsp 	}
 8535 ff0d2220 2019-07-11 stsp done:
 8536 ff0d2220 2019-07-11 stsp 	got_object_commit_close(commit);
 8537 ff0d2220 2019-07-11 stsp 	return error;
 8538 64c6d990 2019-07-11 stsp }
 8539 64c6d990 2019-07-11 stsp 
 8540 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
 8541 64c6d990 2019-07-11 stsp 	const char *path_prefix;
 8542 64c6d990 2019-07-11 stsp 	size_t len;
 8543 8ca9bd68 2019-07-25 stsp 	int errcode;
 8544 64c6d990 2019-07-11 stsp };
 8545 64c6d990 2019-07-11 stsp 
 8546 64c6d990 2019-07-11 stsp static const struct got_error *
 8547 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
 8548 64c6d990 2019-07-11 stsp     struct got_blob_object *blob2, struct got_object_id *id1,
 8549 64c6d990 2019-07-11 stsp     struct got_object_id *id2, const char *path1, const char *path2,
 8550 46f68b20 2019-10-19 stsp     mode_t mode1, mode_t mode2, struct got_repository *repo)
 8551 64c6d990 2019-07-11 stsp {
 8552 64c6d990 2019-07-11 stsp 	struct check_path_prefix_arg *a = arg;
 8553 64c6d990 2019-07-11 stsp 
 8554 64c6d990 2019-07-11 stsp 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
 8555 64c6d990 2019-07-11 stsp 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
 8556 8ca9bd68 2019-07-25 stsp 		return got_error(a->errcode);
 8557 64c6d990 2019-07-11 stsp 
 8558 64c6d990 2019-07-11 stsp 	return NULL;
 8559 64c6d990 2019-07-11 stsp }
 8560 64c6d990 2019-07-11 stsp 
 8561 64c6d990 2019-07-11 stsp static const struct got_error *
 8562 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
 8563 64c6d990 2019-07-11 stsp     struct got_object_id *commit_id, const char *path_prefix,
 8564 8ca9bd68 2019-07-25 stsp     int errcode, struct got_repository *repo)
 8565 64c6d990 2019-07-11 stsp {
 8566 64c6d990 2019-07-11 stsp 	const struct got_error *err;
 8567 64c6d990 2019-07-11 stsp 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
 8568 64c6d990 2019-07-11 stsp 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
 8569 64c6d990 2019-07-11 stsp 	struct check_path_prefix_arg cpp_arg;
 8570 64c6d990 2019-07-11 stsp 
 8571 64c6d990 2019-07-11 stsp 	if (got_path_is_root_dir(path_prefix))
 8572 64c6d990 2019-07-11 stsp 		return NULL;
 8573 64c6d990 2019-07-11 stsp 
 8574 64c6d990 2019-07-11 stsp 	err = got_object_open_as_commit(&commit, repo, commit_id);
 8575 64c6d990 2019-07-11 stsp 	if (err)
 8576 64c6d990 2019-07-11 stsp 		goto done;
 8577 64c6d990 2019-07-11 stsp 
 8578 64c6d990 2019-07-11 stsp 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
 8579 64c6d990 2019-07-11 stsp 	if (err)
 8580 64c6d990 2019-07-11 stsp 		goto done;
 8581 64c6d990 2019-07-11 stsp 
 8582 64c6d990 2019-07-11 stsp 	err = got_object_open_as_tree(&tree1, repo,
 8583 64c6d990 2019-07-11 stsp 	    got_object_commit_get_tree_id(parent_commit));
 8584 64c6d990 2019-07-11 stsp 	if (err)
 8585 64c6d990 2019-07-11 stsp 		goto done;
 8586 64c6d990 2019-07-11 stsp 
 8587 64c6d990 2019-07-11 stsp 	err = got_object_open_as_tree(&tree2, repo,
 8588 64c6d990 2019-07-11 stsp 	    got_object_commit_get_tree_id(commit));
 8589 64c6d990 2019-07-11 stsp 	if (err)
 8590 64c6d990 2019-07-11 stsp 		goto done;
 8591 64c6d990 2019-07-11 stsp 
 8592 64c6d990 2019-07-11 stsp 	cpp_arg.path_prefix = path_prefix;
 8593 d23ace97 2019-07-25 stsp 	while (cpp_arg.path_prefix[0] == '/')
 8594 d23ace97 2019-07-25 stsp 		cpp_arg.path_prefix++;
 8595 d23ace97 2019-07-25 stsp 	cpp_arg.len = strlen(cpp_arg.path_prefix);
 8596 8ca9bd68 2019-07-25 stsp 	cpp_arg.errcode = errcode;
 8597 8ca9bd68 2019-07-25 stsp 	err = got_diff_tree(tree1, tree2, "", "", repo,
 8598 31b4484f 2019-07-27 stsp 	    check_path_prefix_in_diff, &cpp_arg, 0);
 8599 64c6d990 2019-07-11 stsp done:
 8600 64c6d990 2019-07-11 stsp 	if (tree1)
 8601 64c6d990 2019-07-11 stsp 		got_object_tree_close(tree1);
 8602 64c6d990 2019-07-11 stsp 	if (tree2)
 8603 64c6d990 2019-07-11 stsp 		got_object_tree_close(tree2);
 8604 64c6d990 2019-07-11 stsp 	if (commit)
 8605 64c6d990 2019-07-11 stsp 		got_object_commit_close(commit);
 8606 64c6d990 2019-07-11 stsp 	if (parent_commit)
 8607 64c6d990 2019-07-11 stsp 		got_object_commit_close(parent_commit);
 8608 64c6d990 2019-07-11 stsp 	return err;
 8609 ff0d2220 2019-07-11 stsp }
 8610 ff0d2220 2019-07-11 stsp 
 8611 ff0d2220 2019-07-11 stsp static const struct got_error *
 8612 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
 8613 af61c510 2019-07-19 stsp     struct got_object_id *initial_commit_id,
 8614 af61c510 2019-07-19 stsp     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
 8615 8ca9bd68 2019-07-25 stsp     const char *path_prefix, int path_prefix_errcode,
 8616 8ca9bd68 2019-07-25 stsp     struct got_repository *repo)
 8617 af61c510 2019-07-19 stsp {
 8618 af61c510 2019-07-19 stsp 	const struct got_error *err = NULL;
 8619 af61c510 2019-07-19 stsp 	struct got_commit_graph *graph = NULL;
 8620 af61c510 2019-07-19 stsp 	struct got_object_id *parent_id = NULL;
 8621 af61c510 2019-07-19 stsp 	struct got_object_qid *qid;
 8622 af61c510 2019-07-19 stsp         struct got_object_id *commit_id = initial_commit_id;
 8623 af61c510 2019-07-19 stsp 
 8624 3d509237 2020-01-04 stsp 	err = got_commit_graph_open(&graph, "/", 1);
 8625 af61c510 2019-07-19 stsp 	if (err)
 8626 af61c510 2019-07-19 stsp 		return err;
 8627 af61c510 2019-07-19 stsp 
 8628 6fb7cd11 2019-08-22 stsp 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
 8629 6fb7cd11 2019-08-22 stsp 	    check_cancelled, NULL);
 8630 af61c510 2019-07-19 stsp 	if (err)
 8631 af61c510 2019-07-19 stsp 		goto done;
 8632 af61c510 2019-07-19 stsp 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
 8633 ee780d5c 2020-01-04 stsp 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
 8634 ee780d5c 2020-01-04 stsp 		    check_cancelled, NULL);
 8635 af61c510 2019-07-19 stsp 		if (err) {
 8636 af61c510 2019-07-19 stsp 			if (err->code == GOT_ERR_ITER_COMPLETED) {
 8637 af61c510 2019-07-19 stsp 				err = got_error_msg(GOT_ERR_ANCESTRY,
 8638 af61c510 2019-07-19 stsp 				    "ran out of commits to rebase before "
 8639 af61c510 2019-07-19 stsp 				    "youngest common ancestor commit has "
 8640 af61c510 2019-07-19 stsp 				    "been reached?!?");
 8641 ee780d5c 2020-01-04 stsp 			}
 8642 ee780d5c 2020-01-04 stsp 			goto done;
 8643 af61c510 2019-07-19 stsp 		} else {
 8644 8ca9bd68 2019-07-25 stsp 			err = check_path_prefix(parent_id, commit_id,
 8645 8ca9bd68 2019-07-25 stsp 			    path_prefix, path_prefix_errcode, repo);
 8646 af61c510 2019-07-19 stsp 			if (err)
 8647 af61c510 2019-07-19 stsp 				goto done;
 8648 af61c510 2019-07-19 stsp 
 8649 af61c510 2019-07-19 stsp 			err = got_object_qid_alloc(&qid, commit_id);
 8650 af61c510 2019-07-19 stsp 			if (err)
 8651 af61c510 2019-07-19 stsp 				goto done;
 8652 dbdddfee 2021-06-23 naddy 			STAILQ_INSERT_HEAD(commits, qid, entry);
 8653 af61c510 2019-07-19 stsp 			commit_id = parent_id;
 8654 af61c510 2019-07-19 stsp 		}
 8655 af61c510 2019-07-19 stsp 	}
 8656 af61c510 2019-07-19 stsp done:
 8657 af61c510 2019-07-19 stsp 	got_commit_graph_close(graph);
 8658 af61c510 2019-07-19 stsp 	return err;
 8659 e600f124 2021-03-21 stsp }
 8660 e600f124 2021-03-21 stsp 
 8661 e600f124 2021-03-21 stsp static const struct got_error *
 8662 e600f124 2021-03-21 stsp get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
 8663 e600f124 2021-03-21 stsp {
 8664 e600f124 2021-03-21 stsp 	const struct got_error *err = NULL;
 8665 e600f124 2021-03-21 stsp 	time_t committer_time;
 8666 e600f124 2021-03-21 stsp 	struct tm tm;
 8667 e600f124 2021-03-21 stsp 	char datebuf[11]; /* YYYY-MM-DD + NUL */
 8668 e600f124 2021-03-21 stsp 	char *author0 = NULL, *author, *smallerthan;
 8669 e600f124 2021-03-21 stsp 	char *logmsg0 = NULL, *logmsg, *newline;
 8670 e600f124 2021-03-21 stsp 
 8671 e600f124 2021-03-21 stsp 	committer_time = got_object_commit_get_committer_time(commit);
 8672 e385fc42 2021-08-30 stsp 	if (gmtime_r(&committer_time, &tm) == NULL)
 8673 e385fc42 2021-08-30 stsp 		return got_error_from_errno("gmtime_r");
 8674 e3199de8 2021-03-21 stsp 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
 8675 e600f124 2021-03-21 stsp 		return got_error(GOT_ERR_NO_SPACE);
 8676 e600f124 2021-03-21 stsp 
 8677 e600f124 2021-03-21 stsp 	author0 = strdup(got_object_commit_get_author(commit));
 8678 e600f124 2021-03-21 stsp 	if (author0 == NULL)
 8679 e600f124 2021-03-21 stsp 		return got_error_from_errno("strdup");
 8680 e600f124 2021-03-21 stsp 	author = author0;
 8681 e600f124 2021-03-21 stsp 	smallerthan = strchr(author, '<');
 8682 e600f124 2021-03-21 stsp 	if (smallerthan && smallerthan[1] != '\0')
 8683 e600f124 2021-03-21 stsp 		author = smallerthan + 1;
 8684 e600f124 2021-03-21 stsp 	author[strcspn(author, "@>")] = '\0';
 8685 e600f124 2021-03-21 stsp 
 8686 e600f124 2021-03-21 stsp 	err = got_object_commit_get_logmsg(&logmsg0, commit);
 8687 e600f124 2021-03-21 stsp 	if (err)
 8688 e600f124 2021-03-21 stsp 		goto done;
 8689 e600f124 2021-03-21 stsp 	logmsg = logmsg0;
 8690 e600f124 2021-03-21 stsp 	while (*logmsg == '\n')
 8691 e600f124 2021-03-21 stsp 		logmsg++;
 8692 e600f124 2021-03-21 stsp 	newline = strchr(logmsg, '\n');
 8693 e600f124 2021-03-21 stsp 	if (newline)
 8694 e600f124 2021-03-21 stsp 		*newline = '\0';
 8695 e600f124 2021-03-21 stsp 
 8696 e600f124 2021-03-21 stsp 	if (asprintf(brief_str, "%s %s  %s",
 8697 e600f124 2021-03-21 stsp 	    datebuf, author, logmsg) == -1)
 8698 e600f124 2021-03-21 stsp 		err = got_error_from_errno("asprintf");
 8699 e600f124 2021-03-21 stsp done:
 8700 e600f124 2021-03-21 stsp 	free(author0);
 8701 e600f124 2021-03-21 stsp 	free(logmsg0);
 8702 643b85bc 2021-07-16 stsp 	return err;
 8703 643b85bc 2021-07-16 stsp }
 8704 643b85bc 2021-07-16 stsp 
 8705 643b85bc 2021-07-16 stsp static const struct got_error *
 8706 643b85bc 2021-07-16 stsp delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
 8707 643b85bc 2021-07-16 stsp     struct got_repository *repo)
 8708 643b85bc 2021-07-16 stsp {
 8709 643b85bc 2021-07-16 stsp 	const struct got_error *err;
 8710 643b85bc 2021-07-16 stsp 	char *id_str;
 8711 643b85bc 2021-07-16 stsp 
 8712 643b85bc 2021-07-16 stsp 	err = got_object_id_str(&id_str, id);
 8713 643b85bc 2021-07-16 stsp 	if (err)
 8714 643b85bc 2021-07-16 stsp 		return err;
 8715 643b85bc 2021-07-16 stsp 
 8716 643b85bc 2021-07-16 stsp 	err = got_ref_delete(ref, repo);
 8717 643b85bc 2021-07-16 stsp 	if (err)
 8718 643b85bc 2021-07-16 stsp 		goto done;
 8719 643b85bc 2021-07-16 stsp 
 8720 643b85bc 2021-07-16 stsp 	printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
 8721 643b85bc 2021-07-16 stsp done:
 8722 643b85bc 2021-07-16 stsp 	free(id_str);
 8723 e600f124 2021-03-21 stsp 	return err;
 8724 e600f124 2021-03-21 stsp }
 8725 e600f124 2021-03-21 stsp 
 8726 e600f124 2021-03-21 stsp static const struct got_error *
 8727 e600f124 2021-03-21 stsp print_backup_ref(const char *branch_name, const char *new_id_str,
 8728 e600f124 2021-03-21 stsp     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
 8729 e600f124 2021-03-21 stsp     struct got_reflist_object_id_map *refs_idmap,
 8730 e600f124 2021-03-21 stsp     struct got_repository *repo)
 8731 e600f124 2021-03-21 stsp {
 8732 e600f124 2021-03-21 stsp 	const struct got_error *err = NULL;
 8733 e600f124 2021-03-21 stsp 	struct got_reflist_head *refs;
 8734 e600f124 2021-03-21 stsp 	char *refs_str = NULL;
 8735 e600f124 2021-03-21 stsp 	struct got_object_id *new_commit_id = NULL;
 8736 e600f124 2021-03-21 stsp 	struct got_commit_object *new_commit = NULL;
 8737 e600f124 2021-03-21 stsp 	char *new_commit_brief_str = NULL;
 8738 e600f124 2021-03-21 stsp 	struct got_object_id *yca_id = NULL;
 8739 e600f124 2021-03-21 stsp 	struct got_commit_object *yca_commit = NULL;
 8740 e600f124 2021-03-21 stsp 	char *yca_id_str = NULL, *yca_brief_str = NULL;
 8741 e600f124 2021-03-21 stsp 	char *custom_refs_str;
 8742 e600f124 2021-03-21 stsp 
 8743 e600f124 2021-03-21 stsp 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
 8744 e600f124 2021-03-21 stsp 		return got_error_from_errno("asprintf");
 8745 e600f124 2021-03-21 stsp 
 8746 e600f124 2021-03-21 stsp 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
 8747 e600f124 2021-03-21 stsp 	    0, 0, refs_idmap, custom_refs_str);
 8748 e600f124 2021-03-21 stsp 	if (err)
 8749 e600f124 2021-03-21 stsp 		goto done;
 8750 e600f124 2021-03-21 stsp 
 8751 e600f124 2021-03-21 stsp 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
 8752 e600f124 2021-03-21 stsp 	if (err)
 8753 e600f124 2021-03-21 stsp 		goto done;
 8754 e600f124 2021-03-21 stsp 
 8755 e600f124 2021-03-21 stsp 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
 8756 e600f124 2021-03-21 stsp 	if (refs) {
 8757 e600f124 2021-03-21 stsp 		err = build_refs_str(&refs_str, refs, new_commit_id, repo);
 8758 e600f124 2021-03-21 stsp 		if (err)
 8759 e600f124 2021-03-21 stsp 			goto done;
 8760 e600f124 2021-03-21 stsp 	}
 8761 e600f124 2021-03-21 stsp 
 8762 e600f124 2021-03-21 stsp 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
 8763 e600f124 2021-03-21 stsp 	if (err)
 8764 e600f124 2021-03-21 stsp 		goto done;
 8765 e600f124 2021-03-21 stsp 
 8766 e600f124 2021-03-21 stsp 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
 8767 e600f124 2021-03-21 stsp 	if (err)
 8768 e600f124 2021-03-21 stsp 		goto done;
 8769 e600f124 2021-03-21 stsp 
 8770 e600f124 2021-03-21 stsp 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
 8771 768705e3 2021-09-27 thomas 	    old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
 8772 e600f124 2021-03-21 stsp 	if (err)
 8773 e600f124 2021-03-21 stsp 		goto done;
 8774 e600f124 2021-03-21 stsp 
 8775 e600f124 2021-03-21 stsp 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
 8776 e600f124 2021-03-21 stsp 	    refs_str ? " (" : "", refs_str ? refs_str : "",
 8777 e600f124 2021-03-21 stsp 	    refs_str ? ")" : "", new_commit_brief_str);
 8778 e600f124 2021-03-21 stsp 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
 8779 e600f124 2021-03-21 stsp 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
 8780 e600f124 2021-03-21 stsp 		free(refs_str);
 8781 e600f124 2021-03-21 stsp 		refs_str = NULL;
 8782 e600f124 2021-03-21 stsp 
 8783 e600f124 2021-03-21 stsp 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
 8784 e600f124 2021-03-21 stsp 		if (err)
 8785 e600f124 2021-03-21 stsp 			goto done;
 8786 e600f124 2021-03-21 stsp 
 8787 e600f124 2021-03-21 stsp 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
 8788 e600f124 2021-03-21 stsp 		if (err)
 8789 e600f124 2021-03-21 stsp 			goto done;
 8790 e600f124 2021-03-21 stsp 
 8791 e600f124 2021-03-21 stsp 		err = got_object_id_str(&yca_id_str, yca_id);
 8792 e600f124 2021-03-21 stsp 		if (err)
 8793 e600f124 2021-03-21 stsp 			goto done;
 8794 e600f124 2021-03-21 stsp 
 8795 e600f124 2021-03-21 stsp 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
 8796 e600f124 2021-03-21 stsp 		if (refs) {
 8797 e600f124 2021-03-21 stsp 			err = build_refs_str(&refs_str, refs, yca_id, repo);
 8798 e600f124 2021-03-21 stsp 			if (err)
 8799 e600f124 2021-03-21 stsp 				goto done;
 8800 e600f124 2021-03-21 stsp 		}
 8801 e600f124 2021-03-21 stsp 		printf("history forked at %s%s%s%s\n %s\n",
 8802 e600f124 2021-03-21 stsp 		    yca_id_str,
 8803 e600f124 2021-03-21 stsp 		    refs_str ? " (" : "", refs_str ? refs_str : "",
 8804 e600f124 2021-03-21 stsp 		    refs_str ? ")" : "", yca_brief_str);
 8805 e600f124 2021-03-21 stsp 	}
 8806 e600f124 2021-03-21 stsp done:
 8807 e600f124 2021-03-21 stsp 	free(custom_refs_str);
 8808 e600f124 2021-03-21 stsp 	free(new_commit_id);
 8809 e600f124 2021-03-21 stsp 	free(refs_str);
 8810 e600f124 2021-03-21 stsp 	free(yca_id);
 8811 e600f124 2021-03-21 stsp 	free(yca_id_str);
 8812 e600f124 2021-03-21 stsp 	free(yca_brief_str);
 8813 e600f124 2021-03-21 stsp 	if (new_commit)
 8814 e600f124 2021-03-21 stsp 		got_object_commit_close(new_commit);
 8815 e600f124 2021-03-21 stsp 	if (yca_commit)
 8816 e600f124 2021-03-21 stsp 		got_object_commit_close(yca_commit);
 8817 e600f124 2021-03-21 stsp 
 8818 e600f124 2021-03-21 stsp 	return NULL;
 8819 af61c510 2019-07-19 stsp }
 8820 af61c510 2019-07-19 stsp 
 8821 af61c510 2019-07-19 stsp static const struct got_error *
 8822 643b85bc 2021-07-16 stsp process_backup_refs(const char *backup_ref_prefix, const char *wanted_branch_name,
 8823 643b85bc 2021-07-16 stsp     int delete, struct got_repository *repo)
 8824 e600f124 2021-03-21 stsp {
 8825 e600f124 2021-03-21 stsp 	const struct got_error *err;
 8826 e600f124 2021-03-21 stsp 	struct got_reflist_head refs, backup_refs;
 8827 e600f124 2021-03-21 stsp 	struct got_reflist_entry *re;
 8828 e600f124 2021-03-21 stsp 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
 8829 e600f124 2021-03-21 stsp 	struct got_object_id *old_commit_id = NULL;
 8830 e600f124 2021-03-21 stsp 	char *branch_name = NULL;
 8831 e600f124 2021-03-21 stsp 	struct got_commit_object *old_commit = NULL;
 8832 e600f124 2021-03-21 stsp 	struct got_reflist_object_id_map *refs_idmap = NULL;
 8833 9e822917 2021-03-23 stsp 	int wanted_branch_found = 0;
 8834 e600f124 2021-03-21 stsp 
 8835 e600f124 2021-03-21 stsp 	TAILQ_INIT(&refs);
 8836 e600f124 2021-03-21 stsp 	TAILQ_INIT(&backup_refs);
 8837 e600f124 2021-03-21 stsp 
 8838 e600f124 2021-03-21 stsp 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
 8839 e600f124 2021-03-21 stsp 	if (err)
 8840 e600f124 2021-03-21 stsp 		return err;
 8841 e600f124 2021-03-21 stsp 
 8842 e600f124 2021-03-21 stsp 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
 8843 e600f124 2021-03-21 stsp 	if (err)
 8844 e600f124 2021-03-21 stsp 		goto done;
 8845 e600f124 2021-03-21 stsp 
 8846 e600f124 2021-03-21 stsp 	if (wanted_branch_name) {
 8847 e600f124 2021-03-21 stsp 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
 8848 e600f124 2021-03-21 stsp 			wanted_branch_name += 11;
 8849 e600f124 2021-03-21 stsp 	}
 8850 e600f124 2021-03-21 stsp 
 8851 e600f124 2021-03-21 stsp 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
 8852 e600f124 2021-03-21 stsp 	    got_ref_cmp_by_commit_timestamp_descending, repo);
 8853 e600f124 2021-03-21 stsp 	if (err)
 8854 e600f124 2021-03-21 stsp 		goto done;
 8855 e600f124 2021-03-21 stsp 
 8856 e600f124 2021-03-21 stsp 	TAILQ_FOREACH(re, &backup_refs, entry) {
 8857 e600f124 2021-03-21 stsp 		const char *refname = got_ref_get_name(re->ref);
 8858 e600f124 2021-03-21 stsp 		char *slash;
 8859 e600f124 2021-03-21 stsp 
 8860 643b85bc 2021-07-16 stsp 		err = check_cancelled(NULL);
 8861 643b85bc 2021-07-16 stsp 		if (err)
 8862 643b85bc 2021-07-16 stsp 			break;
 8863 643b85bc 2021-07-16 stsp 
 8864 e600f124 2021-03-21 stsp 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
 8865 e600f124 2021-03-21 stsp 		if (err)
 8866 e600f124 2021-03-21 stsp 			break;
 8867 e600f124 2021-03-21 stsp 
 8868 e600f124 2021-03-21 stsp 		err = got_object_open_as_commit(&old_commit, repo,
 8869 e600f124 2021-03-21 stsp 		    old_commit_id);
 8870 e600f124 2021-03-21 stsp 		if (err)
 8871 e600f124 2021-03-21 stsp 			break;
 8872 e600f124 2021-03-21 stsp 
 8873 e600f124 2021-03-21 stsp 		if (strncmp(backup_ref_prefix, refname,
 8874 e600f124 2021-03-21 stsp 		    backup_ref_prefix_len) == 0)
 8875 e600f124 2021-03-21 stsp 			refname += backup_ref_prefix_len;
 8876 e600f124 2021-03-21 stsp 
 8877 e600f124 2021-03-21 stsp 		while (refname[0] == '/')
 8878 e600f124 2021-03-21 stsp 			refname++;
 8879 e600f124 2021-03-21 stsp 
 8880 e600f124 2021-03-21 stsp 		branch_name = strdup(refname);
 8881 e600f124 2021-03-21 stsp 		if (branch_name == NULL) {
 8882 e600f124 2021-03-21 stsp 			err = got_error_from_errno("strdup");
 8883 e600f124 2021-03-21 stsp 			break;
 8884 e600f124 2021-03-21 stsp 		}
 8885 e600f124 2021-03-21 stsp 		slash = strrchr(branch_name, '/');
 8886 e600f124 2021-03-21 stsp 		if (slash) {
 8887 e600f124 2021-03-21 stsp 			*slash = '\0';
 8888 e600f124 2021-03-21 stsp 			refname += strlen(branch_name) + 1;
 8889 e600f124 2021-03-21 stsp 		}
 8890 e600f124 2021-03-21 stsp 
 8891 e600f124 2021-03-21 stsp 		if (wanted_branch_name == NULL ||
 8892 e600f124 2021-03-21 stsp 		    strcmp(wanted_branch_name, branch_name) == 0) {
 8893 9e822917 2021-03-23 stsp 			wanted_branch_found = 1;
 8894 643b85bc 2021-07-16 stsp 			if (delete) {
 8895 643b85bc 2021-07-16 stsp 				err = delete_backup_ref(re->ref,
 8896 643b85bc 2021-07-16 stsp 				    old_commit_id, repo);
 8897 643b85bc 2021-07-16 stsp 			} else {
 8898 643b85bc 2021-07-16 stsp 				err = print_backup_ref(branch_name, refname,
 8899 abc59930 2021-09-05 naddy 				    old_commit_id, old_commit, refs_idmap,
 8900 abc59930 2021-09-05 naddy 				    repo);
 8901 643b85bc 2021-07-16 stsp 			}
 8902 e600f124 2021-03-21 stsp 			if (err)
 8903 e600f124 2021-03-21 stsp 				break;
 8904 e600f124 2021-03-21 stsp 		}
 8905 e600f124 2021-03-21 stsp 
 8906 e600f124 2021-03-21 stsp 		free(old_commit_id);
 8907 e600f124 2021-03-21 stsp 		old_commit_id = NULL;
 8908 e600f124 2021-03-21 stsp 		free(branch_name);
 8909 e600f124 2021-03-21 stsp 		branch_name = NULL;
 8910 e600f124 2021-03-21 stsp 		got_object_commit_close(old_commit);
 8911 e600f124 2021-03-21 stsp 		old_commit = NULL;
 8912 e600f124 2021-03-21 stsp 	}
 8913 9e822917 2021-03-23 stsp 
 8914 9e822917 2021-03-23 stsp 	if (wanted_branch_name && !wanted_branch_found) {
 8915 9e822917 2021-03-23 stsp 		err = got_error_fmt(GOT_ERR_NOT_REF,
 8916 9e822917 2021-03-23 stsp 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
 8917 9e822917 2021-03-23 stsp 	}
 8918 e600f124 2021-03-21 stsp done:
 8919 e600f124 2021-03-21 stsp 	if (refs_idmap)
 8920 e600f124 2021-03-21 stsp 		got_reflist_object_id_map_free(refs_idmap);
 8921 e600f124 2021-03-21 stsp 	got_ref_list_free(&refs);
 8922 e600f124 2021-03-21 stsp 	got_ref_list_free(&backup_refs);
 8923 e600f124 2021-03-21 stsp 	free(old_commit_id);
 8924 e600f124 2021-03-21 stsp 	free(branch_name);
 8925 e600f124 2021-03-21 stsp 	if (old_commit)
 8926 e600f124 2021-03-21 stsp 		got_object_commit_close(old_commit);
 8927 e600f124 2021-03-21 stsp 	return err;
 8928 e600f124 2021-03-21 stsp }
 8929 e600f124 2021-03-21 stsp 
 8930 e600f124 2021-03-21 stsp static const struct got_error *
 8931 d52bac28 2021-10-08 thomas abort_progress(void *arg, unsigned char status, const char *path)
 8932 d52bac28 2021-10-08 thomas {
 8933 d52bac28 2021-10-08 thomas 	/*
 8934 d52bac28 2021-10-08 thomas 	 * Unversioned files should not clutter progress output when
 8935 d52bac28 2021-10-08 thomas 	 * an operation is aborted.
 8936 d52bac28 2021-10-08 thomas 	 */
 8937 d52bac28 2021-10-08 thomas 	if (status == GOT_STATUS_UNVERSIONED)
 8938 d52bac28 2021-10-08 thomas 		return NULL;
 8939 d52bac28 2021-10-08 thomas 
 8940 d52bac28 2021-10-08 thomas 	return update_progress(arg, status, path);
 8941 d52bac28 2021-10-08 thomas }
 8942 d52bac28 2021-10-08 thomas 
 8943 d52bac28 2021-10-08 thomas static const struct got_error *
 8944 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
 8945 818c7501 2019-07-11 stsp {
 8946 818c7501 2019-07-11 stsp 	const struct got_error *error = NULL;
 8947 818c7501 2019-07-11 stsp 	struct got_worktree *worktree = NULL;
 8948 818c7501 2019-07-11 stsp 	struct got_repository *repo = NULL;
 8949 3e3a69f1 2019-07-25 stsp 	struct got_fileindex *fileindex = NULL;
 8950 818c7501 2019-07-11 stsp 	char *cwd = NULL;
 8951 818c7501 2019-07-11 stsp 	struct got_reference *branch = NULL;
 8952 818c7501 2019-07-11 stsp 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
 8953 818c7501 2019-07-11 stsp 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
 8954 818c7501 2019-07-11 stsp 	struct got_object_id *resume_commit_id = NULL;
 8955 818c7501 2019-07-11 stsp 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
 8956 818c7501 2019-07-11 stsp 	struct got_commit_object *commit = NULL;
 8957 818c7501 2019-07-11 stsp 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
 8958 10604dce 2021-09-24 thomas 	int histedit_in_progress = 0, merge_in_progress = 0;
 8959 10604dce 2021-09-24 thomas 	int create_backup = 1, list_backups = 0, delete_backups = 0;
 8960 818c7501 2019-07-11 stsp 	struct got_object_id_queue commits;
 8961 01757395 2019-07-12 stsp 	struct got_pathlist_head merged_paths;
 8962 818c7501 2019-07-11 stsp 	const struct got_object_id_queue *parent_ids;
 8963 818c7501 2019-07-11 stsp 	struct got_object_qid *qid, *pid;
 8964 bb494413 2021-09-28 thomas 	struct got_update_progress_arg upa;
 8965 818c7501 2019-07-11 stsp 
 8966 dbdddfee 2021-06-23 naddy 	STAILQ_INIT(&commits);
 8967 01757395 2019-07-12 stsp 	TAILQ_INIT(&merged_paths);
 8968 bb494413 2021-09-28 thomas 	memset(&upa, 0, sizeof(upa));
 8969 818c7501 2019-07-11 stsp 
 8970 643b85bc 2021-07-16 stsp 	while ((ch = getopt(argc, argv, "aclX")) != -1) {
 8971 818c7501 2019-07-11 stsp 		switch (ch) {
 8972 818c7501 2019-07-11 stsp 		case 'a':
 8973 818c7501 2019-07-11 stsp 			abort_rebase = 1;
 8974 818c7501 2019-07-11 stsp 			break;
 8975 818c7501 2019-07-11 stsp 		case 'c':
 8976 818c7501 2019-07-11 stsp 			continue_rebase = 1;
 8977 818c7501 2019-07-11 stsp 			break;
 8978 e600f124 2021-03-21 stsp 		case 'l':
 8979 e600f124 2021-03-21 stsp 			list_backups = 1;
 8980 e600f124 2021-03-21 stsp 			break;
 8981 643b85bc 2021-07-16 stsp 		case 'X':
 8982 643b85bc 2021-07-16 stsp 			delete_backups = 1;
 8983 643b85bc 2021-07-16 stsp 			break;
 8984 818c7501 2019-07-11 stsp 		default:
 8985 818c7501 2019-07-11 stsp 			usage_rebase();
 8986 818c7501 2019-07-11 stsp 			/* NOTREACHED */
 8987 818c7501 2019-07-11 stsp 		}
 8988 818c7501 2019-07-11 stsp 	}
 8989 818c7501 2019-07-11 stsp 
 8990 818c7501 2019-07-11 stsp 	argc -= optind;
 8991 818c7501 2019-07-11 stsp 	argv += optind;
 8992 818c7501 2019-07-11 stsp 
 8993 43012d58 2019-07-14 stsp #ifndef PROFILE
 8994 43012d58 2019-07-14 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
 8995 43012d58 2019-07-14 stsp 	    "unveil", NULL) == -1)
 8996 43012d58 2019-07-14 stsp 		err(1, "pledge");
 8997 43012d58 2019-07-14 stsp #endif
 8998 e600f124 2021-03-21 stsp 	if (list_backups) {
 8999 e600f124 2021-03-21 stsp 		if (abort_rebase)
 9000 e600f124 2021-03-21 stsp 			option_conflict('l', 'a');
 9001 e600f124 2021-03-21 stsp 		if (continue_rebase)
 9002 e600f124 2021-03-21 stsp 			option_conflict('l', 'c');
 9003 643b85bc 2021-07-16 stsp 		if (delete_backups)
 9004 643b85bc 2021-07-16 stsp 			option_conflict('l', 'X');
 9005 643b85bc 2021-07-16 stsp 		if (argc != 0 && argc != 1)
 9006 643b85bc 2021-07-16 stsp 			usage_rebase();
 9007 643b85bc 2021-07-16 stsp 	} else if (delete_backups) {
 9008 643b85bc 2021-07-16 stsp 		if (abort_rebase)
 9009 643b85bc 2021-07-16 stsp 			option_conflict('X', 'a');
 9010 643b85bc 2021-07-16 stsp 		if (continue_rebase)
 9011 643b85bc 2021-07-16 stsp 			option_conflict('X', 'c');
 9012 643b85bc 2021-07-16 stsp 		if (list_backups)
 9013 643b85bc 2021-07-16 stsp 			option_conflict('l', 'X');
 9014 e600f124 2021-03-21 stsp 		if (argc != 0 && argc != 1)
 9015 818c7501 2019-07-11 stsp 			usage_rebase();
 9016 e600f124 2021-03-21 stsp 	} else {
 9017 e600f124 2021-03-21 stsp 		if (abort_rebase && continue_rebase)
 9018 e600f124 2021-03-21 stsp 			usage_rebase();
 9019 e600f124 2021-03-21 stsp 		else if (abort_rebase || continue_rebase) {
 9020 e600f124 2021-03-21 stsp 			if (argc != 0)
 9021 e600f124 2021-03-21 stsp 				usage_rebase();
 9022 e600f124 2021-03-21 stsp 		} else if (argc != 1)
 9023 e600f124 2021-03-21 stsp 			usage_rebase();
 9024 e600f124 2021-03-21 stsp 	}
 9025 818c7501 2019-07-11 stsp 
 9026 818c7501 2019-07-11 stsp 	cwd = getcwd(NULL, 0);
 9027 818c7501 2019-07-11 stsp 	if (cwd == NULL) {
 9028 818c7501 2019-07-11 stsp 		error = got_error_from_errno("getcwd");
 9029 818c7501 2019-07-11 stsp 		goto done;
 9030 818c7501 2019-07-11 stsp 	}
 9031 818c7501 2019-07-11 stsp 	error = got_worktree_open(&worktree, cwd);
 9032 fa51e947 2020-03-27 stsp 	if (error) {
 9033 643b85bc 2021-07-16 stsp 		if (list_backups || delete_backups) {
 9034 e600f124 2021-03-21 stsp 			if (error->code != GOT_ERR_NOT_WORKTREE)
 9035 e600f124 2021-03-21 stsp 				goto done;
 9036 e600f124 2021-03-21 stsp 		} else {
 9037 e600f124 2021-03-21 stsp 			if (error->code == GOT_ERR_NOT_WORKTREE)
 9038 e600f124 2021-03-21 stsp 				error = wrap_not_worktree_error(error,
 9039 e600f124 2021-03-21 stsp 				    "rebase", cwd);
 9040 e600f124 2021-03-21 stsp 			goto done;
 9041 e600f124 2021-03-21 stsp 		}
 9042 fa51e947 2020-03-27 stsp 	}
 9043 818c7501 2019-07-11 stsp 
 9044 e600f124 2021-03-21 stsp 	error = got_repo_open(&repo,
 9045 e600f124 2021-03-21 stsp 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
 9046 818c7501 2019-07-11 stsp 	if (error != NULL)
 9047 818c7501 2019-07-11 stsp 		goto done;
 9048 818c7501 2019-07-11 stsp 
 9049 818c7501 2019-07-11 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
 9050 e600f124 2021-03-21 stsp 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 9051 7ef62c4e 2020-02-24 stsp 	if (error)
 9052 7ef62c4e 2020-02-24 stsp 		goto done;
 9053 7ef62c4e 2020-02-24 stsp 
 9054 643b85bc 2021-07-16 stsp 	if (list_backups || delete_backups) {
 9055 643b85bc 2021-07-16 stsp 		error = process_backup_refs(
 9056 643b85bc 2021-07-16 stsp 		    GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
 9057 643b85bc 2021-07-16 stsp 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
 9058 e600f124 2021-03-21 stsp 		goto done; /* nothing else to do */
 9059 e600f124 2021-03-21 stsp 	}
 9060 e600f124 2021-03-21 stsp 
 9061 7ef62c4e 2020-02-24 stsp 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
 9062 7ef62c4e 2020-02-24 stsp 	    worktree);
 9063 818c7501 2019-07-11 stsp 	if (error)
 9064 7ef62c4e 2020-02-24 stsp 		goto done;
 9065 7ef62c4e 2020-02-24 stsp 	if (histedit_in_progress) {
 9066 7ef62c4e 2020-02-24 stsp 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
 9067 10604dce 2021-09-24 thomas 		goto done;
 9068 10604dce 2021-09-24 thomas 	}
 9069 10604dce 2021-09-24 thomas 
 9070 10604dce 2021-09-24 thomas 	error = got_worktree_merge_in_progress(&merge_in_progress,
 9071 10604dce 2021-09-24 thomas 	    worktree, repo);
 9072 10604dce 2021-09-24 thomas 	if (error)
 9073 10604dce 2021-09-24 thomas 		goto done;
 9074 10604dce 2021-09-24 thomas 	if (merge_in_progress) {
 9075 10604dce 2021-09-24 thomas 		error = got_error(GOT_ERR_MERGE_BUSY);
 9076 818c7501 2019-07-11 stsp 		goto done;
 9077 7ef62c4e 2020-02-24 stsp 	}
 9078 818c7501 2019-07-11 stsp 
 9079 818c7501 2019-07-11 stsp 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
 9080 818c7501 2019-07-11 stsp 	if (error)
 9081 818c7501 2019-07-11 stsp 		goto done;
 9082 818c7501 2019-07-11 stsp 
 9083 f6794adc 2019-07-23 stsp 	if (abort_rebase) {
 9084 f6794adc 2019-07-23 stsp 		if (!rebase_in_progress) {
 9085 f6794adc 2019-07-23 stsp 			error = got_error(GOT_ERR_NOT_REBASING);
 9086 f6794adc 2019-07-23 stsp 			goto done;
 9087 f6794adc 2019-07-23 stsp 		}
 9088 818c7501 2019-07-11 stsp 		error = got_worktree_rebase_continue(&resume_commit_id,
 9089 3e3a69f1 2019-07-25 stsp 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
 9090 3e3a69f1 2019-07-25 stsp 		    worktree, repo);
 9091 818c7501 2019-07-11 stsp 		if (error)
 9092 818c7501 2019-07-11 stsp 			goto done;
 9093 818c7501 2019-07-11 stsp 		printf("Switching work tree to %s\n",
 9094 818c7501 2019-07-11 stsp 		    got_ref_get_symref_target(new_base_branch));
 9095 3e3a69f1 2019-07-25 stsp 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
 9096 d52bac28 2021-10-08 thomas 		    new_base_branch, abort_progress, &upa);
 9097 818c7501 2019-07-11 stsp 		if (error)
 9098 818c7501 2019-07-11 stsp 			goto done;
 9099 818c7501 2019-07-11 stsp 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
 9100 0ef68859 2021-09-28 thomas 		print_merge_progress_stats(&upa);
 9101 818c7501 2019-07-11 stsp 		goto done; /* nothing else to do */
 9102 818c7501 2019-07-11 stsp 	}
 9103 818c7501 2019-07-11 stsp 
 9104 818c7501 2019-07-11 stsp 	if (continue_rebase) {
 9105 f6794adc 2019-07-23 stsp 		if (!rebase_in_progress) {
 9106 f6794adc 2019-07-23 stsp 			error = got_error(GOT_ERR_NOT_REBASING);
 9107 f6794adc 2019-07-23 stsp 			goto done;
 9108 f6794adc 2019-07-23 stsp 		}
 9109 818c7501 2019-07-11 stsp 		error = got_worktree_rebase_continue(&resume_commit_id,
 9110 3e3a69f1 2019-07-25 stsp 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
 9111 3e3a69f1 2019-07-25 stsp 		    worktree, repo);
 9112 818c7501 2019-07-11 stsp 		if (error)
 9113 818c7501 2019-07-11 stsp 			goto done;
 9114 818c7501 2019-07-11 stsp 
 9115 3e3a69f1 2019-07-25 stsp 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
 9116 01757395 2019-07-12 stsp 		    resume_commit_id, repo);
 9117 818c7501 2019-07-11 stsp 		if (error)
 9118 818c7501 2019-07-11 stsp 			goto done;
 9119 818c7501 2019-07-11 stsp 
 9120 ff0d2220 2019-07-11 stsp 		yca_id = got_object_id_dup(resume_commit_id);
 9121 ff0d2220 2019-07-11 stsp 		if (yca_id == NULL) {
 9122 818c7501 2019-07-11 stsp 			error = got_error_from_errno("got_object_id_dup");
 9123 818c7501 2019-07-11 stsp 			goto done;
 9124 818c7501 2019-07-11 stsp 		}
 9125 818c7501 2019-07-11 stsp 	} else {
 9126 818c7501 2019-07-11 stsp 		error = got_ref_open(&branch, repo, argv[0], 0);
 9127 818c7501 2019-07-11 stsp 		if (error != NULL)
 9128 818c7501 2019-07-11 stsp 			goto done;
 9129 ff0d2220 2019-07-11 stsp 	}
 9130 818c7501 2019-07-11 stsp 
 9131 ff0d2220 2019-07-11 stsp 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
 9132 ff0d2220 2019-07-11 stsp 	if (error)
 9133 ff0d2220 2019-07-11 stsp 		goto done;
 9134 ff0d2220 2019-07-11 stsp 
 9135 ff0d2220 2019-07-11 stsp 	if (!continue_rebase) {
 9136 a51a74b3 2019-07-27 stsp 		struct got_object_id *base_commit_id;
 9137 a51a74b3 2019-07-27 stsp 
 9138 a51a74b3 2019-07-27 stsp 		base_commit_id = got_worktree_get_base_commit_id(worktree);
 9139 818c7501 2019-07-11 stsp 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
 9140 768705e3 2021-09-27 thomas 		    base_commit_id, branch_head_commit_id, 1, repo,
 9141 6fb7cd11 2019-08-22 stsp 		    check_cancelled, NULL);
 9142 818c7501 2019-07-11 stsp 		if (error)
 9143 818c7501 2019-07-11 stsp 			goto done;
 9144 818c7501 2019-07-11 stsp 		if (yca_id == NULL) {
 9145 818c7501 2019-07-11 stsp 			error = got_error_msg(GOT_ERR_ANCESTRY,
 9146 818c7501 2019-07-11 stsp 			    "specified branch shares no common ancestry "
 9147 818c7501 2019-07-11 stsp 			    "with work tree's branch");
 9148 818c7501 2019-07-11 stsp 			goto done;
 9149 818c7501 2019-07-11 stsp 		}
 9150 818c7501 2019-07-11 stsp 
 9151 a51a74b3 2019-07-27 stsp 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
 9152 a51a74b3 2019-07-27 stsp 		if (error) {
 9153 a51a74b3 2019-07-27 stsp 			if (error->code != GOT_ERR_ANCESTRY)
 9154 a51a74b3 2019-07-27 stsp 				goto done;
 9155 a51a74b3 2019-07-27 stsp 			error = NULL;
 9156 a51a74b3 2019-07-27 stsp 		} else {
 9157 82d979c5 2021-11-04 thomas 			struct got_pathlist_head paths;
 9158 82d979c5 2021-11-04 thomas 			printf("%s is already based on %s\n",
 9159 df3ed485 2021-01-31 stsp 			    got_ref_get_name(branch),
 9160 df3ed485 2021-01-31 stsp 			    got_worktree_get_head_ref_name(worktree));
 9161 82d979c5 2021-11-04 thomas 			error = switch_head_ref(branch, branch_head_commit_id,
 9162 82d979c5 2021-11-04 thomas 			    worktree, repo);
 9163 82d979c5 2021-11-04 thomas 			if (error)
 9164 82d979c5 2021-11-04 thomas 				goto done;
 9165 82d979c5 2021-11-04 thomas 			error = got_worktree_set_base_commit_id(worktree, repo,
 9166 82d979c5 2021-11-04 thomas 			    branch_head_commit_id);
 9167 82d979c5 2021-11-04 thomas 			if (error)
 9168 82d979c5 2021-11-04 thomas 				goto done;
 9169 82d979c5 2021-11-04 thomas 			TAILQ_INIT(&paths);
 9170 82d979c5 2021-11-04 thomas 			error = got_pathlist_append(&paths, "", NULL);
 9171 82d979c5 2021-11-04 thomas 			if (error)
 9172 82d979c5 2021-11-04 thomas 				goto done;
 9173 82d979c5 2021-11-04 thomas 			error = got_worktree_checkout_files(worktree,
 9174 82d979c5 2021-11-04 thomas 			    &paths, repo, update_progress, &upa,
 9175 82d979c5 2021-11-04 thomas 			    check_cancelled, NULL);
 9176 82d979c5 2021-11-04 thomas 			got_pathlist_free(&paths);
 9177 82d979c5 2021-11-04 thomas 			if (error)
 9178 82d979c5 2021-11-04 thomas 				goto done;
 9179 82d979c5 2021-11-04 thomas 			if (upa.did_something) {
 9180 82d979c5 2021-11-04 thomas 				char *id_str;
 9181 82d979c5 2021-11-04 thomas 				error = got_object_id_str(&id_str,
 9182 82d979c5 2021-11-04 thomas 				    branch_head_commit_id);
 9183 82d979c5 2021-11-04 thomas 				if (error)
 9184 82d979c5 2021-11-04 thomas 					goto done;
 9185 82d979c5 2021-11-04 thomas 				printf("Updated to %s: %s\n",
 9186 82d979c5 2021-11-04 thomas 				    got_worktree_get_head_ref_name(worktree),
 9187 82d979c5 2021-11-04 thomas 				    id_str);
 9188 82d979c5 2021-11-04 thomas 				free(id_str);
 9189 82d979c5 2021-11-04 thomas 			} else
 9190 82d979c5 2021-11-04 thomas 				printf("Already up-to-date\n");
 9191 82d979c5 2021-11-04 thomas 			print_update_progress_stats(&upa);
 9192 a51a74b3 2019-07-27 stsp 			goto done;
 9193 a51a74b3 2019-07-27 stsp 		}
 9194 818c7501 2019-07-11 stsp 		error = got_worktree_rebase_prepare(&new_base_branch,
 9195 3e3a69f1 2019-07-25 stsp 		    &tmp_branch, &fileindex, worktree, branch, repo);
 9196 818c7501 2019-07-11 stsp 		if (error)
 9197 818c7501 2019-07-11 stsp 			goto done;
 9198 818c7501 2019-07-11 stsp 	}
 9199 818c7501 2019-07-11 stsp 
 9200 ff0d2220 2019-07-11 stsp 	commit_id = branch_head_commit_id;
 9201 818c7501 2019-07-11 stsp 	error = got_object_open_as_commit(&commit, repo, commit_id);
 9202 818c7501 2019-07-11 stsp 	if (error)
 9203 818c7501 2019-07-11 stsp 		goto done;
 9204 818c7501 2019-07-11 stsp 
 9205 818c7501 2019-07-11 stsp 	parent_ids = got_object_commit_get_parent_ids(commit);
 9206 dbdddfee 2021-06-23 naddy 	pid = STAILQ_FIRST(parent_ids);
 9207 fc66b545 2019-08-12 stsp 	if (pid == NULL) {
 9208 fc66b545 2019-08-12 stsp 		if (!continue_rebase) {
 9209 fc66b545 2019-08-12 stsp 			error = got_worktree_rebase_abort(worktree, fileindex,
 9210 d52bac28 2021-10-08 thomas 			    repo, new_base_branch, abort_progress, &upa);
 9211 fc66b545 2019-08-12 stsp 			if (error)
 9212 fc66b545 2019-08-12 stsp 				goto done;
 9213 fc66b545 2019-08-12 stsp 			printf("Rebase of %s aborted\n",
 9214 fc66b545 2019-08-12 stsp 			    got_ref_get_name(branch));
 9215 0ef68859 2021-09-28 thomas 			print_merge_progress_stats(&upa);
 9216 9627c110 2020-04-18 stsp 
 9217 fc66b545 2019-08-12 stsp 		}
 9218 fc66b545 2019-08-12 stsp 		error = got_error(GOT_ERR_EMPTY_REBASE);
 9219 fc66b545 2019-08-12 stsp 		goto done;
 9220 fc66b545 2019-08-12 stsp 	}
 9221 8ca9bd68 2019-07-25 stsp 	error = collect_commits(&commits, commit_id, pid->id,
 9222 8ca9bd68 2019-07-25 stsp 	    yca_id, got_worktree_get_path_prefix(worktree),
 9223 8ca9bd68 2019-07-25 stsp 	    GOT_ERR_REBASE_PATH, repo);
 9224 818c7501 2019-07-11 stsp 	got_object_commit_close(commit);
 9225 818c7501 2019-07-11 stsp 	commit = NULL;
 9226 818c7501 2019-07-11 stsp 	if (error)
 9227 818c7501 2019-07-11 stsp 		goto done;
 9228 64c6d990 2019-07-11 stsp 
 9229 dbdddfee 2021-06-23 naddy 	if (STAILQ_EMPTY(&commits)) {
 9230 38b0338b 2019-11-29 stsp 		if (continue_rebase) {
 9231 3e3a69f1 2019-07-25 stsp 			error = rebase_complete(worktree, fileindex,
 9232 e600f124 2021-03-21 stsp 			    branch, new_base_branch, tmp_branch, repo,
 9233 e600f124 2021-03-21 stsp 			    create_backup);
 9234 38b0338b 2019-11-29 stsp 			goto done;
 9235 38b0338b 2019-11-29 stsp 		} else {
 9236 38b0338b 2019-11-29 stsp 			/* Fast-forward the reference of the branch. */
 9237 38b0338b 2019-11-29 stsp 			struct got_object_id *new_head_commit_id;
 9238 38b0338b 2019-11-29 stsp 			char *id_str;
 9239 38b0338b 2019-11-29 stsp 			error = got_ref_resolve(&new_head_commit_id, repo,
 9240 38b0338b 2019-11-29 stsp 			    new_base_branch);
 9241 38b0338b 2019-11-29 stsp 			if (error)
 9242 38b0338b 2019-11-29 stsp 				goto done;
 9243 38b0338b 2019-11-29 stsp 			error = got_object_id_str(&id_str, new_head_commit_id);
 9244 38b0338b 2019-11-29 stsp 			printf("Forwarding %s to commit %s\n",
 9245 38b0338b 2019-11-29 stsp 			    got_ref_get_name(branch), id_str);
 9246 38b0338b 2019-11-29 stsp 			free(id_str);
 9247 38b0338b 2019-11-29 stsp 			error = got_ref_change_ref(branch,
 9248 38b0338b 2019-11-29 stsp 			    new_head_commit_id);
 9249 38b0338b 2019-11-29 stsp 			if (error)
 9250 38b0338b 2019-11-29 stsp 				goto done;
 9251 e600f124 2021-03-21 stsp 			/* No backup needed since objects did not change. */
 9252 e600f124 2021-03-21 stsp 			create_backup = 0;
 9253 38b0338b 2019-11-29 stsp 		}
 9254 818c7501 2019-07-11 stsp 	}
 9255 818c7501 2019-07-11 stsp 
 9256 818c7501 2019-07-11 stsp 	pid = NULL;
 9257 dbdddfee 2021-06-23 naddy 	STAILQ_FOREACH(qid, &commits, entry) {
 9258 9627c110 2020-04-18 stsp 
 9259 818c7501 2019-07-11 stsp 		commit_id = qid->id;
 9260 818c7501 2019-07-11 stsp 		parent_id = pid ? pid->id : yca_id;
 9261 818c7501 2019-07-11 stsp 		pid = qid;
 9262 818c7501 2019-07-11 stsp 
 9263 9627c110 2020-04-18 stsp 		memset(&upa, 0, sizeof(upa));
 9264 01757395 2019-07-12 stsp 		error = got_worktree_rebase_merge_files(&merged_paths,
 9265 3e3a69f1 2019-07-25 stsp 		    worktree, fileindex, parent_id, commit_id, repo,
 9266 9627c110 2020-04-18 stsp 		    update_progress, &upa, check_cancelled, NULL);
 9267 818c7501 2019-07-11 stsp 		if (error)
 9268 818c7501 2019-07-11 stsp 			goto done;
 9269 9627c110 2020-04-18 stsp 
 9270 0ef68859 2021-09-28 thomas 		print_merge_progress_stats(&upa);
 9271 bb494413 2021-09-28 thomas 		if (upa.conflicts > 0 || upa.missing > 0 ||
 9272 bb494413 2021-09-28 thomas 		    upa.not_deleted > 0 || upa.unversioned > 0) {
 9273 bb494413 2021-09-28 thomas 			if (upa.conflicts > 0) {
 9274 bb494413 2021-09-28 thomas 				error = show_rebase_merge_conflict(qid->id,
 9275 bb494413 2021-09-28 thomas 				    repo);
 9276 bb494413 2021-09-28 thomas 				if (error)
 9277 bb494413 2021-09-28 thomas 					goto done;
 9278 bb494413 2021-09-28 thomas 			}
 9279 01757395 2019-07-12 stsp 			got_worktree_rebase_pathlist_free(&merged_paths);
 9280 818c7501 2019-07-11 stsp 			break;
 9281 01757395 2019-07-12 stsp 		}
 9282 818c7501 2019-07-11 stsp 
 9283 3e3a69f1 2019-07-25 stsp 		error = rebase_commit(&merged_paths, worktree, fileindex,
 9284 3e3a69f1 2019-07-25 stsp 		    tmp_branch, commit_id, repo);
 9285 01757395 2019-07-12 stsp 		got_worktree_rebase_pathlist_free(&merged_paths);
 9286 818c7501 2019-07-11 stsp 		if (error)
 9287 818c7501 2019-07-11 stsp 			goto done;
 9288 818c7501 2019-07-11 stsp 	}
 9289 818c7501 2019-07-11 stsp 
 9290 bb494413 2021-09-28 thomas 	if (upa.conflicts > 0 || upa.missing > 0 ||
 9291 bb494413 2021-09-28 thomas 	    upa.not_deleted > 0 || upa.unversioned > 0) {
 9292 3e3a69f1 2019-07-25 stsp 		error = got_worktree_rebase_postpone(worktree, fileindex);
 9293 818c7501 2019-07-11 stsp 		if (error)
 9294 818c7501 2019-07-11 stsp 			goto done;
 9295 bb494413 2021-09-28 thomas 		if (upa.conflicts > 0 && upa.missing == 0 &&
 9296 bb494413 2021-09-28 thomas 		    upa.not_deleted == 0 && upa.unversioned == 0) {
 9297 bb494413 2021-09-28 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
 9298 bb494413 2021-09-28 thomas 			    "conflicts must be resolved before rebasing "
 9299 bb494413 2021-09-28 thomas 			    "can continue");
 9300 bb494413 2021-09-28 thomas 		} else if (upa.conflicts > 0) {
 9301 bb494413 2021-09-28 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
 9302 bb494413 2021-09-28 thomas 			    "conflicts must be resolved before rebasing "
 9303 bb494413 2021-09-28 thomas 			    "can continue; changes destined for some "
 9304 bb494413 2021-09-28 thomas 			    "files were not yet merged and should be "
 9305 bb494413 2021-09-28 thomas 			    "merged manually if required before the "
 9306 bb494413 2021-09-28 thomas 			    "rebase operation is continued");
 9307 bb494413 2021-09-28 thomas 		} else {
 9308 bb494413 2021-09-28 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
 9309 bb494413 2021-09-28 thomas 			    "changes destined for some files were not "
 9310 bb494413 2021-09-28 thomas 			    "yet merged and should be merged manually "
 9311 bb494413 2021-09-28 thomas 			    "if required before the rebase operation "
 9312 bb494413 2021-09-28 thomas 			    "is continued");
 9313 bb494413 2021-09-28 thomas 		}
 9314 818c7501 2019-07-11 stsp 	} else
 9315 3e3a69f1 2019-07-25 stsp 		error = rebase_complete(worktree, fileindex, branch,
 9316 e600f124 2021-03-21 stsp 		    new_base_branch, tmp_branch, repo, create_backup);
 9317 818c7501 2019-07-11 stsp done:
 9318 818c7501 2019-07-11 stsp 	got_object_id_queue_free(&commits);
 9319 818c7501 2019-07-11 stsp 	free(branch_head_commit_id);
 9320 818c7501 2019-07-11 stsp 	free(resume_commit_id);
 9321 818c7501 2019-07-11 stsp 	free(yca_id);
 9322 818c7501 2019-07-11 stsp 	if (commit)
 9323 818c7501 2019-07-11 stsp 		got_object_commit_close(commit);
 9324 818c7501 2019-07-11 stsp 	if (branch)
 9325 818c7501 2019-07-11 stsp 		got_ref_close(branch);
 9326 818c7501 2019-07-11 stsp 	if (new_base_branch)
 9327 818c7501 2019-07-11 stsp 		got_ref_close(new_base_branch);
 9328 818c7501 2019-07-11 stsp 	if (tmp_branch)
 9329 818c7501 2019-07-11 stsp 		got_ref_close(tmp_branch);
 9330 5ef14e63 2019-06-02 stsp 	if (worktree)
 9331 5ef14e63 2019-06-02 stsp 		got_worktree_close(worktree);
 9332 1d0f4054 2021-06-17 stsp 	if (repo) {
 9333 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
 9334 1d0f4054 2021-06-17 stsp 		if (error == NULL)
 9335 1d0f4054 2021-06-17 stsp 			error = close_err;
 9336 1d0f4054 2021-06-17 stsp 	}
 9337 5ef14e63 2019-06-02 stsp 	return error;
 9338 0ebf8283 2019-07-24 stsp }
 9339 0ebf8283 2019-07-24 stsp 
 9340 0ebf8283 2019-07-24 stsp __dead static void
 9341 0ebf8283 2019-07-24 stsp usage_histedit(void)
 9342 0ebf8283 2019-07-24 stsp {
 9343 c50a7455 2021-10-04 thomas 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
 9344 643b85bc 2021-07-16 stsp 	    "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
 9345 643b85bc 2021-07-16 stsp 	    getprogname());
 9346 0ebf8283 2019-07-24 stsp 	exit(1);
 9347 0ebf8283 2019-07-24 stsp }
 9348 0ebf8283 2019-07-24 stsp 
 9349 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
 9350 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
 9351 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
 9352 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
 9353 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
 9354 0ebf8283 2019-07-24 stsp 
 9355 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
 9356 0ebf8283 2019-07-24 stsp 	unsigned char code;
 9357 0ebf8283 2019-07-24 stsp 	const char *name;
 9358 0ebf8283 2019-07-24 stsp 	const char *desc;
 9359 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
 9360 0ebf8283 2019-07-24 stsp 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
 9361 0ebf8283 2019-07-24 stsp 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
 9362 82997472 2020-01-29 stsp 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
 9363 82997472 2020-01-29 stsp 	    "be used" },
 9364 0ebf8283 2019-07-24 stsp 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
 9365 0ebf8283 2019-07-24 stsp 	{ GOT_HISTEDIT_MESG, "mesg",
 9366 0ebf8283 2019-07-24 stsp 	    "single-line log message for commit above (open editor if empty)" },
 9367 0ebf8283 2019-07-24 stsp };
 9368 0ebf8283 2019-07-24 stsp 
 9369 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
 9370 0ebf8283 2019-07-24 stsp 	TAILQ_ENTRY(got_histedit_list_entry) entry;
 9371 0ebf8283 2019-07-24 stsp 	struct got_object_id *commit_id;
 9372 0ebf8283 2019-07-24 stsp 	const struct got_histedit_cmd *cmd;
 9373 0ebf8283 2019-07-24 stsp 	char *logmsg;
 9374 0ebf8283 2019-07-24 stsp };
 9375 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
 9376 0ebf8283 2019-07-24 stsp 
 9377 0ebf8283 2019-07-24 stsp static const struct got_error *
 9378 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
 9379 0ebf8283 2019-07-24 stsp     FILE *f, struct got_repository *repo)
 9380 0ebf8283 2019-07-24 stsp {
 9381 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9382 0ebf8283 2019-07-24 stsp 	char *logmsg = NULL, *id_str = NULL;
 9383 0ebf8283 2019-07-24 stsp 	struct got_commit_object *commit = NULL;
 9384 8138f3e1 2019-08-11 stsp 	int n;
 9385 0ebf8283 2019-07-24 stsp 
 9386 0ebf8283 2019-07-24 stsp 	err = got_object_open_as_commit(&commit, repo, commit_id);
 9387 0ebf8283 2019-07-24 stsp 	if (err)
 9388 0ebf8283 2019-07-24 stsp 		goto done;
 9389 0ebf8283 2019-07-24 stsp 
 9390 0ebf8283 2019-07-24 stsp 	err = get_short_logmsg(&logmsg, 34, commit);
 9391 0ebf8283 2019-07-24 stsp 	if (err)
 9392 0ebf8283 2019-07-24 stsp 		goto done;
 9393 0ebf8283 2019-07-24 stsp 
 9394 0ebf8283 2019-07-24 stsp 	err = got_object_id_str(&id_str, commit_id);
 9395 0ebf8283 2019-07-24 stsp 	if (err)
 9396 0ebf8283 2019-07-24 stsp 		goto done;
 9397 0ebf8283 2019-07-24 stsp 
 9398 0ebf8283 2019-07-24 stsp 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
 9399 0ebf8283 2019-07-24 stsp 	if (n < 0)
 9400 0ebf8283 2019-07-24 stsp 		err = got_ferror(f, GOT_ERR_IO);
 9401 0ebf8283 2019-07-24 stsp done:
 9402 0ebf8283 2019-07-24 stsp 	if (commit)
 9403 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
 9404 0ebf8283 2019-07-24 stsp 	free(id_str);
 9405 0ebf8283 2019-07-24 stsp 	free(logmsg);
 9406 0ebf8283 2019-07-24 stsp 	return err;
 9407 0ebf8283 2019-07-24 stsp }
 9408 0ebf8283 2019-07-24 stsp 
 9409 0ebf8283 2019-07-24 stsp static const struct got_error *
 9410 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
 9411 c50a7455 2021-10-04 thomas     FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
 9412 c50a7455 2021-10-04 thomas     struct got_repository *repo)
 9413 0ebf8283 2019-07-24 stsp {
 9414 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9415 0ebf8283 2019-07-24 stsp 	struct got_object_qid *qid;
 9416 466785b9 2020-12-10 jrick 	const char *histedit_cmd = NULL;
 9417 0ebf8283 2019-07-24 stsp 
 9418 dbdddfee 2021-06-23 naddy 	if (STAILQ_EMPTY(commits))
 9419 0ebf8283 2019-07-24 stsp 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
 9420 0ebf8283 2019-07-24 stsp 
 9421 dbdddfee 2021-06-23 naddy 	STAILQ_FOREACH(qid, commits, entry) {
 9422 466785b9 2020-12-10 jrick 		histedit_cmd = got_histedit_cmds[0].name;
 9423 c50a7455 2021-10-04 thomas 		if (edit_only)
 9424 c50a7455 2021-10-04 thomas 			histedit_cmd = "edit";
 9425 c50a7455 2021-10-04 thomas 		else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
 9426 466785b9 2020-12-10 jrick 			histedit_cmd = "fold";
 9427 466785b9 2020-12-10 jrick 		err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
 9428 0ebf8283 2019-07-24 stsp 		if (err)
 9429 0ebf8283 2019-07-24 stsp 			break;
 9430 083957f4 2020-02-24 stsp 		if (edit_logmsg_only) {
 9431 083957f4 2020-02-24 stsp 			int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
 9432 083957f4 2020-02-24 stsp 			if (n < 0) {
 9433 083957f4 2020-02-24 stsp 				err = got_ferror(f, GOT_ERR_IO);
 9434 083957f4 2020-02-24 stsp 				break;
 9435 083957f4 2020-02-24 stsp 			}
 9436 083957f4 2020-02-24 stsp 		}
 9437 0ebf8283 2019-07-24 stsp 	}
 9438 0ebf8283 2019-07-24 stsp 
 9439 0ebf8283 2019-07-24 stsp 	return err;
 9440 0ebf8283 2019-07-24 stsp }
 9441 0ebf8283 2019-07-24 stsp 
 9442 0ebf8283 2019-07-24 stsp static const struct got_error *
 9443 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
 9444 514f2ffe 2020-01-29 stsp     struct got_object_id_queue *commits)
 9445 0ebf8283 2019-07-24 stsp {
 9446 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9447 6059809a 2020-12-17 stsp 	size_t i;
 9448 6059809a 2020-12-17 stsp 	int n;
 9449 514f2ffe 2020-01-29 stsp 	char *id_str;
 9450 514f2ffe 2020-01-29 stsp 	struct got_object_qid *qid;
 9451 514f2ffe 2020-01-29 stsp 
 9452 dbdddfee 2021-06-23 naddy 	qid = STAILQ_FIRST(commits);
 9453 514f2ffe 2020-01-29 stsp 	err = got_object_id_str(&id_str, qid->id);
 9454 514f2ffe 2020-01-29 stsp 	if (err)
 9455 514f2ffe 2020-01-29 stsp 		return err;
 9456 514f2ffe 2020-01-29 stsp 
 9457 514f2ffe 2020-01-29 stsp 	n = fprintf(f,
 9458 514f2ffe 2020-01-29 stsp 	    "# Editing the history of branch '%s' starting at\n"
 9459 514f2ffe 2020-01-29 stsp 	    "# commit %s\n"
 9460 514f2ffe 2020-01-29 stsp 	    "# Commits will be processed in order from top to "
 9461 514f2ffe 2020-01-29 stsp 	    "bottom of this file.\n", branch_name, id_str);
 9462 514f2ffe 2020-01-29 stsp 	if (n < 0) {
 9463 514f2ffe 2020-01-29 stsp 		err = got_ferror(f, GOT_ERR_IO);
 9464 514f2ffe 2020-01-29 stsp 		goto done;
 9465 514f2ffe 2020-01-29 stsp 	}
 9466 0ebf8283 2019-07-24 stsp 
 9467 0ebf8283 2019-07-24 stsp 	n = fprintf(f, "# Available histedit commands:\n");
 9468 514f2ffe 2020-01-29 stsp 	if (n < 0) {
 9469 514f2ffe 2020-01-29 stsp 		err = got_ferror(f, GOT_ERR_IO);
 9470 514f2ffe 2020-01-29 stsp 		goto done;
 9471 514f2ffe 2020-01-29 stsp 	}
 9472 0ebf8283 2019-07-24 stsp 
 9473 0ebf8283 2019-07-24 stsp 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
 9474 0ebf8283 2019-07-24 stsp 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
 9475 0ebf8283 2019-07-24 stsp 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
 9476 0ebf8283 2019-07-24 stsp 		    cmd->desc);
 9477 0ebf8283 2019-07-24 stsp 		if (n < 0) {
 9478 0ebf8283 2019-07-24 stsp 			err = got_ferror(f, GOT_ERR_IO);
 9479 0ebf8283 2019-07-24 stsp 			break;
 9480 0ebf8283 2019-07-24 stsp 		}
 9481 0ebf8283 2019-07-24 stsp 	}
 9482 514f2ffe 2020-01-29 stsp done:
 9483 514f2ffe 2020-01-29 stsp 	free(id_str);
 9484 0ebf8283 2019-07-24 stsp 	return err;
 9485 0ebf8283 2019-07-24 stsp }
 9486 0ebf8283 2019-07-24 stsp 
 9487 0ebf8283 2019-07-24 stsp static const struct got_error *
 9488 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
 9489 0ebf8283 2019-07-24 stsp {
 9490 0ebf8283 2019-07-24 stsp 	static char msg[42];
 9491 0ebf8283 2019-07-24 stsp 	int ret;
 9492 0ebf8283 2019-07-24 stsp 
 9493 0ebf8283 2019-07-24 stsp 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
 9494 0ebf8283 2019-07-24 stsp 	    lineno);
 9495 0ebf8283 2019-07-24 stsp 	if (ret == -1 || ret >= sizeof(msg))
 9496 0ebf8283 2019-07-24 stsp 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
 9497 0ebf8283 2019-07-24 stsp 
 9498 0ebf8283 2019-07-24 stsp 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
 9499 0ebf8283 2019-07-24 stsp }
 9500 0ebf8283 2019-07-24 stsp 
 9501 0ebf8283 2019-07-24 stsp static const struct got_error *
 9502 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
 9503 0ebf8283 2019-07-24 stsp     char *logmsg, struct got_repository *repo)
 9504 0ebf8283 2019-07-24 stsp {
 9505 0ebf8283 2019-07-24 stsp 	const struct got_error *err;
 9506 0ebf8283 2019-07-24 stsp 	struct got_commit_object *folded_commit = NULL;
 9507 5943eee2 2019-08-13 stsp 	char *id_str, *folded_logmsg = NULL;
 9508 0ebf8283 2019-07-24 stsp 
 9509 0ebf8283 2019-07-24 stsp 	err = got_object_id_str(&id_str, hle->commit_id);
 9510 0ebf8283 2019-07-24 stsp 	if (err)
 9511 0ebf8283 2019-07-24 stsp 		return err;
 9512 0ebf8283 2019-07-24 stsp 
 9513 0ebf8283 2019-07-24 stsp 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
 9514 0ebf8283 2019-07-24 stsp 	if (err)
 9515 0ebf8283 2019-07-24 stsp 		goto done;
 9516 0ebf8283 2019-07-24 stsp 
 9517 5943eee2 2019-08-13 stsp 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
 9518 5943eee2 2019-08-13 stsp 	if (err)
 9519 5943eee2 2019-08-13 stsp 		goto done;
 9520 0ebf8283 2019-07-24 stsp 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
 9521 0ebf8283 2019-07-24 stsp 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
 9522 5943eee2 2019-08-13 stsp 	    folded_logmsg) == -1) {
 9523 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("asprintf");
 9524 0ebf8283 2019-07-24 stsp 	}
 9525 0ebf8283 2019-07-24 stsp done:
 9526 0ebf8283 2019-07-24 stsp 	if (folded_commit)
 9527 0ebf8283 2019-07-24 stsp 		got_object_commit_close(folded_commit);
 9528 0ebf8283 2019-07-24 stsp 	free(id_str);
 9529 5943eee2 2019-08-13 stsp 	free(folded_logmsg);
 9530 0ebf8283 2019-07-24 stsp 	return err;
 9531 0ebf8283 2019-07-24 stsp }
 9532 0ebf8283 2019-07-24 stsp 
 9533 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
 9534 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
 9535 0ebf8283 2019-07-24 stsp {
 9536 0ebf8283 2019-07-24 stsp 	struct got_histedit_list_entry *prev, *folded = NULL;
 9537 0ebf8283 2019-07-24 stsp 
 9538 0ebf8283 2019-07-24 stsp 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
 9539 3f9de99f 2019-07-24 stsp 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
 9540 3f9de99f 2019-07-24 stsp 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
 9541 3f9de99f 2019-07-24 stsp 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
 9542 3f9de99f 2019-07-24 stsp 			folded = prev;
 9543 0ebf8283 2019-07-24 stsp 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
 9544 0ebf8283 2019-07-24 stsp 	}
 9545 0ebf8283 2019-07-24 stsp 
 9546 0ebf8283 2019-07-24 stsp 	return folded;
 9547 0ebf8283 2019-07-24 stsp }
 9548 0ebf8283 2019-07-24 stsp 
 9549 0ebf8283 2019-07-24 stsp static const struct got_error *
 9550 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
 9551 0ebf8283 2019-07-24 stsp     struct got_repository *repo)
 9552 0ebf8283 2019-07-24 stsp {
 9553 5943eee2 2019-08-13 stsp 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
 9554 0ebf8283 2019-07-24 stsp 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
 9555 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9556 0ebf8283 2019-07-24 stsp 	struct got_commit_object *commit = NULL;
 9557 1601cb9f 2020-09-11 naddy 	int logmsg_len;
 9558 0ebf8283 2019-07-24 stsp 	int fd;
 9559 0ebf8283 2019-07-24 stsp 	struct got_histedit_list_entry *folded = NULL;
 9560 0ebf8283 2019-07-24 stsp 
 9561 0ebf8283 2019-07-24 stsp 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
 9562 0ebf8283 2019-07-24 stsp 	if (err)
 9563 0ebf8283 2019-07-24 stsp 		return err;
 9564 0ebf8283 2019-07-24 stsp 
 9565 0ebf8283 2019-07-24 stsp 	folded = get_folded_commits(hle);
 9566 0ebf8283 2019-07-24 stsp 	if (folded) {
 9567 0ebf8283 2019-07-24 stsp 		while (folded != hle) {
 9568 3f9de99f 2019-07-24 stsp 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
 9569 3f9de99f 2019-07-24 stsp 				folded = TAILQ_NEXT(folded, entry);
 9570 3f9de99f 2019-07-24 stsp 				continue;
 9571 3f9de99f 2019-07-24 stsp 			}
 9572 0ebf8283 2019-07-24 stsp 			err = append_folded_commit_msg(&new_msg, folded,
 9573 0ebf8283 2019-07-24 stsp 			    logmsg, repo);
 9574 0ebf8283 2019-07-24 stsp 			if (err)
 9575 0ebf8283 2019-07-24 stsp 				goto done;
 9576 0ebf8283 2019-07-24 stsp 			free(logmsg);
 9577 0ebf8283 2019-07-24 stsp 			logmsg = new_msg;
 9578 0ebf8283 2019-07-24 stsp 			folded = TAILQ_NEXT(folded, entry);
 9579 0ebf8283 2019-07-24 stsp 		}
 9580 0ebf8283 2019-07-24 stsp 	}
 9581 0ebf8283 2019-07-24 stsp 
 9582 0ebf8283 2019-07-24 stsp 	err = got_object_id_str(&id_str, hle->commit_id);
 9583 0ebf8283 2019-07-24 stsp 	if (err)
 9584 0ebf8283 2019-07-24 stsp 		goto done;
 9585 5943eee2 2019-08-13 stsp 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
 9586 5943eee2 2019-08-13 stsp 	if (err)
 9587 5943eee2 2019-08-13 stsp 		goto done;
 9588 1601cb9f 2020-09-11 naddy 	logmsg_len = asprintf(&new_msg,
 9589 0ebf8283 2019-07-24 stsp 	    "%s\n# original log message of commit %s: %s",
 9590 1601cb9f 2020-09-11 naddy 	    logmsg ? logmsg : "", id_str, orig_logmsg);
 9591 1601cb9f 2020-09-11 naddy 	if (logmsg_len == -1) {
 9592 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("asprintf");
 9593 0ebf8283 2019-07-24 stsp 		goto done;
 9594 0ebf8283 2019-07-24 stsp 	}
 9595 0ebf8283 2019-07-24 stsp 	free(logmsg);
 9596 0ebf8283 2019-07-24 stsp 	logmsg = new_msg;
 9597 0ebf8283 2019-07-24 stsp 
 9598 0ebf8283 2019-07-24 stsp 	err = got_object_id_str(&id_str, hle->commit_id);
 9599 0ebf8283 2019-07-24 stsp 	if (err)
 9600 0ebf8283 2019-07-24 stsp 		goto done;
 9601 0ebf8283 2019-07-24 stsp 
 9602 bb63914a 2020-02-17 stsp 	err = got_opentemp_named_fd(&logmsg_path, &fd,
 9603 bb63914a 2020-02-17 stsp 	    GOT_TMPDIR_STR "/got-logmsg");
 9604 0ebf8283 2019-07-24 stsp 	if (err)
 9605 0ebf8283 2019-07-24 stsp 		goto done;
 9606 0ebf8283 2019-07-24 stsp 
 9607 1601cb9f 2020-09-11 naddy 	write(fd, logmsg, logmsg_len);
 9608 0ebf8283 2019-07-24 stsp 	close(fd);
 9609 0ebf8283 2019-07-24 stsp 
 9610 0ebf8283 2019-07-24 stsp 	err = get_editor(&editor);
 9611 0ebf8283 2019-07-24 stsp 	if (err)
 9612 0ebf8283 2019-07-24 stsp 		goto done;
 9613 0ebf8283 2019-07-24 stsp 
 9614 bfa12d5e 2020-09-26 stsp 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
 9615 0d5bb276 2020-12-15 stsp 	    logmsg_len, 0);
 9616 0ebf8283 2019-07-24 stsp 	if (err) {
 9617 0ebf8283 2019-07-24 stsp 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
 9618 0ebf8283 2019-07-24 stsp 			goto done;
 9619 71392a05 2020-12-13 stsp 		err = NULL;
 9620 71392a05 2020-12-13 stsp 		hle->logmsg = strdup(new_msg);
 9621 71392a05 2020-12-13 stsp 		if (hle->logmsg == NULL)
 9622 71392a05 2020-12-13 stsp 			err = got_error_from_errno("strdup");
 9623 0ebf8283 2019-07-24 stsp 	}
 9624 0ebf8283 2019-07-24 stsp done:
 9625 0ebf8283 2019-07-24 stsp 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
 9626 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno2("unlink", logmsg_path);
 9627 0ebf8283 2019-07-24 stsp 	free(logmsg_path);
 9628 0ebf8283 2019-07-24 stsp 	free(logmsg);
 9629 5943eee2 2019-08-13 stsp 	free(orig_logmsg);
 9630 0ebf8283 2019-07-24 stsp 	free(editor);
 9631 0ebf8283 2019-07-24 stsp 	if (commit)
 9632 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
 9633 0ebf8283 2019-07-24 stsp 	return err;
 9634 5ef14e63 2019-06-02 stsp }
 9635 0ebf8283 2019-07-24 stsp 
 9636 0ebf8283 2019-07-24 stsp static const struct got_error *
 9637 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
 9638 0ebf8283 2019-07-24 stsp     FILE *f, struct got_repository *repo)
 9639 0ebf8283 2019-07-24 stsp {
 9640 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9641 0ebf8283 2019-07-24 stsp 	char *line = NULL, *p, *end;
 9642 6059809a 2020-12-17 stsp 	size_t i, size;
 9643 0ebf8283 2019-07-24 stsp 	ssize_t len;
 9644 6059809a 2020-12-17 stsp 	int lineno = 0;
 9645 0ebf8283 2019-07-24 stsp 	const struct got_histedit_cmd *cmd;
 9646 0ebf8283 2019-07-24 stsp 	struct got_object_id *commit_id = NULL;
 9647 0ebf8283 2019-07-24 stsp 	struct got_histedit_list_entry *hle = NULL;
 9648 0ebf8283 2019-07-24 stsp 
 9649 0ebf8283 2019-07-24 stsp 	for (;;) {
 9650 0ebf8283 2019-07-24 stsp 		len = getline(&line, &size, f);
 9651 0ebf8283 2019-07-24 stsp 		if (len == -1) {
 9652 0ebf8283 2019-07-24 stsp 			const struct got_error *getline_err;
 9653 0ebf8283 2019-07-24 stsp 			if (feof(f))
 9654 0ebf8283 2019-07-24 stsp 				break;
 9655 0ebf8283 2019-07-24 stsp 			getline_err = got_error_from_errno("getline");
 9656 0ebf8283 2019-07-24 stsp 			err = got_ferror(f, getline_err->code);
 9657 0ebf8283 2019-07-24 stsp 			break;
 9658 0ebf8283 2019-07-24 stsp 		}
 9659 0ebf8283 2019-07-24 stsp 		lineno++;
 9660 0ebf8283 2019-07-24 stsp 		p = line;
 9661 0ebf8283 2019-07-24 stsp 		while (isspace((unsigned char)p[0]))
 9662 0ebf8283 2019-07-24 stsp 			p++;
 9663 0ebf8283 2019-07-24 stsp 		if (p[0] == '#' || p[0] == '\0') {
 9664 0ebf8283 2019-07-24 stsp 			free(line);
 9665 0ebf8283 2019-07-24 stsp 			line = NULL;
 9666 0ebf8283 2019-07-24 stsp 			continue;
 9667 0ebf8283 2019-07-24 stsp 		}
 9668 0ebf8283 2019-07-24 stsp 		cmd = NULL;
 9669 0ebf8283 2019-07-24 stsp 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
 9670 0ebf8283 2019-07-24 stsp 			cmd = &got_histedit_cmds[i];
 9671 0ebf8283 2019-07-24 stsp 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
 9672 0ebf8283 2019-07-24 stsp 			    isspace((unsigned char)p[strlen(cmd->name)])) {
 9673 0ebf8283 2019-07-24 stsp 				p += strlen(cmd->name);
 9674 0ebf8283 2019-07-24 stsp 				break;
 9675 0ebf8283 2019-07-24 stsp 			}
 9676 0ebf8283 2019-07-24 stsp 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
 9677 0ebf8283 2019-07-24 stsp 				p++;
 9678 0ebf8283 2019-07-24 stsp 				break;
 9679 0ebf8283 2019-07-24 stsp 			}
 9680 0ebf8283 2019-07-24 stsp 		}
 9681 6c1844f6 2019-07-25 stsp 		if (i == nitems(got_histedit_cmds)) {
 9682 0ebf8283 2019-07-24 stsp 			err = histedit_syntax_error(lineno);
 9683 0ebf8283 2019-07-24 stsp 			break;
 9684 0ebf8283 2019-07-24 stsp 		}
 9685 0ebf8283 2019-07-24 stsp 		while (isspace((unsigned char)p[0]))
 9686 0ebf8283 2019-07-24 stsp 			p++;
 9687 0ebf8283 2019-07-24 stsp 		if (cmd->code == GOT_HISTEDIT_MESG) {
 9688 0ebf8283 2019-07-24 stsp 			if (hle == NULL || hle->logmsg != NULL) {
 9689 0ebf8283 2019-07-24 stsp 				err = got_error(GOT_ERR_HISTEDIT_CMD);
 9690 0ebf8283 2019-07-24 stsp 				break;
 9691 0ebf8283 2019-07-24 stsp 			}
 9692 0ebf8283 2019-07-24 stsp 			if (p[0] == '\0') {
 9693 0ebf8283 2019-07-24 stsp 				err = histedit_edit_logmsg(hle, repo);
 9694 0ebf8283 2019-07-24 stsp 				if (err)
 9695 0ebf8283 2019-07-24 stsp 					break;
 9696 0ebf8283 2019-07-24 stsp 			} else {
 9697 0ebf8283 2019-07-24 stsp 				hle->logmsg = strdup(p);
 9698 0ebf8283 2019-07-24 stsp 				if (hle->logmsg == NULL) {
 9699 0ebf8283 2019-07-24 stsp 					err = got_error_from_errno("strdup");
 9700 0ebf8283 2019-07-24 stsp 					break;
 9701 0ebf8283 2019-07-24 stsp 				}
 9702 0ebf8283 2019-07-24 stsp 			}
 9703 0ebf8283 2019-07-24 stsp 			free(line);
 9704 0ebf8283 2019-07-24 stsp 			line = NULL;
 9705 0ebf8283 2019-07-24 stsp 			continue;
 9706 0ebf8283 2019-07-24 stsp 		} else {
 9707 0ebf8283 2019-07-24 stsp 			end = p;
 9708 0ebf8283 2019-07-24 stsp 			while (end[0] && !isspace((unsigned char)end[0]))
 9709 0ebf8283 2019-07-24 stsp 				end++;
 9710 0ebf8283 2019-07-24 stsp 			*end = '\0';
 9711 0ebf8283 2019-07-24 stsp 
 9712 0ebf8283 2019-07-24 stsp 			err = got_object_resolve_id_str(&commit_id, repo, p);
 9713 0ebf8283 2019-07-24 stsp 			if (err) {
 9714 0ebf8283 2019-07-24 stsp 				/* override error code */
 9715 0ebf8283 2019-07-24 stsp 				err = histedit_syntax_error(lineno);
 9716 0ebf8283 2019-07-24 stsp 				break;
 9717 0ebf8283 2019-07-24 stsp 			}
 9718 0ebf8283 2019-07-24 stsp 		}
 9719 0ebf8283 2019-07-24 stsp 		hle = malloc(sizeof(*hle));
 9720 0ebf8283 2019-07-24 stsp 		if (hle == NULL) {
 9721 0ebf8283 2019-07-24 stsp 			err = got_error_from_errno("malloc");
 9722 0ebf8283 2019-07-24 stsp 			break;
 9723 0ebf8283 2019-07-24 stsp 		}
 9724 0ebf8283 2019-07-24 stsp 		hle->cmd = cmd;
 9725 0ebf8283 2019-07-24 stsp 		hle->commit_id = commit_id;
 9726 0ebf8283 2019-07-24 stsp 		hle->logmsg = NULL;
 9727 0ebf8283 2019-07-24 stsp 		commit_id = NULL;
 9728 0ebf8283 2019-07-24 stsp 		free(line);
 9729 0ebf8283 2019-07-24 stsp 		line = NULL;
 9730 0ebf8283 2019-07-24 stsp 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
 9731 0ebf8283 2019-07-24 stsp 	}
 9732 0ebf8283 2019-07-24 stsp 
 9733 0ebf8283 2019-07-24 stsp 	free(line);
 9734 0ebf8283 2019-07-24 stsp 	free(commit_id);
 9735 0ebf8283 2019-07-24 stsp 	return err;
 9736 0ebf8283 2019-07-24 stsp }
 9737 0ebf8283 2019-07-24 stsp 
 9738 0ebf8283 2019-07-24 stsp static const struct got_error *
 9739 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
 9740 bfce7f83 2019-07-27 stsp     struct got_object_id_queue *commits, struct got_repository *repo)
 9741 bfce7f83 2019-07-27 stsp {
 9742 bfce7f83 2019-07-27 stsp 	const struct got_error *err = NULL;
 9743 bfce7f83 2019-07-27 stsp 	struct got_object_qid *qid;
 9744 bfce7f83 2019-07-27 stsp 	struct got_histedit_list_entry *hle;
 9745 5b87815e 2020-03-05 stsp 	static char msg[92];
 9746 bfce7f83 2019-07-27 stsp 	char *id_str;
 9747 bfce7f83 2019-07-27 stsp 
 9748 bfce7f83 2019-07-27 stsp 	if (TAILQ_EMPTY(histedit_cmds))
 9749 bfce7f83 2019-07-27 stsp 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
 9750 bfce7f83 2019-07-27 stsp 		    "histedit script contains no commands");
 9751 dbdddfee 2021-06-23 naddy 	if (STAILQ_EMPTY(commits))
 9752 a0de39f3 2019-08-09 stsp 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
 9753 5b87815e 2020-03-05 stsp 
 9754 5b87815e 2020-03-05 stsp 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
 9755 5b87815e 2020-03-05 stsp 		struct got_histedit_list_entry *hle2;
 9756 5b87815e 2020-03-05 stsp 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
 9757 5b87815e 2020-03-05 stsp 			if (hle == hle2)
 9758 5b87815e 2020-03-05 stsp 				continue;
 9759 5b87815e 2020-03-05 stsp 			if (got_object_id_cmp(hle->commit_id,
 9760 5b87815e 2020-03-05 stsp 			    hle2->commit_id) != 0)
 9761 5b87815e 2020-03-05 stsp 				continue;
 9762 5b87815e 2020-03-05 stsp 			err = got_object_id_str(&id_str, hle->commit_id);
 9763 5b87815e 2020-03-05 stsp 			if (err)
 9764 5b87815e 2020-03-05 stsp 				return err;
 9765 5b87815e 2020-03-05 stsp 			snprintf(msg, sizeof(msg), "commit %s is listed "
 9766 5b87815e 2020-03-05 stsp 			    "more than once in histedit script", id_str);
 9767 5b87815e 2020-03-05 stsp 			free(id_str);
 9768 5b87815e 2020-03-05 stsp 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
 9769 5b87815e 2020-03-05 stsp 		}
 9770 5b87815e 2020-03-05 stsp 	}
 9771 bfce7f83 2019-07-27 stsp 
 9772 dbdddfee 2021-06-23 naddy 	STAILQ_FOREACH(qid, commits, entry) {
 9773 bfce7f83 2019-07-27 stsp 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
 9774 bfce7f83 2019-07-27 stsp 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
 9775 bfce7f83 2019-07-27 stsp 				break;
 9776 bfce7f83 2019-07-27 stsp 		}
 9777 bfce7f83 2019-07-27 stsp 		if (hle == NULL) {
 9778 bfce7f83 2019-07-27 stsp 			err = got_object_id_str(&id_str, qid->id);
 9779 bfce7f83 2019-07-27 stsp 			if (err)
 9780 bfce7f83 2019-07-27 stsp 				return err;
 9781 bfce7f83 2019-07-27 stsp 			snprintf(msg, sizeof(msg),
 9782 bfce7f83 2019-07-27 stsp 			    "commit %s missing from histedit script", id_str);
 9783 bfce7f83 2019-07-27 stsp 			free(id_str);
 9784 bfce7f83 2019-07-27 stsp 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
 9785 bfce7f83 2019-07-27 stsp 		}
 9786 bfce7f83 2019-07-27 stsp 	}
 9787 bfce7f83 2019-07-27 stsp 
 9788 0def28b1 2019-08-17 stsp 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
 9789 0def28b1 2019-08-17 stsp 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
 9790 bfce7f83 2019-07-27 stsp 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
 9791 bfce7f83 2019-07-27 stsp 		    "last commit in histedit script cannot be folded");
 9792 bfce7f83 2019-07-27 stsp 
 9793 bfce7f83 2019-07-27 stsp 	return NULL;
 9794 bfce7f83 2019-07-27 stsp }
 9795 bfce7f83 2019-07-27 stsp 
 9796 bfce7f83 2019-07-27 stsp static const struct got_error *
 9797 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
 9798 bfce7f83 2019-07-27 stsp     const char *path, struct got_object_id_queue *commits,
 9799 bfce7f83 2019-07-27 stsp     struct got_repository *repo)
 9800 0ebf8283 2019-07-24 stsp {
 9801 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9802 0ebf8283 2019-07-24 stsp 	char *editor;
 9803 0ebf8283 2019-07-24 stsp 	FILE *f = NULL;
 9804 0ebf8283 2019-07-24 stsp 
 9805 0ebf8283 2019-07-24 stsp 	err = get_editor(&editor);
 9806 0ebf8283 2019-07-24 stsp 	if (err)
 9807 0ebf8283 2019-07-24 stsp 		return err;
 9808 0ebf8283 2019-07-24 stsp 
 9809 0ebf8283 2019-07-24 stsp 	if (spawn_editor(editor, path) == -1) {
 9810 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("failed spawning editor");
 9811 0ebf8283 2019-07-24 stsp 		goto done;
 9812 0ebf8283 2019-07-24 stsp 	}
 9813 0ebf8283 2019-07-24 stsp 
 9814 0ebf8283 2019-07-24 stsp 	f = fopen(path, "r");
 9815 0ebf8283 2019-07-24 stsp 	if (f == NULL) {
 9816 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("fopen");
 9817 0ebf8283 2019-07-24 stsp 		goto done;
 9818 0ebf8283 2019-07-24 stsp 	}
 9819 0ebf8283 2019-07-24 stsp 	err = histedit_parse_list(histedit_cmds, f, repo);
 9820 bfce7f83 2019-07-27 stsp 	if (err)
 9821 bfce7f83 2019-07-27 stsp 		goto done;
 9822 bfce7f83 2019-07-27 stsp 
 9823 bfce7f83 2019-07-27 stsp 	err = histedit_check_script(histedit_cmds, commits, repo);
 9824 0ebf8283 2019-07-24 stsp done:
 9825 56b63ca4 2021-01-22 stsp 	if (f && fclose(f) == EOF && err == NULL)
 9826 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("fclose");
 9827 0ebf8283 2019-07-24 stsp 	free(editor);
 9828 0ebf8283 2019-07-24 stsp 	return err;
 9829 0ebf8283 2019-07-24 stsp }
 9830 0ebf8283 2019-07-24 stsp 
 9831 0ebf8283 2019-07-24 stsp static const struct got_error *
 9832 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
 9833 514f2ffe 2020-01-29 stsp     struct got_object_id_queue *, const char *, const char *,
 9834 514f2ffe 2020-01-29 stsp     struct got_repository *);
 9835 0ebf8283 2019-07-24 stsp 
 9836 0ebf8283 2019-07-24 stsp static const struct got_error *
 9837 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
 9838 514f2ffe 2020-01-29 stsp     struct got_object_id_queue *commits, const char *branch_name,
 9839 c50a7455 2021-10-04 thomas     int edit_logmsg_only, int fold_only, int edit_only,
 9840 c50a7455 2021-10-04 thomas     struct got_repository *repo)
 9841 0ebf8283 2019-07-24 stsp {
 9842 0ebf8283 2019-07-24 stsp 	const struct got_error *err;
 9843 0ebf8283 2019-07-24 stsp 	FILE *f = NULL;
 9844 0ebf8283 2019-07-24 stsp 	char *path = NULL;
 9845 0ebf8283 2019-07-24 stsp 
 9846 0ebf8283 2019-07-24 stsp 	err = got_opentemp_named(&path, &f, "got-histedit");
 9847 0ebf8283 2019-07-24 stsp 	if (err)
 9848 0ebf8283 2019-07-24 stsp 		return err;
 9849 0ebf8283 2019-07-24 stsp 
 9850 514f2ffe 2020-01-29 stsp 	err = write_cmd_list(f, branch_name, commits);
 9851 0ebf8283 2019-07-24 stsp 	if (err)
 9852 0ebf8283 2019-07-24 stsp 		goto done;
 9853 0ebf8283 2019-07-24 stsp 
 9854 466785b9 2020-12-10 jrick 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
 9855 c50a7455 2021-10-04 thomas 	    fold_only, edit_only, repo);
 9856 0ebf8283 2019-07-24 stsp 	if (err)
 9857 0ebf8283 2019-07-24 stsp 		goto done;
 9858 0ebf8283 2019-07-24 stsp 
 9859 c50a7455 2021-10-04 thomas 	if (edit_logmsg_only || fold_only || edit_only) {
 9860 083957f4 2020-02-24 stsp 		rewind(f);
 9861 083957f4 2020-02-24 stsp 		err = histedit_parse_list(histedit_cmds, f, repo);
 9862 083957f4 2020-02-24 stsp 	} else {
 9863 56b63ca4 2021-01-22 stsp 		if (fclose(f) == EOF) {
 9864 083957f4 2020-02-24 stsp 			err = got_error_from_errno("fclose");
 9865 0ebf8283 2019-07-24 stsp 			goto done;
 9866 083957f4 2020-02-24 stsp 		}
 9867 083957f4 2020-02-24 stsp 		f = NULL;
 9868 083957f4 2020-02-24 stsp 		err = histedit_run_editor(histedit_cmds, path, commits, repo);
 9869 083957f4 2020-02-24 stsp 		if (err) {
 9870 083957f4 2020-02-24 stsp 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
 9871 083957f4 2020-02-24 stsp 			    err->code != GOT_ERR_HISTEDIT_CMD)
 9872 083957f4 2020-02-24 stsp 				goto done;
 9873 083957f4 2020-02-24 stsp 			err = histedit_edit_list_retry(histedit_cmds, err,
 9874 083957f4 2020-02-24 stsp 			    commits, path, branch_name, repo);
 9875 083957f4 2020-02-24 stsp 		}
 9876 0ebf8283 2019-07-24 stsp 	}
 9877 0ebf8283 2019-07-24 stsp done:
 9878 56b63ca4 2021-01-22 stsp 	if (f && fclose(f) == EOF && err == NULL)
 9879 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("fclose");
 9880 0ebf8283 2019-07-24 stsp 	if (path && unlink(path) != 0 && err == NULL)
 9881 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno2("unlink", path);
 9882 0ebf8283 2019-07-24 stsp 	free(path);
 9883 0ebf8283 2019-07-24 stsp 	return err;
 9884 0ebf8283 2019-07-24 stsp }
 9885 0ebf8283 2019-07-24 stsp 
 9886 0ebf8283 2019-07-24 stsp static const struct got_error *
 9887 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
 9888 0ebf8283 2019-07-24 stsp     struct got_worktree *worktree, struct got_repository *repo)
 9889 0ebf8283 2019-07-24 stsp {
 9890 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9891 0ebf8283 2019-07-24 stsp 	char *path = NULL;
 9892 0ebf8283 2019-07-24 stsp 	FILE *f = NULL;
 9893 0ebf8283 2019-07-24 stsp 	struct got_histedit_list_entry *hle;
 9894 0ebf8283 2019-07-24 stsp 	struct got_commit_object *commit = NULL;
 9895 0ebf8283 2019-07-24 stsp 
 9896 c3022ba5 2019-07-27 stsp 	err = got_worktree_get_histedit_script_path(&path, worktree);
 9897 0ebf8283 2019-07-24 stsp 	if (err)
 9898 0ebf8283 2019-07-24 stsp 		return err;
 9899 0ebf8283 2019-07-24 stsp 
 9900 0ebf8283 2019-07-24 stsp 	f = fopen(path, "w");
 9901 0ebf8283 2019-07-24 stsp 	if (f == NULL) {
 9902 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno2("fopen", path);
 9903 0ebf8283 2019-07-24 stsp 		goto done;
 9904 0ebf8283 2019-07-24 stsp 	}
 9905 0ebf8283 2019-07-24 stsp 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
 9906 0ebf8283 2019-07-24 stsp 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
 9907 0ebf8283 2019-07-24 stsp 		    repo);
 9908 0ebf8283 2019-07-24 stsp 		if (err)
 9909 0ebf8283 2019-07-24 stsp 			break;
 9910 0ebf8283 2019-07-24 stsp 
 9911 0ebf8283 2019-07-24 stsp 		if (hle->logmsg) {
 9912 0ebf8283 2019-07-24 stsp 			int n = fprintf(f, "%c %s\n",
 9913 0ebf8283 2019-07-24 stsp 			    GOT_HISTEDIT_MESG, hle->logmsg);
 9914 0ebf8283 2019-07-24 stsp 			if (n < 0) {
 9915 0ebf8283 2019-07-24 stsp 				err = got_ferror(f, GOT_ERR_IO);
 9916 0ebf8283 2019-07-24 stsp 				break;
 9917 0ebf8283 2019-07-24 stsp 			}
 9918 0ebf8283 2019-07-24 stsp 		}
 9919 0ebf8283 2019-07-24 stsp 	}
 9920 0ebf8283 2019-07-24 stsp done:
 9921 56b63ca4 2021-01-22 stsp 	if (f && fclose(f) == EOF && err == NULL)
 9922 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("fclose");
 9923 0ebf8283 2019-07-24 stsp 	free(path);
 9924 0ebf8283 2019-07-24 stsp 	if (commit)
 9925 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
 9926 0ebf8283 2019-07-24 stsp 	return err;
 9927 0ebf8283 2019-07-24 stsp }
 9928 0ebf8283 2019-07-24 stsp 
 9929 bfce7f83 2019-07-27 stsp void
 9930 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
 9931 bfce7f83 2019-07-27 stsp {
 9932 bfce7f83 2019-07-27 stsp 	struct got_histedit_list_entry *hle;
 9933 bfce7f83 2019-07-27 stsp 
 9934 bfce7f83 2019-07-27 stsp 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
 9935 bfce7f83 2019-07-27 stsp 		TAILQ_REMOVE(histedit_cmds, hle, entry);
 9936 bfce7f83 2019-07-27 stsp 		free(hle);
 9937 bfce7f83 2019-07-27 stsp 	}
 9938 bfce7f83 2019-07-27 stsp }
 9939 bfce7f83 2019-07-27 stsp 
 9940 0ebf8283 2019-07-24 stsp static const struct got_error *
 9941 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
 9942 0ebf8283 2019-07-24 stsp     const char *path, struct got_repository *repo)
 9943 0ebf8283 2019-07-24 stsp {
 9944 0ebf8283 2019-07-24 stsp 	const struct got_error *err = NULL;
 9945 0ebf8283 2019-07-24 stsp 	FILE *f = NULL;
 9946 0ebf8283 2019-07-24 stsp 
 9947 0ebf8283 2019-07-24 stsp 	f = fopen(path, "r");
 9948 0ebf8283 2019-07-24 stsp 	if (f == NULL) {
 9949 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno2("fopen", path);
 9950 0ebf8283 2019-07-24 stsp 		goto done;
 9951 0ebf8283 2019-07-24 stsp 	}
 9952 0ebf8283 2019-07-24 stsp 
 9953 0ebf8283 2019-07-24 stsp 	err = histedit_parse_list(histedit_cmds, f, repo);
 9954 0ebf8283 2019-07-24 stsp done:
 9955 56b63ca4 2021-01-22 stsp 	if (f && fclose(f) == EOF && err == NULL)
 9956 0ebf8283 2019-07-24 stsp 		err = got_error_from_errno("fclose");
 9957 0ebf8283 2019-07-24 stsp 	return err;
 9958 0ebf8283 2019-07-24 stsp }
 9959 0ebf8283 2019-07-24 stsp 
 9960 0ebf8283 2019-07-24 stsp static const struct got_error *
 9961 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
 9962 bfce7f83 2019-07-27 stsp     const struct got_error *edit_err, struct got_object_id_queue *commits,
 9963 514f2ffe 2020-01-29 stsp     const char *path, const char *branch_name, struct got_repository *repo)
 9964 0ebf8283 2019-07-24 stsp {
 9965 bfce7f83 2019-07-27 stsp 	const struct got_error *err = NULL, *prev_err = edit_err;
 9966 0ebf8283 2019-07-24 stsp 	int resp = ' ';
 9967 0ebf8283 2019-07-24 stsp 
 9968 b006047e 2019-07-25 stsp 	while (resp != 'c' && resp != 'r' && resp != 'a') {
 9969 0ebf8283 2019-07-24 stsp 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
 9970 bfce7f83 2019-07-27 stsp 		    "or (a)bort: ", getprogname(), prev_err->msg);
 9971 0ebf8283 2019-07-24 stsp 		resp = getchar();
 9972 a61a4414 2019-08-07 stsp 		if (resp == '\n')
 9973 a61a4414 2019-08-07 stsp 			resp = getchar();
 9974 426ebf2e 2019-07-25 stsp 		if (resp == 'c') {
 9975 bfce7f83 2019-07-27 stsp 			histedit_free_list(histedit_cmds);
 9976 bfce7f83 2019-07-27 stsp 			err = histedit_run_editor(histedit_cmds, path, commits,
 9977 bfce7f83 2019-07-27 stsp 			    repo);
 9978 426ebf2e 2019-07-25 stsp 			if (err) {
 9979 bfce7f83 2019-07-27 stsp 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
 9980 bfce7f83 2019-07-27 stsp 				    err->code != GOT_ERR_HISTEDIT_CMD)
 9981 426ebf2e 2019-07-25 stsp 					break;
 9982 bfce7f83 2019-07-27 stsp 				prev_err = err;
 9983 426ebf2e 2019-07-25 stsp 				resp = ' ';
 9984 426ebf2e 2019-07-25 stsp 				continue;
 9985 426ebf2e 2019-07-25 stsp 			}
 9986 bfce7f83 2019-07-27 stsp 			break;
 9987 426ebf2e 2019-07-25 stsp 		} else if (resp == 'r') {
 9988 bfce7f83 2019-07-27 stsp 			histedit_free_list(histedit_cmds);
 9989 0ebf8283 2019-07-24 stsp 			err = histedit_edit_script(histedit_cmds,
 9990 c50a7455 2021-10-04 thomas 			    commits, branch_name, 0, 0, 0, repo);
 9991 426ebf2e 2019-07-25 stsp 			if (err) {
 9992 bfce7f83 2019-07-27 stsp 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
 9993 bfce7f83 2019-07-27 stsp 				    err->code != GOT_ERR_HISTEDIT_CMD)
 9994 426ebf2e 2019-07-25 stsp 					break;
 9995 bfce7f83 2019-07-27 stsp 				prev_err = err;
 9996 426ebf2e 2019-07-25 stsp 				resp = ' ';
 9997 426ebf2e 2019-07-25 stsp 				continue;
 9998 426ebf2e 2019-07-25 stsp 			}
 9999 bfce7f83 2019-07-27 stsp 			break;
10000 426ebf2e 2019-07-25 stsp 		} else if (resp == 'a') {
10001 0ebf8283 2019-07-24 stsp 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10002 0ebf8283 2019-07-24 stsp 			break;
10003 426ebf2e 2019-07-25 stsp 		} else
10004 0ebf8283 2019-07-24 stsp 			printf("invalid response '%c'\n", resp);
10005 0ebf8283 2019-07-24 stsp 	}
10006 0ebf8283 2019-07-24 stsp 
10007 0ebf8283 2019-07-24 stsp 	return err;
10008 0ebf8283 2019-07-24 stsp }
10009 0ebf8283 2019-07-24 stsp 
10010 0ebf8283 2019-07-24 stsp static const struct got_error *
10011 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
10012 3e3a69f1 2019-07-25 stsp     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10013 3e3a69f1 2019-07-25 stsp     struct got_reference *branch, struct got_repository *repo)
10014 0ebf8283 2019-07-24 stsp {
10015 0ebf8283 2019-07-24 stsp 	printf("Switching work tree to %s\n",
10016 0ebf8283 2019-07-24 stsp 	    got_ref_get_symref_target(branch));
10017 3e3a69f1 2019-07-25 stsp 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10018 3e3a69f1 2019-07-25 stsp 	    branch, repo);
10019 0ebf8283 2019-07-24 stsp }
10020 0ebf8283 2019-07-24 stsp 
10021 0ebf8283 2019-07-24 stsp static const struct got_error *
10022 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
10023 0ebf8283 2019-07-24 stsp     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10024 0ebf8283 2019-07-24 stsp {
10025 0ebf8283 2019-07-24 stsp 	const struct got_error *err;
10026 0ebf8283 2019-07-24 stsp 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10027 0ebf8283 2019-07-24 stsp 
10028 0ebf8283 2019-07-24 stsp 	err = got_object_id_str(&old_id_str, hle->commit_id);
10029 0ebf8283 2019-07-24 stsp 	if (err)
10030 0ebf8283 2019-07-24 stsp 		goto done;
10031 0ebf8283 2019-07-24 stsp 
10032 0ebf8283 2019-07-24 stsp 	if (new_id) {
10033 0ebf8283 2019-07-24 stsp 		err = got_object_id_str(&new_id_str, new_id);
10034 0ebf8283 2019-07-24 stsp 		if (err)
10035 0ebf8283 2019-07-24 stsp 			goto done;
10036 0ebf8283 2019-07-24 stsp 	}
10037 0ebf8283 2019-07-24 stsp 
10038 0ebf8283 2019-07-24 stsp 	old_id_str[12] = '\0';
10039 0ebf8283 2019-07-24 stsp 	if (new_id_str)
10040 0ebf8283 2019-07-24 stsp 		new_id_str[12] = '\0';
10041 0ebf8283 2019-07-24 stsp 
10042 0ebf8283 2019-07-24 stsp 	if (hle->logmsg) {
10043 0ebf8283 2019-07-24 stsp 		logmsg = strdup(hle->logmsg);
10044 0ebf8283 2019-07-24 stsp 		if (logmsg == NULL) {
10045 0ebf8283 2019-07-24 stsp 			err = got_error_from_errno("strdup");
10046 0ebf8283 2019-07-24 stsp 			goto done;
10047 0ebf8283 2019-07-24 stsp 		}
10048 0ebf8283 2019-07-24 stsp 		trim_logmsg(logmsg, 42);
10049 0ebf8283 2019-07-24 stsp 	} else {
10050 0ebf8283 2019-07-24 stsp 		err = get_short_logmsg(&logmsg, 42, commit);
10051 0ebf8283 2019-07-24 stsp 		if (err)
10052 0ebf8283 2019-07-24 stsp 			goto done;
10053 0ebf8283 2019-07-24 stsp 	}
10054 0ebf8283 2019-07-24 stsp 
10055 0ebf8283 2019-07-24 stsp 	switch (hle->cmd->code) {
10056 0ebf8283 2019-07-24 stsp 	case GOT_HISTEDIT_PICK:
10057 0ebf8283 2019-07-24 stsp 	case GOT_HISTEDIT_EDIT:
10058 0ebf8283 2019-07-24 stsp 		printf("%s -> %s: %s\n", old_id_str,
10059 0ebf8283 2019-07-24 stsp 		    new_id_str ? new_id_str : "no-op change", logmsg);
10060 0ebf8283 2019-07-24 stsp 		break;
10061 0ebf8283 2019-07-24 stsp 	case GOT_HISTEDIT_DROP:
10062 0ebf8283 2019-07-24 stsp 	case GOT_HISTEDIT_FOLD:
10063 0ebf8283 2019-07-24 stsp 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
10064 0ebf8283 2019-07-24 stsp 		    logmsg);
10065 0ebf8283 2019-07-24 stsp 		break;
10066 0ebf8283 2019-07-24 stsp 	default:
10067 0ebf8283 2019-07-24 stsp 		break;
10068 0ebf8283 2019-07-24 stsp 	}
10069 0ebf8283 2019-07-24 stsp done:
10070 0ebf8283 2019-07-24 stsp 	free(old_id_str);
10071 0ebf8283 2019-07-24 stsp 	free(new_id_str);
10072 0ebf8283 2019-07-24 stsp 	return err;
10073 0ebf8283 2019-07-24 stsp }
10074 0ebf8283 2019-07-24 stsp 
10075 0ebf8283 2019-07-24 stsp static const struct got_error *
10076 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
10077 3e3a69f1 2019-07-25 stsp     struct got_worktree *worktree, struct got_fileindex *fileindex,
10078 3e3a69f1 2019-07-25 stsp     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10079 3e3a69f1 2019-07-25 stsp     struct got_repository *repo)
10080 0ebf8283 2019-07-24 stsp {
10081 0ebf8283 2019-07-24 stsp 	const struct got_error *err;
10082 0ebf8283 2019-07-24 stsp 	struct got_commit_object *commit;
10083 0ebf8283 2019-07-24 stsp 	struct got_object_id *new_commit_id;
10084 0ebf8283 2019-07-24 stsp 
10085 0ebf8283 2019-07-24 stsp 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10086 0ebf8283 2019-07-24 stsp 	    && hle->logmsg == NULL) {
10087 0ebf8283 2019-07-24 stsp 		err = histedit_edit_logmsg(hle, repo);
10088 0ebf8283 2019-07-24 stsp 		if (err)
10089 0ebf8283 2019-07-24 stsp 			return err;
10090 0ebf8283 2019-07-24 stsp 	}
10091 0ebf8283 2019-07-24 stsp 
10092 0ebf8283 2019-07-24 stsp 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10093 0ebf8283 2019-07-24 stsp 	if (err)
10094 0ebf8283 2019-07-24 stsp 		return err;
10095 0ebf8283 2019-07-24 stsp 
10096 0ebf8283 2019-07-24 stsp 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10097 3e3a69f1 2019-07-25 stsp 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
10098 3e3a69f1 2019-07-25 stsp 	    hle->logmsg, repo);
10099 0ebf8283 2019-07-24 stsp 	if (err) {
10100 0ebf8283 2019-07-24 stsp 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10101 0ebf8283 2019-07-24 stsp 			goto done;
10102 0ebf8283 2019-07-24 stsp 		err = show_histedit_progress(commit, hle, NULL);
10103 0ebf8283 2019-07-24 stsp 	} else {
10104 0ebf8283 2019-07-24 stsp 		err = show_histedit_progress(commit, hle, new_commit_id);
10105 0ebf8283 2019-07-24 stsp 		free(new_commit_id);
10106 0ebf8283 2019-07-24 stsp 	}
10107 0ebf8283 2019-07-24 stsp done:
10108 0ebf8283 2019-07-24 stsp 	got_object_commit_close(commit);
10109 0ebf8283 2019-07-24 stsp 	return err;
10110 0ebf8283 2019-07-24 stsp }
10111 0ebf8283 2019-07-24 stsp 
10112 0ebf8283 2019-07-24 stsp static const struct got_error *
10113 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
10114 0ebf8283 2019-07-24 stsp     struct got_worktree *worktree, struct got_repository *repo)
10115 0ebf8283 2019-07-24 stsp {
10116 0ebf8283 2019-07-24 stsp 	const struct got_error *error;
10117 0ebf8283 2019-07-24 stsp 	struct got_commit_object *commit;
10118 0ebf8283 2019-07-24 stsp 
10119 0ebf8283 2019-07-24 stsp 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10120 0ebf8283 2019-07-24 stsp 	    repo);
10121 0ebf8283 2019-07-24 stsp 	if (error)
10122 0ebf8283 2019-07-24 stsp 		return error;
10123 0ebf8283 2019-07-24 stsp 
10124 0ebf8283 2019-07-24 stsp 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10125 0ebf8283 2019-07-24 stsp 	if (error)
10126 0ebf8283 2019-07-24 stsp 		return error;
10127 0ebf8283 2019-07-24 stsp 
10128 0ebf8283 2019-07-24 stsp 	error = show_histedit_progress(commit, hle, NULL);
10129 0ebf8283 2019-07-24 stsp 	got_object_commit_close(commit);
10130 0ebf8283 2019-07-24 stsp 	return error;
10131 ab20a43a 2020-01-29 stsp }
10132 ab20a43a 2020-01-29 stsp 
10133 ab20a43a 2020-01-29 stsp static const struct got_error *
10134 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
10135 ab20a43a 2020-01-29 stsp     unsigned char staged_status, const char *path,
10136 ab20a43a 2020-01-29 stsp     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10137 ab20a43a 2020-01-29 stsp     struct got_object_id *commit_id, int dirfd, const char *de_name)
10138 ab20a43a 2020-01-29 stsp {
10139 ab20a43a 2020-01-29 stsp 	int *have_local_changes = arg;
10140 ab20a43a 2020-01-29 stsp 
10141 ab20a43a 2020-01-29 stsp 	switch (status) {
10142 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_ADD:
10143 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_DELETE:
10144 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_MODIFY:
10145 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_CONFLICT:
10146 ab20a43a 2020-01-29 stsp 		*have_local_changes = 1;
10147 ab20a43a 2020-01-29 stsp 		return got_error(GOT_ERR_CANCELLED);
10148 ab20a43a 2020-01-29 stsp 	default:
10149 ab20a43a 2020-01-29 stsp 		break;
10150 ab20a43a 2020-01-29 stsp 	}
10151 ab20a43a 2020-01-29 stsp 
10152 ab20a43a 2020-01-29 stsp 	switch (staged_status) {
10153 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_ADD:
10154 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_DELETE:
10155 ab20a43a 2020-01-29 stsp 	case GOT_STATUS_MODIFY:
10156 ab20a43a 2020-01-29 stsp 		*have_local_changes = 1;
10157 ab20a43a 2020-01-29 stsp 		return got_error(GOT_ERR_CANCELLED);
10158 ab20a43a 2020-01-29 stsp 	default:
10159 ab20a43a 2020-01-29 stsp 		break;
10160 ab20a43a 2020-01-29 stsp 	}
10161 ab20a43a 2020-01-29 stsp 
10162 ab20a43a 2020-01-29 stsp 	return NULL;
10163 0ebf8283 2019-07-24 stsp }
10164 0ebf8283 2019-07-24 stsp 
10165 0ebf8283 2019-07-24 stsp static const struct got_error *
10166 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
10167 0ebf8283 2019-07-24 stsp {
10168 0ebf8283 2019-07-24 stsp 	const struct got_error *error = NULL;
10169 0ebf8283 2019-07-24 stsp 	struct got_worktree *worktree = NULL;
10170 3e3a69f1 2019-07-25 stsp 	struct got_fileindex *fileindex = NULL;
10171 0ebf8283 2019-07-24 stsp 	struct got_repository *repo = NULL;
10172 0ebf8283 2019-07-24 stsp 	char *cwd = NULL;
10173 0ebf8283 2019-07-24 stsp 	struct got_reference *branch = NULL;
10174 0ebf8283 2019-07-24 stsp 	struct got_reference *tmp_branch = NULL;
10175 0ebf8283 2019-07-24 stsp 	struct got_object_id *resume_commit_id = NULL;
10176 0ebf8283 2019-07-24 stsp 	struct got_object_id *base_commit_id = NULL;
10177 0ebf8283 2019-07-24 stsp 	struct got_object_id *head_commit_id = NULL;
10178 0ebf8283 2019-07-24 stsp 	struct got_commit_object *commit = NULL;
10179 10604dce 2021-09-24 thomas 	int ch, rebase_in_progress = 0, merge_in_progress = 0;
10180 9627c110 2020-04-18 stsp 	struct got_update_progress_arg upa;
10181 0ebf8283 2019-07-24 stsp 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10182 c50a7455 2021-10-04 thomas 	int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10183 643b85bc 2021-07-16 stsp 	int list_backups = 0, delete_backups = 0;
10184 0ebf8283 2019-07-24 stsp 	const char *edit_script_path = NULL;
10185 0ebf8283 2019-07-24 stsp 	struct got_object_id_queue commits;
10186 0ebf8283 2019-07-24 stsp 	struct got_pathlist_head merged_paths;
10187 0ebf8283 2019-07-24 stsp 	const struct got_object_id_queue *parent_ids;
10188 0ebf8283 2019-07-24 stsp 	struct got_object_qid *pid;
10189 0ebf8283 2019-07-24 stsp 	struct got_histedit_list histedit_cmds;
10190 0ebf8283 2019-07-24 stsp 	struct got_histedit_list_entry *hle;
10191 0ebf8283 2019-07-24 stsp 
10192 dbdddfee 2021-06-23 naddy 	STAILQ_INIT(&commits);
10193 0ebf8283 2019-07-24 stsp 	TAILQ_INIT(&histedit_cmds);
10194 0ebf8283 2019-07-24 stsp 	TAILQ_INIT(&merged_paths);
10195 9627c110 2020-04-18 stsp 	memset(&upa, 0, sizeof(upa));
10196 0ebf8283 2019-07-24 stsp 
10197 c50a7455 2021-10-04 thomas 	while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10198 0ebf8283 2019-07-24 stsp 		switch (ch) {
10199 0ebf8283 2019-07-24 stsp 		case 'a':
10200 0ebf8283 2019-07-24 stsp 			abort_edit = 1;
10201 0ebf8283 2019-07-24 stsp 			break;
10202 0ebf8283 2019-07-24 stsp 		case 'c':
10203 0ebf8283 2019-07-24 stsp 			continue_edit = 1;
10204 0ebf8283 2019-07-24 stsp 			break;
10205 c50a7455 2021-10-04 thomas 		case 'e':
10206 c50a7455 2021-10-04 thomas 			edit_only = 1;
10207 c50a7455 2021-10-04 thomas 			break;
10208 466785b9 2020-12-10 jrick 		case 'f':
10209 466785b9 2020-12-10 jrick 			fold_only = 1;
10210 466785b9 2020-12-10 jrick 			break;
10211 0ebf8283 2019-07-24 stsp 		case 'F':
10212 0ebf8283 2019-07-24 stsp 			edit_script_path = optarg;
10213 0ebf8283 2019-07-24 stsp 			break;
10214 083957f4 2020-02-24 stsp 		case 'm':
10215 083957f4 2020-02-24 stsp 			edit_logmsg_only = 1;
10216 083957f4 2020-02-24 stsp 			break;
10217 e600f124 2021-03-21 stsp 		case 'l':
10218 e600f124 2021-03-21 stsp 			list_backups = 1;
10219 e600f124 2021-03-21 stsp 			break;
10220 643b85bc 2021-07-16 stsp 		case 'X':
10221 643b85bc 2021-07-16 stsp 			delete_backups = 1;
10222 643b85bc 2021-07-16 stsp 			break;
10223 0ebf8283 2019-07-24 stsp 		default:
10224 0ebf8283 2019-07-24 stsp 			usage_histedit();
10225 0ebf8283 2019-07-24 stsp 			/* NOTREACHED */
10226 0ebf8283 2019-07-24 stsp 		}
10227 0ebf8283 2019-07-24 stsp 	}
10228 0ebf8283 2019-07-24 stsp 
10229 0ebf8283 2019-07-24 stsp 	argc -= optind;
10230 0ebf8283 2019-07-24 stsp 	argv += optind;
10231 0ebf8283 2019-07-24 stsp 
10232 0ebf8283 2019-07-24 stsp #ifndef PROFILE
10233 0ebf8283 2019-07-24 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10234 0ebf8283 2019-07-24 stsp 	    "unveil", NULL) == -1)
10235 0ebf8283 2019-07-24 stsp 		err(1, "pledge");
10236 0ebf8283 2019-07-24 stsp #endif
10237 0ebf8283 2019-07-24 stsp 	if (abort_edit && continue_edit)
10238 ff69268e 2020-12-13 stsp 		option_conflict('a', 'c');
10239 083957f4 2020-02-24 stsp 	if (edit_script_path && edit_logmsg_only)
10240 ff69268e 2020-12-13 stsp 		option_conflict('F', 'm');
10241 083957f4 2020-02-24 stsp 	if (abort_edit && edit_logmsg_only)
10242 ff69268e 2020-12-13 stsp 		option_conflict('a', 'm');
10243 083957f4 2020-02-24 stsp 	if (continue_edit && edit_logmsg_only)
10244 ff69268e 2020-12-13 stsp 		option_conflict('c', 'm');
10245 466785b9 2020-12-10 jrick 	if (abort_edit && fold_only)
10246 ff69268e 2020-12-13 stsp 		option_conflict('a', 'f');
10247 ff69268e 2020-12-13 stsp 	if (continue_edit && fold_only)
10248 ff69268e 2020-12-13 stsp 		option_conflict('c', 'f');
10249 466785b9 2020-12-10 jrick 	if (fold_only && edit_logmsg_only)
10250 ff69268e 2020-12-13 stsp 		option_conflict('f', 'm');
10251 b3805337 2020-12-13 stsp 	if (edit_script_path && fold_only)
10252 b3805337 2020-12-13 stsp 		option_conflict('F', 'f');
10253 c50a7455 2021-10-04 thomas 	if (abort_edit && edit_only)
10254 c50a7455 2021-10-04 thomas 		option_conflict('a', 'e');
10255 c50a7455 2021-10-04 thomas 	if (continue_edit && edit_only)
10256 c50a7455 2021-10-04 thomas 		option_conflict('c', 'e');
10257 c50a7455 2021-10-04 thomas 	if (edit_only && edit_logmsg_only)
10258 c50a7455 2021-10-04 thomas 		option_conflict('e', 'm');
10259 c50a7455 2021-10-04 thomas 	if (edit_script_path && edit_only)
10260 c50a7455 2021-10-04 thomas 		option_conflict('F', 'e');
10261 e600f124 2021-03-21 stsp 	if (list_backups) {
10262 e600f124 2021-03-21 stsp 		if (abort_edit)
10263 e600f124 2021-03-21 stsp 			option_conflict('l', 'a');
10264 e600f124 2021-03-21 stsp 		if (continue_edit)
10265 e600f124 2021-03-21 stsp 			option_conflict('l', 'c');
10266 e600f124 2021-03-21 stsp 		if (edit_script_path)
10267 e600f124 2021-03-21 stsp 			option_conflict('l', 'F');
10268 e600f124 2021-03-21 stsp 		if (edit_logmsg_only)
10269 e600f124 2021-03-21 stsp 			option_conflict('l', 'm');
10270 e600f124 2021-03-21 stsp 		if (fold_only)
10271 e600f124 2021-03-21 stsp 			option_conflict('l', 'f');
10272 c50a7455 2021-10-04 thomas 		if (edit_only)
10273 c50a7455 2021-10-04 thomas 			option_conflict('l', 'e');
10274 643b85bc 2021-07-16 stsp 		if (delete_backups)
10275 643b85bc 2021-07-16 stsp 			option_conflict('l', 'X');
10276 e600f124 2021-03-21 stsp 		if (argc != 0 && argc != 1)
10277 e600f124 2021-03-21 stsp 			usage_histedit();
10278 643b85bc 2021-07-16 stsp 	} else if (delete_backups) {
10279 643b85bc 2021-07-16 stsp 		if (abort_edit)
10280 643b85bc 2021-07-16 stsp 			option_conflict('X', 'a');
10281 643b85bc 2021-07-16 stsp 		if (continue_edit)
10282 643b85bc 2021-07-16 stsp 			option_conflict('X', 'c');
10283 643b85bc 2021-07-16 stsp 		if (edit_script_path)
10284 643b85bc 2021-07-16 stsp 			option_conflict('X', 'F');
10285 643b85bc 2021-07-16 stsp 		if (edit_logmsg_only)
10286 643b85bc 2021-07-16 stsp 			option_conflict('X', 'm');
10287 643b85bc 2021-07-16 stsp 		if (fold_only)
10288 643b85bc 2021-07-16 stsp 			option_conflict('X', 'f');
10289 c50a7455 2021-10-04 thomas 		if (edit_only)
10290 c50a7455 2021-10-04 thomas 			option_conflict('X', 'e');
10291 643b85bc 2021-07-16 stsp 		if (list_backups)
10292 643b85bc 2021-07-16 stsp 			option_conflict('X', 'l');
10293 643b85bc 2021-07-16 stsp 		if (argc != 0 && argc != 1)
10294 643b85bc 2021-07-16 stsp 			usage_histedit();
10295 e600f124 2021-03-21 stsp 	} else if (argc != 0)
10296 0ebf8283 2019-07-24 stsp 		usage_histedit();
10297 0ebf8283 2019-07-24 stsp 
10298 0ebf8283 2019-07-24 stsp 	/*
10299 0ebf8283 2019-07-24 stsp 	 * This command cannot apply unveil(2) in all cases because the
10300 0ebf8283 2019-07-24 stsp 	 * user may choose to run an editor to edit the histedit script
10301 0ebf8283 2019-07-24 stsp 	 * and to edit individual commit log messages.
10302 0ebf8283 2019-07-24 stsp 	 * unveil(2) traverses exec(2); if an editor is used we have to
10303 0ebf8283 2019-07-24 stsp 	 * apply unveil after edit script and log messages have been written.
10304 0ebf8283 2019-07-24 stsp 	 * XXX TODO: Make use of unveil(2) where possible.
10305 0ebf8283 2019-07-24 stsp 	 */
10306 0ebf8283 2019-07-24 stsp 
10307 0ebf8283 2019-07-24 stsp 	cwd = getcwd(NULL, 0);
10308 0ebf8283 2019-07-24 stsp 	if (cwd == NULL) {
10309 0ebf8283 2019-07-24 stsp 		error = got_error_from_errno("getcwd");
10310 0ebf8283 2019-07-24 stsp 		goto done;
10311 0ebf8283 2019-07-24 stsp 	}
10312 0ebf8283 2019-07-24 stsp 	error = got_worktree_open(&worktree, cwd);
10313 fa51e947 2020-03-27 stsp 	if (error) {
10314 643b85bc 2021-07-16 stsp 		if (list_backups || delete_backups) {
10315 e600f124 2021-03-21 stsp 			if (error->code != GOT_ERR_NOT_WORKTREE)
10316 e600f124 2021-03-21 stsp 				goto done;
10317 e600f124 2021-03-21 stsp 		} else {
10318 e600f124 2021-03-21 stsp 			if (error->code == GOT_ERR_NOT_WORKTREE)
10319 e600f124 2021-03-21 stsp 				error = wrap_not_worktree_error(error,
10320 e600f124 2021-03-21 stsp 				    "histedit", cwd);
10321 e600f124 2021-03-21 stsp 			goto done;
10322 e600f124 2021-03-21 stsp 		}
10323 e600f124 2021-03-21 stsp 	}
10324 e600f124 2021-03-21 stsp 
10325 643b85bc 2021-07-16 stsp 	if (list_backups || delete_backups) {
10326 e600f124 2021-03-21 stsp 		error = got_repo_open(&repo,
10327 e600f124 2021-03-21 stsp 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
10328 e600f124 2021-03-21 stsp 		    NULL);
10329 e600f124 2021-03-21 stsp 		if (error != NULL)
10330 e600f124 2021-03-21 stsp 			goto done;
10331 e600f124 2021-03-21 stsp 		error = apply_unveil(got_repo_get_path(repo), 0,
10332 e600f124 2021-03-21 stsp 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
10333 e600f124 2021-03-21 stsp 		if (error)
10334 e600f124 2021-03-21 stsp 			goto done;
10335 643b85bc 2021-07-16 stsp 		error = process_backup_refs(
10336 e600f124 2021-03-21 stsp 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10337 643b85bc 2021-07-16 stsp 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
10338 e600f124 2021-03-21 stsp 		goto done; /* nothing else to do */
10339 fa51e947 2020-03-27 stsp 	}
10340 0ebf8283 2019-07-24 stsp 
10341 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10342 c9956ddf 2019-09-08 stsp 	    NULL);
10343 0ebf8283 2019-07-24 stsp 	if (error != NULL)
10344 0ebf8283 2019-07-24 stsp 		goto done;
10345 0ebf8283 2019-07-24 stsp 
10346 0ebf8283 2019-07-24 stsp 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10347 0ebf8283 2019-07-24 stsp 	if (error)
10348 0ebf8283 2019-07-24 stsp 		goto done;
10349 0ebf8283 2019-07-24 stsp 	if (rebase_in_progress) {
10350 0ebf8283 2019-07-24 stsp 		error = got_error(GOT_ERR_REBASING);
10351 10604dce 2021-09-24 thomas 		goto done;
10352 10604dce 2021-09-24 thomas 	}
10353 10604dce 2021-09-24 thomas 
10354 10604dce 2021-09-24 thomas 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10355 10604dce 2021-09-24 thomas 	    repo);
10356 10604dce 2021-09-24 thomas 	if (error)
10357 10604dce 2021-09-24 thomas 		goto done;
10358 10604dce 2021-09-24 thomas 	if (merge_in_progress) {
10359 10604dce 2021-09-24 thomas 		error = got_error(GOT_ERR_MERGE_BUSY);
10360 0ebf8283 2019-07-24 stsp 		goto done;
10361 0ebf8283 2019-07-24 stsp 	}
10362 0ebf8283 2019-07-24 stsp 
10363 0ebf8283 2019-07-24 stsp 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10364 0ebf8283 2019-07-24 stsp 	if (error)
10365 0ebf8283 2019-07-24 stsp 		goto done;
10366 0ebf8283 2019-07-24 stsp 
10367 083957f4 2020-02-24 stsp 	if (edit_in_progress && edit_logmsg_only) {
10368 083957f4 2020-02-24 stsp 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10369 083957f4 2020-02-24 stsp 		    "histedit operation is in progress in this "
10370 083957f4 2020-02-24 stsp 		    "work tree and must be continued or aborted "
10371 083957f4 2020-02-24 stsp 		    "before the -m option can be used");
10372 083957f4 2020-02-24 stsp 		goto done;
10373 083957f4 2020-02-24 stsp 	}
10374 466785b9 2020-12-10 jrick 	if (edit_in_progress && fold_only) {
10375 466785b9 2020-12-10 jrick 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10376 466785b9 2020-12-10 jrick 		    "histedit operation is in progress in this "
10377 466785b9 2020-12-10 jrick 		    "work tree and must be continued or aborted "
10378 466785b9 2020-12-10 jrick 		    "before the -f option can be used");
10379 466785b9 2020-12-10 jrick 		goto done;
10380 466785b9 2020-12-10 jrick 	}
10381 c50a7455 2021-10-04 thomas 	if (edit_in_progress && edit_only) {
10382 c50a7455 2021-10-04 thomas 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10383 c50a7455 2021-10-04 thomas 		    "histedit operation is in progress in this "
10384 c50a7455 2021-10-04 thomas 		    "work tree and must be continued or aborted "
10385 c50a7455 2021-10-04 thomas 		    "before the -e option can be used");
10386 c50a7455 2021-10-04 thomas 		goto done;
10387 c50a7455 2021-10-04 thomas 	}
10388 083957f4 2020-02-24 stsp 
10389 0ebf8283 2019-07-24 stsp 	if (edit_in_progress && abort_edit) {
10390 0ebf8283 2019-07-24 stsp 		error = got_worktree_histedit_continue(&resume_commit_id,
10391 3e3a69f1 2019-07-25 stsp 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
10392 3e3a69f1 2019-07-25 stsp 		    worktree, repo);
10393 0ebf8283 2019-07-24 stsp 		if (error)
10394 0ebf8283 2019-07-24 stsp 			goto done;
10395 0ebf8283 2019-07-24 stsp 		printf("Switching work tree to %s\n",
10396 0ebf8283 2019-07-24 stsp 		    got_ref_get_symref_target(branch));
10397 3e3a69f1 2019-07-25 stsp 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
10398 d52bac28 2021-10-08 thomas 		    branch, base_commit_id, abort_progress, &upa);
10399 0ebf8283 2019-07-24 stsp 		if (error)
10400 0ebf8283 2019-07-24 stsp 			goto done;
10401 0ebf8283 2019-07-24 stsp 		printf("Histedit of %s aborted\n",
10402 0ebf8283 2019-07-24 stsp 		    got_ref_get_symref_target(branch));
10403 0ef68859 2021-09-28 thomas 		print_merge_progress_stats(&upa);
10404 0ebf8283 2019-07-24 stsp 		goto done; /* nothing else to do */
10405 0ebf8283 2019-07-24 stsp 	} else if (abort_edit) {
10406 0ebf8283 2019-07-24 stsp 		error = got_error(GOT_ERR_NOT_HISTEDIT);
10407 0ebf8283 2019-07-24 stsp 		goto done;
10408 0ebf8283 2019-07-24 stsp 	}
10409 0ebf8283 2019-07-24 stsp 
10410 0ebf8283 2019-07-24 stsp 	if (continue_edit) {
10411 0ebf8283 2019-07-24 stsp 		char *path;
10412 0ebf8283 2019-07-24 stsp 
10413 0ebf8283 2019-07-24 stsp 		if (!edit_in_progress) {
10414 0ebf8283 2019-07-24 stsp 			error = got_error(GOT_ERR_NOT_HISTEDIT);
10415 0ebf8283 2019-07-24 stsp 			goto done;
10416 0ebf8283 2019-07-24 stsp 		}
10417 0ebf8283 2019-07-24 stsp 
10418 c3022ba5 2019-07-27 stsp 		error = got_worktree_get_histedit_script_path(&path, worktree);
10419 0ebf8283 2019-07-24 stsp 		if (error)
10420 0ebf8283 2019-07-24 stsp 			goto done;
10421 0ebf8283 2019-07-24 stsp 
10422 0ebf8283 2019-07-24 stsp 		error = histedit_load_list(&histedit_cmds, path, repo);
10423 0ebf8283 2019-07-24 stsp 		free(path);
10424 0ebf8283 2019-07-24 stsp 		if (error)
10425 0ebf8283 2019-07-24 stsp 			goto done;
10426 0ebf8283 2019-07-24 stsp 
10427 0ebf8283 2019-07-24 stsp 		error = got_worktree_histedit_continue(&resume_commit_id,
10428 3e3a69f1 2019-07-25 stsp 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
10429 3e3a69f1 2019-07-25 stsp 		    worktree, repo);
10430 0ebf8283 2019-07-24 stsp 		if (error)
10431 0ebf8283 2019-07-24 stsp 			goto done;
10432 0ebf8283 2019-07-24 stsp 
10433 0ebf8283 2019-07-24 stsp 		error = got_ref_resolve(&head_commit_id, repo, branch);
10434 0ebf8283 2019-07-24 stsp 		if (error)
10435 0ebf8283 2019-07-24 stsp 			goto done;
10436 0ebf8283 2019-07-24 stsp 
10437 0ebf8283 2019-07-24 stsp 		error = got_object_open_as_commit(&commit, repo,
10438 0ebf8283 2019-07-24 stsp 		    head_commit_id);
10439 0ebf8283 2019-07-24 stsp 		if (error)
10440 0ebf8283 2019-07-24 stsp 			goto done;
10441 0ebf8283 2019-07-24 stsp 		parent_ids = got_object_commit_get_parent_ids(commit);
10442 dbdddfee 2021-06-23 naddy 		pid = STAILQ_FIRST(parent_ids);
10443 3aac7cf7 2019-07-25 stsp 		if (pid == NULL) {
10444 3aac7cf7 2019-07-25 stsp 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10445 3aac7cf7 2019-07-25 stsp 			goto done;
10446 3aac7cf7 2019-07-25 stsp 		}
10447 8ca9bd68 2019-07-25 stsp 		error = collect_commits(&commits, head_commit_id, pid->id,
10448 8ca9bd68 2019-07-25 stsp 		    base_commit_id, got_worktree_get_path_prefix(worktree),
10449 8ca9bd68 2019-07-25 stsp 		    GOT_ERR_HISTEDIT_PATH, repo);
10450 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
10451 0ebf8283 2019-07-24 stsp 		commit = NULL;
10452 0ebf8283 2019-07-24 stsp 		if (error)
10453 0ebf8283 2019-07-24 stsp 			goto done;
10454 0ebf8283 2019-07-24 stsp 	} else {
10455 0ebf8283 2019-07-24 stsp 		if (edit_in_progress) {
10456 0ebf8283 2019-07-24 stsp 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
10457 0ebf8283 2019-07-24 stsp 			goto done;
10458 0ebf8283 2019-07-24 stsp 		}
10459 0ebf8283 2019-07-24 stsp 
10460 0ebf8283 2019-07-24 stsp 		error = got_ref_open(&branch, repo,
10461 0ebf8283 2019-07-24 stsp 		    got_worktree_get_head_ref_name(worktree), 0);
10462 0ebf8283 2019-07-24 stsp 		if (error != NULL)
10463 0ebf8283 2019-07-24 stsp 			goto done;
10464 0ebf8283 2019-07-24 stsp 
10465 c7d20a3f 2019-07-30 stsp 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10466 c7d20a3f 2019-07-30 stsp 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10467 c7d20a3f 2019-07-30 stsp 			    "will not edit commit history of a branch outside "
10468 c7d20a3f 2019-07-30 stsp 			    "the \"refs/heads/\" reference namespace");
10469 c7d20a3f 2019-07-30 stsp 			goto done;
10470 c7d20a3f 2019-07-30 stsp 		}
10471 c7d20a3f 2019-07-30 stsp 
10472 0ebf8283 2019-07-24 stsp 		error = got_ref_resolve(&head_commit_id, repo, branch);
10473 bfce7f83 2019-07-27 stsp 		got_ref_close(branch);
10474 bfce7f83 2019-07-27 stsp 		branch = NULL;
10475 0ebf8283 2019-07-24 stsp 		if (error)
10476 0ebf8283 2019-07-24 stsp 			goto done;
10477 0ebf8283 2019-07-24 stsp 
10478 0ebf8283 2019-07-24 stsp 		error = got_object_open_as_commit(&commit, repo,
10479 0ebf8283 2019-07-24 stsp 		    head_commit_id);
10480 0ebf8283 2019-07-24 stsp 		if (error)
10481 0ebf8283 2019-07-24 stsp 			goto done;
10482 0ebf8283 2019-07-24 stsp 		parent_ids = got_object_commit_get_parent_ids(commit);
10483 dbdddfee 2021-06-23 naddy 		pid = STAILQ_FIRST(parent_ids);
10484 3aac7cf7 2019-07-25 stsp 		if (pid == NULL) {
10485 3aac7cf7 2019-07-25 stsp 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10486 3aac7cf7 2019-07-25 stsp 			goto done;
10487 3aac7cf7 2019-07-25 stsp 		}
10488 8ca9bd68 2019-07-25 stsp 		error = collect_commits(&commits, head_commit_id, pid->id,
10489 8ca9bd68 2019-07-25 stsp 		    got_worktree_get_base_commit_id(worktree),
10490 8ca9bd68 2019-07-25 stsp 		    got_worktree_get_path_prefix(worktree),
10491 8ca9bd68 2019-07-25 stsp 		    GOT_ERR_HISTEDIT_PATH, repo);
10492 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
10493 0ebf8283 2019-07-24 stsp 		commit = NULL;
10494 0ebf8283 2019-07-24 stsp 		if (error)
10495 0ebf8283 2019-07-24 stsp 			goto done;
10496 0ebf8283 2019-07-24 stsp 
10497 dbdddfee 2021-06-23 naddy 		if (STAILQ_EMPTY(&commits)) {
10498 c5996fff 2020-01-29 stsp 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10499 c5996fff 2020-01-29 stsp 			goto done;
10500 c5996fff 2020-01-29 stsp 		}
10501 c5996fff 2020-01-29 stsp 
10502 bfce7f83 2019-07-27 stsp 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10503 bfce7f83 2019-07-27 stsp 		    &base_commit_id, &fileindex, worktree, repo);
10504 bfce7f83 2019-07-27 stsp 		if (error)
10505 bfce7f83 2019-07-27 stsp 			goto done;
10506 bfce7f83 2019-07-27 stsp 
10507 0ebf8283 2019-07-24 stsp 		if (edit_script_path) {
10508 0ebf8283 2019-07-24 stsp 			error = histedit_load_list(&histedit_cmds,
10509 0ebf8283 2019-07-24 stsp 			    edit_script_path, repo);
10510 6ba2bea2 2019-07-27 stsp 			if (error) {
10511 6ba2bea2 2019-07-27 stsp 				got_worktree_histedit_abort(worktree, fileindex,
10512 6ba2bea2 2019-07-27 stsp 				    repo, branch, base_commit_id,
10513 d52bac28 2021-10-08 thomas 				    abort_progress, &upa);
10514 0ef68859 2021-09-28 thomas 				print_merge_progress_stats(&upa);
10515 0ebf8283 2019-07-24 stsp 				goto done;
10516 6ba2bea2 2019-07-27 stsp 			}
10517 0ebf8283 2019-07-24 stsp 		} else {
10518 514f2ffe 2020-01-29 stsp 			const char *branch_name;
10519 514f2ffe 2020-01-29 stsp 			branch_name = got_ref_get_symref_target(branch);
10520 514f2ffe 2020-01-29 stsp 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
10521 514f2ffe 2020-01-29 stsp 				branch_name += 11;
10522 0ebf8283 2019-07-24 stsp 			error = histedit_edit_script(&histedit_cmds, &commits,
10523 c50a7455 2021-10-04 thomas 			    branch_name, edit_logmsg_only, fold_only,
10524 c50a7455 2021-10-04 thomas 			    edit_only, repo);
10525 6ba2bea2 2019-07-27 stsp 			if (error) {
10526 6ba2bea2 2019-07-27 stsp 				got_worktree_histedit_abort(worktree, fileindex,
10527 6ba2bea2 2019-07-27 stsp 				    repo, branch, base_commit_id,
10528 d52bac28 2021-10-08 thomas 				    abort_progress, &upa);
10529 0ef68859 2021-09-28 thomas 				print_merge_progress_stats(&upa);
10530 0ebf8283 2019-07-24 stsp 				goto done;
10531 6ba2bea2 2019-07-27 stsp 			}
10532 0ebf8283 2019-07-24 stsp 
10533 0ebf8283 2019-07-24 stsp 		}
10534 0ebf8283 2019-07-24 stsp 
10535 0ebf8283 2019-07-24 stsp 		error = histedit_save_list(&histedit_cmds, worktree,
10536 0ebf8283 2019-07-24 stsp 		    repo);
10537 6ba2bea2 2019-07-27 stsp 		if (error) {
10538 6ba2bea2 2019-07-27 stsp 			got_worktree_histedit_abort(worktree, fileindex,
10539 6ba2bea2 2019-07-27 stsp 			    repo, branch, base_commit_id,
10540 d52bac28 2021-10-08 thomas 			    abort_progress, &upa);
10541 0ef68859 2021-09-28 thomas 			print_merge_progress_stats(&upa);
10542 0ebf8283 2019-07-24 stsp 			goto done;
10543 6ba2bea2 2019-07-27 stsp 		}
10544 0ebf8283 2019-07-24 stsp 
10545 0ebf8283 2019-07-24 stsp 	}
10546 0ebf8283 2019-07-24 stsp 
10547 4ec14e60 2019-08-28 hiltjo 	error = histedit_check_script(&histedit_cmds, &commits, repo);
10548 4ec14e60 2019-08-28 hiltjo 	if (error)
10549 0ebf8283 2019-07-24 stsp 		goto done;
10550 0ebf8283 2019-07-24 stsp 
10551 0ebf8283 2019-07-24 stsp 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10552 0ebf8283 2019-07-24 stsp 		if (resume_commit_id) {
10553 0ebf8283 2019-07-24 stsp 			if (got_object_id_cmp(hle->commit_id,
10554 0ebf8283 2019-07-24 stsp 			    resume_commit_id) != 0)
10555 0ebf8283 2019-07-24 stsp 				continue;
10556 0ebf8283 2019-07-24 stsp 
10557 0ebf8283 2019-07-24 stsp 			resume_commit_id = NULL;
10558 0ebf8283 2019-07-24 stsp 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10559 0ebf8283 2019-07-24 stsp 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
10560 0ebf8283 2019-07-24 stsp 				error = histedit_skip_commit(hle, worktree,
10561 62d463ca 2020-10-20 naddy 				    repo);
10562 ab20a43a 2020-01-29 stsp 				if (error)
10563 ab20a43a 2020-01-29 stsp 					goto done;
10564 0ebf8283 2019-07-24 stsp 			} else {
10565 ab20a43a 2020-01-29 stsp 				struct got_pathlist_head paths;
10566 ab20a43a 2020-01-29 stsp 				int have_changes = 0;
10567 ab20a43a 2020-01-29 stsp 
10568 ab20a43a 2020-01-29 stsp 				TAILQ_INIT(&paths);
10569 ab20a43a 2020-01-29 stsp 				error = got_pathlist_append(&paths, "", NULL);
10570 ab20a43a 2020-01-29 stsp 				if (error)
10571 ab20a43a 2020-01-29 stsp 					goto done;
10572 ab20a43a 2020-01-29 stsp 				error = got_worktree_status(worktree, &paths,
10573 f6343036 2021-06-22 stsp 				    repo, 0, check_local_changes, &have_changes,
10574 ab20a43a 2020-01-29 stsp 				    check_cancelled, NULL);
10575 ab20a43a 2020-01-29 stsp 				got_pathlist_free(&paths);
10576 ab20a43a 2020-01-29 stsp 				if (error) {
10577 ab20a43a 2020-01-29 stsp 					if (error->code != GOT_ERR_CANCELLED)
10578 ab20a43a 2020-01-29 stsp 						goto done;
10579 ab20a43a 2020-01-29 stsp 					if (sigint_received || sigpipe_received)
10580 ab20a43a 2020-01-29 stsp 						goto done;
10581 ab20a43a 2020-01-29 stsp 				}
10582 ab20a43a 2020-01-29 stsp 				if (have_changes) {
10583 ab20a43a 2020-01-29 stsp 					error = histedit_commit(NULL, worktree,
10584 ab20a43a 2020-01-29 stsp 					    fileindex, tmp_branch, hle, repo);
10585 ab20a43a 2020-01-29 stsp 					if (error)
10586 ab20a43a 2020-01-29 stsp 						goto done;
10587 ab20a43a 2020-01-29 stsp 				} else {
10588 ab20a43a 2020-01-29 stsp 					error = got_object_open_as_commit(
10589 ab20a43a 2020-01-29 stsp 					    &commit, repo, hle->commit_id);
10590 ab20a43a 2020-01-29 stsp 					if (error)
10591 ab20a43a 2020-01-29 stsp 						goto done;
10592 ab20a43a 2020-01-29 stsp 					error = show_histedit_progress(commit,
10593 ab20a43a 2020-01-29 stsp 					    hle, NULL);
10594 ab20a43a 2020-01-29 stsp 					got_object_commit_close(commit);
10595 ab20a43a 2020-01-29 stsp 					commit = NULL;
10596 ab20a43a 2020-01-29 stsp 					if (error)
10597 ab20a43a 2020-01-29 stsp 						goto done;
10598 ab20a43a 2020-01-29 stsp 				}
10599 0ebf8283 2019-07-24 stsp 			}
10600 0ebf8283 2019-07-24 stsp 			continue;
10601 0ebf8283 2019-07-24 stsp 		}
10602 0ebf8283 2019-07-24 stsp 
10603 0ebf8283 2019-07-24 stsp 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10604 0ebf8283 2019-07-24 stsp 			error = histedit_skip_commit(hle, worktree, repo);
10605 0ebf8283 2019-07-24 stsp 			if (error)
10606 0ebf8283 2019-07-24 stsp 				goto done;
10607 0ebf8283 2019-07-24 stsp 			continue;
10608 0ebf8283 2019-07-24 stsp 		}
10609 0ebf8283 2019-07-24 stsp 
10610 0ebf8283 2019-07-24 stsp 		error = got_object_open_as_commit(&commit, repo,
10611 0ebf8283 2019-07-24 stsp 		    hle->commit_id);
10612 0ebf8283 2019-07-24 stsp 		if (error)
10613 0ebf8283 2019-07-24 stsp 			goto done;
10614 0ebf8283 2019-07-24 stsp 		parent_ids = got_object_commit_get_parent_ids(commit);
10615 dbdddfee 2021-06-23 naddy 		pid = STAILQ_FIRST(parent_ids);
10616 0ebf8283 2019-07-24 stsp 
10617 0ebf8283 2019-07-24 stsp 		error = got_worktree_histedit_merge_files(&merged_paths,
10618 3e3a69f1 2019-07-25 stsp 		    worktree, fileindex, pid->id, hle->commit_id, repo,
10619 9627c110 2020-04-18 stsp 		    update_progress, &upa, check_cancelled, NULL);
10620 0ebf8283 2019-07-24 stsp 		if (error)
10621 0ebf8283 2019-07-24 stsp 			goto done;
10622 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
10623 0ebf8283 2019-07-24 stsp 		commit = NULL;
10624 0ebf8283 2019-07-24 stsp 
10625 0ef68859 2021-09-28 thomas 		print_merge_progress_stats(&upa);
10626 dddbe150 2021-09-28 thomas 		if (upa.conflicts > 0 || upa.missing > 0 ||
10627 dddbe150 2021-09-28 thomas 		    upa.not_deleted > 0 || upa.unversioned > 0) {
10628 dddbe150 2021-09-28 thomas 			if (upa.conflicts > 0) {
10629 dddbe150 2021-09-28 thomas 				error = show_rebase_merge_conflict(
10630 dddbe150 2021-09-28 thomas 				    hle->commit_id, repo);
10631 dddbe150 2021-09-28 thomas 				if (error)
10632 dddbe150 2021-09-28 thomas 					goto done;
10633 dddbe150 2021-09-28 thomas 			}
10634 0ebf8283 2019-07-24 stsp 			got_worktree_rebase_pathlist_free(&merged_paths);
10635 0ebf8283 2019-07-24 stsp 			break;
10636 0ebf8283 2019-07-24 stsp 		}
10637 0ebf8283 2019-07-24 stsp 
10638 0ebf8283 2019-07-24 stsp 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10639 0ebf8283 2019-07-24 stsp 			char *id_str;
10640 0ebf8283 2019-07-24 stsp 			error = got_object_id_str(&id_str, hle->commit_id);
10641 0ebf8283 2019-07-24 stsp 			if (error)
10642 0ebf8283 2019-07-24 stsp 				goto done;
10643 0ebf8283 2019-07-24 stsp 			printf("Stopping histedit for amending commit %s\n",
10644 0ebf8283 2019-07-24 stsp 			    id_str);
10645 0ebf8283 2019-07-24 stsp 			free(id_str);
10646 0ebf8283 2019-07-24 stsp 			got_worktree_rebase_pathlist_free(&merged_paths);
10647 3e3a69f1 2019-07-25 stsp 			error = got_worktree_histedit_postpone(worktree,
10648 3e3a69f1 2019-07-25 stsp 			    fileindex);
10649 0ebf8283 2019-07-24 stsp 			goto done;
10650 0ebf8283 2019-07-24 stsp 		}
10651 0ebf8283 2019-07-24 stsp 
10652 0ebf8283 2019-07-24 stsp 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
10653 0ebf8283 2019-07-24 stsp 			error = histedit_skip_commit(hle, worktree, repo);
10654 0ebf8283 2019-07-24 stsp 			if (error)
10655 0ebf8283 2019-07-24 stsp 				goto done;
10656 0ebf8283 2019-07-24 stsp 			continue;
10657 0ebf8283 2019-07-24 stsp 		}
10658 0ebf8283 2019-07-24 stsp 
10659 3e3a69f1 2019-07-25 stsp 		error = histedit_commit(&merged_paths, worktree, fileindex,
10660 3e3a69f1 2019-07-25 stsp 		    tmp_branch, hle, repo);
10661 0ebf8283 2019-07-24 stsp 		got_worktree_rebase_pathlist_free(&merged_paths);
10662 0ebf8283 2019-07-24 stsp 		if (error)
10663 0ebf8283 2019-07-24 stsp 			goto done;
10664 0ebf8283 2019-07-24 stsp 	}
10665 0ebf8283 2019-07-24 stsp 
10666 dddbe150 2021-09-28 thomas 	if (upa.conflicts > 0 || upa.missing > 0 ||
10667 dddbe150 2021-09-28 thomas 	    upa.not_deleted > 0 || upa.unversioned > 0) {
10668 3e3a69f1 2019-07-25 stsp 		error = got_worktree_histedit_postpone(worktree, fileindex);
10669 0ebf8283 2019-07-24 stsp 		if (error)
10670 0ebf8283 2019-07-24 stsp 			goto done;
10671 dddbe150 2021-09-28 thomas 		if (upa.conflicts > 0 && upa.missing == 0 &&
10672 dddbe150 2021-09-28 thomas 		    upa.not_deleted == 0 && upa.unversioned == 0) {
10673 dddbe150 2021-09-28 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
10674 dddbe150 2021-09-28 thomas 			    "conflicts must be resolved before histedit "
10675 dddbe150 2021-09-28 thomas 			    "can continue");
10676 dddbe150 2021-09-28 thomas 		} else if (upa.conflicts > 0) {
10677 dddbe150 2021-09-28 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
10678 dddbe150 2021-09-28 thomas 			    "conflicts must be resolved before histedit "
10679 dddbe150 2021-09-28 thomas 			    "can continue; changes destined for some "
10680 dddbe150 2021-09-28 thomas 			    "files were not yet merged and should be "
10681 dddbe150 2021-09-28 thomas 			    "merged manually if required before the "
10682 dddbe150 2021-09-28 thomas 			    "histedit operation is continued");
10683 dddbe150 2021-09-28 thomas 		} else {
10684 dddbe150 2021-09-28 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
10685 dddbe150 2021-09-28 thomas 			    "changes destined for some files were not "
10686 dddbe150 2021-09-28 thomas 			    "yet merged and should be merged manually "
10687 dddbe150 2021-09-28 thomas 			    "if required before the histedit operation "
10688 dddbe150 2021-09-28 thomas 			    "is continued");
10689 dddbe150 2021-09-28 thomas 		}
10690 0ebf8283 2019-07-24 stsp 	} else
10691 3e3a69f1 2019-07-25 stsp 		error = histedit_complete(worktree, fileindex, tmp_branch,
10692 3e3a69f1 2019-07-25 stsp 		    branch, repo);
10693 0ebf8283 2019-07-24 stsp done:
10694 0ebf8283 2019-07-24 stsp 	got_object_id_queue_free(&commits);
10695 bfce7f83 2019-07-27 stsp 	histedit_free_list(&histedit_cmds);
10696 0ebf8283 2019-07-24 stsp 	free(head_commit_id);
10697 0ebf8283 2019-07-24 stsp 	free(base_commit_id);
10698 0ebf8283 2019-07-24 stsp 	free(resume_commit_id);
10699 0ebf8283 2019-07-24 stsp 	if (commit)
10700 0ebf8283 2019-07-24 stsp 		got_object_commit_close(commit);
10701 0ebf8283 2019-07-24 stsp 	if (branch)
10702 0ebf8283 2019-07-24 stsp 		got_ref_close(branch);
10703 0ebf8283 2019-07-24 stsp 	if (tmp_branch)
10704 0ebf8283 2019-07-24 stsp 		got_ref_close(tmp_branch);
10705 0ebf8283 2019-07-24 stsp 	if (worktree)
10706 0ebf8283 2019-07-24 stsp 		got_worktree_close(worktree);
10707 1d0f4054 2021-06-17 stsp 	if (repo) {
10708 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
10709 1d0f4054 2021-06-17 stsp 		if (error == NULL)
10710 1d0f4054 2021-06-17 stsp 			error = close_err;
10711 1d0f4054 2021-06-17 stsp 	}
10712 2822a352 2019-10-15 stsp 	return error;
10713 2822a352 2019-10-15 stsp }
10714 2822a352 2019-10-15 stsp 
10715 2822a352 2019-10-15 stsp __dead static void
10716 2822a352 2019-10-15 stsp usage_integrate(void)
10717 2822a352 2019-10-15 stsp {
10718 2822a352 2019-10-15 stsp 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
10719 2822a352 2019-10-15 stsp 	exit(1);
10720 2822a352 2019-10-15 stsp }
10721 2822a352 2019-10-15 stsp 
10722 2822a352 2019-10-15 stsp static const struct got_error *
10723 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
10724 2822a352 2019-10-15 stsp {
10725 2822a352 2019-10-15 stsp 	const struct got_error *error = NULL;
10726 2822a352 2019-10-15 stsp 	struct got_repository *repo = NULL;
10727 2822a352 2019-10-15 stsp 	struct got_worktree *worktree = NULL;
10728 2822a352 2019-10-15 stsp 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
10729 2822a352 2019-10-15 stsp 	const char *branch_arg = NULL;
10730 2822a352 2019-10-15 stsp 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
10731 2822a352 2019-10-15 stsp 	struct got_fileindex *fileindex = NULL;
10732 2822a352 2019-10-15 stsp 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
10733 9627c110 2020-04-18 stsp 	int ch;
10734 9627c110 2020-04-18 stsp 	struct got_update_progress_arg upa;
10735 2822a352 2019-10-15 stsp 
10736 2822a352 2019-10-15 stsp 	while ((ch = getopt(argc, argv, "")) != -1) {
10737 2822a352 2019-10-15 stsp 		switch (ch) {
10738 2822a352 2019-10-15 stsp 		default:
10739 2822a352 2019-10-15 stsp 			usage_integrate();
10740 2822a352 2019-10-15 stsp 			/* NOTREACHED */
10741 2822a352 2019-10-15 stsp 		}
10742 2822a352 2019-10-15 stsp 	}
10743 2822a352 2019-10-15 stsp 
10744 2822a352 2019-10-15 stsp 	argc -= optind;
10745 2822a352 2019-10-15 stsp 	argv += optind;
10746 2822a352 2019-10-15 stsp 
10747 2822a352 2019-10-15 stsp 	if (argc != 1)
10748 2822a352 2019-10-15 stsp 		usage_integrate();
10749 2822a352 2019-10-15 stsp 	branch_arg = argv[0];
10750 b08a0ccd 2020-09-24 stsp #ifndef PROFILE
10751 2822a352 2019-10-15 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10752 2822a352 2019-10-15 stsp 	    "unveil", NULL) == -1)
10753 2822a352 2019-10-15 stsp 		err(1, "pledge");
10754 b08a0ccd 2020-09-24 stsp #endif
10755 2822a352 2019-10-15 stsp 	cwd = getcwd(NULL, 0);
10756 2822a352 2019-10-15 stsp 	if (cwd == NULL) {
10757 2822a352 2019-10-15 stsp 		error = got_error_from_errno("getcwd");
10758 2822a352 2019-10-15 stsp 		goto done;
10759 2822a352 2019-10-15 stsp 	}
10760 2822a352 2019-10-15 stsp 
10761 2822a352 2019-10-15 stsp 	error = got_worktree_open(&worktree, cwd);
10762 fa51e947 2020-03-27 stsp 	if (error) {
10763 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
10764 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "integrate",
10765 fa51e947 2020-03-27 stsp 			    cwd);
10766 2822a352 2019-10-15 stsp 		goto done;
10767 fa51e947 2020-03-27 stsp 	}
10768 2822a352 2019-10-15 stsp 
10769 2822a352 2019-10-15 stsp 	error = check_rebase_or_histedit_in_progress(worktree);
10770 2822a352 2019-10-15 stsp 	if (error)
10771 2822a352 2019-10-15 stsp 		goto done;
10772 2822a352 2019-10-15 stsp 
10773 2822a352 2019-10-15 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10774 2822a352 2019-10-15 stsp 	    NULL);
10775 2822a352 2019-10-15 stsp 	if (error != NULL)
10776 2822a352 2019-10-15 stsp 		goto done;
10777 2822a352 2019-10-15 stsp 
10778 2822a352 2019-10-15 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
10779 2822a352 2019-10-15 stsp 	    got_worktree_get_root_path(worktree));
10780 2822a352 2019-10-15 stsp 	if (error)
10781 2822a352 2019-10-15 stsp 		goto done;
10782 2822a352 2019-10-15 stsp 
10783 10604dce 2021-09-24 thomas 	error = check_merge_in_progress(worktree, repo);
10784 10604dce 2021-09-24 thomas 	if (error)
10785 10604dce 2021-09-24 thomas 		goto done;
10786 10604dce 2021-09-24 thomas 
10787 2822a352 2019-10-15 stsp 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
10788 2822a352 2019-10-15 stsp 		error = got_error_from_errno("asprintf");
10789 2822a352 2019-10-15 stsp 		goto done;
10790 2822a352 2019-10-15 stsp 	}
10791 2822a352 2019-10-15 stsp 
10792 2822a352 2019-10-15 stsp 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
10793 2822a352 2019-10-15 stsp 	    &base_branch_ref, worktree, refname, repo);
10794 2822a352 2019-10-15 stsp 	if (error)
10795 2822a352 2019-10-15 stsp 		goto done;
10796 2822a352 2019-10-15 stsp 
10797 2822a352 2019-10-15 stsp 	refname = strdup(got_ref_get_name(branch_ref));
10798 2822a352 2019-10-15 stsp 	if (refname == NULL) {
10799 2822a352 2019-10-15 stsp 		error = got_error_from_errno("strdup");
10800 2822a352 2019-10-15 stsp 		got_worktree_integrate_abort(worktree, fileindex, repo,
10801 2822a352 2019-10-15 stsp 		    branch_ref, base_branch_ref);
10802 2822a352 2019-10-15 stsp 		goto done;
10803 2822a352 2019-10-15 stsp 	}
10804 2822a352 2019-10-15 stsp 	base_refname = strdup(got_ref_get_name(base_branch_ref));
10805 2822a352 2019-10-15 stsp 	if (base_refname == NULL) {
10806 2822a352 2019-10-15 stsp 		error = got_error_from_errno("strdup");
10807 2822a352 2019-10-15 stsp 		got_worktree_integrate_abort(worktree, fileindex, repo,
10808 2822a352 2019-10-15 stsp 		    branch_ref, base_branch_ref);
10809 2822a352 2019-10-15 stsp 		goto done;
10810 2822a352 2019-10-15 stsp 	}
10811 2822a352 2019-10-15 stsp 
10812 2822a352 2019-10-15 stsp 	error = got_ref_resolve(&commit_id, repo, branch_ref);
10813 2822a352 2019-10-15 stsp 	if (error)
10814 2822a352 2019-10-15 stsp 		goto done;
10815 2822a352 2019-10-15 stsp 
10816 2822a352 2019-10-15 stsp 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
10817 2822a352 2019-10-15 stsp 	if (error)
10818 2822a352 2019-10-15 stsp 		goto done;
10819 2822a352 2019-10-15 stsp 
10820 2822a352 2019-10-15 stsp 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
10821 2822a352 2019-10-15 stsp 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
10822 2822a352 2019-10-15 stsp 		    "specified branch has already been integrated");
10823 2822a352 2019-10-15 stsp 		got_worktree_integrate_abort(worktree, fileindex, repo,
10824 2822a352 2019-10-15 stsp 		    branch_ref, base_branch_ref);
10825 2822a352 2019-10-15 stsp 		goto done;
10826 2822a352 2019-10-15 stsp 	}
10827 2822a352 2019-10-15 stsp 
10828 3aef623b 2019-10-15 stsp 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
10829 2822a352 2019-10-15 stsp 	if (error) {
10830 2822a352 2019-10-15 stsp 		if (error->code == GOT_ERR_ANCESTRY)
10831 2822a352 2019-10-15 stsp 			error = got_error(GOT_ERR_REBASE_REQUIRED);
10832 2822a352 2019-10-15 stsp 		got_worktree_integrate_abort(worktree, fileindex, repo,
10833 2822a352 2019-10-15 stsp 		    branch_ref, base_branch_ref);
10834 2822a352 2019-10-15 stsp 		goto done;
10835 2822a352 2019-10-15 stsp 	}
10836 2822a352 2019-10-15 stsp 
10837 9627c110 2020-04-18 stsp 	memset(&upa, 0, sizeof(upa));
10838 2822a352 2019-10-15 stsp 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
10839 9627c110 2020-04-18 stsp 	    branch_ref, base_branch_ref, update_progress, &upa,
10840 2822a352 2019-10-15 stsp 	    check_cancelled, NULL);
10841 2822a352 2019-10-15 stsp 	if (error)
10842 2822a352 2019-10-15 stsp 		goto done;
10843 2822a352 2019-10-15 stsp 
10844 2822a352 2019-10-15 stsp 	printf("Integrated %s into %s\n", refname, base_refname);
10845 9627c110 2020-04-18 stsp 	print_update_progress_stats(&upa);
10846 2822a352 2019-10-15 stsp done:
10847 1d0f4054 2021-06-17 stsp 	if (repo) {
10848 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
10849 1d0f4054 2021-06-17 stsp 		if (error == NULL)
10850 1d0f4054 2021-06-17 stsp 			error = close_err;
10851 1d0f4054 2021-06-17 stsp 	}
10852 2822a352 2019-10-15 stsp 	if (worktree)
10853 2822a352 2019-10-15 stsp 		got_worktree_close(worktree);
10854 2822a352 2019-10-15 stsp 	free(cwd);
10855 2822a352 2019-10-15 stsp 	free(base_commit_id);
10856 2822a352 2019-10-15 stsp 	free(commit_id);
10857 2822a352 2019-10-15 stsp 	free(refname);
10858 2822a352 2019-10-15 stsp 	free(base_refname);
10859 10604dce 2021-09-24 thomas 	return error;
10860 10604dce 2021-09-24 thomas }
10861 10604dce 2021-09-24 thomas 
10862 10604dce 2021-09-24 thomas __dead static void
10863 10604dce 2021-09-24 thomas usage_merge(void)
10864 10604dce 2021-09-24 thomas {
10865 ba34626b 2021-09-27 thomas 	fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
10866 10604dce 2021-09-24 thomas 	    getprogname());
10867 10604dce 2021-09-24 thomas 	exit(1);
10868 10604dce 2021-09-24 thomas }
10869 10604dce 2021-09-24 thomas 
10870 10604dce 2021-09-24 thomas static const struct got_error *
10871 10604dce 2021-09-24 thomas cmd_merge(int argc, char *argv[])
10872 10604dce 2021-09-24 thomas {
10873 10604dce 2021-09-24 thomas 	const struct got_error *error = NULL;
10874 10604dce 2021-09-24 thomas 	struct got_worktree *worktree = NULL;
10875 10604dce 2021-09-24 thomas 	struct got_repository *repo = NULL;
10876 10604dce 2021-09-24 thomas 	struct got_fileindex *fileindex = NULL;
10877 10604dce 2021-09-24 thomas 	char *cwd = NULL, *id_str = NULL, *author = NULL;
10878 10604dce 2021-09-24 thomas 	struct got_reference *branch = NULL, *wt_branch = NULL;
10879 10604dce 2021-09-24 thomas 	struct got_object_id *branch_tip = NULL, *yca_id = NULL;
10880 10604dce 2021-09-24 thomas 	struct got_object_id *wt_branch_tip = NULL;
10881 10604dce 2021-09-24 thomas 	int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
10882 ba34626b 2021-09-27 thomas 	int interrupt_merge = 0;
10883 10604dce 2021-09-24 thomas 	struct got_update_progress_arg upa;
10884 10604dce 2021-09-24 thomas 	struct got_object_id *merge_commit_id = NULL;
10885 10604dce 2021-09-24 thomas 	char *branch_name = NULL;
10886 10604dce 2021-09-24 thomas 
10887 10604dce 2021-09-24 thomas 	memset(&upa, 0, sizeof(upa));
10888 10604dce 2021-09-24 thomas 
10889 ba34626b 2021-09-27 thomas 	while ((ch = getopt(argc, argv, "acn")) != -1) {
10890 10604dce 2021-09-24 thomas 		switch (ch) {
10891 10604dce 2021-09-24 thomas 		case 'a':
10892 10604dce 2021-09-24 thomas 			abort_merge = 1;
10893 10604dce 2021-09-24 thomas 			break;
10894 10604dce 2021-09-24 thomas 		case 'c':
10895 10604dce 2021-09-24 thomas 			continue_merge = 1;
10896 10604dce 2021-09-24 thomas 			break;
10897 ba34626b 2021-09-27 thomas 		case 'n':
10898 ba34626b 2021-09-27 thomas 			interrupt_merge = 1;
10899 ba34626b 2021-09-27 thomas 			break;
10900 10604dce 2021-09-24 thomas 		default:
10901 10604dce 2021-09-24 thomas 			usage_rebase();
10902 10604dce 2021-09-24 thomas 			/* NOTREACHED */
10903 10604dce 2021-09-24 thomas 		}
10904 10604dce 2021-09-24 thomas 	}
10905 10604dce 2021-09-24 thomas 
10906 10604dce 2021-09-24 thomas 	argc -= optind;
10907 10604dce 2021-09-24 thomas 	argv += optind;
10908 10604dce 2021-09-24 thomas 
10909 10604dce 2021-09-24 thomas #ifndef PROFILE
10910 10604dce 2021-09-24 thomas 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10911 10604dce 2021-09-24 thomas 	    "unveil", NULL) == -1)
10912 10604dce 2021-09-24 thomas 		err(1, "pledge");
10913 10604dce 2021-09-24 thomas #endif
10914 10604dce 2021-09-24 thomas 
10915 10604dce 2021-09-24 thomas 	if (abort_merge && continue_merge)
10916 10604dce 2021-09-24 thomas 		option_conflict('a', 'c');
10917 10604dce 2021-09-24 thomas 	if (abort_merge || continue_merge) {
10918 10604dce 2021-09-24 thomas 		if (argc != 0)
10919 10604dce 2021-09-24 thomas 			usage_merge();
10920 10604dce 2021-09-24 thomas 	} else if (argc != 1)
10921 10604dce 2021-09-24 thomas 		usage_merge();
10922 10604dce 2021-09-24 thomas 
10923 10604dce 2021-09-24 thomas 	cwd = getcwd(NULL, 0);
10924 10604dce 2021-09-24 thomas 	if (cwd == NULL) {
10925 10604dce 2021-09-24 thomas 		error = got_error_from_errno("getcwd");
10926 10604dce 2021-09-24 thomas 		goto done;
10927 10604dce 2021-09-24 thomas 	}
10928 10604dce 2021-09-24 thomas 
10929 10604dce 2021-09-24 thomas 	error = got_worktree_open(&worktree, cwd);
10930 10604dce 2021-09-24 thomas 	if (error) {
10931 10604dce 2021-09-24 thomas 		if (error->code == GOT_ERR_NOT_WORKTREE)
10932 10604dce 2021-09-24 thomas 			error = wrap_not_worktree_error(error,
10933 10604dce 2021-09-24 thomas 			    "merge", cwd);
10934 10604dce 2021-09-24 thomas 		goto done;
10935 10604dce 2021-09-24 thomas 	}
10936 10604dce 2021-09-24 thomas 
10937 10604dce 2021-09-24 thomas 	error = got_repo_open(&repo,
10938 10604dce 2021-09-24 thomas 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
10939 10604dce 2021-09-24 thomas 	if (error != NULL)
10940 10604dce 2021-09-24 thomas 		goto done;
10941 10604dce 2021-09-24 thomas 
10942 10604dce 2021-09-24 thomas 	error = apply_unveil(got_repo_get_path(repo), 0,
10943 10604dce 2021-09-24 thomas 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
10944 10604dce 2021-09-24 thomas 	if (error)
10945 10604dce 2021-09-24 thomas 		goto done;
10946 10604dce 2021-09-24 thomas 
10947 10604dce 2021-09-24 thomas 	error = check_rebase_or_histedit_in_progress(worktree);
10948 10604dce 2021-09-24 thomas 	if (error)
10949 10604dce 2021-09-24 thomas 		goto done;
10950 10604dce 2021-09-24 thomas 
10951 10604dce 2021-09-24 thomas 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10952 10604dce 2021-09-24 thomas 	    repo);
10953 10604dce 2021-09-24 thomas 	if (error)
10954 10604dce 2021-09-24 thomas 		goto done;
10955 10604dce 2021-09-24 thomas 
10956 10604dce 2021-09-24 thomas 	if (abort_merge) {
10957 10604dce 2021-09-24 thomas 		if (!merge_in_progress) {
10958 10604dce 2021-09-24 thomas 			error = got_error(GOT_ERR_NOT_MERGING);
10959 10604dce 2021-09-24 thomas 			goto done;
10960 10604dce 2021-09-24 thomas 		}
10961 10604dce 2021-09-24 thomas 		error = got_worktree_merge_continue(&branch_name,
10962 10604dce 2021-09-24 thomas 		    &branch_tip, &fileindex, worktree, repo);
10963 10604dce 2021-09-24 thomas 		if (error)
10964 10604dce 2021-09-24 thomas 			goto done;
10965 10604dce 2021-09-24 thomas 		error = got_worktree_merge_abort(worktree, fileindex, repo,
10966 d52bac28 2021-10-08 thomas 		    abort_progress, &upa);
10967 10604dce 2021-09-24 thomas 		if (error)
10968 10604dce 2021-09-24 thomas 			goto done;
10969 10604dce 2021-09-24 thomas 		printf("Merge of %s aborted\n", branch_name);
10970 10604dce 2021-09-24 thomas 		goto done; /* nothing else to do */
10971 10604dce 2021-09-24 thomas 	}
10972 10604dce 2021-09-24 thomas 
10973 10604dce 2021-09-24 thomas 	error = get_author(&author, repo, worktree);
10974 10604dce 2021-09-24 thomas 	if (error)
10975 10604dce 2021-09-24 thomas 		goto done;
10976 10604dce 2021-09-24 thomas 
10977 10604dce 2021-09-24 thomas 	if (continue_merge) {
10978 10604dce 2021-09-24 thomas 		if (!merge_in_progress) {
10979 10604dce 2021-09-24 thomas 			error = got_error(GOT_ERR_NOT_MERGING);
10980 10604dce 2021-09-24 thomas 			goto done;
10981 10604dce 2021-09-24 thomas 		}
10982 10604dce 2021-09-24 thomas 		error = got_worktree_merge_continue(&branch_name,
10983 10604dce 2021-09-24 thomas 		    &branch_tip, &fileindex, worktree, repo);
10984 10604dce 2021-09-24 thomas 		if (error)
10985 10604dce 2021-09-24 thomas 			goto done;
10986 10604dce 2021-09-24 thomas 	} else {
10987 10604dce 2021-09-24 thomas 		error = got_ref_open(&branch, repo, argv[0], 0);
10988 10604dce 2021-09-24 thomas 		if (error != NULL)
10989 10604dce 2021-09-24 thomas 			goto done;
10990 10604dce 2021-09-24 thomas 		branch_name = strdup(got_ref_get_name(branch));
10991 10604dce 2021-09-24 thomas 		if (branch_name == NULL) {
10992 10604dce 2021-09-24 thomas 			error = got_error_from_errno("strdup");
10993 10604dce 2021-09-24 thomas 			goto done;
10994 10604dce 2021-09-24 thomas 		}
10995 10604dce 2021-09-24 thomas 		error = got_ref_resolve(&branch_tip, repo, branch);
10996 10604dce 2021-09-24 thomas 		if (error)
10997 10604dce 2021-09-24 thomas 			goto done;
10998 10604dce 2021-09-24 thomas 	}
10999 10604dce 2021-09-24 thomas 
11000 10604dce 2021-09-24 thomas 	error = got_ref_open(&wt_branch, repo,
11001 10604dce 2021-09-24 thomas 	    got_worktree_get_head_ref_name(worktree), 0);
11002 10604dce 2021-09-24 thomas 	if (error)
11003 10604dce 2021-09-24 thomas 		goto done;
11004 10604dce 2021-09-24 thomas 	error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11005 10604dce 2021-09-24 thomas 	if (error)
11006 10604dce 2021-09-24 thomas 		goto done;
11007 10604dce 2021-09-24 thomas 	error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11008 768705e3 2021-09-27 thomas 	    wt_branch_tip, branch_tip, 0, repo,
11009 10604dce 2021-09-24 thomas 	    check_cancelled, NULL);
11010 768705e3 2021-09-27 thomas 	if (error && error->code != GOT_ERR_ANCESTRY)
11011 10604dce 2021-09-24 thomas 		goto done;
11012 10604dce 2021-09-24 thomas 
11013 10604dce 2021-09-24 thomas 	if (!continue_merge) {
11014 10604dce 2021-09-24 thomas 		error = check_path_prefix(wt_branch_tip, branch_tip,
11015 10604dce 2021-09-24 thomas 		    got_worktree_get_path_prefix(worktree),
11016 10604dce 2021-09-24 thomas 		    GOT_ERR_MERGE_PATH, repo);
11017 10604dce 2021-09-24 thomas 		if (error)
11018 10604dce 2021-09-24 thomas 			goto done;
11019 768705e3 2021-09-27 thomas 		if (yca_id) {
11020 768705e3 2021-09-27 thomas 			error = check_same_branch(wt_branch_tip, branch,
11021 768705e3 2021-09-27 thomas 			    yca_id, repo);
11022 768705e3 2021-09-27 thomas 			if (error) {
11023 768705e3 2021-09-27 thomas 				if (error->code != GOT_ERR_ANCESTRY)
11024 768705e3 2021-09-27 thomas 					goto done;
11025 768705e3 2021-09-27 thomas 				error = NULL;
11026 768705e3 2021-09-27 thomas 			} else {
11027 768705e3 2021-09-27 thomas 				static char msg[512];
11028 768705e3 2021-09-27 thomas 				snprintf(msg, sizeof(msg),
11029 768705e3 2021-09-27 thomas 				    "cannot create a merge commit because "
11030 768705e3 2021-09-27 thomas 				    "%s is based on %s; %s can be integrated "
11031 768705e3 2021-09-27 thomas 				    "with 'got integrate' instead", branch_name,
11032 768705e3 2021-09-27 thomas 				    got_worktree_get_head_ref_name(worktree),
11033 768705e3 2021-09-27 thomas 				    branch_name);
11034 768705e3 2021-09-27 thomas 				error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11035 10604dce 2021-09-24 thomas 				goto done;
11036 768705e3 2021-09-27 thomas 			}
11037 10604dce 2021-09-24 thomas 		}
11038 10604dce 2021-09-24 thomas 		error = got_worktree_merge_prepare(&fileindex, worktree,
11039 10604dce 2021-09-24 thomas 		    branch, repo);
11040 10604dce 2021-09-24 thomas 		if (error)
11041 10604dce 2021-09-24 thomas 			goto done;
11042 10604dce 2021-09-24 thomas 
11043 10604dce 2021-09-24 thomas 		error = got_worktree_merge_branch(worktree, fileindex,
11044 10604dce 2021-09-24 thomas 		    yca_id, branch_tip, repo, update_progress, &upa,
11045 10604dce 2021-09-24 thomas 		    check_cancelled, NULL);
11046 10604dce 2021-09-24 thomas 		if (error)
11047 10604dce 2021-09-24 thomas 			goto done;
11048 0ef68859 2021-09-28 thomas 		print_merge_progress_stats(&upa);
11049 768705e3 2021-09-27 thomas 		if (!upa.did_something) {
11050 768705e3 2021-09-27 thomas 			error = got_worktree_merge_abort(worktree, fileindex,
11051 d52bac28 2021-10-08 thomas 			    repo, abort_progress, &upa);
11052 768705e3 2021-09-27 thomas 			if (error)
11053 768705e3 2021-09-27 thomas 				goto done;
11054 768705e3 2021-09-27 thomas 			printf("Already up-to-date\n");
11055 768705e3 2021-09-27 thomas 			goto done;
11056 768705e3 2021-09-27 thomas 		}
11057 10604dce 2021-09-24 thomas 	}
11058 10604dce 2021-09-24 thomas 
11059 ba34626b 2021-09-27 thomas 	if (interrupt_merge) {
11060 10604dce 2021-09-24 thomas 		error = got_worktree_merge_postpone(worktree, fileindex);
11061 10604dce 2021-09-24 thomas 		if (error)
11062 10604dce 2021-09-24 thomas 			goto done;
11063 ba34626b 2021-09-27 thomas 		printf("Merge of %s interrupted on request\n", branch_name);
11064 ba162991 2021-09-28 thomas 	} else if (upa.conflicts > 0 || upa.missing > 0 ||
11065 ba162991 2021-09-28 thomas 	    upa.not_deleted > 0 || upa.unversioned > 0) {
11066 ba34626b 2021-09-27 thomas 		error = got_worktree_merge_postpone(worktree, fileindex);
11067 ba34626b 2021-09-27 thomas 		if (error)
11068 ba34626b 2021-09-27 thomas 			goto done;
11069 ba162991 2021-09-28 thomas 		if (upa.conflicts > 0 && upa.missing == 0 &&
11070 ba162991 2021-09-28 thomas 		    upa.not_deleted == 0 && upa.unversioned == 0) {
11071 10604dce 2021-09-24 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
11072 10604dce 2021-09-24 thomas 			    "conflicts must be resolved before merging "
11073 10604dce 2021-09-24 thomas 			    "can continue");
11074 10604dce 2021-09-24 thomas 		} else if (upa.conflicts > 0) {
11075 10604dce 2021-09-24 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
11076 10604dce 2021-09-24 thomas 			    "conflicts must be resolved before merging "
11077 ba162991 2021-09-28 thomas 			    "can continue; changes destined for some "
11078 88d249c2 2021-09-24 thomas 			    "files were not yet merged and "
11079 10604dce 2021-09-24 thomas 			    "should be merged manually if required before the "
11080 10604dce 2021-09-24 thomas 			    "merge operation is continued");
11081 10604dce 2021-09-24 thomas 		} else {
11082 10604dce 2021-09-24 thomas 			error = got_error_msg(GOT_ERR_CONFLICTS,
11083 ba162991 2021-09-28 thomas 			    "changes destined for some "
11084 10604dce 2021-09-24 thomas 			    "files were not yet merged and should be "
11085 10604dce 2021-09-24 thomas 			    "merged manually if required before the "
11086 10604dce 2021-09-24 thomas 			    "merge operation is continued");
11087 10604dce 2021-09-24 thomas 		}
11088 10604dce 2021-09-24 thomas 		goto done;
11089 10604dce 2021-09-24 thomas 	} else {
11090 10604dce 2021-09-24 thomas 		error = got_worktree_merge_commit(&merge_commit_id, worktree,
11091 ae1e948a 2021-09-28 thomas 		    fileindex, author, NULL, 1, branch_tip, branch_name,
11092 ae1e948a 2021-09-28 thomas 		    repo, continue_merge ? print_status : NULL, NULL);
11093 10604dce 2021-09-24 thomas 		if (error)
11094 10604dce 2021-09-24 thomas 			goto done;
11095 10604dce 2021-09-24 thomas 		error = got_worktree_merge_complete(worktree, fileindex, repo);
11096 10604dce 2021-09-24 thomas 		if (error)
11097 10604dce 2021-09-24 thomas 			goto done;
11098 10604dce 2021-09-24 thomas 		error = got_object_id_str(&id_str, merge_commit_id);
11099 10604dce 2021-09-24 thomas 		if (error)
11100 10604dce 2021-09-24 thomas 			goto done;
11101 10604dce 2021-09-24 thomas 		printf("Merged %s into %s: %s\n", branch_name,
11102 10604dce 2021-09-24 thomas 		    got_worktree_get_head_ref_name(worktree),
11103 10604dce 2021-09-24 thomas 		    id_str);
11104 10604dce 2021-09-24 thomas 
11105 10604dce 2021-09-24 thomas 	}
11106 10604dce 2021-09-24 thomas done:
11107 10604dce 2021-09-24 thomas 	free(id_str);
11108 10604dce 2021-09-24 thomas 	free(merge_commit_id);
11109 10604dce 2021-09-24 thomas 	free(author);
11110 10604dce 2021-09-24 thomas 	free(branch_tip);
11111 10604dce 2021-09-24 thomas 	free(branch_name);
11112 10604dce 2021-09-24 thomas 	free(yca_id);
11113 10604dce 2021-09-24 thomas 	if (branch)
11114 10604dce 2021-09-24 thomas 		got_ref_close(branch);
11115 10604dce 2021-09-24 thomas 	if (wt_branch)
11116 10604dce 2021-09-24 thomas 		got_ref_close(wt_branch);
11117 10604dce 2021-09-24 thomas 	if (worktree)
11118 10604dce 2021-09-24 thomas 		got_worktree_close(worktree);
11119 10604dce 2021-09-24 thomas 	if (repo) {
11120 10604dce 2021-09-24 thomas 		const struct got_error *close_err = got_repo_close(repo);
11121 10604dce 2021-09-24 thomas 		if (error == NULL)
11122 10604dce 2021-09-24 thomas 			error = close_err;
11123 10604dce 2021-09-24 thomas 	}
11124 715dc77e 2019-08-03 stsp 	return error;
11125 715dc77e 2019-08-03 stsp }
11126 715dc77e 2019-08-03 stsp 
11127 715dc77e 2019-08-03 stsp __dead static void
11128 715dc77e 2019-08-03 stsp usage_stage(void)
11129 715dc77e 2019-08-03 stsp {
11130 f3055044 2019-08-07 stsp 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11131 35213c7c 2020-07-23 stsp 	    "[-S] [file-path ...]\n",
11132 715dc77e 2019-08-03 stsp 	    getprogname());
11133 715dc77e 2019-08-03 stsp 	exit(1);
11134 715dc77e 2019-08-03 stsp }
11135 715dc77e 2019-08-03 stsp 
11136 715dc77e 2019-08-03 stsp static const struct got_error *
11137 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
11138 408b4ebc 2019-08-03 stsp     const char *path, struct got_object_id *blob_id,
11139 12463d8b 2019-12-13 stsp     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11140 12463d8b 2019-12-13 stsp     int dirfd, const char *de_name)
11141 408b4ebc 2019-08-03 stsp {
11142 408b4ebc 2019-08-03 stsp 	const struct got_error *err = NULL;
11143 408b4ebc 2019-08-03 stsp 	char *id_str = NULL;
11144 408b4ebc 2019-08-03 stsp 
11145 408b4ebc 2019-08-03 stsp 	if (staged_status != GOT_STATUS_ADD &&
11146 408b4ebc 2019-08-03 stsp 	    staged_status != GOT_STATUS_MODIFY &&
11147 408b4ebc 2019-08-03 stsp 	    staged_status != GOT_STATUS_DELETE)
11148 408b4ebc 2019-08-03 stsp 		return NULL;
11149 408b4ebc 2019-08-03 stsp 
11150 408b4ebc 2019-08-03 stsp 	if (staged_status == GOT_STATUS_ADD ||
11151 408b4ebc 2019-08-03 stsp 	    staged_status == GOT_STATUS_MODIFY)
11152 408b4ebc 2019-08-03 stsp 		err = got_object_id_str(&id_str, staged_blob_id);
11153 408b4ebc 2019-08-03 stsp 	else
11154 408b4ebc 2019-08-03 stsp 		err = got_object_id_str(&id_str, blob_id);
11155 408b4ebc 2019-08-03 stsp 	if (err)
11156 408b4ebc 2019-08-03 stsp 		return err;
11157 408b4ebc 2019-08-03 stsp 
11158 408b4ebc 2019-08-03 stsp 	printf("%s %c %s\n", id_str, staged_status, path);
11159 408b4ebc 2019-08-03 stsp 	free(id_str);
11160 dc424a06 2019-08-07 stsp 	return NULL;
11161 dc424a06 2019-08-07 stsp }
11162 2e1f37b0 2019-08-08 stsp 
11163 dc424a06 2019-08-07 stsp static const struct got_error *
11164 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
11165 715dc77e 2019-08-03 stsp {
11166 715dc77e 2019-08-03 stsp 	const struct got_error *error = NULL;
11167 715dc77e 2019-08-03 stsp 	struct got_repository *repo = NULL;
11168 715dc77e 2019-08-03 stsp 	struct got_worktree *worktree = NULL;
11169 715dc77e 2019-08-03 stsp 	char *cwd = NULL;
11170 715dc77e 2019-08-03 stsp 	struct got_pathlist_head paths;
11171 715dc77e 2019-08-03 stsp 	struct got_pathlist_entry *pe;
11172 35213c7c 2020-07-23 stsp 	int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11173 dc424a06 2019-08-07 stsp 	FILE *patch_script_file = NULL;
11174 2e1f37b0 2019-08-08 stsp 	const char *patch_script_path = NULL;
11175 2e1f37b0 2019-08-08 stsp 	struct choose_patch_arg cpa;
11176 715dc77e 2019-08-03 stsp 
11177 715dc77e 2019-08-03 stsp 	TAILQ_INIT(&paths);
11178 715dc77e 2019-08-03 stsp 
11179 35213c7c 2020-07-23 stsp 	while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11180 715dc77e 2019-08-03 stsp 		switch (ch) {
11181 408b4ebc 2019-08-03 stsp 		case 'l':
11182 408b4ebc 2019-08-03 stsp 			list_stage = 1;
11183 408b4ebc 2019-08-03 stsp 			break;
11184 dc424a06 2019-08-07 stsp 		case 'p':
11185 dc424a06 2019-08-07 stsp 			pflag = 1;
11186 dc424a06 2019-08-07 stsp 			break;
11187 dc424a06 2019-08-07 stsp 		case 'F':
11188 dc424a06 2019-08-07 stsp 			patch_script_path = optarg;
11189 dc424a06 2019-08-07 stsp 			break;
11190 35213c7c 2020-07-23 stsp 		case 'S':
11191 35213c7c 2020-07-23 stsp 			allow_bad_symlinks = 1;
11192 35213c7c 2020-07-23 stsp 			break;
11193 715dc77e 2019-08-03 stsp 		default:
11194 715dc77e 2019-08-03 stsp 			usage_stage();
11195 715dc77e 2019-08-03 stsp 			/* NOTREACHED */
11196 715dc77e 2019-08-03 stsp 		}
11197 715dc77e 2019-08-03 stsp 	}
11198 715dc77e 2019-08-03 stsp 
11199 715dc77e 2019-08-03 stsp 	argc -= optind;
11200 715dc77e 2019-08-03 stsp 	argv += optind;
11201 715dc77e 2019-08-03 stsp 
11202 715dc77e 2019-08-03 stsp #ifndef PROFILE
11203 715dc77e 2019-08-03 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11204 715dc77e 2019-08-03 stsp 	    "unveil", NULL) == -1)
11205 715dc77e 2019-08-03 stsp 		err(1, "pledge");
11206 715dc77e 2019-08-03 stsp #endif
11207 2db2652d 2019-08-07 stsp 	if (list_stage && (pflag || patch_script_path))
11208 2db2652d 2019-08-07 stsp 		errx(1, "-l option cannot be used with other options");
11209 dc424a06 2019-08-07 stsp 	if (patch_script_path && !pflag)
11210 dc424a06 2019-08-07 stsp 		errx(1, "-F option can only be used together with -p option");
11211 715dc77e 2019-08-03 stsp 
11212 715dc77e 2019-08-03 stsp 	cwd = getcwd(NULL, 0);
11213 715dc77e 2019-08-03 stsp 	if (cwd == NULL) {
11214 715dc77e 2019-08-03 stsp 		error = got_error_from_errno("getcwd");
11215 715dc77e 2019-08-03 stsp 		goto done;
11216 715dc77e 2019-08-03 stsp 	}
11217 715dc77e 2019-08-03 stsp 
11218 715dc77e 2019-08-03 stsp 	error = got_worktree_open(&worktree, cwd);
11219 fa51e947 2020-03-27 stsp 	if (error) {
11220 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
11221 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "stage", cwd);
11222 715dc77e 2019-08-03 stsp 		goto done;
11223 fa51e947 2020-03-27 stsp 	}
11224 715dc77e 2019-08-03 stsp 
11225 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11226 c9956ddf 2019-09-08 stsp 	    NULL);
11227 715dc77e 2019-08-03 stsp 	if (error != NULL)
11228 715dc77e 2019-08-03 stsp 		goto done;
11229 715dc77e 2019-08-03 stsp 
11230 dc424a06 2019-08-07 stsp 	if (patch_script_path) {
11231 dc424a06 2019-08-07 stsp 		patch_script_file = fopen(patch_script_path, "r");
11232 dc424a06 2019-08-07 stsp 		if (patch_script_file == NULL) {
11233 dc424a06 2019-08-07 stsp 			error = got_error_from_errno2("fopen",
11234 dc424a06 2019-08-07 stsp 			    patch_script_path);
11235 dc424a06 2019-08-07 stsp 			goto done;
11236 dc424a06 2019-08-07 stsp 		}
11237 dc424a06 2019-08-07 stsp 	}
11238 9fd7cd22 2019-08-30 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
11239 715dc77e 2019-08-03 stsp 	    got_worktree_get_root_path(worktree));
11240 715dc77e 2019-08-03 stsp 	if (error)
11241 715dc77e 2019-08-03 stsp 		goto done;
11242 715dc77e 2019-08-03 stsp 
11243 10604dce 2021-09-24 thomas 	error = check_merge_in_progress(worktree, repo);
11244 10604dce 2021-09-24 thomas 	if (error)
11245 10604dce 2021-09-24 thomas 		goto done;
11246 10604dce 2021-09-24 thomas 
11247 6d022e97 2019-08-04 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11248 6d022e97 2019-08-04 stsp 	if (error)
11249 6d022e97 2019-08-04 stsp 		goto done;
11250 715dc77e 2019-08-03 stsp 
11251 6d022e97 2019-08-04 stsp 	if (list_stage)
11252 f6343036 2021-06-22 stsp 		error = got_worktree_status(worktree, &paths, repo, 0,
11253 408b4ebc 2019-08-03 stsp 		    print_stage, NULL, check_cancelled, NULL);
11254 2e1f37b0 2019-08-08 stsp 	else {
11255 2e1f37b0 2019-08-08 stsp 		cpa.patch_script_file = patch_script_file;
11256 2e1f37b0 2019-08-08 stsp 		cpa.action = "stage";
11257 dc424a06 2019-08-07 stsp 		error = got_worktree_stage(worktree, &paths,
11258 dc424a06 2019-08-07 stsp 		    pflag ? NULL : print_status, NULL,
11259 35213c7c 2020-07-23 stsp 		    pflag ? choose_patch : NULL, &cpa,
11260 35213c7c 2020-07-23 stsp 		    allow_bad_symlinks, repo);
11261 2e1f37b0 2019-08-08 stsp 	}
11262 ad493afc 2019-08-03 stsp done:
11263 2e1f37b0 2019-08-08 stsp 	if (patch_script_file && fclose(patch_script_file) == EOF &&
11264 2e1f37b0 2019-08-08 stsp 	    error == NULL)
11265 2e1f37b0 2019-08-08 stsp 		error = got_error_from_errno2("fclose", patch_script_path);
11266 1d0f4054 2021-06-17 stsp 	if (repo) {
11267 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
11268 1d0f4054 2021-06-17 stsp 		if (error == NULL)
11269 1d0f4054 2021-06-17 stsp 			error = close_err;
11270 1d0f4054 2021-06-17 stsp 	}
11271 ad493afc 2019-08-03 stsp 	if (worktree)
11272 ad493afc 2019-08-03 stsp 		got_worktree_close(worktree);
11273 ad493afc 2019-08-03 stsp 	TAILQ_FOREACH(pe, &paths, entry)
11274 ad493afc 2019-08-03 stsp 		free((char *)pe->path);
11275 ad493afc 2019-08-03 stsp 	got_pathlist_free(&paths);
11276 ad493afc 2019-08-03 stsp 	free(cwd);
11277 ad493afc 2019-08-03 stsp 	return error;
11278 ad493afc 2019-08-03 stsp }
11279 ad493afc 2019-08-03 stsp 
11280 ad493afc 2019-08-03 stsp __dead static void
11281 ad493afc 2019-08-03 stsp usage_unstage(void)
11282 ad493afc 2019-08-03 stsp {
11283 2e1f37b0 2019-08-08 stsp 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11284 2e1f37b0 2019-08-08 stsp 	    "[file-path ...]\n",
11285 ad493afc 2019-08-03 stsp 	    getprogname());
11286 ad493afc 2019-08-03 stsp 	exit(1);
11287 ad493afc 2019-08-03 stsp }
11288 ad493afc 2019-08-03 stsp 
11289 ad493afc 2019-08-03 stsp 
11290 ad493afc 2019-08-03 stsp static const struct got_error *
11291 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
11292 ad493afc 2019-08-03 stsp {
11293 ad493afc 2019-08-03 stsp 	const struct got_error *error = NULL;
11294 ad493afc 2019-08-03 stsp 	struct got_repository *repo = NULL;
11295 ad493afc 2019-08-03 stsp 	struct got_worktree *worktree = NULL;
11296 ad493afc 2019-08-03 stsp 	char *cwd = NULL;
11297 ad493afc 2019-08-03 stsp 	struct got_pathlist_head paths;
11298 ad493afc 2019-08-03 stsp 	struct got_pathlist_entry *pe;
11299 9627c110 2020-04-18 stsp 	int ch, pflag = 0;
11300 9627c110 2020-04-18 stsp 	struct got_update_progress_arg upa;
11301 2e1f37b0 2019-08-08 stsp 	FILE *patch_script_file = NULL;
11302 2e1f37b0 2019-08-08 stsp 	const char *patch_script_path = NULL;
11303 2e1f37b0 2019-08-08 stsp 	struct choose_patch_arg cpa;
11304 ad493afc 2019-08-03 stsp 
11305 ad493afc 2019-08-03 stsp 	TAILQ_INIT(&paths);
11306 ad493afc 2019-08-03 stsp 
11307 2e1f37b0 2019-08-08 stsp 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
11308 ad493afc 2019-08-03 stsp 		switch (ch) {
11309 2e1f37b0 2019-08-08 stsp 		case 'p':
11310 2e1f37b0 2019-08-08 stsp 			pflag = 1;
11311 2e1f37b0 2019-08-08 stsp 			break;
11312 2e1f37b0 2019-08-08 stsp 		case 'F':
11313 2e1f37b0 2019-08-08 stsp 			patch_script_path = optarg;
11314 2e1f37b0 2019-08-08 stsp 			break;
11315 ad493afc 2019-08-03 stsp 		default:
11316 ad493afc 2019-08-03 stsp 			usage_unstage();
11317 ad493afc 2019-08-03 stsp 			/* NOTREACHED */
11318 ad493afc 2019-08-03 stsp 		}
11319 ad493afc 2019-08-03 stsp 	}
11320 ad493afc 2019-08-03 stsp 
11321 ad493afc 2019-08-03 stsp 	argc -= optind;
11322 ad493afc 2019-08-03 stsp 	argv += optind;
11323 ad493afc 2019-08-03 stsp 
11324 ad493afc 2019-08-03 stsp #ifndef PROFILE
11325 ad493afc 2019-08-03 stsp 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11326 ad493afc 2019-08-03 stsp 	    "unveil", NULL) == -1)
11327 ad493afc 2019-08-03 stsp 		err(1, "pledge");
11328 ad493afc 2019-08-03 stsp #endif
11329 2e1f37b0 2019-08-08 stsp 	if (patch_script_path && !pflag)
11330 2e1f37b0 2019-08-08 stsp 		errx(1, "-F option can only be used together with -p option");
11331 2e1f37b0 2019-08-08 stsp 
11332 ad493afc 2019-08-03 stsp 	cwd = getcwd(NULL, 0);
11333 ad493afc 2019-08-03 stsp 	if (cwd == NULL) {
11334 ad493afc 2019-08-03 stsp 		error = got_error_from_errno("getcwd");
11335 ad493afc 2019-08-03 stsp 		goto done;
11336 ad493afc 2019-08-03 stsp 	}
11337 ad493afc 2019-08-03 stsp 
11338 ad493afc 2019-08-03 stsp 	error = got_worktree_open(&worktree, cwd);
11339 fa51e947 2020-03-27 stsp 	if (error) {
11340 fa51e947 2020-03-27 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
11341 fa51e947 2020-03-27 stsp 			error = wrap_not_worktree_error(error, "unstage", cwd);
11342 ad493afc 2019-08-03 stsp 		goto done;
11343 fa51e947 2020-03-27 stsp 	}
11344 ad493afc 2019-08-03 stsp 
11345 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11346 c9956ddf 2019-09-08 stsp 	    NULL);
11347 ad493afc 2019-08-03 stsp 	if (error != NULL)
11348 ad493afc 2019-08-03 stsp 		goto done;
11349 ad493afc 2019-08-03 stsp 
11350 2e1f37b0 2019-08-08 stsp 	if (patch_script_path) {
11351 2e1f37b0 2019-08-08 stsp 		patch_script_file = fopen(patch_script_path, "r");
11352 2e1f37b0 2019-08-08 stsp 		if (patch_script_file == NULL) {
11353 2e1f37b0 2019-08-08 stsp 			error = got_error_from_errno2("fopen",
11354 2e1f37b0 2019-08-08 stsp 			    patch_script_path);
11355 2e1f37b0 2019-08-08 stsp 			goto done;
11356 2e1f37b0 2019-08-08 stsp 		}
11357 2e1f37b0 2019-08-08 stsp 	}
11358 2e1f37b0 2019-08-08 stsp 
11359 00f36e47 2019-09-06 stsp 	error = apply_unveil(got_repo_get_path(repo), 0,
11360 ad493afc 2019-08-03 stsp 	    got_worktree_get_root_path(worktree));
11361 ad493afc 2019-08-03 stsp 	if (error)
11362 ad493afc 2019-08-03 stsp 		goto done;
11363 ad493afc 2019-08-03 stsp 
11364 ad493afc 2019-08-03 stsp 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11365 ad493afc 2019-08-03 stsp 	if (error)
11366 ad493afc 2019-08-03 stsp 		goto done;
11367 ad493afc 2019-08-03 stsp 
11368 2e1f37b0 2019-08-08 stsp 	cpa.patch_script_file = patch_script_file;
11369 2e1f37b0 2019-08-08 stsp 	cpa.action = "unstage";
11370 9627c110 2020-04-18 stsp 	memset(&upa, 0, sizeof(upa));
11371 ad493afc 2019-08-03 stsp 	error = got_worktree_unstage(worktree, &paths, update_progress,
11372 9627c110 2020-04-18 stsp 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
11373 9627c110 2020-04-18 stsp 	if (!error)
11374 0ef68859 2021-09-28 thomas 		print_merge_progress_stats(&upa);
11375 715dc77e 2019-08-03 stsp done:
11376 2e1f37b0 2019-08-08 stsp 	if (patch_script_file && fclose(patch_script_file) == EOF &&
11377 2e1f37b0 2019-08-08 stsp 	    error == NULL)
11378 2e1f37b0 2019-08-08 stsp 		error = got_error_from_errno2("fclose", patch_script_path);
11379 1d0f4054 2021-06-17 stsp 	if (repo) {
11380 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
11381 1d0f4054 2021-06-17 stsp 		if (error == NULL)
11382 1d0f4054 2021-06-17 stsp 			error = close_err;
11383 1d0f4054 2021-06-17 stsp 	}
11384 715dc77e 2019-08-03 stsp 	if (worktree)
11385 715dc77e 2019-08-03 stsp 		got_worktree_close(worktree);
11386 715dc77e 2019-08-03 stsp 	TAILQ_FOREACH(pe, &paths, entry)
11387 715dc77e 2019-08-03 stsp 		free((char *)pe->path);
11388 715dc77e 2019-08-03 stsp 	got_pathlist_free(&paths);
11389 715dc77e 2019-08-03 stsp 	free(cwd);
11390 01073a5d 2019-08-22 stsp 	return error;
11391 01073a5d 2019-08-22 stsp }
11392 01073a5d 2019-08-22 stsp 
11393 01073a5d 2019-08-22 stsp __dead static void
11394 01073a5d 2019-08-22 stsp usage_cat(void)
11395 01073a5d 2019-08-22 stsp {
11396 896e9b6f 2019-08-26 stsp 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11397 896e9b6f 2019-08-26 stsp 	    "arg1 [arg2 ...]\n", getprogname());
11398 01073a5d 2019-08-22 stsp 	exit(1);
11399 01073a5d 2019-08-22 stsp }
11400 01073a5d 2019-08-22 stsp 
11401 01073a5d 2019-08-22 stsp static const struct got_error *
11402 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11403 01073a5d 2019-08-22 stsp {
11404 01073a5d 2019-08-22 stsp 	const struct got_error *err;
11405 01073a5d 2019-08-22 stsp 	struct got_blob_object *blob;
11406 01073a5d 2019-08-22 stsp 
11407 01073a5d 2019-08-22 stsp 	err = got_object_open_as_blob(&blob, repo, id, 8192);
11408 01073a5d 2019-08-22 stsp 	if (err)
11409 01073a5d 2019-08-22 stsp 		return err;
11410 01073a5d 2019-08-22 stsp 
11411 01073a5d 2019-08-22 stsp 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11412 01073a5d 2019-08-22 stsp 	got_object_blob_close(blob);
11413 01073a5d 2019-08-22 stsp 	return err;
11414 01073a5d 2019-08-22 stsp }
11415 01073a5d 2019-08-22 stsp 
11416 01073a5d 2019-08-22 stsp static const struct got_error *
11417 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11418 01073a5d 2019-08-22 stsp {
11419 01073a5d 2019-08-22 stsp 	const struct got_error *err;
11420 01073a5d 2019-08-22 stsp 	struct got_tree_object *tree;
11421 56e0773d 2019-11-28 stsp 	int nentries, i;
11422 01073a5d 2019-08-22 stsp 
11423 01073a5d 2019-08-22 stsp 	err = got_object_open_as_tree(&tree, repo, id);
11424 01073a5d 2019-08-22 stsp 	if (err)
11425 01073a5d 2019-08-22 stsp 		return err;
11426 01073a5d 2019-08-22 stsp 
11427 56e0773d 2019-11-28 stsp 	nentries = got_object_tree_get_nentries(tree);
11428 56e0773d 2019-11-28 stsp 	for (i = 0; i < nentries; i++) {
11429 56e0773d 2019-11-28 stsp 		struct got_tree_entry *te;
11430 01073a5d 2019-08-22 stsp 		char *id_str;
11431 01073a5d 2019-08-22 stsp 		if (sigint_received || sigpipe_received)
11432 01073a5d 2019-08-22 stsp 			break;
11433 56e0773d 2019-11-28 stsp 		te = got_object_tree_get_entry(tree, i);
11434 56e0773d 2019-11-28 stsp 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11435 01073a5d 2019-08-22 stsp 		if (err)
11436 01073a5d 2019-08-22 stsp 			break;
11437 56e0773d 2019-11-28 stsp 		fprintf(outfile, "%s %.7o %s\n", id_str,
11438 56e0773d 2019-11-28 stsp 		    got_tree_entry_get_mode(te),
11439 56e0773d 2019-11-28 stsp 		    got_tree_entry_get_name(te));
11440 01073a5d 2019-08-22 stsp 		free(id_str);
11441 01073a5d 2019-08-22 stsp 	}
11442 01073a5d 2019-08-22 stsp 
11443 01073a5d 2019-08-22 stsp 	got_object_tree_close(tree);
11444 01073a5d 2019-08-22 stsp 	return err;
11445 01073a5d 2019-08-22 stsp }
11446 01073a5d 2019-08-22 stsp 
11447 01073a5d 2019-08-22 stsp static const struct got_error *
11448 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11449 01073a5d 2019-08-22 stsp {
11450 01073a5d 2019-08-22 stsp 	const struct got_error *err;
11451 01073a5d 2019-08-22 stsp 	struct got_commit_object *commit;
11452 01073a5d 2019-08-22 stsp 	const struct got_object_id_queue *parent_ids;
11453 01073a5d 2019-08-22 stsp 	struct got_object_qid *pid;
11454 01073a5d 2019-08-22 stsp 	char *id_str = NULL;
11455 24ea5512 2019-08-22 stsp 	const char *logmsg = NULL;
11456 01073a5d 2019-08-22 stsp 
11457 01073a5d 2019-08-22 stsp 	err = got_object_open_as_commit(&commit, repo, id);
11458 01073a5d 2019-08-22 stsp 	if (err)
11459 01073a5d 2019-08-22 stsp 		return err;
11460 01073a5d 2019-08-22 stsp 
11461 01073a5d 2019-08-22 stsp 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11462 01073a5d 2019-08-22 stsp 	if (err)
11463 01073a5d 2019-08-22 stsp 		goto done;
11464 01073a5d 2019-08-22 stsp 
11465 8aa93786 2019-08-22 stsp 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11466 01073a5d 2019-08-22 stsp 	parent_ids = got_object_commit_get_parent_ids(commit);
11467 8aa93786 2019-08-22 stsp 	fprintf(outfile, "numparents %d\n",
11468 01073a5d 2019-08-22 stsp 	    got_object_commit_get_nparents(commit));
11469 dbdddfee 2021-06-23 naddy 	STAILQ_FOREACH(pid, parent_ids, entry) {
11470 01073a5d 2019-08-22 stsp 		char *pid_str;
11471 01073a5d 2019-08-22 stsp 		err = got_object_id_str(&pid_str, pid->id);
11472 01073a5d 2019-08-22 stsp 		if (err)
11473 01073a5d 2019-08-22 stsp 			goto done;
11474 8aa93786 2019-08-22 stsp 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11475 01073a5d 2019-08-22 stsp 		free(pid_str);
11476 01073a5d 2019-08-22 stsp 	}
11477 8aa93786 2019-08-22 stsp 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
11478 8aa93786 2019-08-22 stsp 	    got_object_commit_get_author(commit),
11479 1367695b 2020-09-26 naddy 	    (long long)got_object_commit_get_author_time(commit));
11480 01073a5d 2019-08-22 stsp 
11481 8aa93786 2019-08-22 stsp 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
11482 8aa93786 2019-08-22 stsp 	    got_object_commit_get_author(commit),
11483 1367695b 2020-09-26 naddy 	    (long long)got_object_commit_get_committer_time(commit));
11484 01073a5d 2019-08-22 stsp 
11485 24ea5512 2019-08-22 stsp 	logmsg = got_object_commit_get_logmsg_raw(commit);
11486 8aa93786 2019-08-22 stsp 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11487 01073a5d 2019-08-22 stsp 	fprintf(outfile, "%s", logmsg);
11488 01073a5d 2019-08-22 stsp done:
11489 01073a5d 2019-08-22 stsp 	free(id_str);
11490 01073a5d 2019-08-22 stsp 	got_object_commit_close(commit);
11491 01073a5d 2019-08-22 stsp 	return err;
11492 01073a5d 2019-08-22 stsp }
11493 01073a5d 2019-08-22 stsp 
11494 01073a5d 2019-08-22 stsp static const struct got_error *
11495 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11496 01073a5d 2019-08-22 stsp {
11497 01073a5d 2019-08-22 stsp 	const struct got_error *err;
11498 01073a5d 2019-08-22 stsp 	struct got_tag_object *tag;
11499 01073a5d 2019-08-22 stsp 	char *id_str = NULL;
11500 01073a5d 2019-08-22 stsp 	const char *tagmsg = NULL;
11501 01073a5d 2019-08-22 stsp 
11502 01073a5d 2019-08-22 stsp 	err = got_object_open_as_tag(&tag, repo, id);
11503 01073a5d 2019-08-22 stsp 	if (err)
11504 01073a5d 2019-08-22 stsp 		return err;
11505 01073a5d 2019-08-22 stsp 
11506 01073a5d 2019-08-22 stsp 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11507 01073a5d 2019-08-22 stsp 	if (err)
11508 01073a5d 2019-08-22 stsp 		goto done;
11509 01073a5d 2019-08-22 stsp 
11510 e15d5241 2019-08-22 stsp 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11511 e15d5241 2019-08-22 stsp 
11512 01073a5d 2019-08-22 stsp 	switch (got_object_tag_get_object_type(tag)) {
11513 01073a5d 2019-08-22 stsp 	case GOT_OBJ_TYPE_BLOB:
11514 8aa93786 2019-08-22 stsp 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11515 8aa93786 2019-08-22 stsp 		    GOT_OBJ_LABEL_BLOB);
11516 01073a5d 2019-08-22 stsp 		break;
11517 01073a5d 2019-08-22 stsp 	case GOT_OBJ_TYPE_TREE:
11518 8aa93786 2019-08-22 stsp 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11519 8aa93786 2019-08-22 stsp 		    GOT_OBJ_LABEL_TREE);
11520 01073a5d 2019-08-22 stsp 		break;
11521 01073a5d 2019-08-22 stsp 	case GOT_OBJ_TYPE_COMMIT:
11522 8aa93786 2019-08-22 stsp 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11523 8aa93786 2019-08-22 stsp 		    GOT_OBJ_LABEL_COMMIT);
11524 01073a5d 2019-08-22 stsp 		break;
11525 01073a5d 2019-08-22 stsp 	case GOT_OBJ_TYPE_TAG:
11526 8aa93786 2019-08-22 stsp 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11527 8aa93786 2019-08-22 stsp 		    GOT_OBJ_LABEL_TAG);
11528 01073a5d 2019-08-22 stsp 		break;
11529 01073a5d 2019-08-22 stsp 	default:
11530 01073a5d 2019-08-22 stsp 		break;
11531 01073a5d 2019-08-22 stsp 	}
11532 01073a5d 2019-08-22 stsp 
11533 e15d5241 2019-08-22 stsp 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11534 e15d5241 2019-08-22 stsp 	    got_object_tag_get_name(tag));
11535 e15d5241 2019-08-22 stsp 
11536 8aa93786 2019-08-22 stsp 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
11537 8aa93786 2019-08-22 stsp 	    got_object_tag_get_tagger(tag),
11538 1367695b 2020-09-26 naddy 	    (long long)got_object_tag_get_tagger_time(tag));
11539 01073a5d 2019-08-22 stsp 
11540 01073a5d 2019-08-22 stsp 	tagmsg = got_object_tag_get_message(tag);
11541 8aa93786 2019-08-22 stsp 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11542 01073a5d 2019-08-22 stsp 	fprintf(outfile, "%s", tagmsg);
11543 01073a5d 2019-08-22 stsp done:
11544 01073a5d 2019-08-22 stsp 	free(id_str);
11545 01073a5d 2019-08-22 stsp 	got_object_tag_close(tag);
11546 01073a5d 2019-08-22 stsp 	return err;
11547 01073a5d 2019-08-22 stsp }
11548 01073a5d 2019-08-22 stsp 
11549 01073a5d 2019-08-22 stsp static const struct got_error *
11550 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
11551 01073a5d 2019-08-22 stsp {
11552 01073a5d 2019-08-22 stsp 	const struct got_error *error;
11553 01073a5d 2019-08-22 stsp 	struct got_repository *repo = NULL;
11554 01073a5d 2019-08-22 stsp 	struct got_worktree *worktree = NULL;
11555 01073a5d 2019-08-22 stsp 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
11556 896e9b6f 2019-08-26 stsp 	const char *commit_id_str = NULL;
11557 896e9b6f 2019-08-26 stsp 	struct got_object_id *id = NULL, *commit_id = NULL;
11558 896e9b6f 2019-08-26 stsp 	int ch, obj_type, i, force_path = 0;
11559 84de9106 2020-12-26 stsp 	struct got_reflist_head refs;
11560 84de9106 2020-12-26 stsp 
11561 d9dff0e5 2020-12-26 stsp 	TAILQ_INIT(&refs);
11562 01073a5d 2019-08-22 stsp 
11563 01073a5d 2019-08-22 stsp #ifndef PROFILE
11564 01073a5d 2019-08-22 stsp 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11565 01073a5d 2019-08-22 stsp 	    NULL) == -1)
11566 01073a5d 2019-08-22 stsp 		err(1, "pledge");
11567 01073a5d 2019-08-22 stsp #endif
11568 01073a5d 2019-08-22 stsp 
11569 896e9b6f 2019-08-26 stsp 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11570 01073a5d 2019-08-22 stsp 		switch (ch) {
11571 896e9b6f 2019-08-26 stsp 		case 'c':
11572 896e9b6f 2019-08-26 stsp 			commit_id_str = optarg;
11573 896e9b6f 2019-08-26 stsp 			break;
11574 01073a5d 2019-08-22 stsp 		case 'r':
11575 01073a5d 2019-08-22 stsp 			repo_path = realpath(optarg, NULL);
11576 01073a5d 2019-08-22 stsp 			if (repo_path == NULL)
11577 9ba1d308 2019-10-21 stsp 				return got_error_from_errno2("realpath",
11578 9ba1d308 2019-10-21 stsp 				    optarg);
11579 01073a5d 2019-08-22 stsp 			got_path_strip_trailing_slashes(repo_path);
11580 01073a5d 2019-08-22 stsp 			break;
11581 896e9b6f 2019-08-26 stsp 		case 'P':
11582 896e9b6f 2019-08-26 stsp 			force_path = 1;
11583 896e9b6f 2019-08-26 stsp 			break;
11584 01073a5d 2019-08-22 stsp 		default:
11585 01073a5d 2019-08-22 stsp 			usage_cat();
11586 01073a5d 2019-08-22 stsp 			/* NOTREACHED */
11587 01073a5d 2019-08-22 stsp 		}
11588 01073a5d 2019-08-22 stsp 	}
11589 01073a5d 2019-08-22 stsp 
11590 01073a5d 2019-08-22 stsp 	argc -= optind;
11591 01073a5d 2019-08-22 stsp 	argv += optind;
11592 01073a5d 2019-08-22 stsp 
11593 01073a5d 2019-08-22 stsp 	cwd = getcwd(NULL, 0);
11594 01073a5d 2019-08-22 stsp 	if (cwd == NULL) {
11595 01073a5d 2019-08-22 stsp 		error = got_error_from_errno("getcwd");
11596 01073a5d 2019-08-22 stsp 		goto done;
11597 01073a5d 2019-08-22 stsp 	}
11598 01073a5d 2019-08-22 stsp 	error = got_worktree_open(&worktree, cwd);
11599 01073a5d 2019-08-22 stsp 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
11600 01073a5d 2019-08-22 stsp 		goto done;
11601 01073a5d 2019-08-22 stsp 	if (worktree) {
11602 01073a5d 2019-08-22 stsp 		if (repo_path == NULL) {
11603 01073a5d 2019-08-22 stsp 			repo_path = strdup(
11604 01073a5d 2019-08-22 stsp 			    got_worktree_get_repo_path(worktree));
11605 01073a5d 2019-08-22 stsp 			if (repo_path == NULL) {
11606 01073a5d 2019-08-22 stsp 				error = got_error_from_errno("strdup");
11607 01073a5d 2019-08-22 stsp 				goto done;
11608 01073a5d 2019-08-22 stsp 			}
11609 01073a5d 2019-08-22 stsp 		}
11610 01073a5d 2019-08-22 stsp 	}
11611 01073a5d 2019-08-22 stsp 
11612 01073a5d 2019-08-22 stsp 	if (repo_path == NULL) {
11613 01073a5d 2019-08-22 stsp 		repo_path = getcwd(NULL, 0);
11614 01073a5d 2019-08-22 stsp 		if (repo_path == NULL)
11615 01073a5d 2019-08-22 stsp 			return got_error_from_errno("getcwd");
11616 01073a5d 2019-08-22 stsp 	}
11617 01073a5d 2019-08-22 stsp 
11618 c9956ddf 2019-09-08 stsp 	error = got_repo_open(&repo, repo_path, NULL);
11619 01073a5d 2019-08-22 stsp 	free(repo_path);
11620 01073a5d 2019-08-22 stsp 	if (error != NULL)
11621 01073a5d 2019-08-22 stsp 		goto done;
11622 01073a5d 2019-08-22 stsp 
11623 01073a5d 2019-08-22 stsp 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
11624 896e9b6f 2019-08-26 stsp 	if (error)
11625 896e9b6f 2019-08-26 stsp 		goto done;
11626 896e9b6f 2019-08-26 stsp 
11627 84de9106 2020-12-26 stsp 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11628 84de9106 2020-12-26 stsp 	if (error)
11629 84de9106 2020-12-26 stsp 		goto done;
11630 84de9106 2020-12-26 stsp 
11631 896e9b6f 2019-08-26 stsp 	if (commit_id_str == NULL)
11632 896e9b6f 2019-08-26 stsp 		commit_id_str = GOT_REF_HEAD;
11633 71a27632 2020-01-15 stsp 	error = got_repo_match_object_id(&commit_id, NULL,
11634 84de9106 2020-12-26 stsp 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
11635 01073a5d 2019-08-22 stsp 	if (error)
11636 01073a5d 2019-08-22 stsp 		goto done;
11637 01073a5d 2019-08-22 stsp 
11638 01073a5d 2019-08-22 stsp 	for (i = 0; i < argc; i++) {
11639 896e9b6f 2019-08-26 stsp 		if (force_path) {
11640 896e9b6f 2019-08-26 stsp 			error = got_object_id_by_path(&id, repo, commit_id,
11641 896e9b6f 2019-08-26 stsp 			    argv[i]);
11642 896e9b6f 2019-08-26 stsp 			if (error)
11643 896e9b6f 2019-08-26 stsp 				break;
11644 896e9b6f 2019-08-26 stsp 		} else {
11645 71a27632 2020-01-15 stsp 			error = got_repo_match_object_id(&id, &label, argv[i],
11646 84de9106 2020-12-26 stsp 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
11647 84de9106 2020-12-26 stsp 			    repo);
11648 896e9b6f 2019-08-26 stsp 			if (error) {
11649 896e9b6f 2019-08-26 stsp 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
11650 896e9b6f 2019-08-26 stsp 				    error->code != GOT_ERR_NOT_REF)
11651 896e9b6f 2019-08-26 stsp 					break;
11652 896e9b6f 2019-08-26 stsp 				error = got_object_id_by_path(&id, repo,
11653 896e9b6f 2019-08-26 stsp 				    commit_id, argv[i]);
11654 896e9b6f 2019-08-26 stsp 				if (error)
11655 896e9b6f 2019-08-26 stsp 					break;
11656 896e9b6f 2019-08-26 stsp 			}
11657 896e9b6f 2019-08-26 stsp 		}
11658 01073a5d 2019-08-22 stsp 
11659 01073a5d 2019-08-22 stsp 		error = got_object_get_type(&obj_type, repo, id);
11660 01073a5d 2019-08-22 stsp 		if (error)
11661 01073a5d 2019-08-22 stsp 			break;
11662 01073a5d 2019-08-22 stsp 
11663 01073a5d 2019-08-22 stsp 		switch (obj_type) {
11664 01073a5d 2019-08-22 stsp 		case GOT_OBJ_TYPE_BLOB:
11665 01073a5d 2019-08-22 stsp 			error = cat_blob(id, repo, stdout);
11666 01073a5d 2019-08-22 stsp 			break;
11667 01073a5d 2019-08-22 stsp 		case GOT_OBJ_TYPE_TREE:
11668 01073a5d 2019-08-22 stsp 			error = cat_tree(id, repo, stdout);
11669 01073a5d 2019-08-22 stsp 			break;
11670 01073a5d 2019-08-22 stsp 		case GOT_OBJ_TYPE_COMMIT:
11671 01073a5d 2019-08-22 stsp 			error = cat_commit(id, repo, stdout);
11672 01073a5d 2019-08-22 stsp 			break;
11673 01073a5d 2019-08-22 stsp 		case GOT_OBJ_TYPE_TAG:
11674 01073a5d 2019-08-22 stsp 			error = cat_tag(id, repo, stdout);
11675 01073a5d 2019-08-22 stsp 			break;
11676 01073a5d 2019-08-22 stsp 		default:
11677 01073a5d 2019-08-22 stsp 			error = got_error(GOT_ERR_OBJ_TYPE);
11678 01073a5d 2019-08-22 stsp 			break;
11679 01073a5d 2019-08-22 stsp 		}
11680 01073a5d 2019-08-22 stsp 		if (error)
11681 01073a5d 2019-08-22 stsp 			break;
11682 01073a5d 2019-08-22 stsp 		free(label);
11683 01073a5d 2019-08-22 stsp 		label = NULL;
11684 01073a5d 2019-08-22 stsp 		free(id);
11685 01073a5d 2019-08-22 stsp 		id = NULL;
11686 01073a5d 2019-08-22 stsp 	}
11687 01073a5d 2019-08-22 stsp done:
11688 01073a5d 2019-08-22 stsp 	free(label);
11689 01073a5d 2019-08-22 stsp 	free(id);
11690 896e9b6f 2019-08-26 stsp 	free(commit_id);
11691 01073a5d 2019-08-22 stsp 	if (worktree)
11692 01073a5d 2019-08-22 stsp 		got_worktree_close(worktree);
11693 01073a5d 2019-08-22 stsp 	if (repo) {
11694 1d0f4054 2021-06-17 stsp 		const struct got_error *close_err = got_repo_close(repo);
11695 01073a5d 2019-08-22 stsp 		if (error == NULL)
11696 1d0f4054 2021-06-17 stsp 			error = close_err;
11697 b2118c49 2020-07-28 stsp 	}
11698 84de9106 2020-12-26 stsp 	got_ref_list_free(&refs);
11699 b2118c49 2020-07-28 stsp 	return error;
11700 b2118c49 2020-07-28 stsp }
11701 b2118c49 2020-07-28 stsp 
11702 b2118c49 2020-07-28 stsp __dead static void
11703 b2118c49 2020-07-28 stsp usage_info(void)
11704 b2118c49 2020-07-28 stsp {
11705 b2118c49 2020-07-28 stsp 	fprintf(stderr, "usage: %s info [path ...]\n",
11706 b2118c49 2020-07-28 stsp 	    getprogname());
11707 b2118c49 2020-07-28 stsp 	exit(1);
11708 b2118c49 2020-07-28 stsp }
11709 b2118c49 2020-07-28 stsp 
11710 b2118c49 2020-07-28 stsp static const struct got_error *
11711 b2118c49 2020-07-28 stsp print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
11712 b2118c49 2020-07-28 stsp     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11713 b2118c49 2020-07-28 stsp     struct got_object_id *commit_id)
11714 b2118c49 2020-07-28 stsp {
11715 b2118c49 2020-07-28 stsp 	const struct got_error *err = NULL;
11716 b2118c49 2020-07-28 stsp 	char *id_str = NULL;
11717 b2118c49 2020-07-28 stsp 	char datebuf[128];
11718 b2118c49 2020-07-28 stsp 	struct tm mytm, *tm;
11719 b2118c49 2020-07-28 stsp 	struct got_pathlist_head *paths = arg;
11720 b2118c49 2020-07-28 stsp 	struct got_pathlist_entry *pe;
11721 b2118c49 2020-07-28 stsp 
11722 b2118c49 2020-07-28 stsp 	/*
11723 b2118c49 2020-07-28 stsp 	 * Clear error indication from any of the path arguments which
11724 b2118c49 2020-07-28 stsp 	 * would cause this file index entry to be displayed.
11725 b2118c49 2020-07-28 stsp 	 */
11726 b2118c49 2020-07-28 stsp 	TAILQ_FOREACH(pe, paths, entry) {
11727 b2118c49 2020-07-28 stsp 		if (got_path_cmp(path, pe->path, strlen(path),
11728 b2118c49 2020-07-28 stsp 		    pe->path_len) == 0 ||
11729 b2118c49 2020-07-28 stsp 		    got_path_is_child(path, pe->path, pe->path_len))
11730 b2118c49 2020-07-28 stsp 			pe->data = NULL; /* no error */
11731 b2118c49 2020-07-28 stsp 	}
11732 b2118c49 2020-07-28 stsp 
11733 b2118c49 2020-07-28 stsp 	printf(GOT_COMMIT_SEP_STR);
11734 b2118c49 2020-07-28 stsp 	if (S_ISLNK(mode))
11735 b2118c49 2020-07-28 stsp 		printf("symlink: %s\n", path);
11736 b2118c49 2020-07-28 stsp 	else if (S_ISREG(mode)) {
11737 b2118c49 2020-07-28 stsp 		printf("file: %s\n", path);
11738 b2118c49 2020-07-28 stsp 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
11739 b2118c49 2020-07-28 stsp 	} else if (S_ISDIR(mode))
11740 b2118c49 2020-07-28 stsp 		printf("directory: %s\n", path);
11741 b2118c49 2020-07-28 stsp 	else
11742 b2118c49 2020-07-28 stsp 		printf("something: %s\n", path);
11743 b2118c49 2020-07-28 stsp 
11744 b2118c49 2020-07-28 stsp 	tm = localtime_r(&mtime, &mytm);
11745 b2118c49 2020-07-28 stsp 	if (tm == NULL)
11746 b2118c49 2020-07-28 stsp 		return NULL;
11747 ec6d1a36 2021-03-21 jrick 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
11748 b2118c49 2020-07-28 stsp 		return got_error(GOT_ERR_NO_SPACE);
11749 b2118c49 2020-07-28 stsp 	printf("timestamp: %s\n", datebuf);
11750 b2118c49 2020-07-28 stsp 
11751 b2118c49 2020-07-28 stsp 	if (blob_id) {
11752 b2118c49 2020-07-28 stsp 		err = got_object_id_str(&id_str, blob_id);
11753 b2118c49 2020-07-28 stsp 		if (err)
11754 b2118c49 2020-07-28 stsp 			return err;
11755 b2118c49 2020-07-28 stsp 		printf("based on blob: %s\n", id_str);
11756 b2118c49 2020-07-28 stsp 		free(id_str);
11757 b2118c49 2020-07-28 stsp 	}
11758 b2118c49 2020-07-28 stsp 
11759 b2118c49 2020-07-28 stsp 	if (staged_blob_id) {
11760 b2118c49 2020-07-28 stsp 		err = got_object_id_str(&id_str, staged_blob_id);
11761 b2118c49 2020-07-28 stsp 		if (err)
11762 b2118c49 2020-07-28 stsp 			return err;
11763 b2118c49 2020-07-28 stsp 		printf("based on staged blob: %s\n", id_str);
11764 b2118c49 2020-07-28 stsp 		free(id_str);
11765 b2118c49 2020-07-28 stsp 	}
11766 b2118c49 2020-07-28 stsp 
11767 b2118c49 2020-07-28 stsp 	if (commit_id) {
11768 b2118c49 2020-07-28 stsp 		err = got_object_id_str(&id_str, commit_id);
11769 b2118c49 2020-07-28 stsp 		if (err)
11770 b2118c49 2020-07-28 stsp 			return err;
11771 b2118c49 2020-07-28 stsp 		printf("based on commit: %s\n", id_str);
11772 b2118c49 2020-07-28 stsp 		free(id_str);
11773 b2118c49 2020-07-28 stsp 	}
11774 b2118c49 2020-07-28 stsp 
11775 b2118c49 2020-07-28 stsp 	return NULL;
11776 b2118c49 2020-07-28 stsp }
11777 b2118c49 2020-07-28 stsp 
11778 b2118c49 2020-07-28 stsp static const struct got_error *
11779 b2118c49 2020-07-28 stsp cmd_info(int argc, char *argv[])
11780 b2118c49 2020-07-28 stsp {
11781 b2118c49 2020-07-28 stsp 	const struct got_error *error = NULL;
11782 b2118c49 2020-07-28 stsp 	struct got_worktree *worktree = NULL;
11783 b2118c49 2020-07-28 stsp 	char *cwd = NULL, *id_str = NULL;
11784 b2118c49 2020-07-28 stsp 	struct got_pathlist_head paths;
11785 b2118c49 2020-07-28 stsp 	struct got_pathlist_entry *pe;
11786 b2118c49 2020-07-28 stsp 	char *uuidstr = NULL;
11787 b2118c49 2020-07-28 stsp 	int ch, show_files = 0;
11788 b2118c49 2020-07-28 stsp 
11789 b2118c49 2020-07-28 stsp 	TAILQ_INIT(&paths);
11790 b2118c49 2020-07-28 stsp 
11791 b2118c49 2020-07-28 stsp 	while ((ch = getopt(argc, argv, "")) != -1) {
11792 b2118c49 2020-07-28 stsp 		switch (ch) {
11793 b2118c49 2020-07-28 stsp 		default:
11794 b2118c49 2020-07-28 stsp 			usage_info();
11795 b2118c49 2020-07-28 stsp 			/* NOTREACHED */
11796 b2118c49 2020-07-28 stsp 		}
11797 01073a5d 2019-08-22 stsp 	}
11798 b2118c49 2020-07-28 stsp 
11799 b2118c49 2020-07-28 stsp 	argc -= optind;
11800 b2118c49 2020-07-28 stsp 	argv += optind;
11801 b2118c49 2020-07-28 stsp 
11802 b2118c49 2020-07-28 stsp #ifndef PROFILE
11803 b2118c49 2020-07-28 stsp 	if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
11804 b2118c49 2020-07-28 stsp 	    NULL) == -1)
11805 b2118c49 2020-07-28 stsp 		err(1, "pledge");
11806 b2118c49 2020-07-28 stsp #endif
11807 b2118c49 2020-07-28 stsp 	cwd = getcwd(NULL, 0);
11808 b2118c49 2020-07-28 stsp 	if (cwd == NULL) {
11809 b2118c49 2020-07-28 stsp 		error = got_error_from_errno("getcwd");
11810 b2118c49 2020-07-28 stsp 		goto done;
11811 b2118c49 2020-07-28 stsp 	}
11812 b2118c49 2020-07-28 stsp 
11813 b2118c49 2020-07-28 stsp 	error = got_worktree_open(&worktree, cwd);
11814 b2118c49 2020-07-28 stsp 	if (error) {
11815 b2118c49 2020-07-28 stsp 		if (error->code == GOT_ERR_NOT_WORKTREE)
11816 8ea5c997 2021-02-07 naddy 			error = wrap_not_worktree_error(error, "info", cwd);
11817 b2118c49 2020-07-28 stsp 		goto done;
11818 b2118c49 2020-07-28 stsp 	}
11819 b2118c49 2020-07-28 stsp 
11820 b2118c49 2020-07-28 stsp 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
11821 b2118c49 2020-07-28 stsp 	if (error)
11822 b2118c49 2020-07-28 stsp 		goto done;
11823 b2118c49 2020-07-28 stsp 
11824 b2118c49 2020-07-28 stsp 	if (argc >= 1) {
11825 b2118c49 2020-07-28 stsp 		error = get_worktree_paths_from_argv(&paths, argc, argv,
11826 b2118c49 2020-07-28 stsp 		    worktree);
11827 b2118c49 2020-07-28 stsp 		if (error)
11828 b2118c49 2020-07-28 stsp 			goto done;
11829 b2118c49 2020-07-28 stsp 		show_files = 1;
11830 b2118c49 2020-07-28 stsp 	}
11831 b2118c49 2020-07-28 stsp 
11832 b2118c49 2020-07-28 stsp 	error = got_object_id_str(&id_str,
11833 b2118c49 2020-07-28 stsp 	    got_worktree_get_base_commit_id(worktree));
11834 b2118c49 2020-07-28 stsp 	if (error)
11835 b2118c49 2020-07-28 stsp 		goto done;
11836 b2118c49 2020-07-28 stsp 
11837 b2118c49 2020-07-28 stsp 	error = got_worktree_get_uuid(&uuidstr, worktree);
11838 b2118c49 2020-07-28 stsp 	if (error)
11839 b2118c49 2020-07-28 stsp 		goto done;
11840 b2118c49 2020-07-28 stsp 
11841 b2118c49 2020-07-28 stsp 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
11842 b2118c49 2020-07-28 stsp 	printf("work tree base commit: %s\n", id_str);
11843 b2118c49 2020-07-28 stsp 	printf("work tree path prefix: %s\n",
11844 b2118c49 2020-07-28 stsp 	    got_worktree_get_path_prefix(worktree));
11845 b2118c49 2020-07-28 stsp 	printf("work tree branch reference: %s\n",
11846 b2118c49 2020-07-28 stsp 	    got_worktree_get_head_ref_name(worktree));
11847 b2118c49 2020-07-28 stsp 	printf("work tree UUID: %s\n", uuidstr);
11848 b2118c49 2020-07-28 stsp 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
11849 b2118c49 2020-07-28 stsp 
11850 b2118c49 2020-07-28 stsp 	if (show_files) {
11851 b2118c49 2020-07-28 stsp 		struct got_pathlist_entry *pe;
11852 b2118c49 2020-07-28 stsp 		TAILQ_FOREACH(pe, &paths, entry) {
11853 b2118c49 2020-07-28 stsp 			if (pe->path_len == 0)
11854 b2118c49 2020-07-28 stsp 				continue;
11855 b2118c49 2020-07-28 stsp 			/*
11856 b2118c49 2020-07-28 stsp 			 * Assume this path will fail. This will be corrected
11857 b2118c49 2020-07-28 stsp 			 * in print_path_info() in case the path does suceeed.
11858 b2118c49 2020-07-28 stsp 			 */
11859 b2118c49 2020-07-28 stsp 			pe->data = (void *)got_error_path(pe->path,
11860 b2118c49 2020-07-28 stsp 			    GOT_ERR_BAD_PATH);
11861 b2118c49 2020-07-28 stsp 		}
11862 b2118c49 2020-07-28 stsp 		error = got_worktree_path_info(worktree, &paths,
11863 b2118c49 2020-07-28 stsp 		    print_path_info, &paths, check_cancelled, NULL);
11864 b2118c49 2020-07-28 stsp 		if (error)
11865 b2118c49 2020-07-28 stsp 			goto done;
11866 b2118c49 2020-07-28 stsp 		TAILQ_FOREACH(pe, &paths, entry) {
11867 b2118c49 2020-07-28 stsp 			if (pe->data != NULL) {
11868 b2118c49 2020-07-28 stsp 				error = pe->data; /* bad path */
11869 b2118c49 2020-07-28 stsp 				break;
11870 b2118c49 2020-07-28 stsp 			}
11871 b2118c49 2020-07-28 stsp 		}
11872 b2118c49 2020-07-28 stsp 	}
11873 b2118c49 2020-07-28 stsp done:
11874 b2118c49 2020-07-28 stsp 	TAILQ_FOREACH(pe, &paths, entry)
11875 b2118c49 2020-07-28 stsp 		free((char *)pe->path);
11876 b2118c49 2020-07-28 stsp 	got_pathlist_free(&paths);
11877 b2118c49 2020-07-28 stsp 	free(cwd);
11878 b2118c49 2020-07-28 stsp 	free(id_str);
11879 b2118c49 2020-07-28 stsp 	free(uuidstr);
11880 0ebf8283 2019-07-24 stsp 	return error;
11881 0ebf8283 2019-07-24 stsp }