receive-pack.c: negotiate atomic push support
This adds the atomic protocol option to allow receive-pack to inform the client that it has atomic push capability. This commit makes the functionality introduced in the previous commits go live for the serving side. The changes in documentation reflect the protocol capabilities of the server. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ronnie Sahlberg committed
Jan 7, 2015 at 19:23 UTC
1b70fe5d305462f1dd4b9d6233a2f4cb98e3a581
2 files changed
+22
-2
Documentation/technical/protocol-capabilities.txt
+11
-2
@@ -18,8 +18,9 @@ was sent. Server MUST NOT ignore capabilities that client requested
18
and server advertised. As a consequence of these rules, server MUST
19
NOT advertise capabilities it does not understand.
20
21
-The 'report-status', 'delete-refs', 'quiet', and 'push-cert' capabilities
22
-are sent and recognized by the receive-pack (push to server) process.
21
+The 'atomic', 'report-status', 'delete-refs', 'quiet', and 'push-cert'
22
+capabilities are sent and recognized by the receive-pack (push to server)
23
+process.
24
25
The 'ofs-delta' and 'side-band-64k' capabilities are sent and recognized
26
by both upload-pack and receive-pack protocols. The 'agent' capability
@@ -244,6 +245,14 @@ respond with the 'quiet' capability to suppress server-side progress
245
reporting if the local progress reporting is also being suppressed
246
(e.g., via `push -q`, or if stderr does not go to a tty).
247
248
+atomic
249
+------
250
+
251
+If the server sends the 'atomic' capability it is capable of accepting
252
+atomic pushes. If the pushing client requests this capability, the server
253
+will update the refs in one atomic transaction. Either all refs are
254
+updated or none.
255
+
256
allow-tip-sha1-in-want
257
----------------------
258
builtin/receive-pack.c
+11
@@ -37,6 +37,7 @@ static int receive_fsck_objects = -1;
37
static int transfer_fsck_objects = -1;
38
static int receive_unpack_limit = -1;
39
static int transfer_unpack_limit = -1;
40
+static int advertise_atomic_push = 1;
41
static int unpack_limit = 100;
42
static int report_status;
43
static int use_sideband;
@@ -159,6 +160,11 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
160
return 0;
161
}
162
163
+ if (strcmp(var, "receive.advertiseatomic") == 0) {
164
+ advertise_atomic_push = git_config_bool(var, value);
165
+ return 0;
166
+ }
167
+
168
return git_default_config(var, value, cb);
169
}
170
@@ -174,6 +180,8 @@ static void show_ref(const char *path, const unsigned char *sha1)
180
181
strbuf_addstr(&cap,
182
"report-status delete-refs side-band-64k quiet");
183
+ if (advertise_atomic_push)
184
+ strbuf_addstr(&cap, " atomic");
185
if (prefer_ofs_delta)
186
strbuf_addstr(&cap, " ofs-delta");
187
if (push_cert_nonce)
@@ -1263,6 +1271,9 @@ static struct command *read_head_info(struct sha1_array *shallow)
1271
use_sideband = LARGE_PACKET_MAX;
1272
if (parse_feature_request(feature_list, "quiet"))
1273
quiet = 1;
1274
+ if (advertise_atomic_push
1275
+ && parse_feature_request(feature_list, "atomic"))
1276
+ use_atomic = 1;
1277
}
1278
1279
if (!strcmp(line, "push-cert")) {