fetch, remote: properly convey --no-prune options to subprocesses
[git/jrn.git] / send-pack.c
blobb228d65613c511ffa59eb3ab254ee2e2b6f26c9b
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"
8 #include "connect.h"
9 #include "send-pack.h"
10 #include "quote.h"
11 #include "transport.h"
12 #include "version.h"
14 static int feed_object(const unsigned char *sha1, int fd, int negative)
16 char buf[42];
18 if (negative && !has_sha1_file(sha1))
19 return 1;
21 memcpy(buf + negative, sha1_to_hex(sha1), 40);
22 if (negative)
23 buf[0] = '^';
24 buf[40 + negative] = '\n';
25 return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
29 * Make a pack stream and spit it out into file descriptor fd
31 static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
34 * The child becomes pack-objects --revs; we feed
35 * the revision parameters to it via its stdin and
36 * let its stdout go back to the other end.
38 const char *argv[] = {
39 "pack-objects",
40 "--all-progress-implied",
41 "--revs",
42 "--stdout",
43 NULL,
44 NULL,
45 NULL,
46 NULL,
47 NULL,
49 struct child_process po;
50 int i;
52 i = 4;
53 if (args->use_thin_pack)
54 argv[i++] = "--thin";
55 if (args->use_ofs_delta)
56 argv[i++] = "--delta-base-offset";
57 if (args->quiet || !args->progress)
58 argv[i++] = "-q";
59 if (args->progress)
60 argv[i++] = "--progress";
61 memset(&po, 0, sizeof(po));
62 po.argv = argv;
63 po.in = -1;
64 po.out = args->stateless_rpc ? -1 : fd;
65 po.git_cmd = 1;
66 if (start_command(&po))
67 die_errno("git pack-objects failed");
70 * We feed the pack-objects we just spawned with revision
71 * parameters by writing to the pipe.
73 for (i = 0; i < extra->nr; i++)
74 if (!feed_object(extra->array[i], po.in, 1))
75 break;
77 while (refs) {
78 if (!is_null_sha1(refs->old_sha1) &&
79 !feed_object(refs->old_sha1, po.in, 1))
80 break;
81 if (!is_null_sha1(refs->new_sha1) &&
82 !feed_object(refs->new_sha1, po.in, 0))
83 break;
84 refs = refs->next;
87 close(po.in);
89 if (args->stateless_rpc) {
90 char *buf = xmalloc(LARGE_PACKET_MAX);
91 while (1) {
92 ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
93 if (n <= 0)
94 break;
95 send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
97 free(buf);
98 close(po.out);
99 po.out = -1;
102 if (finish_command(&po))
103 return -1;
104 return 0;
107 static int receive_status(int in, struct ref *refs)
109 struct ref *hint;
110 int ret = 0;
111 char *line = packet_read_line(in, NULL);
112 if (prefixcmp(line, "unpack "))
113 return error("did not receive remote status");
114 if (strcmp(line, "unpack ok")) {
115 error("unpack failed: %s", line + 7);
116 ret = -1;
118 hint = NULL;
119 while (1) {
120 char *refname;
121 char *msg;
122 line = packet_read_line(in, NULL);
123 if (!line)
124 break;
125 if (prefixcmp(line, "ok ") && prefixcmp(line, "ng ")) {
126 error("invalid ref status from remote: %s", line);
127 ret = -1;
128 break;
131 refname = line + 3;
132 msg = strchr(refname, ' ');
133 if (msg)
134 *msg++ = '\0';
136 /* first try searching at our hint, falling back to all refs */
137 if (hint)
138 hint = find_ref_by_name(hint, refname);
139 if (!hint)
140 hint = find_ref_by_name(refs, refname);
141 if (!hint) {
142 warning("remote reported status on unknown ref: %s",
143 refname);
144 continue;
146 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
147 warning("remote reported status on unexpected ref: %s",
148 refname);
149 continue;
152 if (line[0] == 'o' && line[1] == 'k')
153 hint->status = REF_STATUS_OK;
154 else {
155 hint->status = REF_STATUS_REMOTE_REJECT;
156 ret = -1;
158 if (msg)
159 hint->remote_status = xstrdup(msg);
160 /* start our next search from the next ref */
161 hint = hint->next;
163 return ret;
166 static int sideband_demux(int in, int out, void *data)
168 int *fd = data, ret;
169 #ifdef NO_PTHREADS
170 close(fd[1]);
171 #endif
172 ret = recv_sideband("send-pack", fd[0], out);
173 close(out);
174 return ret;
177 int send_pack(struct send_pack_args *args,
178 int fd[], struct child_process *conn,
179 struct ref *remote_refs,
180 struct extra_have_objects *extra_have)
182 int in = fd[0];
183 int out = fd[1];
184 struct strbuf req_buf = STRBUF_INIT;
185 struct ref *ref;
186 int new_refs;
187 int allow_deleting_refs = 0;
188 int status_report = 0;
189 int use_sideband = 0;
190 int quiet_supported = 0;
191 int agent_supported = 0;
192 unsigned cmds_sent = 0;
193 int ret;
194 struct async demux;
196 /* Does the other end support the reporting? */
197 if (server_supports("report-status"))
198 status_report = 1;
199 if (server_supports("delete-refs"))
200 allow_deleting_refs = 1;
201 if (server_supports("ofs-delta"))
202 args->use_ofs_delta = 1;
203 if (server_supports("side-band-64k"))
204 use_sideband = 1;
205 if (server_supports("quiet"))
206 quiet_supported = 1;
207 if (server_supports("agent"))
208 agent_supported = 1;
210 if (!remote_refs) {
211 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
212 "Perhaps you should specify a branch such as 'master'.\n");
213 return 0;
217 * Finally, tell the other end!
219 new_refs = 0;
220 for (ref = remote_refs; ref; ref = ref->next) {
221 if (!ref->peer_ref && !args->send_mirror)
222 continue;
224 /* Check for statuses set by set_ref_status_for_push() */
225 switch (ref->status) {
226 case REF_STATUS_REJECT_NONFASTFORWARD:
227 case REF_STATUS_REJECT_ALREADY_EXISTS:
228 case REF_STATUS_REJECT_FETCH_FIRST:
229 case REF_STATUS_REJECT_NEEDS_FORCE:
230 case REF_STATUS_REJECT_STALE:
231 case REF_STATUS_UPTODATE:
232 continue;
233 default:
234 ; /* do nothing */
237 if (ref->deletion && !allow_deleting_refs) {
238 ref->status = REF_STATUS_REJECT_NODELETE;
239 continue;
242 if (!ref->deletion)
243 new_refs++;
245 if (args->dry_run) {
246 ref->status = REF_STATUS_OK;
247 } else {
248 char *old_hex = sha1_to_hex(ref->old_sha1);
249 char *new_hex = sha1_to_hex(ref->new_sha1);
250 int quiet = quiet_supported && (args->quiet || !args->progress);
252 if (!cmds_sent && (status_report || use_sideband ||
253 quiet || agent_supported)) {
254 packet_buf_write(&req_buf,
255 "%s %s %s%c%s%s%s%s%s",
256 old_hex, new_hex, ref->name, 0,
257 status_report ? " report-status" : "",
258 use_sideband ? " side-band-64k" : "",
259 quiet ? " quiet" : "",
260 agent_supported ? " agent=" : "",
261 agent_supported ? git_user_agent_sanitized() : ""
264 else
265 packet_buf_write(&req_buf, "%s %s %s",
266 old_hex, new_hex, ref->name);
267 ref->status = status_report ?
268 REF_STATUS_EXPECTING_REPORT :
269 REF_STATUS_OK;
270 cmds_sent++;
274 if (args->stateless_rpc) {
275 if (!args->dry_run && cmds_sent) {
276 packet_buf_flush(&req_buf);
277 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
279 } else {
280 write_or_die(out, req_buf.buf, req_buf.len);
281 packet_flush(out);
283 strbuf_release(&req_buf);
285 if (use_sideband && cmds_sent) {
286 memset(&demux, 0, sizeof(demux));
287 demux.proc = sideband_demux;
288 demux.data = fd;
289 demux.out = -1;
290 if (start_async(&demux))
291 die("send-pack: unable to fork off sideband demultiplexer");
292 in = demux.out;
295 if (new_refs && cmds_sent) {
296 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
297 for (ref = remote_refs; ref; ref = ref->next)
298 ref->status = REF_STATUS_NONE;
299 if (args->stateless_rpc)
300 close(out);
301 if (git_connection_is_socket(conn))
302 shutdown(fd[0], SHUT_WR);
303 if (use_sideband)
304 finish_async(&demux);
305 return -1;
308 if (args->stateless_rpc && cmds_sent)
309 packet_flush(out);
311 if (status_report && cmds_sent)
312 ret = receive_status(in, remote_refs);
313 else
314 ret = 0;
315 if (args->stateless_rpc)
316 packet_flush(out);
318 if (use_sideband && cmds_sent) {
319 if (finish_async(&demux)) {
320 error("error in sideband demultiplexer");
321 ret = -1;
323 close(demux.out);
326 if (ret < 0)
327 return ret;
329 if (args->porcelain)
330 return 0;
332 for (ref = remote_refs; ref; ref = ref->next) {
333 switch (ref->status) {
334 case REF_STATUS_NONE:
335 case REF_STATUS_UPTODATE:
336 case REF_STATUS_OK:
337 break;
338 default:
339 return -1;
342 return 0;