ee4512ed48 ("trace2: create new combined trace facility", 2019-02-
22) introduced trace2_cmd_name() and taught both the Git built-ins and
some non-built-ins to use it. However, http-fetch was not one of them
(perhaps due to its low usage at the time).
Teach http-fetch to invoke this function. After this patch, this
function will be invoked right after argument parsing, just like in
remote-curl.c.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			168 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "cache.h"
 | 
						|
#include "config.h"
 | 
						|
#include "exec-cmd.h"
 | 
						|
#include "http.h"
 | 
						|
#include "walker.h"
 | 
						|
#include "strvec.h"
 | 
						|
#include "urlmatch.h"
 | 
						|
#include "trace2.h"
 | 
						|
 | 
						|
static const char http_fetch_usage[] = "git http-fetch "
 | 
						|
"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url";
 | 
						|
 | 
						|
static int fetch_using_walker(const char *raw_url, int get_verbosely,
 | 
						|
			      int get_recover, int commits, char **commit_id,
 | 
						|
			      const char **write_ref, int commits_on_stdin)
 | 
						|
{
 | 
						|
	char *url = NULL;
 | 
						|
	struct walker *walker;
 | 
						|
	int rc;
 | 
						|
 | 
						|
	str_end_url_with_slash(raw_url, &url);
 | 
						|
 | 
						|
	http_init(NULL, url, 0);
 | 
						|
 | 
						|
	walker = get_http_walker(url);
 | 
						|
	walker->get_verbosely = get_verbosely;
 | 
						|
	walker->get_recover = get_recover;
 | 
						|
	walker->get_progress = 0;
 | 
						|
 | 
						|
	rc = walker_fetch(walker, commits, commit_id, write_ref, url);
 | 
						|
 | 
						|
	if (commits_on_stdin)
 | 
						|
		walker_targets_free(commits, commit_id, write_ref);
 | 
						|
 | 
						|
	if (walker->corrupt_object_found) {
 | 
						|
		fprintf(stderr,
 | 
						|
"Some loose object were found to be corrupt, but they might be just\n"
 | 
						|
"a false '404 Not Found' error message sent with incorrect HTTP\n"
 | 
						|
"status code.  Suggest running 'git fsck'.\n");
 | 
						|
	}
 | 
						|
 | 
						|
	walker_free(walker);
 | 
						|
	http_cleanup();
 | 
						|
	free(url);
 | 
						|
 | 
						|
	return rc;
 | 
						|
}
 | 
						|
 | 
						|
static void fetch_single_packfile(struct object_id *packfile_hash,
 | 
						|
				  const char *url,
 | 
						|
				  const char **index_pack_args) {
 | 
						|
	struct http_pack_request *preq;
 | 
						|
	struct slot_results results;
 | 
						|
	int ret;
 | 
						|
 | 
						|
	http_init(NULL, url, 0);
 | 
						|
 | 
						|
	preq = new_direct_http_pack_request(packfile_hash->hash, xstrdup(url));
 | 
						|
	if (!preq)
 | 
						|
		die("couldn't create http pack request");
 | 
						|
	preq->slot->results = &results;
 | 
						|
	preq->index_pack_args = index_pack_args;
 | 
						|
	preq->preserve_index_pack_stdout = 1;
 | 
						|
 | 
						|
	if (start_active_slot(preq->slot)) {
 | 
						|
		run_active_slot(preq->slot);
 | 
						|
		if (results.curl_result != CURLE_OK) {
 | 
						|
			struct url_info url;
 | 
						|
			char *nurl = url_normalize(preq->url, &url);
 | 
						|
			if (!nurl || !git_env_bool("GIT_TRACE_REDACT", 1)) {
 | 
						|
				die("unable to get pack file '%s'\n%s", preq->url,
 | 
						|
				    curl_errorstr);
 | 
						|
			} else {
 | 
						|
				die("failed to get '%.*s' url from '%.*s' "
 | 
						|
				    "(full URL redacted due to GIT_TRACE_REDACT setting)\n%s",
 | 
						|
				    (int)url.scheme_len, url.url,
 | 
						|
				    (int)url.host_len, &url.url[url.host_off], curl_errorstr);
 | 
						|
			}
 | 
						|
		}
 | 
						|
	} else {
 | 
						|
		die("Unable to start request");
 | 
						|
	}
 | 
						|
 | 
						|
	if ((ret = finish_http_pack_request(preq)))
 | 
						|
		die("finish_http_pack_request gave result %d", ret);
 | 
						|
 | 
						|
	release_http_pack_request(preq);
 | 
						|
	http_cleanup();
 | 
						|
}
 | 
						|
 | 
						|
int cmd_main(int argc, const char **argv)
 | 
						|
{
 | 
						|
	int commits_on_stdin = 0;
 | 
						|
	int commits;
 | 
						|
	const char **write_ref = NULL;
 | 
						|
	char **commit_id;
 | 
						|
	int arg = 1;
 | 
						|
	int get_verbosely = 0;
 | 
						|
	int get_recover = 0;
 | 
						|
	int packfile = 0;
 | 
						|
	int nongit;
 | 
						|
	struct object_id packfile_hash;
 | 
						|
	struct strvec index_pack_args = STRVEC_INIT;
 | 
						|
 | 
						|
	setup_git_directory_gently(&nongit);
 | 
						|
 | 
						|
	while (arg < argc && argv[arg][0] == '-') {
 | 
						|
		const char *p;
 | 
						|
 | 
						|
		if (argv[arg][1] == 't') {
 | 
						|
		} else if (argv[arg][1] == 'c') {
 | 
						|
		} else if (argv[arg][1] == 'a') {
 | 
						|
		} else if (argv[arg][1] == 'v') {
 | 
						|
			get_verbosely = 1;
 | 
						|
		} else if (argv[arg][1] == 'w') {
 | 
						|
			write_ref = &argv[arg + 1];
 | 
						|
			arg++;
 | 
						|
		} else if (argv[arg][1] == 'h') {
 | 
						|
			usage(http_fetch_usage);
 | 
						|
		} else if (!strcmp(argv[arg], "--recover")) {
 | 
						|
			get_recover = 1;
 | 
						|
		} else if (!strcmp(argv[arg], "--stdin")) {
 | 
						|
			commits_on_stdin = 1;
 | 
						|
		} else if (skip_prefix(argv[arg], "--packfile=", &p)) {
 | 
						|
			const char *end;
 | 
						|
 | 
						|
			packfile = 1;
 | 
						|
			if (parse_oid_hex(p, &packfile_hash, &end) || *end)
 | 
						|
				die(_("argument to --packfile must be a valid hash (got '%s')"), p);
 | 
						|
		} else if (skip_prefix(argv[arg], "--index-pack-arg=", &p)) {
 | 
						|
			strvec_push(&index_pack_args, p);
 | 
						|
		}
 | 
						|
		arg++;
 | 
						|
	}
 | 
						|
	if (argc != arg + 2 - (commits_on_stdin || packfile))
 | 
						|
		usage(http_fetch_usage);
 | 
						|
 | 
						|
	if (nongit)
 | 
						|
		die(_("not a git repository"));
 | 
						|
 | 
						|
	trace2_cmd_name("http-fetch");
 | 
						|
 | 
						|
	git_config(git_default_config, NULL);
 | 
						|
 | 
						|
	if (packfile) {
 | 
						|
		if (!index_pack_args.nr)
 | 
						|
			die(_("the option '%s' requires '%s'"), "--packfile", "--index-pack-args");
 | 
						|
 | 
						|
		fetch_single_packfile(&packfile_hash, argv[arg],
 | 
						|
				      index_pack_args.v);
 | 
						|
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
 | 
						|
	if (index_pack_args.nr)
 | 
						|
		die(_("the option '%s' requires '%s'"), "--index-pack-args", "--packfile");
 | 
						|
 | 
						|
	if (commits_on_stdin) {
 | 
						|
		commits = walker_targets_stdin(&commit_id, &write_ref);
 | 
						|
	} else {
 | 
						|
		commit_id = (char **) &argv[arg++];
 | 
						|
		commits = 1;
 | 
						|
	}
 | 
						|
	return fetch_using_walker(argv[arg], get_verbosely, get_recover,
 | 
						|
				  commits, commit_id, write_ref,
 | 
						|
				  commits_on_stdin);
 | 
						|
}
 |