pkt-line: teach packet_read_line to chomp newlines
[git/jrn.git] / send-pack.c
blob8c230bf6c925ba6bd3617af62f44cfea8dc09a7b
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 "send-pack.h"
9 #include "quote.h"
10 #include "transport.h"
11 #include "version.h"
13 static int feed_object(const unsigned char *sha1, int fd, int negative)
15 char buf[42];
17 if (negative && !has_sha1_file(sha1))
18 return 1;
20 memcpy(buf + negative, sha1_to_hex(sha1), 40);
21 if (negative)
22 buf[0] = '^';
23 buf[40 + negative] = '\n';
24 return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
28 * Make a pack stream and spit it out into file descriptor fd
30 static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
33 * The child becomes pack-objects --revs; we feed
34 * the revision parameters to it via its stdin and
35 * let its stdout go back to the other end.
37 const char *argv[] = {
38 "pack-objects",
39 "--all-progress-implied",
40 "--revs",
41 "--stdout",
42 NULL,
43 NULL,
44 NULL,
45 NULL,
46 NULL,
48 struct child_process po;
49 int i;
51 i = 4;
52 if (args->use_thin_pack)
53 argv[i++] = "--thin";
54 if (args->use_ofs_delta)
55 argv[i++] = "--delta-base-offset";
56 if (args->quiet || !args->progress)
57 argv[i++] = "-q";
58 if (args->progress)
59 argv[i++] = "--progress";
60 memset(&po, 0, sizeof(po));
61 po.argv = argv;
62 po.in = -1;
63 po.out = args->stateless_rpc ? -1 : fd;
64 po.git_cmd = 1;
65 if (start_command(&po))
66 die_errno("git pack-objects failed");
69 * We feed the pack-objects we just spawned with revision
70 * parameters by writing to the pipe.
72 for (i = 0; i < extra->nr; i++)
73 if (!feed_object(extra->array[i], po.in, 1))
74 break;
76 while (refs) {
77 if (!is_null_sha1(refs->old_sha1) &&
78 !feed_object(refs->old_sha1, po.in, 1))
79 break;
80 if (!is_null_sha1(refs->new_sha1) &&
81 !feed_object(refs->new_sha1, po.in, 0))
82 break;
83 refs = refs->next;
86 close(po.in);
88 if (args->stateless_rpc) {
89 char *buf = xmalloc(LARGE_PACKET_MAX);
90 while (1) {
91 ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
92 if (n <= 0)
93 break;
94 send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
96 free(buf);
97 close(po.out);
98 po.out = -1;
101 if (finish_command(&po))
102 return -1;
103 return 0;
106 static int receive_status(int in, struct ref *refs)
108 struct ref *hint;
109 char line[1000];
110 int ret = 0;
111 int len = packet_read_line(in, line, sizeof(line));
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 len = packet_read_line(in, line, sizeof(line));
123 if (!len)
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_UPTODATE:
231 continue;
232 default:
233 ; /* do nothing */
236 if (ref->deletion && !allow_deleting_refs) {
237 ref->status = REF_STATUS_REJECT_NODELETE;
238 continue;
241 if (!ref->deletion)
242 new_refs++;
244 if (args->dry_run) {
245 ref->status = REF_STATUS_OK;
246 } else {
247 char *old_hex = sha1_to_hex(ref->old_sha1);
248 char *new_hex = sha1_to_hex(ref->new_sha1);
249 int quiet = quiet_supported && (args->quiet || !args->progress);
251 if (!cmds_sent && (status_report || use_sideband ||
252 quiet || agent_supported)) {
253 packet_buf_write(&req_buf,
254 "%s %s %s%c%s%s%s%s%s",
255 old_hex, new_hex, ref->name, 0,
256 status_report ? " report-status" : "",
257 use_sideband ? " side-band-64k" : "",
258 quiet ? " quiet" : "",
259 agent_supported ? " agent=" : "",
260 agent_supported ? git_user_agent_sanitized() : ""
263 else
264 packet_buf_write(&req_buf, "%s %s %s",
265 old_hex, new_hex, ref->name);
266 ref->status = status_report ?
267 REF_STATUS_EXPECTING_REPORT :
268 REF_STATUS_OK;
269 cmds_sent++;
273 if (args->stateless_rpc) {
274 if (!args->dry_run && cmds_sent) {
275 packet_buf_flush(&req_buf);
276 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
278 } else {
279 write_or_die(out, req_buf.buf, req_buf.len);
280 packet_flush(out);
282 strbuf_release(&req_buf);
284 if (use_sideband && cmds_sent) {
285 memset(&demux, 0, sizeof(demux));
286 demux.proc = sideband_demux;
287 demux.data = fd;
288 demux.out = -1;
289 if (start_async(&demux))
290 die("send-pack: unable to fork off sideband demultiplexer");
291 in = demux.out;
294 if (new_refs && cmds_sent) {
295 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
296 for (ref = remote_refs; ref; ref = ref->next)
297 ref->status = REF_STATUS_NONE;
298 if (args->stateless_rpc)
299 close(out);
300 if (git_connection_is_socket(conn))
301 shutdown(fd[0], SHUT_WR);
302 if (use_sideband)
303 finish_async(&demux);
304 return -1;
307 if (args->stateless_rpc && cmds_sent)
308 packet_flush(out);
310 if (status_report && cmds_sent)
311 ret = receive_status(in, remote_refs);
312 else
313 ret = 0;
314 if (args->stateless_rpc)
315 packet_flush(out);
317 if (use_sideband && cmds_sent) {
318 if (finish_async(&demux)) {
319 error("error in sideband demultiplexer");
320 ret = -1;
322 close(demux.out);
325 if (ret < 0)
326 return ret;
328 if (args->porcelain)
329 return 0;
331 for (ref = remote_refs; ref; ref = ref->next) {
332 switch (ref->status) {
333 case REF_STATUS_NONE:
334 case REF_STATUS_UPTODATE:
335 case REF_STATUS_OK:
336 break;
337 default:
338 return -1;
341 return 0;