[PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack
- From
Stefan Beller <sbeller@google.com>
- Date
- Apr 29, 2016, 23:34 UTC
- Message-ID
- <1461972887-22100-4-git-send-email-sbeller@google.com>
- In-Reply-To
- <1461972887-22100-1-git-send-email-sbeller@google.com>
In upload-pack-2 we send each capability in its own packet buffer. The construction of upload-pack-2 is a bit unfortunate as I would like it to not be depending on a symlink linking to upload-pack.c, but I did not find another easy way to do it. I would like it to generate upload-pack-2.o from upload-pack.c but with '-DTRANSPORT_VERSION=2' set.
Signed-off-by: Stefan Beller <sbeller@google.com> --- .gitignore | 1 + Makefile | 4 ++++ upload-pack-2.c | 1 + upload-pack.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 1 deletion(-) create mode 120000 upload-pack-2.c
diff --git a/.gitignore b/.gitignore index 5087ce1..9a6ea8c 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,7 @@ /git-update-server-info /git-upload-archive /git-upload-pack +/git-upload-pack-2 /git-var /git-verify-commit /git-verify-pack diff --git a/Makefile b/Makefile index a83e322..3d96126 100644 --- a/Makefile +++ b/Makefile @@ -580,6 +580,7 @@ PROGRAM_OBJS += sh-i18n--envsubst.o PROGRAM_OBJS += shell.o PROGRAM_OBJS += show-index.o PROGRAM_OBJS += upload-pack.o +PROGRAM_OBJS += upload-pack-2.o PROGRAM_OBJS += remote-testsvn.o # Binary suffix, set to .exe for Windows builds @@ -648,6 +649,7 @@ OTHER_PROGRAMS = git$X # what test wrappers are needed and 'install' will install, in bindir BINDIR_PROGRAMS_NEED_X += git BINDIR_PROGRAMS_NEED_X += git-upload-pack +BINDIR_PROGRAMS_NEED_X += git-upload-pack-2 BINDIR_PROGRAMS_NEED_X += git-receive-pack BINDIR_PROGRAMS_NEED_X += git-upload-archive BINDIR_PROGRAMS_NEED_X += git-shell @@ -1730,6 +1732,8 @@ $(BUILT_INS): git$X ln -s $< $@ 2>/dev/null || \ cp $< $@ +$X%-2.o: EXTRA_CPPFLAGS = '-DTRANSPORT_VERSION=2' + common-cmds.h: generate-cmdlist.sh command-list.txt common-cmds.h: $(wildcard Documentation/git-*.txt) diff --git a/upload-pack-2.c b/upload-pack-2.c new file mode 120000 index 0000000..e30a871 --- /dev/null +++ b/upload-pack-2.c @@ -0,0 +1 @@ +upload-pack.c \ No newline at end of file diff --git a/upload-pack.c b/upload-pack.c index 85381d5..edfd417 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -820,6 +820,45 @@ static void upload_pack(void) } } +#if (TRANSPORT_VERSION == 2) +static void send_capabilities_version_2(void) +{ + int i; + for (i = 0; i < ARRAY_SIZE(all_capabilities); i++) { + const char *cap = all_capabilities[i]; + if (!strcmp(cap, "allow-tip-sha1-in-want") + && !(allow_unadvertised_object_request & ALLOW_TIP_SHA1)) + continue; + if (!strcmp(cap, "no-done") && !stateless_rpc) + continue; + packet_write(1, "%s\n", cap); + } + + packet_write(1, "agent=%s\n", git_user_agent_sanitized()); + packet_flush(1); +} + +static void receive_capabilities_version_2(void) +{ + char *line = packet_read_line(0, NULL); + while (line) { + parse_features(line); + line = packet_read_line(0, NULL); + } +} + +static void upload_pack_version_2(void) +{ + send_capabilities_version_2(); + receive_capabilities_version_2(); + + /* The rest of the protocol stays the same, capabilities advertising + is disabled though. */ + advertise_capabilities = 0; + upload_pack(); +} +#endif + static int upload_pack_config(const char *var, const char *value, void *unused) { if (!strcmp("uploadpack.allowtipsha1inwant", var)) { @@ -847,8 +886,11 @@ int main(int argc, char **argv) int strict = 0; git_setup_gettext(); - +#if TRANSPORT_VERSION == 2 + packet_trace_identity("upload-pack-2"); +#else packet_trace_identity("upload-pack"); +#endif git_extract_argv0_path(argv[0]); check_replace_refs = 0; @@ -891,6 +933,11 @@ int main(int argc, char **argv) die("'%s' does not appear to be a git repository", dir); git_config(upload_pack_config, NULL); + +#if TRANSPORT_VERSION == 2 + upload_pack_version_2(); +#else upload_pack(); +#endif return 0; }
-- 2.8.0.32.g71f8beb.dirty