From b7a025d921e416a708eb2d664d9ff51b303edd97 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Fri, 6 Jan 2012 15:12:31 +0100 Subject: [PATCH 1/3] receive-pack: move more work into write_head_info() Move some more code from the calling site into write_head_info(), and inline add_alternate_refs() there. (Some more simplification is coming, and it is easier if all this code is in the same place.) Move some helper functions to avoid the need for forward declarations. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- builtin/receive-pack.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index b6d957cb0d..43d161f811 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -143,12 +143,30 @@ static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, vo return show_ref(path, sha1, flag, cb_data); } +static void add_one_alternate_sha1(const unsigned char sha1[20], void *unused) +{ + add_extra_ref(".have", sha1, 0); +} + +static void collect_one_alternate_ref(const struct ref *ref, void *data) +{ + struct sha1_array *sa = data; + sha1_array_append(sa, ref->old_sha1); +} + static void write_head_info(void) { + struct sha1_array sa = SHA1_ARRAY_INIT; + for_each_alternate_ref(collect_one_alternate_ref, &sa); + sha1_array_for_each_unique(&sa, add_one_alternate_sha1, NULL); + sha1_array_clear(&sa); for_each_ref(show_ref_cb, NULL); if (!sent_capabilities) show_ref("capabilities^{}", null_sha1, 0, NULL); + clear_extra_refs(); + /* EOF */ + packet_flush(1); } struct command { @@ -870,25 +888,6 @@ static int delete_only(struct command *commands) return 1; } -static void add_one_alternate_sha1(const unsigned char sha1[20], void *unused) -{ - add_extra_ref(".have", sha1, 0); -} - -static void collect_one_alternate_ref(const struct ref *ref, void *data) -{ - struct sha1_array *sa = data; - sha1_array_append(sa, ref->old_sha1); -} - -static void add_alternate_refs(void) -{ - struct sha1_array sa = SHA1_ARRAY_INIT; - for_each_alternate_ref(collect_one_alternate_ref, &sa); - sha1_array_for_each_unique(&sa, add_one_alternate_sha1, NULL); - sha1_array_clear(&sa); -} - int cmd_receive_pack(int argc, const char **argv, const char *prefix) { int advertise_refs = 0; @@ -938,12 +937,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) unpack_limit = receive_unpack_limit; if (advertise_refs || !stateless_rpc) { - add_alternate_refs(); write_head_info(); - clear_extra_refs(); - - /* EOF */ - packet_flush(1); } if (advertise_refs) return 0; From bc98201d84eb3eb283aa4ebb9de9f7a3b32b97af Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Fri, 6 Jan 2012 15:12:32 +0100 Subject: [PATCH 2/3] show_ref(): remove unused "flag" and "cb_data" arguments The function is not used as a callback, so it doesn't need these arguments. Also change its return type to void. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- builtin/receive-pack.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 43d161f811..eb878c5731 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -114,7 +114,7 @@ static int receive_pack_config(const char *var, const char *value, void *cb) return git_default_config(var, value, cb); } -static int show_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) +static void show_ref(const char *path, const unsigned char *sha1) { if (sent_capabilities) packet_write(1, "%s %s\n", sha1_to_hex(sha1), path); @@ -124,10 +124,9 @@ static int show_ref(const char *path, const unsigned char *sha1, int flag, void " report-status delete-refs side-band-64k", prefer_ofs_delta ? " ofs-delta" : ""); sent_capabilities = 1; - return 0; } -static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, void *cb_data) +static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, void *unused) { path = strip_namespace(path); /* @@ -140,7 +139,8 @@ static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, vo */ if (!path) path = ".have"; - return show_ref(path, sha1, flag, cb_data); + show_ref(path, sha1); + return 0; } static void add_one_alternate_sha1(const unsigned char sha1[20], void *unused) @@ -162,7 +162,7 @@ static void write_head_info(void) sha1_array_clear(&sa); for_each_ref(show_ref_cb, NULL); if (!sent_capabilities) - show_ref("capabilities^{}", null_sha1, 0, NULL); + show_ref("capabilities^{}", null_sha1); clear_extra_refs(); /* EOF */ From 85f251045019296a9143fd6527a48461e7b7c0e7 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Fri, 6 Jan 2012 15:12:33 +0100 Subject: [PATCH 3/3] write_head_info(): handle "extra refs" locally The old code basically did: generate array of SHA1s for alternate refs for each unique SHA1 in array: add_extra_ref(".have", sha1) for each ref (including real refs and extra refs): show_ref(refname, sha1) But there is no need to stuff the alternate refs in extra_refs; we can call show_ref() directly when iterating over the array, then handle real refs separately. So change the code to: generate array of SHA1s for alternate refs for each unique SHA1 in array: show_ref(".have", sha1) for each ref (this now only includes real refs): show_ref(refname, sha1) Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- builtin/receive-pack.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index eb878c5731..0bb91d4479 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -143,9 +143,9 @@ static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, vo return 0; } -static void add_one_alternate_sha1(const unsigned char sha1[20], void *unused) +static void show_one_alternate_sha1(const unsigned char sha1[20], void *unused) { - add_extra_ref(".have", sha1, 0); + show_ref(".have", sha1); } static void collect_one_alternate_ref(const struct ref *ref, void *data) @@ -158,12 +158,11 @@ static void write_head_info(void) { struct sha1_array sa = SHA1_ARRAY_INIT; for_each_alternate_ref(collect_one_alternate_ref, &sa); - sha1_array_for_each_unique(&sa, add_one_alternate_sha1, NULL); + sha1_array_for_each_unique(&sa, show_one_alternate_sha1, NULL); sha1_array_clear(&sa); for_each_ref(show_ref_cb, NULL); if (!sent_capabilities) show_ref("capabilities^{}", null_sha1); - clear_extra_refs(); /* EOF */ packet_flush(1);