From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Feb 2009 03:40:36 +0000 (-0800)
Subject: Merge branch 'rc/http-push'
X-Git-Tag: v1.6.2-rc0~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7aa4e736b295c8784a70645e79dd80a7a80c6147?hp=-c

Merge branch 'rc/http-push'

* rc/http-push:
http-push: wrap signature of get_remote_object_url
http-push: add back underscore separator before lock token
http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
http-push: refactor request url creation
---

7aa4e736b295c8784a70645e79dd80a7a80c6147
diff --combined http-push.c
index 18d81acd1b,bb00728f14..a8ae545dfb
--- a/http-push.c
+++ b/http-push.c
@@@ -10,7 -10,6 +10,7 @@@
  #include "exec_cmd.h"
  #include "remote.h"
  #include "list-objects.h"
 +#include "sigchain.h"
  
  #include <expat.h>
  
@@@ -210,6 -209,15 +210,15 @@@ static struct curl_slist *get_dav_token
  	return dav_headers;
  }
  
+ static void append_remote_object_url(struct strbuf *buf, const char *url,
+ 				     const char *hex,
+ 				     int only_two_digit_prefix)
+ {
+ 	strbuf_addf(buf, "%sobjects/%.*s/", url, 2, hex);
+ 	if (!only_two_digit_prefix)
+ 		strbuf_addf(buf, "%s", hex+2);
+ }
+ 
  static void finish_request(struct transfer_request *request);
  static void release_request(struct transfer_request *request);
  
@@@ -222,6 -230,15 +231,15 @@@ static void process_response(void *call
  }
  
  #ifdef USE_CURL_MULTI
+ 
+ static char *get_remote_object_url(const char *url, const char *hex,
+ 				   int only_two_digit_prefix)
+ {
+ 	struct strbuf buf = STRBUF_INIT;
+ 	append_remote_object_url(&buf, url, hex, only_two_digit_prefix);
+ 	return strbuf_detach(&buf, NULL);
+ }
+ 
  static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
  			       void *data)
  {
@@@ -256,7 -273,6 +274,6 @@@ static void start_fetch_loose(struct tr
  	char *filename;
  	char prevfile[PATH_MAX];
  	char *url;
- 	char *posn;
  	int prevlocal;
  	unsigned char prev_buf[PREV_BUF_SIZE];
  	ssize_t prev_read = 0;
@@@ -306,17 -322,8 +323,8 @@@
  
  	git_SHA1_Init(&request->c);
  
- 	url = xmalloc(strlen(remote->url) + 50);
- 	request->url = xmalloc(strlen(remote->url) + 50);
- 	strcpy(url, remote->url);
- 	posn = url + strlen(remote->url);
- 	strcpy(posn, "objects/");
- 	posn += 8;
- 	memcpy(posn, hex, 2);
- 	posn += 2;
- 	*(posn++) = '/';
- 	strcpy(posn, hex + 2);
- 	strcpy(request->url, url);
+ 	url = get_remote_object_url(remote->url, hex, 0);
+ 	request->url = xstrdup(url);
  
  	/* If a previous temp file is present, process what was already
  	   fetched. */
@@@ -389,16 -396,8 +397,8 @@@ static void start_mkcol(struct transfer
  {
  	char *hex = sha1_to_hex(request->obj->sha1);
  	struct active_request_slot *slot;
- 	char *posn;
  
- 	request->url = xmalloc(strlen(remote->url) + 13);
- 	strcpy(request->url, remote->url);
- 	posn = request->url + strlen(remote->url);
- 	strcpy(posn, "objects/");
- 	posn += 8;
- 	memcpy(posn, hex, 2);
- 	posn += 2;
- 	strcpy(posn, "/");
+ 	request->url = get_remote_object_url(remote->url, hex, 1);
  
  	slot = get_active_slot();
  	slot->callback_func = process_response;
@@@ -513,7 -512,7 +513,7 @@@ static void start_put(struct transfer_r
  {
  	char *hex = sha1_to_hex(request->obj->sha1);
  	struct active_request_slot *slot;
- 	char *posn;
+ 	struct strbuf buf = STRBUF_INIT;
  	enum object_type type;
  	char hdr[50];
  	void *unpacked;
@@@ -552,21 -551,14 +552,14 @@@
  
  	request->buffer.buf.len = stream.total_out;
  
- 	request->url = xmalloc(strlen(remote->url) +
- 			       strlen(request->lock->token) + 51);
- 	strcpy(request->url, remote->url);
- 	posn = request->url + strlen(remote->url);
- 	strcpy(posn, "objects/");
- 	posn += 8;
- 	memcpy(posn, hex, 2);
- 	posn += 2;
- 	*(posn++) = '/';
- 	strcpy(posn, hex + 2);
- 	request->dest = xmalloc(strlen(request->url) + 14);
- 	sprintf(request->dest, "Destination: %s", request->url);
- 	posn += 38;
- 	*(posn++) = '_';
- 	strcpy(posn, request->lock->token);
+ 	strbuf_addstr(&buf, "Destination: ");
+ 	append_remote_object_url(&buf, remote->url, hex, 0);
+ 	request->dest = strbuf_detach(&buf, NULL);
+ 
+ 	append_remote_object_url(&buf, remote->url, hex, 0);
+ 	strbuf_addstr(&buf, "_");
+ 	strbuf_addstr(&buf, request->lock->token);
+ 	request->url = strbuf_detach(&buf, NULL);
  
  	slot = get_active_slot();
  	slot->callback_func = process_response;
@@@ -1385,7 -1377,7 +1378,7 @@@ static void remove_locks(void
  static void remove_locks_on_signal(int signo)
  {
  	remove_locks();
 -	signal(signo, SIG_DFL);
 +	sigchain_pop(signo);
  	raise(signo);
  }
  
@@@ -2196,8 -2188,6 +2189,8 @@@ int main(int argc, char **argv
  	struct ref *ref;
  	char *rewritten_url = NULL;
  
 +	git_extract_argv0_path(argv[0]);
 +
  	setup_git_directory();
  
  	remote = xcalloc(sizeof(*remote), 1);
@@@ -2280,7 -2270,10 +2273,7 @@@
  		goto cleanup;
  	}
  
 -	signal(SIGINT, remove_locks_on_signal);
 -	signal(SIGHUP, remove_locks_on_signal);
 -	signal(SIGQUIT, remove_locks_on_signal);
 -	signal(SIGTERM, remove_locks_on_signal);
 +	sigchain_push_common(remove_locks_on_signal);
  
  	/* Check whether the remote has server info files */
  	remote->can_update_info_refs = 0;