receive-pack: reorder some code in unpack()
[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);
8f9e3e49 113 if (prefixcmp(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;
8f9e3e49
JK
126 if (prefixcmp(line, "ok ") && prefixcmp(line, "ng ")) {
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
178int send_pack(struct send_pack_args *args,
179 int fd[], struct child_process *conn,
180 struct ref *remote_refs,
13eb4626 181 struct sha1_array *extra_have)
f5d942e1
NTND
182{
183 int in = fd[0];
184 int out = fd[1];
185 struct strbuf req_buf = STRBUF_INIT;
186 struct ref *ref;
187 int new_refs;
188 int allow_deleting_refs = 0;
189 int status_report = 0;
190 int use_sideband = 0;
191 int quiet_supported = 0;
192 int agent_supported = 0;
193 unsigned cmds_sent = 0;
194 int ret;
195 struct async demux;
196
197 /* Does the other end support the reporting? */
198 if (server_supports("report-status"))
199 status_report = 1;
200 if (server_supports("delete-refs"))
201 allow_deleting_refs = 1;
202 if (server_supports("ofs-delta"))
203 args->use_ofs_delta = 1;
204 if (server_supports("side-band-64k"))
205 use_sideband = 1;
206 if (server_supports("quiet"))
207 quiet_supported = 1;
208 if (server_supports("agent"))
209 agent_supported = 1;
210
211 if (!remote_refs) {
212 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
213 "Perhaps you should specify a branch such as 'master'.\n");
214 return 0;
215 }
216
217 /*
218 * Finally, tell the other end!
219 */
220 new_refs = 0;
221 for (ref = remote_refs; ref; ref = ref->next) {
222 if (!ref->peer_ref && !args->send_mirror)
223 continue;
224
225 /* Check for statuses set by set_ref_status_for_push() */
226 switch (ref->status) {
227 case REF_STATUS_REJECT_NONFASTFORWARD:
dbfeddb1 228 case REF_STATUS_REJECT_ALREADY_EXISTS:
75e5c0dc
JH
229 case REF_STATUS_REJECT_FETCH_FIRST:
230 case REF_STATUS_REJECT_NEEDS_FORCE:
631b5ef2 231 case REF_STATUS_REJECT_STALE:
f5d942e1
NTND
232 case REF_STATUS_UPTODATE:
233 continue;
234 default:
235 ; /* do nothing */
236 }
237
238 if (ref->deletion && !allow_deleting_refs) {
239 ref->status = REF_STATUS_REJECT_NODELETE;
240 continue;
241 }
242
243 if (!ref->deletion)
244 new_refs++;
245
246 if (args->dry_run) {
247 ref->status = REF_STATUS_OK;
248 } else {
249 char *old_hex = sha1_to_hex(ref->old_sha1);
250 char *new_hex = sha1_to_hex(ref->new_sha1);
251 int quiet = quiet_supported && (args->quiet || !args->progress);
252
253 if (!cmds_sent && (status_report || use_sideband ||
254 quiet || agent_supported)) {
255 packet_buf_write(&req_buf,
256 "%s %s %s%c%s%s%s%s%s",
257 old_hex, new_hex, ref->name, 0,
258 status_report ? " report-status" : "",
259 use_sideband ? " side-band-64k" : "",
260 quiet ? " quiet" : "",
261 agent_supported ? " agent=" : "",
262 agent_supported ? git_user_agent_sanitized() : ""
263 );
264 }
265 else
266 packet_buf_write(&req_buf, "%s %s %s",
267 old_hex, new_hex, ref->name);
268 ref->status = status_report ?
269 REF_STATUS_EXPECTING_REPORT :
270 REF_STATUS_OK;
271 cmds_sent++;
272 }
273 }
274
275 if (args->stateless_rpc) {
276 if (!args->dry_run && cmds_sent) {
277 packet_buf_flush(&req_buf);
278 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
279 }
280 } else {
cdf4fb8e 281 write_or_die(out, req_buf.buf, req_buf.len);
f5d942e1
NTND
282 packet_flush(out);
283 }
284 strbuf_release(&req_buf);
285
286 if (use_sideband && cmds_sent) {
287 memset(&demux, 0, sizeof(demux));
288 demux.proc = sideband_demux;
289 demux.data = fd;
290 demux.out = -1;
291 if (start_async(&demux))
292 die("send-pack: unable to fork off sideband demultiplexer");
293 in = demux.out;
294 }
295
296 if (new_refs && cmds_sent) {
297 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
298 for (ref = remote_refs; ref; ref = ref->next)
299 ref->status = REF_STATUS_NONE;
300 if (args->stateless_rpc)
301 close(out);
302 if (git_connection_is_socket(conn))
303 shutdown(fd[0], SHUT_WR);
304 if (use_sideband)
305 finish_async(&demux);
37cb1dd6 306 fd[1] = -1;
f5d942e1
NTND
307 return -1;
308 }
37cb1dd6
JL
309 if (!args->stateless_rpc)
310 /* Closed by pack_objects() via start_command() */
311 fd[1] = -1;
f5d942e1
NTND
312 }
313 if (args->stateless_rpc && cmds_sent)
314 packet_flush(out);
315
316 if (status_report && cmds_sent)
317 ret = receive_status(in, remote_refs);
318 else
319 ret = 0;
320 if (args->stateless_rpc)
321 packet_flush(out);
322
323 if (use_sideband && cmds_sent) {
324 if (finish_async(&demux)) {
325 error("error in sideband demultiplexer");
326 ret = -1;
327 }
328 close(demux.out);
329 }
330
331 if (ret < 0)
332 return ret;
333
334 if (args->porcelain)
335 return 0;
336
337 for (ref = remote_refs; ref; ref = ref->next) {
338 switch (ref->status) {
339 case REF_STATUS_NONE:
340 case REF_STATUS_UPTODATE:
341 case REF_STATUS_OK:
342 break;
343 default:
344 return -1;
345 }
346 }
347 return 0;
348}