From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: pclouds@gmail.com, gitster@pobox.com, peff@peff.net,
Stefan Beller <sbeller@google.com>
Subject: [RFCv2 11/16] remote: have preselect_capabilities
Date: Mon, 1 Jun 2015 17:02:13 -0700 [thread overview]
Message-ID: <1433203338-27493-12-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1433203338-27493-1-git-send-email-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
connect.c | 28 ++++++++++++++++++++++++++++
remote.h | 1 +
2 files changed, 29 insertions(+)
diff --git a/connect.c b/connect.c
index 4ebe1dc..752b9a5 100644
--- a/connect.c
+++ b/connect.c
@@ -126,6 +126,34 @@ void get_remote_capabilities(int in, char *src_buf, size_t src_len)
}
}
+/* just select all options the server advertised. */
+void preselect_capabilities(struct transport_options *options)
+{
+ if (is_repository_shallow() && !server_supports("shallow"))
+ die("Server does not support shallow clients");
+
+ if (server_supports("multi_ack"))
+ options->multi_ack = 1;
+ else if (server_supports("multi_ack_detailed"))
+ options->multi_ack = 2;
+
+ if (server_supports("side-band"))
+ options->use_sideband = 1;
+ else if (server_supports("side-band-64k"))
+ options->use_sideband = 2;
+
+ if (server_supports("no-done"))
+ options->no_done = 1;
+ if (server_supports("thin-pack"))
+ options->use_thin_pack = 1;
+ if (server_supports("no-progress"))
+ options->no_progress = 1;
+ if (server_supports("include-tag"))
+ options->include_tag = 1;
+ if (server_supports("ofs-delta"))
+ options->prefer_ofs_delta = 1;
+}
+
int request_capabilities(int out, struct transport_options *options)
{
if (options->multi_ack == 2) packet_write(out, "multi_ack_detailed");
diff --git a/remote.h b/remote.h
index 61619c5..264a513 100644
--- a/remote.h
+++ b/remote.h
@@ -166,6 +166,7 @@ extern void get_remote_heads(int in, char *src_buf, size_t src_len,
struct sha1_array *shallow);
void get_remote_capabilities(int in, char *src_buf, size_t src_len);
+void preselect_capabilities(struct transport_options *options);
int request_capabilities(int out, struct transport_options*);
int resolve_remote_symref(struct ref *ref, struct ref *list);
--
2.4.1.345.gab207b6.dirty
next prev parent reply other threads:[~2015-06-02 0:03 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 0:02 [RFCv2 00/16] Protocol version 2 Stefan Beller
2015-06-02 0:02 ` [RFCv2 01/16] stringlist: add from_space_separated_string Stefan Beller
2015-06-02 9:42 ` Duy Nguyen
2015-06-02 15:10 ` Eric Sunshine
2015-06-02 17:54 ` Stefan Beller
2015-06-02 0:02 ` [RFCv2 02/16] upload-pack: make client capability parsing code a separate function Stefan Beller
2015-06-02 0:02 ` [RFCv2 03/16] connect: rewrite feature parsing to work on string_list Stefan Beller
2015-06-02 18:48 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack Stefan Beller
2015-06-02 18:59 ` Junio C Hamano
2015-06-02 23:08 ` Stefan Beller
2015-06-02 0:02 ` [RFCv2 05/16] remote.h: Change get_remote_heads return to void Stefan Beller
2015-06-02 21:17 ` Junio C Hamano
2015-06-02 21:25 ` Stefan Beller
2015-06-02 21:41 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 06/16] remote.h: add new struct for options Stefan Beller
2015-06-02 21:18 ` Junio C Hamano
2015-06-02 21:40 ` Stefan Beller
2015-06-02 21:43 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 07/16] transport: add infrastructure to support a protocol version number Stefan Beller
2015-06-02 0:02 ` [RFCv2 08/16] transport: select transport version via command line or config Stefan Beller
2015-06-02 0:02 ` [RFCv2 09/16] remote.h: add get_remote_capabilities, request_capabilities Stefan Beller
2015-06-02 21:24 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 10/16] transport: connect_setup appends protocol version number Stefan Beller
2015-06-02 9:58 ` Duy Nguyen
2015-06-02 18:04 ` Stefan Beller
2015-06-02 21:37 ` Junio C Hamano
2015-06-02 22:09 ` Stefan Beller
2015-06-02 22:27 ` Junio C Hamano
2015-06-02 0:02 ` Stefan Beller [this message]
2015-06-02 21:45 ` [RFCv2 11/16] remote: have preselect_capabilities Junio C Hamano
2015-06-02 0:02 ` [RFCv2 12/16] transport: get_refs_via_connect exchanges capabilities before refs Stefan Beller
2015-06-02 21:55 ` Junio C Hamano
2015-06-02 22:19 ` Stefan Beller
2015-06-02 0:02 ` [RFCv2 13/16] fetch-pack: use the configured transport protocol Stefan Beller
2015-06-02 9:55 ` Duy Nguyen
2015-06-02 10:02 ` Duy Nguyen
2015-06-02 11:32 ` Ilari Liusvaara
2015-06-02 0:02 ` [RFCv2 14/16] t5544: add a test case for the new protocol Stefan Beller
2015-06-03 0:16 ` Eric Sunshine
2015-06-02 0:02 ` [RFCv2 15/16] Documentation/technical/pack-protocol: Mention http as possible protocol Stefan Beller
2015-06-02 21:57 ` Junio C Hamano
2015-06-02 22:00 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 16/16] Document protocol version 2 Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433203338-27493-12-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).