send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
[git/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"
f5d942e1
NTND
14
15static int feed_object(const unsigned char *sha1, int fd, int negative)
16{
17 char buf[42];
18
19 if (negative && !has_sha1_file(sha1))
20 return 1;
21
22 memcpy(buf + negative, sha1_to_hex(sha1), 40);
23 if (negative)
24 buf[0] = '^';
25 buf[40 + negative] = '\n';
26 return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
27}
28
29/*
30 * Make a pack stream and spit it out into file descriptor fd
31 */
13eb4626 32static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, struct send_pack_args *args)
f5d942e1
NTND
33{
34 /*
35 * The child becomes pack-objects --revs; we feed
36 * the revision parameters to it via its stdin and
37 * let its stdout go back to the other end.
38 */
39 const char *argv[] = {
40 "pack-objects",
41 "--all-progress-implied",
42 "--revs",
43 "--stdout",
44 NULL,
45 NULL,
46 NULL,
47 NULL,
48 NULL,
49 };
50 struct child_process po;
51 int i;
52
53 i = 4;
54 if (args->use_thin_pack)
55 argv[i++] = "--thin";
56 if (args->use_ofs_delta)
57 argv[i++] = "--delta-base-offset";
58 if (args->quiet || !args->progress)
59 argv[i++] = "-q";
60 if (args->progress)
61 argv[i++] = "--progress";
62 memset(&po, 0, sizeof(po));
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
f5d942e1
NTND
193int send_pack(struct send_pack_args *args,
194 int fd[], struct child_process *conn,
195 struct ref *remote_refs,
13eb4626 196 struct sha1_array *extra_have)
f5d942e1
NTND
197{
198 int in = fd[0];
199 int out = fd[1];
200 struct strbuf req_buf = STRBUF_INIT;
201 struct ref *ref;
202 int new_refs;
203 int allow_deleting_refs = 0;
204 int status_report = 0;
205 int use_sideband = 0;
206 int quiet_supported = 0;
207 int agent_supported = 0;
208 unsigned cmds_sent = 0;
209 int ret;
210 struct async demux;
211
212 /* Does the other end support the reporting? */
213 if (server_supports("report-status"))
214 status_report = 1;
215 if (server_supports("delete-refs"))
216 allow_deleting_refs = 1;
217 if (server_supports("ofs-delta"))
218 args->use_ofs_delta = 1;
219 if (server_supports("side-band-64k"))
220 use_sideband = 1;
221 if (server_supports("quiet"))
222 quiet_supported = 1;
223 if (server_supports("agent"))
224 agent_supported = 1;
1ba98a79
CMN
225 if (server_supports("no-thin"))
226 args->use_thin_pack = 0;
f5d942e1
NTND
227
228 if (!remote_refs) {
229 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
230 "Perhaps you should specify a branch such as 'master'.\n");
231 return 0;
232 }
233
621b0599
JH
234 /*
235 * NEEDSWORK: why does delete-refs have to be so specific to
236 * send-pack machinery that set_ref_status_for_push() cannot
237 * set this bit for us???
238 */
239 for (ref = remote_refs; ref; ref = ref->next)
240 if (ref->deletion && !allow_deleting_refs)
241 ref->status = REF_STATUS_REJECT_NODELETE;
242
5dbd7676 243 if (!args->dry_run)
f2c681cf 244 advertise_shallow_grafts_buf(&req_buf);
5dbd7676 245
f5d942e1
NTND
246 /*
247 * Finally, tell the other end!
248 */
249 new_refs = 0;
250 for (ref = remote_refs; ref; ref = ref->next) {
251 if (!ref->peer_ref && !args->send_mirror)
252 continue;
253
254 /* Check for statuses set by set_ref_status_for_push() */
255 switch (ref->status) {
256 case REF_STATUS_REJECT_NONFASTFORWARD:
dbfeddb1 257 case REF_STATUS_REJECT_ALREADY_EXISTS:
75e5c0dc
JH
258 case REF_STATUS_REJECT_FETCH_FIRST:
259 case REF_STATUS_REJECT_NEEDS_FORCE:
631b5ef2 260 case REF_STATUS_REJECT_STALE:
621b0599 261 case REF_STATUS_REJECT_NODELETE:
f5d942e1
NTND
262 case REF_STATUS_UPTODATE:
263 continue;
264 default:
265 ; /* do nothing */
266 }
267
f5d942e1
NTND
268 if (!ref->deletion)
269 new_refs++;
270
271 if (args->dry_run) {
272 ref->status = REF_STATUS_OK;
273 } else {
274 char *old_hex = sha1_to_hex(ref->old_sha1);
275 char *new_hex = sha1_to_hex(ref->new_sha1);
276 int quiet = quiet_supported && (args->quiet || !args->progress);
277
278 if (!cmds_sent && (status_report || use_sideband ||
279 quiet || agent_supported)) {
280 packet_buf_write(&req_buf,
281 "%s %s %s%c%s%s%s%s%s",
282 old_hex, new_hex, ref->name, 0,
283 status_report ? " report-status" : "",
284 use_sideband ? " side-band-64k" : "",
285 quiet ? " quiet" : "",
286 agent_supported ? " agent=" : "",
287 agent_supported ? git_user_agent_sanitized() : ""
288 );
289 }
290 else
291 packet_buf_write(&req_buf, "%s %s %s",
292 old_hex, new_hex, ref->name);
293 ref->status = status_report ?
294 REF_STATUS_EXPECTING_REPORT :
295 REF_STATUS_OK;
296 cmds_sent++;
297 }
298 }
299
300 if (args->stateless_rpc) {
f2c681cf 301 if (!args->dry_run && (cmds_sent || is_repository_shallow())) {
f5d942e1
NTND
302 packet_buf_flush(&req_buf);
303 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
304 }
305 } else {
cdf4fb8e 306 write_or_die(out, req_buf.buf, req_buf.len);
f5d942e1
NTND
307 packet_flush(out);
308 }
309 strbuf_release(&req_buf);
310
311 if (use_sideband && cmds_sent) {
312 memset(&demux, 0, sizeof(demux));
313 demux.proc = sideband_demux;
314 demux.data = fd;
315 demux.out = -1;
316 if (start_async(&demux))
317 die("send-pack: unable to fork off sideband demultiplexer");
318 in = demux.out;
319 }
320
321 if (new_refs && cmds_sent) {
322 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
323 for (ref = remote_refs; ref; ref = ref->next)
324 ref->status = REF_STATUS_NONE;
325 if (args->stateless_rpc)
326 close(out);
327 if (git_connection_is_socket(conn))
328 shutdown(fd[0], SHUT_WR);
329 if (use_sideband)
330 finish_async(&demux);
37cb1dd6 331 fd[1] = -1;
f5d942e1
NTND
332 return -1;
333 }
37cb1dd6
JL
334 if (!args->stateless_rpc)
335 /* Closed by pack_objects() via start_command() */
336 fd[1] = -1;
f5d942e1
NTND
337 }
338 if (args->stateless_rpc && cmds_sent)
339 packet_flush(out);
340
341 if (status_report && cmds_sent)
342 ret = receive_status(in, remote_refs);
343 else
344 ret = 0;
345 if (args->stateless_rpc)
346 packet_flush(out);
347
348 if (use_sideband && cmds_sent) {
349 if (finish_async(&demux)) {
350 error("error in sideband demultiplexer");
351 ret = -1;
352 }
353 close(demux.out);
354 }
355
356 if (ret < 0)
357 return ret;
358
359 if (args->porcelain)
360 return 0;
361
362 for (ref = remote_refs; ref; ref = ref->next) {
363 switch (ref->status) {
364 case REF_STATUS_NONE:
365 case REF_STATUS_UPTODATE:
366 case REF_STATUS_OK:
367 break;
368 default:
369 return -1;
370 }
371 }
372 return 0;
373}