aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Hengeveld <nickh@reactrix.com>2005-11-07 11:39:37 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-07 13:29:39 -0800
commit0dd276b8713a484496a2ef694b6c72b1ddbef08b (patch)
tree923a12575a779cd88c2614e3a696f24708cd9c14
parent5e0306adfa03aebb8f6cf866c4450f04e128c3fd (diff)
downloadgit-0dd276b8713a484496a2ef694b6c72b1ddbef08b.tar.gz
git-0dd276b8713a484496a2ef694b6c72b1ddbef08b.tar.xz
Make http-push smarter about creating remote dirs
Remember object directories known to exist in the remote repo and don't bother trying to create them. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--http-push.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c
index 89fda42ef..8e953a675 100644
--- a/http-push.c
+++ b/http-push.c
@@ -47,6 +47,7 @@ static int active_requests = 0;
static int data_received;
static int pushing = 0;
static int aborted = 0;
+static char remote_dir_exists[256];
#ifdef USE_CURL_MULTI
static int max_requests = -1;
@@ -650,6 +651,7 @@ static void finish_request(struct transfer_request *request)
if (request->http_code == 404) {
request->state = NEED_PUSH;
} else if (request->curl_result == CURLE_OK) {
+ remote_dir_exists[request->sha1[0]] = 1;
request->state = COMPLETE;
} else {
fprintf(stderr, "HEAD %s failed, aborting (%d/%ld)\n",
@@ -661,6 +663,7 @@ static void finish_request(struct transfer_request *request)
} else if (request->state == RUN_MKCOL) {
if (request->curl_result == CURLE_OK ||
request->http_code == 405) {
+ remote_dir_exists[request->sha1[0]] = 1;
start_put(request);
} else {
fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n",
@@ -767,7 +770,10 @@ void process_request_queue(void)
start_check(request);
curl_multi_perform(curlm, &num_transfers);
} else if (pushing && request->state == NEED_PUSH) {
- start_mkcol(request);
+ if (remote_dir_exists[request->sha1[0]])
+ start_put(request);
+ else
+ start_mkcol(request);
curl_multi_perform(curlm, &num_transfers);
}
request = request->next;
@@ -1599,6 +1605,8 @@ int main(int argc, char **argv)
break;
}
+ memset(remote_dir_exists, 0, 256);
+
curl_global_init(CURL_GLOBAL_ALL);
#ifdef USE_CURL_MULTI