]> git.ipfire.org Git - thirdparty/git.git/blame - send-pack.c
Document receive.advertiseatomic
[thirdparty/git.git] / send-pack.c
CommitLineData
f5d942e1
NTND
1#include "builtin.h"
2#include "commit.h"
3#include "refs.h"
4#include "pkt-line.h"
5#include "sideband.h"
6#include "run-command.h"
7#include "remote.h"
47a59185 8#include "connect.h"
f5d942e1
NTND
9#include "send-pack.h"
10#include "quote.h"
11#include "transport.h"
12#include "version.h"
13eb4626 13#include "sha1-array.h"
a85b377d 14#include "gpg-interface.h"
f5d942e1
NTND
15
16static int feed_object(const unsigned char *sha1, int fd, int negative)
17{
18 char buf[42];
19
20 if (negative && !has_sha1_file(sha1))
21 return 1;
22
23 memcpy(buf + negative, sha1_to_hex(sha1), 40);
24 if (negative)
25 buf[0] = '^';
26 buf[40 + negative] = '\n';
27 return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
28}
29
30/*
31 * Make a pack stream and spit it out into file descriptor fd
32 */
13eb4626 33static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, struct send_pack_args *args)
f5d942e1
NTND
34{
35 /*
36 * The child becomes pack-objects --revs; we feed
37 * the revision parameters to it via its stdin and
38 * let its stdout go back to the other end.
39 */
40 const char *argv[] = {
41 "pack-objects",
42 "--all-progress-implied",
43 "--revs",
44 "--stdout",
45 NULL,
46 NULL,
47 NULL,
48 NULL,
49 NULL,
50 };
d3180279 51 struct child_process po = CHILD_PROCESS_INIT;
f5d942e1
NTND
52 int i;
53
54 i = 4;
55 if (args->use_thin_pack)
56 argv[i++] = "--thin";
57 if (args->use_ofs_delta)
58 argv[i++] = "--delta-base-offset";
59 if (args->quiet || !args->progress)
60 argv[i++] = "-q";
61 if (args->progress)
62 argv[i++] = "--progress";
f5d942e1
NTND
63 po.argv = argv;
64 po.in = -1;
65 po.out = args->stateless_rpc ? -1 : fd;
66 po.git_cmd = 1;
67 if (start_command(&po))
68 die_errno("git pack-objects failed");
69
70 /*
71 * We feed the pack-objects we just spawned with revision
72 * parameters by writing to the pipe.
73 */
74 for (i = 0; i < extra->nr; i++)
13eb4626 75 if (!feed_object(extra->sha1[i], po.in, 1))
f5d942e1
NTND
76 break;
77
78 while (refs) {
79 if (!is_null_sha1(refs->old_sha1) &&
80 !feed_object(refs->old_sha1, po.in, 1))
81 break;
82 if (!is_null_sha1(refs->new_sha1) &&
83 !feed_object(refs->new_sha1, po.in, 0))
84 break;
85 refs = refs->next;
86 }
87
88 close(po.in);
89
90 if (args->stateless_rpc) {
91 char *buf = xmalloc(LARGE_PACKET_MAX);
92 while (1) {
93 ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
94 if (n <= 0)
95 break;
96 send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
97 }
98 free(buf);
99 close(po.out);
100 po.out = -1;
101 }
102
103 if (finish_command(&po))
104 return -1;
105 return 0;
106}
107
108static int receive_status(int in, struct ref *refs)
109{
110 struct ref *hint;
f5d942e1 111 int ret = 0;
74543a04 112 char *line = packet_read_line(in, NULL);
59556548 113 if (!starts_with(line, "unpack "))
f5d942e1 114 return error("did not receive remote status");
819b929d 115 if (strcmp(line, "unpack ok")) {
f5d942e1
NTND
116 error("unpack failed: %s", line + 7);
117 ret = -1;
118 }
119 hint = NULL;
120 while (1) {
121 char *refname;
122 char *msg;
74543a04
JK
123 line = packet_read_line(in, NULL);
124 if (!line)
f5d942e1 125 break;
59556548 126 if (!starts_with(line, "ok ") && !starts_with(line, "ng ")) {
8f9e3e49 127 error("invalid ref status from remote: %s", line);
f5d942e1
NTND
128 ret = -1;
129 break;
130 }
131
f5d942e1
NTND
132 refname = line + 3;
133 msg = strchr(refname, ' ');
134 if (msg)
135 *msg++ = '\0';
136
137 /* first try searching at our hint, falling back to all refs */
138 if (hint)
139 hint = find_ref_by_name(hint, refname);
140 if (!hint)
141 hint = find_ref_by_name(refs, refname);
142 if (!hint) {
143 warning("remote reported status on unknown ref: %s",
144 refname);
145 continue;
146 }
147 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
148 warning("remote reported status on unexpected ref: %s",
149 refname);
150 continue;
151 }
152
153 if (line[0] == 'o' && line[1] == 'k')
154 hint->status = REF_STATUS_OK;
155 else {
156 hint->status = REF_STATUS_REMOTE_REJECT;
157 ret = -1;
158 }
159 if (msg)
160 hint->remote_status = xstrdup(msg);
161 /* start our next search from the next ref */
162 hint = hint->next;
163 }
164 return ret;
165}
166
167static int sideband_demux(int in, int out, void *data)
168{
169 int *fd = data, ret;
170#ifdef NO_PTHREADS
171 close(fd[1]);
172#endif
173 ret = recv_sideband("send-pack", fd[0], out);
174 close(out);
175 return ret;
176}
177
f2c681cf
NTND
178static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
179{
180 struct strbuf *sb = cb;
181 if (graft->nr_parent == -1)
182 packet_buf_write(sb, "shallow %s\n", sha1_to_hex(graft->sha1));
183 return 0;
184}
185
16a2743c 186static void advertise_shallow_grafts_buf(struct strbuf *sb)
f2c681cf
NTND
187{
188 if (!is_repository_shallow())
189 return;
190 for_each_commit_graft(advertise_shallow_grafts_cb, sb);
191}
192
7582e939
SB
193#define CHECK_REF_NO_PUSH -1
194#define CHECK_REF_STATUS_REJECTED -2
195#define CHECK_REF_UPTODATE -3
196static int check_to_send_update(const struct ref *ref, const struct send_pack_args *args)
e40671a3
JH
197{
198 if (!ref->peer_ref && !args->send_mirror)
7582e939 199 return CHECK_REF_NO_PUSH;
e40671a3
JH
200
201 /* Check for statuses set by set_ref_status_for_push() */
202 switch (ref->status) {
203 case REF_STATUS_REJECT_NONFASTFORWARD:
204 case REF_STATUS_REJECT_ALREADY_EXISTS:
205 case REF_STATUS_REJECT_FETCH_FIRST:
206 case REF_STATUS_REJECT_NEEDS_FORCE:
207 case REF_STATUS_REJECT_STALE:
208 case REF_STATUS_REJECT_NODELETE:
7582e939 209 return CHECK_REF_STATUS_REJECTED;
e40671a3 210 case REF_STATUS_UPTODATE:
7582e939 211 return CHECK_REF_UPTODATE;
e40671a3 212 default:
7582e939 213 return 0;
e40671a3
JH
214 }
215}
216
a85b377d
JH
217/*
218 * the beginning of the next line, or the end of buffer.
219 *
220 * NEEDSWORK: perhaps move this to git-compat-util.h or somewhere and
221 * convert many similar uses found by "git grep -A4 memchr".
222 */
223static const char *next_line(const char *line, size_t len)
224{
225 const char *nl = memchr(line, '\n', len);
226 if (!nl)
227 return line + len; /* incomplete line */
228 return nl + 1;
229}
230
20a7558f
JH
231static int generate_push_cert(struct strbuf *req_buf,
232 const struct ref *remote_refs,
233 struct send_pack_args *args,
b89363e4
JH
234 const char *cap_string,
235 const char *push_cert_nonce)
a85b377d
JH
236{
237 const struct ref *ref;
a85b377d
JH
238 char *signing_key = xstrdup(get_signing_key());
239 const char *cp, *np;
240 struct strbuf cert = STRBUF_INIT;
241 int update_seen = 0;
242
a85b377d 243 strbuf_addf(&cert, "certificate version 0.1\n");
fb06b528
JH
244 strbuf_addf(&cert, "pusher %s ", signing_key);
245 datestamp(&cert);
246 strbuf_addch(&cert, '\n');
9be89160
JH
247 if (args->url && *args->url) {
248 char *anon_url = transport_anonymize_url(args->url);
249 strbuf_addf(&cert, "pushee %s\n", anon_url);
250 free(anon_url);
251 }
b89363e4
JH
252 if (push_cert_nonce[0])
253 strbuf_addf(&cert, "nonce %s\n", push_cert_nonce);
a85b377d
JH
254 strbuf_addstr(&cert, "\n");
255
256 for (ref = remote_refs; ref; ref = ref->next) {
7582e939 257 if (check_to_send_update(ref, args) < 0)
a85b377d
JH
258 continue;
259 update_seen = 1;
260 strbuf_addf(&cert, "%s %s %s\n",
261 sha1_to_hex(ref->old_sha1),
262 sha1_to_hex(ref->new_sha1),
263 ref->name);
264 }
265 if (!update_seen)
266 goto free_return;
267
268 if (sign_buffer(&cert, &cert, signing_key))
269 die(_("failed to sign the push certificate"));
270
20a7558f 271 packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
a85b377d
JH
272 for (cp = cert.buf; cp < cert.buf + cert.len; cp = np) {
273 np = next_line(cp, cert.buf + cert.len - cp);
274 packet_buf_write(req_buf,
275 "%.*s", (int)(np - cp), cp);
276 }
277 packet_buf_write(req_buf, "push-cert-end\n");
278
279free_return:
280 free(signing_key);
281 strbuf_release(&cert);
20a7558f 282 return update_seen;
a85b377d
JH
283}
284
4ff17f10
RS
285
286static int atomic_push_failure(struct send_pack_args *args,
287 struct ref *remote_refs,
288 struct ref *failing_ref)
289{
290 struct ref *ref;
291 /* Mark other refs as failed */
292 for (ref = remote_refs; ref; ref = ref->next) {
293 if (!ref->peer_ref && !args->send_mirror)
294 continue;
295
296 switch (ref->status) {
297 case REF_STATUS_EXPECTING_REPORT:
298 ref->status = REF_STATUS_ATOMIC_PUSH_FAILED;
299 continue;
300 default:
301 break; /* do nothing */
302 }
303 }
304 return error("atomic push failed for ref %s. status: %d\n",
305 failing_ref->name, failing_ref->status);
306}
307
f5d942e1
NTND
308int send_pack(struct send_pack_args *args,
309 int fd[], struct child_process *conn,
310 struct ref *remote_refs,
13eb4626 311 struct sha1_array *extra_have)
f5d942e1
NTND
312{
313 int in = fd[0];
314 int out = fd[1];
315 struct strbuf req_buf = STRBUF_INIT;
887f3533 316 struct strbuf cap_buf = STRBUF_INIT;
f5d942e1 317 struct ref *ref;
ab2b0c90 318 int need_pack_data = 0;
f5d942e1
NTND
319 int allow_deleting_refs = 0;
320 int status_report = 0;
321 int use_sideband = 0;
322 int quiet_supported = 0;
323 int agent_supported = 0;
4ff17f10
RS
324 int use_atomic = 0;
325 int atomic_supported = 0;
f5d942e1
NTND
326 unsigned cmds_sent = 0;
327 int ret;
328 struct async demux;
b89363e4 329 const char *push_cert_nonce = NULL;
f5d942e1
NTND
330
331 /* Does the other end support the reporting? */
332 if (server_supports("report-status"))
333 status_report = 1;
334 if (server_supports("delete-refs"))
335 allow_deleting_refs = 1;
336 if (server_supports("ofs-delta"))
337 args->use_ofs_delta = 1;
338 if (server_supports("side-band-64k"))
339 use_sideband = 1;
340 if (server_supports("quiet"))
341 quiet_supported = 1;
342 if (server_supports("agent"))
343 agent_supported = 1;
1ba98a79
CMN
344 if (server_supports("no-thin"))
345 args->use_thin_pack = 0;
4ff17f10
RS
346 if (server_supports("atomic"))
347 atomic_supported = 1;
b89363e4
JH
348 if (args->push_cert) {
349 int len;
350
351 push_cert_nonce = server_feature_value("push-cert", &len);
352 if (!push_cert_nonce)
353 die(_("the receiving end does not support --signed push"));
354 push_cert_nonce = xmemdupz(push_cert_nonce, len);
355 }
f5d942e1
NTND
356
357 if (!remote_refs) {
358 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
359 "Perhaps you should specify a branch such as 'master'.\n");
360 return 0;
361 }
4ff17f10
RS
362 if (args->atomic && !atomic_supported)
363 die(_("server does not support --atomic push"));
364
365 use_atomic = atomic_supported && args->atomic;
f5d942e1 366
887f3533
JH
367 if (status_report)
368 strbuf_addstr(&cap_buf, " report-status");
369 if (use_sideband)
370 strbuf_addstr(&cap_buf, " side-band-64k");
371 if (quiet_supported && (args->quiet || !args->progress))
372 strbuf_addstr(&cap_buf, " quiet");
4ff17f10
RS
373 if (use_atomic)
374 strbuf_addstr(&cap_buf, " atomic");
887f3533
JH
375 if (agent_supported)
376 strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
377
621b0599
JH
378 /*
379 * NEEDSWORK: why does delete-refs have to be so specific to
380 * send-pack machinery that set_ref_status_for_push() cannot
381 * set this bit for us???
382 */
383 for (ref = remote_refs; ref; ref = ref->next)
384 if (ref->deletion && !allow_deleting_refs)
385 ref->status = REF_STATUS_REJECT_NODELETE;
386
5dbd7676 387 if (!args->dry_run)
f2c681cf 388 advertise_shallow_grafts_buf(&req_buf);
5dbd7676 389
a85b377d 390 if (!args->dry_run && args->push_cert)
20a7558f 391 cmds_sent = generate_push_cert(&req_buf, remote_refs, args,
b89363e4 392 cap_buf.buf, push_cert_nonce);
a85b377d 393
f5d942e1 394 /*
b783aa71
JH
395 * Clear the status for each ref and see if we need to send
396 * the pack data.
f5d942e1 397 */
f5d942e1 398 for (ref = remote_refs; ref; ref = ref->next) {
4ff17f10
RS
399 switch (check_to_send_update(ref, args)) {
400 case 0: /* no error */
401 break;
402 case CHECK_REF_STATUS_REJECTED:
403 /*
404 * When we know the server would reject a ref update if
405 * we were to send it and we're trying to send the refs
406 * atomically, abort the whole operation.
407 */
408 if (use_atomic)
409 return atomic_push_failure(args, remote_refs, ref);
410 /* Fallthrough for non atomic case. */
411 default:
f5d942e1 412 continue;
4ff17f10 413 }
f5d942e1 414 if (!ref->deletion)
ab2b0c90 415 need_pack_data = 1;
f5d942e1 416
b783aa71 417 if (args->dry_run || !status_report)
f5d942e1 418 ref->status = REF_STATUS_OK;
b783aa71
JH
419 else
420 ref->status = REF_STATUS_EXPECTING_REPORT;
421 }
422
423 /*
424 * Finally, tell the other end!
425 */
426 for (ref = remote_refs; ref; ref = ref->next) {
427 char *old_hex, *new_hex;
428
4adf569d 429 if (args->dry_run || args->push_cert)
f5d942e1 430 continue;
f5d942e1 431
7582e939 432 if (check_to_send_update(ref, args) < 0)
b783aa71 433 continue;
f5d942e1 434
b783aa71
JH
435 old_hex = sha1_to_hex(ref->old_sha1);
436 new_hex = sha1_to_hex(ref->new_sha1);
c67072b9 437 if (!cmds_sent) {
b783aa71
JH
438 packet_buf_write(&req_buf,
439 "%s %s %s%c%s",
440 old_hex, new_hex, ref->name, 0,
441 cap_buf.buf);
c67072b9 442 cmds_sent = 1;
f5d942e1 443 } else {
b783aa71
JH
444 packet_buf_write(&req_buf, "%s %s %s",
445 old_hex, new_hex, ref->name);
f5d942e1
NTND
446 }
447 }
448
449 if (args->stateless_rpc) {
f2c681cf 450 if (!args->dry_run && (cmds_sent || is_repository_shallow())) {
f5d942e1
NTND
451 packet_buf_flush(&req_buf);
452 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
453 }
454 } else {
cdf4fb8e 455 write_or_die(out, req_buf.buf, req_buf.len);
f5d942e1
NTND
456 packet_flush(out);
457 }
458 strbuf_release(&req_buf);
887f3533 459 strbuf_release(&cap_buf);
f5d942e1
NTND
460
461 if (use_sideband && cmds_sent) {
462 memset(&demux, 0, sizeof(demux));
463 demux.proc = sideband_demux;
464 demux.data = fd;
465 demux.out = -1;
466 if (start_async(&demux))
467 die("send-pack: unable to fork off sideband demultiplexer");
468 in = demux.out;
469 }
470
ab2b0c90 471 if (need_pack_data && cmds_sent) {
f5d942e1
NTND
472 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
473 for (ref = remote_refs; ref; ref = ref->next)
474 ref->status = REF_STATUS_NONE;
475 if (args->stateless_rpc)
476 close(out);
477 if (git_connection_is_socket(conn))
478 shutdown(fd[0], SHUT_WR);
479 if (use_sideband)
480 finish_async(&demux);
37cb1dd6 481 fd[1] = -1;
f5d942e1
NTND
482 return -1;
483 }
37cb1dd6
JL
484 if (!args->stateless_rpc)
485 /* Closed by pack_objects() via start_command() */
486 fd[1] = -1;
f5d942e1
NTND
487 }
488 if (args->stateless_rpc && cmds_sent)
489 packet_flush(out);
490
491 if (status_report && cmds_sent)
492 ret = receive_status(in, remote_refs);
493 else
494 ret = 0;
495 if (args->stateless_rpc)
496 packet_flush(out);
497
498 if (use_sideband && cmds_sent) {
499 if (finish_async(&demux)) {
500 error("error in sideband demultiplexer");
501 ret = -1;
502 }
503 close(demux.out);
504 }
505
506 if (ret < 0)
507 return ret;
508
509 if (args->porcelain)
510 return 0;
511
512 for (ref = remote_refs; ref; ref = ref->next) {
513 switch (ref->status) {
514 case REF_STATUS_NONE:
515 case REF_STATUS_UPTODATE:
516 case REF_STATUS_OK:
517 break;
518 default:
519 return -1;
520 }
521 }
522 return 0;
523}