upload-pack, receive-pack: introduce protocol version 1

Teach upload-pack and receive-pack to understand and respond using
protocol version 1, if requested.

Protocol version 1 is simply the original and current protocol (what I'm
calling version 0) with the addition of a single packet line, which
precedes the ref advertisement, indicating the protocol version being
spoken.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index dd06b3fb4f9ee3e4da46d807b183541ec14c5481..839c1462dcb4164a668635ac0a1056634642cf06 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -24,6 +24,7 @@
 #include "tmp-objdir.h"
 #include "oidset.h"
 #include "packfile.h"
 #include "tmp-objdir.h"
 #include "oidset.h"
 #include "packfile.h"

+#include "protocol.h"

 
 static const char * const receive_pack_usage[] = {
        N_("git receive-pack <git-dir>"),
 
 static const char * const receive_pack_usage[] = {
        N_("git receive-pack <git-dir>"),


@@ -1963,6 +1964,22 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
        else if (0 <= receive_unpack_limit)
                unpack_limit = receive_unpack_limit;
 
        else if (0 <= receive_unpack_limit)
                unpack_limit = receive_unpack_limit;
 

+       switch (determine_protocol_version_server()) {
+       case protocol_v1:
+               /*
+                * v1 is just the original protocol with a version string,
+                * so just fall through after writing the version string.
+                */
+               if (advertise_refs || !stateless_rpc)
+                       packet_write_fmt(1, "version 1\n");
+
+               /* fallthrough */
+       case protocol_v0:
+               break;
+       case protocol_unknown_version:
+               BUG("unknown protocol version");
+       }
+

        if (advertise_refs || !stateless_rpc) {
                write_head_info();
        }
        if (advertise_refs || !stateless_rpc) {
                write_head_info();
        }

diff --git a/upload-pack.c b/upload-pack.c
index 7efff2fbfd76380fd448d53173f8295d7c9c9d87..ef99a029c12efcde3f686b51f3693ca4c8d05b1e 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -18,6 +18,7 @@
 #include "parse-options.h"
 #include "argv-array.h"
 #include "prio-queue.h"
 #include "parse-options.h"
 #include "argv-array.h"
 #include "prio-queue.h"

+#include "protocol.h"

 
 static const char * const upload_pack_usage[] = {
        N_("git upload-pack [<options>] <dir>"),
 
 static const char * const upload_pack_usage[] = {
        N_("git upload-pack [<options>] <dir>"),


@@ -1067,6 +1068,23 @@ int cmd_main(int argc, const char **argv)
                die("'%s' does not appear to be a git repository", dir);
 
        git_config(upload_pack_config, NULL);
                die("'%s' does not appear to be a git repository", dir);
 
        git_config(upload_pack_config, NULL);

-       upload_pack();
+
+       switch (determine_protocol_version_server()) {
+       case protocol_v1:
+               /*
+                * v1 is just the original protocol with a version string,
+                * so just fall through after writing the version string.
+                */
+               if (advertise_refs || !stateless_rpc)
+                       packet_write_fmt(1, "version 1\n");
+
+               /* fallthrough */
+       case protocol_v0:
+               upload_pack();
+               break;
+       case protocol_unknown_version:
+               BUG("unknown protocol version");
+       }
+

        return 0;
 }
        return 0;
 }