undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sp/maint-upload-pack-stop-early'

Browse Source 
* sp/maint-upload-pack-stop-early:
  upload-pack: Implement no-done capability
  upload-pack: More aggressively send 'ACK %s ready'
This commit is contained in:
Junio C Hamano 2011-03-22 21:38:06 -07:00
commit f59bf09678
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
upload-pack.c
View File

@ -27,6 +27,7 @@ static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<
static unsigned long oldest_have; static unsigned long oldest_have;
static int multi_ack, nr_our_refs; static int multi_ack, nr_our_refs;
static int no_done;
static int use_thin_pack, use_ofs_delta, use_include_tag; static int use_thin_pack, use_ofs_delta, use_include_tag;
static int no_progress, daemon_mode; static int no_progress, daemon_mode;
static int shallow_nr; static int shallow_nr;
@ -429,6 +430,9 @@ static int get_common_commits(void)
static char line[1000]; static char line[1000];
unsigned char sha1[20]; unsigned char sha1[20];
char last_hex[41]; char last_hex[41];
int got_common = 0;
int got_other = 0;
int sent_ready = 0;
save_commit_buffer = 0; save_commit_buffer = 0;
@ -437,25 +441,40 @@ static int get_common_commits(void)
reset_timeout(); reset_timeout();
if (!len) { if (!len) {
if (multi_ack == 2 && got_common
&& !got_other && ok_to_give_up()) {
sent_ready = 1;
packet_write(1, "ACK %s ready\n", last_hex);
}
if (have_obj.nr == 0 || multi_ack) if (have_obj.nr == 0 || multi_ack)
packet_write(1, "NAK\n"); packet_write(1, "NAK\n");
if (no_done && sent_ready) {
packet_write(1, "ACK %s\n", last_hex);
return 0;
}
if (stateless_rpc) if (stateless_rpc)
exit(0); exit(0);
got_common = 0;
got_other = 0;
continue; continue;
} }
strip(line, len); strip(line, len);
if (!prefixcmp(line, "have ")) { if (!prefixcmp(line, "have ")) {
switch (got_sha1(line+5, sha1)) { switch (got_sha1(line+5, sha1)) {
case -1: /* they have what we do not */ case -1: /* they have what we do not */
got_other = 1;
if (multi_ack && ok_to_give_up()) { if (multi_ack && ok_to_give_up()) {
const char *hex = sha1_to_hex(sha1); const char *hex = sha1_to_hex(sha1);
if (multi_ack == 2) if (multi_ack == 2) {
sent_ready = 1;
packet_write(1, "ACK %s ready\n", hex); packet_write(1, "ACK %s ready\n", hex);
else } else
packet_write(1, "ACK %s continue\n", hex); packet_write(1, "ACK %s continue\n", hex);
} }
break; break;
default: default:
got_common = 1;
memcpy(last_hex, sha1_to_hex(sha1), 41); memcpy(last_hex, sha1_to_hex(sha1), 41);
if (multi_ack == 2) if (multi_ack == 2)
packet_write(1, "ACK %s common\n", last_hex); packet_write(1, "ACK %s common\n", last_hex);
@ -526,6 +545,8 @@ static void receive_needs(void)
multi_ack = 2; multi_ack = 2;
else if (strstr(line+45, "multi_ack")) else if (strstr(line+45, "multi_ack"))
multi_ack = 1; multi_ack = 1;
if (strstr(line+45, "no-done"))
no_done = 1;
if (strstr(line+45, "thin-pack")) if (strstr(line+45, "thin-pack"))
use_thin_pack = 1; use_thin_pack = 1;
if (strstr(line+45, "ofs-delta")) if (strstr(line+45, "ofs-delta"))
@ -619,7 +640,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
{ {
static const char *capabilities = "multi_ack thin-pack side-band" static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress" " side-band-64k ofs-delta shallow no-progress"
" include-tag multi_ack_detailed"; " include-tag multi_ack_detailed no-done";
struct object *o = parse_object(sha1); struct object *o = parse_object(sha1);
if (!o) if (!o)