Now that we can read packet data from memory as easily as a descriptor, get_remote_heads can take either one as a source. This will allow further refactoring in remote-curl. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			254 lines
		
	
	
		
			5.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			254 lines
		
	
	
		
			5.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "builtin.h"
 | 
						|
#include "commit.h"
 | 
						|
#include "refs.h"
 | 
						|
#include "pkt-line.h"
 | 
						|
#include "sideband.h"
 | 
						|
#include "run-command.h"
 | 
						|
#include "remote.h"
 | 
						|
#include "send-pack.h"
 | 
						|
#include "quote.h"
 | 
						|
#include "transport.h"
 | 
						|
#include "version.h"
 | 
						|
 | 
						|
static const char send_pack_usage[] =
 | 
						|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
 | 
						|
"  --all and explicit <ref> specification are mutually exclusive.";
 | 
						|
 | 
						|
static struct send_pack_args args;
 | 
						|
 | 
						|
static void print_helper_status(struct ref *ref)
 | 
						|
{
 | 
						|
	struct strbuf buf = STRBUF_INIT;
 | 
						|
 | 
						|
	for (; ref; ref = ref->next) {
 | 
						|
		const char *msg = NULL;
 | 
						|
		const char *res;
 | 
						|
 | 
						|
		switch(ref->status) {
 | 
						|
		case REF_STATUS_NONE:
 | 
						|
			res = "error";
 | 
						|
			msg = "no match";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_OK:
 | 
						|
			res = "ok";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_UPTODATE:
 | 
						|
			res = "ok";
 | 
						|
			msg = "up to date";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_REJECT_NONFASTFORWARD:
 | 
						|
			res = "error";
 | 
						|
			msg = "non-fast forward";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_REJECT_FETCH_FIRST:
 | 
						|
			res = "error";
 | 
						|
			msg = "fetch first";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_REJECT_NEEDS_FORCE:
 | 
						|
			res = "error";
 | 
						|
			msg = "needs force";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_REJECT_ALREADY_EXISTS:
 | 
						|
			res = "error";
 | 
						|
			msg = "already exists";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_REJECT_NODELETE:
 | 
						|
		case REF_STATUS_REMOTE_REJECT:
 | 
						|
			res = "error";
 | 
						|
			break;
 | 
						|
 | 
						|
		case REF_STATUS_EXPECTING_REPORT:
 | 
						|
		default:
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
 | 
						|
		strbuf_reset(&buf);
 | 
						|
		strbuf_addf(&buf, "%s %s", res, ref->name);
 | 
						|
		if (ref->remote_status)
 | 
						|
			msg = ref->remote_status;
 | 
						|
		if (msg) {
 | 
						|
			strbuf_addch(&buf, ' ');
 | 
						|
			quote_two_c_style(&buf, "", msg, 0);
 | 
						|
		}
 | 
						|
		strbuf_addch(&buf, '\n');
 | 
						|
 | 
						|
		write_or_die(1, buf.buf, buf.len);
 | 
						|
	}
 | 
						|
	strbuf_release(&buf);
 | 
						|
}
 | 
						|
 | 
						|
int cmd_send_pack(int argc, const char **argv, const char *prefix)
 | 
						|
{
 | 
						|
	int i, nr_refspecs = 0;
 | 
						|
	const char **refspecs = NULL;
 | 
						|
	const char *remote_name = NULL;
 | 
						|
	struct remote *remote = NULL;
 | 
						|
	const char *dest = NULL;
 | 
						|
	int fd[2];
 | 
						|
	struct child_process *conn;
 | 
						|
	struct extra_have_objects extra_have;
 | 
						|
	struct ref *remote_refs, *local_refs;
 | 
						|
	int ret;
 | 
						|
	int helper_status = 0;
 | 
						|
	int send_all = 0;
 | 
						|
	const char *receivepack = "git-receive-pack";
 | 
						|
	int flags;
 | 
						|
	unsigned int reject_reasons;
 | 
						|
	int progress = -1;
 | 
						|
 | 
						|
	argv++;
 | 
						|
	for (i = 1; i < argc; i++, argv++) {
 | 
						|
		const char *arg = *argv;
 | 
						|
 | 
						|
		if (*arg == '-') {
 | 
						|
			if (!prefixcmp(arg, "--receive-pack=")) {
 | 
						|
				receivepack = arg + 15;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!prefixcmp(arg, "--exec=")) {
 | 
						|
				receivepack = arg + 7;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!prefixcmp(arg, "--remote=")) {
 | 
						|
				remote_name = arg + 9;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--all")) {
 | 
						|
				send_all = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--dry-run")) {
 | 
						|
				args.dry_run = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--mirror")) {
 | 
						|
				args.send_mirror = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--force")) {
 | 
						|
				args.force_update = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--quiet")) {
 | 
						|
				args.quiet = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--verbose")) {
 | 
						|
				args.verbose = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--progress")) {
 | 
						|
				progress = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--no-progress")) {
 | 
						|
				progress = 0;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--thin")) {
 | 
						|
				args.use_thin_pack = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--stateless-rpc")) {
 | 
						|
				args.stateless_rpc = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			if (!strcmp(arg, "--helper-status")) {
 | 
						|
				helper_status = 1;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
			usage(send_pack_usage);
 | 
						|
		}
 | 
						|
		if (!dest) {
 | 
						|
			dest = arg;
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		refspecs = (const char **) argv;
 | 
						|
		nr_refspecs = argc - i;
 | 
						|
		break;
 | 
						|
	}
 | 
						|
	if (!dest)
 | 
						|
		usage(send_pack_usage);
 | 
						|
	/*
 | 
						|
	 * --all and --mirror are incompatible; neither makes sense
 | 
						|
	 * with any refspecs.
 | 
						|
	 */
 | 
						|
	if ((refspecs && (send_all || args.send_mirror)) ||
 | 
						|
	    (send_all && args.send_mirror))
 | 
						|
		usage(send_pack_usage);
 | 
						|
 | 
						|
	if (remote_name) {
 | 
						|
		remote = remote_get(remote_name);
 | 
						|
		if (!remote_has_url(remote, dest)) {
 | 
						|
			die("Destination %s is not a uri for %s",
 | 
						|
			    dest, remote_name);
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	if (progress == -1)
 | 
						|
		progress = !args.quiet && isatty(2);
 | 
						|
	args.progress = progress;
 | 
						|
 | 
						|
	if (args.stateless_rpc) {
 | 
						|
		conn = NULL;
 | 
						|
		fd[0] = 0;
 | 
						|
		fd[1] = 1;
 | 
						|
	} else {
 | 
						|
		conn = git_connect(fd, dest, receivepack,
 | 
						|
			args.verbose ? CONNECT_VERBOSE : 0);
 | 
						|
	}
 | 
						|
 | 
						|
	memset(&extra_have, 0, sizeof(extra_have));
 | 
						|
 | 
						|
	get_remote_heads(fd[0], NULL, 0, &remote_refs, REF_NORMAL, &extra_have);
 | 
						|
 | 
						|
	transport_verify_remote_names(nr_refspecs, refspecs);
 | 
						|
 | 
						|
	local_refs = get_local_heads();
 | 
						|
 | 
						|
	flags = MATCH_REFS_NONE;
 | 
						|
 | 
						|
	if (send_all)
 | 
						|
		flags |= MATCH_REFS_ALL;
 | 
						|
	if (args.send_mirror)
 | 
						|
		flags |= MATCH_REFS_MIRROR;
 | 
						|
 | 
						|
	/* match them up */
 | 
						|
	if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
 | 
						|
		return -1;
 | 
						|
 | 
						|
	set_ref_status_for_push(remote_refs, args.send_mirror,
 | 
						|
		args.force_update);
 | 
						|
 | 
						|
	ret = send_pack(&args, fd, conn, remote_refs, &extra_have);
 | 
						|
 | 
						|
	if (helper_status)
 | 
						|
		print_helper_status(remote_refs);
 | 
						|
 | 
						|
	close(fd[1]);
 | 
						|
	close(fd[0]);
 | 
						|
 | 
						|
	ret |= finish_connect(conn);
 | 
						|
 | 
						|
	if (!helper_status)
 | 
						|
		transport_print_push_status(dest, remote_refs, args.verbose, 0, &reject_reasons);
 | 
						|
 | 
						|
	if (!args.dry_run && remote) {
 | 
						|
		struct ref *ref;
 | 
						|
		for (ref = remote_refs; ref; ref = ref->next)
 | 
						|
			transport_update_tracking_ref(remote, ref, args.verbose);
 | 
						|
	}
 | 
						|
 | 
						|
	if (!ret && !transport_refs_pushed(remote_refs))
 | 
						|
		fprintf(stderr, "Everything up-to-date\n");
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 |