blob: 6142421ea1172f7fe6b57486a4f41b81d92bab85 [file] [log] [blame]
Linus Torvaldsdef88e92005-07-04 13:26:53 -07001#include "cache.h"
2#include "refs.h"
3#include "pkt-line.h"
Junio C Hamano958c24b2006-09-10 03:20:24 -07004#include "sideband.h"
Junio C Hamanof6b42a82005-10-13 18:57:40 -07005#include "tag.h"
6#include "object.h"
Johannes Schindelinf0243f22005-10-28 04:48:32 +02007#include "commit.h"
Michal Ostrowski77cb17e2006-01-10 21:12:17 -05008#include "exec_cmd.h"
Johannes Schindelin9b8dc262006-10-30 20:08:43 +01009#include "diff.h"
10#include "revision.h"
11#include "list-objects.h"
Johannes Sixtcc41fa82007-10-19 21:47:59 +020012#include "run-command.h"
Junio C Hamano051e4002011-08-05 13:54:06 -070013#include "sigchain.h"
Jeff Kingff5effd2012-08-03 12:19:16 -040014#include "version.h"
Linus Torvaldsdef88e92005-07-04 13:26:53 -070015
Štěpán Němec62b46982010-10-08 19:31:15 +020016static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
Linus Torvaldsdef88e92005-07-04 13:26:53 -070017
Junio C Hamano937a5152006-07-05 21:28:20 -070018/* bits #0..7 in revision.h, #8..10 in commit.c */
19#define THEY_HAVE (1u << 11)
20#define OUR_REF (1u << 12)
21#define WANTED (1u << 13)
22#define COMMON_KNOWN (1u << 14)
23#define REACHABLE (1u << 15)
24
Johannes Schindelinf53514b2006-10-30 20:09:53 +010025#define SHALLOW (1u << 16)
26#define NOT_SHALLOW (1u << 17)
27#define CLIENT_SHALLOW (1u << 18)
28
Junio C Hamano3fbe2d52006-11-24 02:34:27 -080029static unsigned long oldest_have;
Junio C Hamano937a5152006-07-05 21:28:20 -070030
David Rientjes96f1e582006-08-15 10:23:48 -070031static int multi_ack, nr_our_refs;
Junio C Hamano4e10cf92011-03-29 12:29:10 -070032static int no_done;
Shawn O. Pearce348e3902008-03-03 22:27:33 -050033static int use_thin_pack, use_ofs_delta, use_include_tag;
Johannes Sixt9462e3f2009-06-16 20:41:16 +020034static int no_progress, daemon_mode;
Nick Edelenf0cea832009-06-10 01:50:18 +020035static int shallow_nr;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -070036static struct object_array have_obj;
37static struct object_array want_obj;
Nicolas Pitre65230782009-09-03 19:08:33 -040038static struct object_array extra_edge_obj;
David Rientjes96f1e582006-08-15 10:23:48 -070039static unsigned int timeout;
Junio C Hamanod47f3db2006-09-10 16:27:08 -070040/* 0 for no sideband,
41 * otherwise maximum packet size (up to 65520 bytes).
42 */
David Rientjes96f1e582006-08-15 10:23:48 -070043static int use_sideband;
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -050044static int debug_fd;
Shawn O. Pearce42526b42009-10-30 17:47:33 -070045static int advertise_refs;
46static int stateless_rpc;
H. Peter Anvin960decc2005-10-19 14:27:01 -070047
48static void reset_timeout(void)
49{
50 alarm(timeout);
51}
Linus Torvaldsfb9040c2005-07-04 15:29:17 -070052
Linus Torvalds75bfc6c2005-07-04 16:35:13 -070053static int strip(char *line, int len)
54{
55 if (len && line[len-1] == '\n')
56 line[--len] = 0;
57 return len;
58}
59
Junio C Hamano583b7ea2006-06-21 00:30:21 -070060static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
61{
Junio C Hamano958c24b2006-09-10 03:20:24 -070062 if (use_sideband)
Junio C Hamanod47f3db2006-09-10 16:27:08 -070063 return send_sideband(1, fd, data, sz, use_sideband);
Junio C Hamano958c24b2006-09-10 03:20:24 -070064 if (fd == 3)
65 /* emergency quit */
66 fd = 2;
67 if (fd == 2) {
Andy Whitcroft93822c22007-01-08 15:58:23 +000068 /* XXX: are we happy to lose stuff here? */
Junio C Hamano958c24b2006-09-10 03:20:24 -070069 xwrite(fd, data, sz);
70 return sz;
Junio C Hamano583b7ea2006-06-21 00:30:21 -070071 }
Junio C Hamano958c24b2006-09-10 03:20:24 -070072 return safe_write(fd, data, sz);
Junio C Hamano583b7ea2006-06-21 00:30:21 -070073}
74
Junio C Hamano16befb82007-06-08 02:54:57 -070075static FILE *pack_pipe = NULL;
Christian Couder11c211f2009-04-06 21:28:36 +020076static void show_commit(struct commit *commit, void *data)
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010077{
78 if (commit->object.flags & BOUNDARY)
79 fputc('-', pack_pipe);
80 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
81 die("broken output pipe");
82 fputc('\n', pack_pipe);
83 fflush(pack_pipe);
84 free(commit->buffer);
85 commit->buffer = NULL;
86}
87
Junio C Hamano49473672011-09-01 15:43:33 -070088static void show_object(struct object *obj,
89 const struct name_path *path, const char *component,
90 void *cb_data)
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010091{
Junio C Hamano91f17512011-08-17 14:30:34 -070092 show_object_with_name(pack_pipe, obj, path, component);
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010093}
94
95static void show_edge(struct commit *commit)
96{
97 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
98}
99
Nguyễn Thái Ngọc Duy1e39d7d2010-07-28 16:39:10 +0700100static int do_rev_list(int in, int out, void *user_data)
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200101{
102 int i;
103 struct rev_info revs;
104
Erik Faye-Lundae6a5602010-02-05 12:57:38 -0800105 pack_pipe = xfdopen(out, "w");
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200106 init_revisions(&revs, NULL);
107 revs.tag_objects = 1;
108 revs.tree_objects = 1;
109 revs.blob_objects = 1;
110 if (use_thin_pack)
111 revs.edge_hint = 1;
112
Nguyễn Thái Ngọc Duy1e39d7d2010-07-28 16:39:10 +0700113 for (i = 0; i < want_obj.nr; i++) {
114 struct object *o = want_obj.objects[i].item;
115 /* why??? */
116 o->flags &= ~UNINTERESTING;
117 add_pending_object(&revs, o, NULL);
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200118 }
Nguyễn Thái Ngọc Duy1e39d7d2010-07-28 16:39:10 +0700119 for (i = 0; i < have_obj.nr; i++) {
120 struct object *o = have_obj.objects[i].item;
121 o->flags |= UNINTERESTING;
122 add_pending_object(&revs, o, NULL);
123 }
124 setup_revisions(0, NULL, &revs, NULL);
Martin Koegler3d51e1b2008-02-18 08:31:56 +0100125 if (prepare_revision_walk(&revs))
126 die("revision walk setup failed");
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200127 mark_edges_uninteresting(revs.commits, &revs, show_edge);
Nicolas Pitre65230782009-09-03 19:08:33 -0400128 if (use_thin_pack)
129 for (i = 0; i < extra_edge_obj.nr; i++)
130 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
131 extra_edge_obj.objects[i].item->sha1));
Christian Couder11c211f2009-04-06 21:28:36 +0200132 traverse_commit_list(&revs, show_commit, show_object, NULL);
Johannes Sixt618ebe92007-12-08 22:19:14 +0100133 fflush(pack_pipe);
134 fclose(pack_pipe);
Johannes Sixt21edd3f2007-10-19 21:48:03 +0200135 return 0;
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200136}
137
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700138static void create_pack_file(void)
139{
Johannes Sixt21edd3f2007-10-19 21:48:03 +0200140 struct async rev_list;
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200141 struct child_process pack_objects;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700142 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
Junio C Hamano363b7812006-06-20 22:48:23 -0700143 char data[8193], progress[128];
Junio C Hamano583b7ea2006-06-21 00:30:21 -0700144 char abort_msg[] = "aborting due to possible repository "
145 "corruption on the remote side.";
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700146 int buffered = -1;
Junio C Hamano1456b042009-12-10 12:17:11 -0800147 ssize_t sz;
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200148 const char *argv[10];
149 int arg = 0;
Linus Torvalds75bfc6c2005-07-04 16:35:13 -0700150
Jeff Kingb9612192011-04-06 17:33:33 -0400151 argv[arg++] = "pack-objects";
152 if (!shallow_nr) {
Nick Edelenf0cea832009-06-10 01:50:18 +0200153 argv[arg++] = "--revs";
154 if (create_full_pack)
155 argv[arg++] = "--all";
156 else if (use_thin_pack)
157 argv[arg++] = "--thin";
158 }
Linus Torvalds75bfc6c2005-07-04 16:35:13 -0700159
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200160 argv[arg++] = "--stdout";
161 if (!no_progress)
162 argv[arg++] = "--progress";
163 if (use_ofs_delta)
164 argv[arg++] = "--delta-base-offset";
Shawn O. Pearce348e3902008-03-03 22:27:33 -0500165 if (use_include_tag)
166 argv[arg++] = "--include-tag";
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200167 argv[arg++] = NULL;
168
169 memset(&pack_objects, 0, sizeof(pack_objects));
Jeff Kingb9612192011-04-06 17:33:33 -0400170 pack_objects.in = -1;
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200171 pack_objects.out = -1;
172 pack_objects.err = -1;
173 pack_objects.git_cmd = 1;
174 pack_objects.argv = argv;
Johannes Sixt21edd3f2007-10-19 21:48:03 +0200175
Johannes Sixt4c324c02007-11-04 20:46:48 +0100176 if (start_command(&pack_objects))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700177 die("git upload-pack: unable to fork git-pack-objects");
Johannes Schindelin83a5ad62007-02-20 03:01:44 +0100178
Jeff Kingb9612192011-04-06 17:33:33 -0400179 if (shallow_nr) {
180 memset(&rev_list, 0, sizeof(rev_list));
181 rev_list.proc = do_rev_list;
182 rev_list.out = pack_objects.in;
183 if (start_async(&rev_list))
184 die("git upload-pack: unable to fork git-rev-list");
185 }
186 else {
Jim Meyering41698372009-09-12 10:43:27 +0200187 FILE *pipe_fd = xfdopen(pack_objects.in, "w");
Nick Edelenf0cea832009-06-10 01:50:18 +0200188 if (!create_full_pack) {
189 int i;
190 for (i = 0; i < want_obj.nr; i++)
191 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
192 fprintf(pipe_fd, "--not\n");
193 for (i = 0; i < have_obj.nr; i++)
194 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
195 }
196
197 fprintf(pipe_fd, "\n");
198 fflush(pipe_fd);
199 fclose(pipe_fd);
200 }
201
202
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200203 /* We read from pack_objects.err to capture stderr output for
204 * progress bar, and pack_objects.out to capture the pack data.
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700205 */
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700206
207 while (1) {
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700208 struct pollfd pfd[2];
Junio C Hamano363b7812006-06-20 22:48:23 -0700209 int pe, pu, pollsize;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700210
Matthias Lederhofer0d516ad2006-07-18 19:14:51 +0200211 reset_timeout();
212
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700213 pollsize = 0;
Junio C Hamano363b7812006-06-20 22:48:23 -0700214 pe = pu = -1;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700215
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200216 if (0 <= pack_objects.out) {
217 pfd[pollsize].fd = pack_objects.out;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700218 pfd[pollsize].events = POLLIN;
219 pu = pollsize;
220 pollsize++;
221 }
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200222 if (0 <= pack_objects.err) {
223 pfd[pollsize].fd = pack_objects.err;
Junio C Hamano363b7812006-06-20 22:48:23 -0700224 pfd[pollsize].events = POLLIN;
225 pe = pollsize;
226 pollsize++;
227 }
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700228
Johannes Sixt4c324c02007-11-04 20:46:48 +0100229 if (!pollsize)
230 break;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700231
Johannes Sixt4c324c02007-11-04 20:46:48 +0100232 if (poll(pfd, pollsize, -1) < 0) {
233 if (errno != EINTR) {
234 error("poll failed, resuming: %s",
235 strerror(errno));
236 sleep(1);
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700237 }
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700238 continue;
Johannes Sixt4c324c02007-11-04 20:46:48 +0100239 }
Nicolas Pitre6b59f512009-11-11 17:24:42 -0500240 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
241 /* Status ready; we ship that in the side-band
242 * or dump to the standard error.
243 */
244 sz = xread(pack_objects.err, progress,
245 sizeof(progress));
246 if (0 < sz)
247 send_client_data(2, progress, sz);
248 else if (sz == 0) {
249 close(pack_objects.err);
250 pack_objects.err = -1;
251 }
252 else
253 goto fail;
254 /* give priority to status messages */
255 continue;
256 }
Johannes Sixt4c324c02007-11-04 20:46:48 +0100257 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
258 /* Data ready; we keep the last byte to ourselves
259 * in case we detect broken rev-list, so that we
260 * can leave the stream corrupted. This is
261 * unfortunate -- unpack-objects would happily
262 * accept a valid packdata with trailing garbage,
263 * so appending garbage after we pass all the
264 * pack data is not good enough to signal
265 * breakage to downstream.
266 */
267 char *cp = data;
268 ssize_t outsz = 0;
269 if (0 <= buffered) {
270 *cp++ = buffered;
271 outsz++;
272 }
273 sz = xread(pack_objects.out, cp,
274 sizeof(data) - outsz);
275 if (0 < sz)
Junio C Hamano1456b042009-12-10 12:17:11 -0800276 ;
Johannes Sixt4c324c02007-11-04 20:46:48 +0100277 else if (sz == 0) {
278 close(pack_objects.out);
279 pack_objects.out = -1;
280 }
281 else
282 goto fail;
283 sz += outsz;
284 if (1 < sz) {
285 buffered = data[sz-1] & 0xFF;
286 sz--;
287 }
288 else
289 buffered = -1;
290 sz = send_client_data(1, data, sz);
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700291 if (sz < 0)
292 goto fail;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700293 }
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700294 }
Johannes Sixt4c324c02007-11-04 20:46:48 +0100295
296 if (finish_command(&pack_objects)) {
Junio C Hamano7e44c932008-08-31 09:39:19 -0700297 error("git upload-pack: git-pack-objects died with error.");
Johannes Sixt4c324c02007-11-04 20:46:48 +0100298 goto fail;
299 }
Nick Edelenf0cea832009-06-10 01:50:18 +0200300 if (shallow_nr && finish_async(&rev_list))
Johannes Sixt4c324c02007-11-04 20:46:48 +0100301 goto fail; /* error was already reported */
302
303 /* flush the data */
304 if (0 <= buffered) {
305 data[0] = buffered;
306 sz = send_client_data(1, data, 1);
307 if (sz < 0)
308 goto fail;
309 fprintf(stderr, "flushed.\n");
310 }
311 if (use_sideband)
312 packet_flush(1);
313 return;
314
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700315 fail:
Junio C Hamano583b7ea2006-06-21 00:30:21 -0700316 send_client_data(3, abort_msg, sizeof(abort_msg));
Junio C Hamano7e44c932008-08-31 09:39:19 -0700317 die("git upload-pack: %s", abort_msg);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700318}
319
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700320static int got_sha1(char *hex, unsigned char *sha1)
321{
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700322 struct object *o;
Junio C Hamano937a5152006-07-05 21:28:20 -0700323 int we_knew_they_have = 0;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700324
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700325 if (get_sha1_hex(hex, sha1))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700326 die("git upload-pack: expected SHA1 object, got '%s'", hex);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700327 if (!has_sha1_file(sha1))
Junio C Hamano937a5152006-07-05 21:28:20 -0700328 return -1;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700329
330 o = lookup_object(sha1);
331 if (!(o && o->parsed))
332 o = parse_object(sha1);
333 if (!o)
334 die("oops (%s)", sha1_to_hex(sha1));
Junio C Hamano182a8da2006-08-12 22:16:51 -0700335 if (o->type == OBJ_COMMIT) {
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700336 struct commit_list *parents;
Junio C Hamano937a5152006-07-05 21:28:20 -0700337 struct commit *commit = (struct commit *)o;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700338 if (o->flags & THEY_HAVE)
Junio C Hamano937a5152006-07-05 21:28:20 -0700339 we_knew_they_have = 1;
340 else
341 o->flags |= THEY_HAVE;
342 if (!oldest_have || (commit->date < oldest_have))
343 oldest_have = commit->date;
344 for (parents = commit->parents;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700345 parents;
346 parents = parents->next)
347 parents->item->object.flags |= THEY_HAVE;
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700348 }
Junio C Hamano937a5152006-07-05 21:28:20 -0700349 if (!we_knew_they_have) {
350 add_object_array(o, NULL, &have_obj);
351 return 1;
352 }
353 return 0;
354}
355
356static int reachable(struct commit *want)
357{
358 struct commit_list *work = NULL;
359
Thiago Farina47e44ed2010-11-26 23:58:14 -0200360 commit_list_insert_by_date(want, &work);
Junio C Hamano937a5152006-07-05 21:28:20 -0700361 while (work) {
362 struct commit_list *list = work->next;
363 struct commit *commit = work->item;
364 free(work);
365 work = list;
366
367 if (commit->object.flags & THEY_HAVE) {
368 want->object.flags |= COMMON_KNOWN;
369 break;
370 }
371 if (!commit->object.parsed)
372 parse_object(commit->object.sha1);
373 if (commit->object.flags & REACHABLE)
374 continue;
375 commit->object.flags |= REACHABLE;
376 if (commit->date < oldest_have)
377 continue;
378 for (list = commit->parents; list; list = list->next) {
379 struct commit *parent = list->item;
380 if (!(parent->object.flags & REACHABLE))
Thiago Farina47e44ed2010-11-26 23:58:14 -0200381 commit_list_insert_by_date(parent, &work);
Junio C Hamano937a5152006-07-05 21:28:20 -0700382 }
383 }
384 want->object.flags |= REACHABLE;
385 clear_commit_marks(want, REACHABLE);
386 free_commit_list(work);
387 return (want->object.flags & COMMON_KNOWN);
388}
389
390static int ok_to_give_up(void)
391{
392 int i;
393
394 if (!have_obj.nr)
395 return 0;
396
397 for (i = 0; i < want_obj.nr; i++) {
398 struct object *want = want_obj.objects[i].item;
399
400 if (want->flags & COMMON_KNOWN)
401 continue;
402 want = deref_tag(want, "a want line", 0);
403 if (!want || want->type != OBJ_COMMIT) {
404 /* no way to tell if this is reachable by
405 * looking at the ancestry chain alone, so
406 * leave a note to ourselves not to worry about
407 * this object anymore.
408 */
409 want_obj.objects[i].item->flags |= COMMON_KNOWN;
410 continue;
411 }
412 if (!reachable((struct commit *)want))
413 return 0;
414 }
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700415 return 1;
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700416}
417
418static int get_common_commits(void)
419{
420 static char line[1000];
Junio C Hamanoc04c4e52006-07-05 18:12:12 -0700421 unsigned char sha1[20];
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700422 char last_hex[41];
Shawn O. Pearce49bee712011-03-14 16:48:39 -0700423 int got_common = 0;
424 int got_other = 0;
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700425 int sent_ready = 0;
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700426
Johannes Schindelinf0243f22005-10-28 04:48:32 +0200427 save_commit_buffer = 0;
428
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -0400429 for (;;) {
Benjamin Kramerfd13b212009-03-07 21:02:26 +0100430 int len = packet_read_line(0, line, sizeof(line));
H. Peter Anvin960decc2005-10-19 14:27:01 -0700431 reset_timeout();
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700432
433 if (!len) {
Shawn O. Pearce49bee712011-03-14 16:48:39 -0700434 if (multi_ack == 2 && got_common
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700435 && !got_other && ok_to_give_up()) {
436 sent_ready = 1;
Shawn O. Pearce49bee712011-03-14 16:48:39 -0700437 packet_write(1, "ACK %s ready\n", last_hex);
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700438 }
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700439 if (have_obj.nr == 0 || multi_ack)
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200440 packet_write(1, "NAK\n");
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700441
442 if (no_done && sent_ready) {
443 packet_write(1, "ACK %s\n", last_hex);
444 return 0;
445 }
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700446 if (stateless_rpc)
447 exit(0);
Shawn O. Pearce49bee712011-03-14 16:48:39 -0700448 got_common = 0;
449 got_other = 0;
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700450 continue;
451 }
Benjamin Kramerfd13b212009-03-07 21:02:26 +0100452 strip(line, len);
Junio C Hamanocc44c762007-02-20 01:53:29 -0800453 if (!prefixcmp(line, "have ")) {
Junio C Hamano937a5152006-07-05 21:28:20 -0700454 switch (got_sha1(line+5, sha1)) {
455 case -1: /* they have what we do not */
Shawn O. Pearce49bee712011-03-14 16:48:39 -0700456 got_other = 1;
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700457 if (multi_ack && ok_to_give_up()) {
458 const char *hex = sha1_to_hex(sha1);
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700459 if (multi_ack == 2) {
460 sent_ready = 1;
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700461 packet_write(1, "ACK %s ready\n", hex);
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700462 } else
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700463 packet_write(1, "ACK %s continue\n", hex);
464 }
Junio C Hamano937a5152006-07-05 21:28:20 -0700465 break;
466 default:
Shawn O. Pearce49bee712011-03-14 16:48:39 -0700467 got_common = 1;
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700468 memcpy(last_hex, sha1_to_hex(sha1), 41);
469 if (multi_ack == 2)
470 packet_write(1, "ACK %s common\n", last_hex);
471 else if (multi_ack)
472 packet_write(1, "ACK %s continue\n", last_hex);
Junio C Hamanoc04c4e52006-07-05 18:12:12 -0700473 else if (have_obj.nr == 1)
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700474 packet_write(1, "ACK %s\n", last_hex);
Junio C Hamano937a5152006-07-05 21:28:20 -0700475 break;
Junio C Hamanoaf2d3aa2005-10-25 14:55:24 -0700476 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700477 continue;
478 }
479 if (!strcmp(line, "done")) {
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700480 if (have_obj.nr > 0) {
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200481 if (multi_ack)
Junio C Hamanoc04c4e52006-07-05 18:12:12 -0700482 packet_write(1, "ACK %s\n", last_hex);
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200483 return 0;
484 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700485 packet_write(1, "NAK\n");
486 return -1;
487 }
Junio C Hamano7e44c932008-08-31 09:39:19 -0700488 die("git upload-pack: expected SHA1 list, got '%s'", line);
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700489 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700490}
491
Junio C Hamano051e4002011-08-05 13:54:06 -0700492static void check_non_tip(void)
493{
494 static const char *argv[] = {
495 "rev-list", "--stdin", NULL,
496 };
497 static struct child_process cmd;
498 struct object *o;
499 char namebuf[42]; /* ^ + SHA-1 + LF */
500 int i;
501
502 /* In the normal in-process case non-tip request can never happen */
503 if (!stateless_rpc)
504 goto error;
505
506 cmd.argv = argv;
507 cmd.git_cmd = 1;
508 cmd.no_stderr = 1;
509 cmd.in = -1;
510 cmd.out = -1;
511
512 if (start_command(&cmd))
513 goto error;
514
515 /*
516 * If rev-list --stdin encounters an unknown commit, it
517 * terminates, which will cause SIGPIPE in the write loop
518 * below.
519 */
520 sigchain_push(SIGPIPE, SIG_IGN);
521
522 namebuf[0] = '^';
523 namebuf[41] = '\n';
524 for (i = get_max_object_index(); 0 < i; ) {
525 o = get_indexed_object(--i);
Brian Harring2a745322011-08-23 22:47:17 -0700526 if (!o)
527 continue;
Junio C Hamano051e4002011-08-05 13:54:06 -0700528 if (!(o->flags & OUR_REF))
529 continue;
530 memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40);
531 if (write_in_full(cmd.in, namebuf, 42) < 0)
532 goto error;
533 }
534 namebuf[40] = '\n';
535 for (i = 0; i < want_obj.nr; i++) {
536 o = want_obj.objects[i].item;
537 if (o->flags & OUR_REF)
538 continue;
539 memcpy(namebuf, sha1_to_hex(o->sha1), 40);
540 if (write_in_full(cmd.in, namebuf, 41) < 0)
541 goto error;
542 }
543 close(cmd.in);
544
545 sigchain_pop(SIGPIPE);
546
547 /*
548 * The commits out of the rev-list are not ancestors of
549 * our ref.
550 */
551 i = read_in_full(cmd.out, namebuf, 1);
552 if (i)
553 goto error;
554 close(cmd.out);
555
556 /*
557 * rev-list may have died by encountering a bad commit
558 * in the history, in which case we do want to bail out
559 * even when it showed no commit.
560 */
561 if (finish_command(&cmd))
562 goto error;
563
564 /* All the non-tip ones are ancestors of what we advertised */
565 return;
566
567error:
568 /* Pick one of them (we know there at least is one) */
569 for (i = 0; i < want_obj.nr; i++) {
570 o = want_obj.objects[i].item;
571 if (!(o->flags & OUR_REF))
572 die("git upload-pack: not our ref %s",
573 sha1_to_hex(o->sha1));
574 }
575}
576
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700577static void receive_needs(void)
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700578{
Thiago Farina3cd47452010-08-28 23:04:17 -0300579 struct object_array shallows = OBJECT_ARRAY_INIT;
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700580 static char line[1000];
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100581 int len, depth = 0;
Junio C Hamano051e4002011-08-05 13:54:06 -0700582 int has_non_tip = 0;
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700583
Nick Edelenf0cea832009-06-10 01:50:18 +0200584 shallow_nr = 0;
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500585 if (debug_fd)
Jim Meyering2b7ca832009-09-12 10:54:32 +0200586 write_str_in_full(debug_fd, "#S\n");
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700587 for (;;) {
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700588 struct object *o;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100589 const char *features;
Junio C Hamano6ece0d32006-07-05 17:41:39 -0700590 unsigned char sha1_buf[20];
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700591 len = packet_read_line(0, line, sizeof(line));
H. Peter Anvin960decc2005-10-19 14:27:01 -0700592 reset_timeout();
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700593 if (!len)
Johannes Schindelined09aef2006-10-30 20:09:06 +0100594 break;
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500595 if (debug_fd)
596 write_in_full(debug_fd, line, len);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700597
Junio C Hamano599065a2007-02-20 01:54:00 -0800598 if (!prefixcmp(line, "shallow ")) {
Johannes Schindelined09aef2006-10-30 20:09:06 +0100599 unsigned char sha1[20];
600 struct object *object;
601 if (get_sha1(line + 8, sha1))
602 die("invalid shallow line: %s", line);
603 object = parse_object(sha1);
604 if (!object)
605 die("did not find object for %s", line);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100606 object->flags |= CLIENT_SHALLOW;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100607 add_object_array(object, NULL, &shallows);
608 continue;
609 }
Junio C Hamano599065a2007-02-20 01:54:00 -0800610 if (!prefixcmp(line, "deepen ")) {
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100611 char *end;
612 depth = strtol(line + 7, &end, 0);
613 if (end == line + 7 || depth <= 0)
614 die("Invalid deepen: %s", line);
615 continue;
616 }
Junio C Hamano599065a2007-02-20 01:54:00 -0800617 if (prefixcmp(line, "want ") ||
Junio C Hamano6ece0d32006-07-05 17:41:39 -0700618 get_sha1_hex(line+5, sha1_buf))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700619 die("git upload-pack: protocol error, "
Junio C Hamanoe091eb92005-10-05 14:49:54 -0700620 "expected to get sha, not '%s'", line);
Junio C Hamanof47182c2012-01-08 22:06:19 +0100621
622 features = line + 45;
623
624 if (parse_feature_request(features, "multi_ack_detailed"))
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700625 multi_ack = 2;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100626 else if (parse_feature_request(features, "multi_ack"))
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200627 multi_ack = 1;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100628 if (parse_feature_request(features, "no-done"))
Junio C Hamano4e10cf92011-03-29 12:29:10 -0700629 no_done = 1;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100630 if (parse_feature_request(features, "thin-pack"))
Junio C Hamanob19696c2006-02-20 00:38:39 -0800631 use_thin_pack = 1;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100632 if (parse_feature_request(features, "ofs-delta"))
Nicolas Pitree4fe4b82006-09-26 11:27:39 -0400633 use_ofs_delta = 1;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100634 if (parse_feature_request(features, "side-band-64k"))
Junio C Hamanod47f3db2006-09-10 16:27:08 -0700635 use_sideband = LARGE_PACKET_MAX;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100636 else if (parse_feature_request(features, "side-band"))
Junio C Hamanod47f3db2006-09-10 16:27:08 -0700637 use_sideband = DEFAULT_PACKET_MAX;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100638 if (parse_feature_request(features, "no-progress"))
Johannes Schindelinb0e90892007-02-23 20:03:10 +0100639 no_progress = 1;
Junio C Hamanof47182c2012-01-08 22:06:19 +0100640 if (parse_feature_request(features, "include-tag"))
Shawn O. Pearce348e3902008-03-03 22:27:33 -0500641 use_include_tag = 1;
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700642
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700643 o = lookup_object(sha1_buf);
Junio C Hamano051e4002011-08-05 13:54:06 -0700644 if (!o)
Elijah Newren9f9aa762010-07-31 14:11:46 -0600645 die("git upload-pack: not our ref %s",
646 sha1_to_hex(sha1_buf));
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700647 if (!(o->flags & WANTED)) {
648 o->flags |= WANTED;
Junio C Hamano051e4002011-08-05 13:54:06 -0700649 if (!(o->flags & OUR_REF))
650 has_non_tip = 1;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700651 add_object_array(o, NULL, &want_obj);
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700652 }
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700653 }
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500654 if (debug_fd)
Jim Meyering2b7ca832009-09-12 10:54:32 +0200655 write_str_in_full(debug_fd, "#E\n");
Johannes Sixt9462e3f2009-06-16 20:41:16 +0200656
Junio C Hamano051e4002011-08-05 13:54:06 -0700657 /*
658 * We have sent all our refs already, and the other end
659 * should have chosen out of them. When we are operating
660 * in the stateless RPC mode, however, their choice may
661 * have been based on the set of older refs advertised
662 * by another process that handled the initial request.
663 */
664 if (has_non_tip)
665 check_non_tip();
666
Johannes Sixt9462e3f2009-06-16 20:41:16 +0200667 if (!use_sideband && daemon_mode)
668 no_progress = 1;
669
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100670 if (depth == 0 && shallows.nr == 0)
671 return;
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100672 if (depth > 0) {
673 struct commit_list *result, *backup;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100674 int i;
675 backup = result = get_shallow_commits(&want_obj, depth,
676 SHALLOW, NOT_SHALLOW);
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100677 while (result) {
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100678 struct object *object = &result->item->object;
Alexandre Julliard1f2de762006-11-24 15:58:25 +0100679 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100680 packet_write(1, "shallow %s",
681 sha1_to_hex(object->sha1));
682 register_shallow(object->sha1);
Nick Edelenf0cea832009-06-10 01:50:18 +0200683 shallow_nr++;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100684 }
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100685 result = result->next;
686 }
687 free_commit_list(backup);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100688 for (i = 0; i < shallows.nr; i++) {
689 struct object *object = shallows.objects[i].item;
690 if (object->flags & NOT_SHALLOW) {
691 struct commit_list *parents;
692 packet_write(1, "unshallow %s",
693 sha1_to_hex(object->sha1));
694 object->flags &= ~CLIENT_SHALLOW;
695 /* make sure the real parents are parsed */
696 unregister_shallow(object->sha1);
Junio C Hamano176d45c2006-11-13 22:47:46 -0800697 object->parsed = 0;
Martin Koeglerdec38c82008-02-18 21:48:03 +0100698 if (parse_commit((struct commit *)object))
699 die("invalid commit");
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100700 parents = ((struct commit *)object)->parents;
701 while (parents) {
702 add_object_array(&parents->item->object,
703 NULL, &want_obj);
704 parents = parents->next;
705 }
Nicolas Pitre65230782009-09-03 19:08:33 -0400706 add_object_array(object, NULL, &extra_edge_obj);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100707 }
708 /* make sure commit traversal conforms to client */
709 register_shallow(object->sha1);
710 }
711 packet_flush(1);
712 } else
713 if (shallows.nr > 0) {
714 int i;
715 for (i = 0; i < shallows.nr; i++)
716 register_shallow(shallows.objects[i].item->sha1);
717 }
Nick Edelenf0cea832009-06-10 01:50:18 +0200718
719 shallow_nr += shallows.nr;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100720 free(shallows.objects);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700721}
722
Junio C Hamano8da19772006-09-20 22:02:01 -0700723static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700724{
Johannes Schindelined09aef2006-10-30 20:09:06 +0100725 static const char *capabilities = "multi_ack thin-pack side-band"
Shawn O. Pearce348e3902008-03-03 22:27:33 -0500726 " side-band-64k ofs-delta shallow no-progress"
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700727 " include-tag multi_ack_detailed";
Jeff King926f1dd2012-01-06 14:17:40 -0500728 struct object *o = lookup_unknown_object(sha1);
Josh Triplett6b01ecf2011-07-08 16:13:32 -0700729 const char *refname_nons = strip_namespace(refname);
Jeff King435c8332012-10-04 04:03:33 -0400730 unsigned char peeled[20];
Carl Worthb5b16992006-02-17 16:14:52 -0800731
Johannes Schindelin1f5881b2005-10-28 05:56:41 +0200732 if (capabilities)
Jeff Kingff5effd2012-08-03 12:19:16 -0400733 packet_write(1, "%s %s%c%s%s agent=%s\n",
734 sha1_to_hex(sha1), refname_nons,
Junio C Hamanocf2ad8e2011-03-29 10:24:59 -0700735 0, capabilities,
Jeff Kingff5effd2012-08-03 12:19:16 -0400736 stateless_rpc ? " no-done" : "",
737 git_user_agent_sanitized());
Johannes Schindelin1f5881b2005-10-28 05:56:41 +0200738 else
Josh Triplett6b01ecf2011-07-08 16:13:32 -0700739 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname_nons);
Johannes Schindelin1f5881b2005-10-28 05:56:41 +0200740 capabilities = NULL;
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700741 if (!(o->flags & OUR_REF)) {
742 o->flags |= OUR_REF;
743 nr_our_refs++;
744 }
Jeff King435c8332012-10-04 04:03:33 -0400745 if (!peel_ref(refname, peeled))
746 packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled), refname_nons);
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700747 return 0;
748}
749
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700750static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
751{
752 struct object *o = parse_object(sha1);
753 if (!o)
754 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
755 if (!(o->flags & OUR_REF)) {
756 o->flags |= OUR_REF;
757 nr_our_refs++;
758 }
759 return 0;
760}
761
David Rientjes59076eb2006-08-14 13:40:51 -0700762static void upload_pack(void)
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700763{
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700764 if (advertise_refs || !stateless_rpc) {
765 reset_timeout();
Josh Triplett6b01ecf2011-07-08 16:13:32 -0700766 head_ref_namespaced(send_ref, NULL);
767 for_each_namespaced_ref(send_ref, NULL);
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700768 packet_flush(1);
769 } else {
Josh Triplett6b01ecf2011-07-08 16:13:32 -0700770 head_ref_namespaced(mark_our_ref, NULL);
771 for_each_namespaced_ref(mark_our_ref, NULL);
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700772 }
773 if (advertise_refs)
774 return;
775
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700776 receive_needs();
David Rientjes59076eb2006-08-14 13:40:51 -0700777 if (want_obj.nr) {
778 get_common_commits();
779 create_pack_file();
780 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700781}
782
783int main(int argc, char **argv)
784{
Andreas Ericsson8d630132005-11-17 20:37:14 +0100785 char *dir;
H. Peter Anvin960decc2005-10-19 14:27:01 -0700786 int i;
787 int strict = 0;
788
Ævar Arnfjörð Bjarmason5e9637c2011-11-18 00:14:42 +0100789 git_setup_gettext();
790
Jeff Kingbbc30f92011-02-24 09:30:19 -0500791 packet_trace_identity("upload-pack");
Steffen Prohaska2fb3f6d2009-01-18 13:00:12 +0100792 git_extract_argv0_path(argv[0]);
Christian Couderdae556b2009-01-23 10:07:46 +0100793 read_replace_refs = 0;
Steffen Prohaska2fb3f6d2009-01-18 13:00:12 +0100794
H. Peter Anvin960decc2005-10-19 14:27:01 -0700795 for (i = 1; i < argc; i++) {
796 char *arg = argv[i];
797
798 if (arg[0] != '-')
799 break;
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700800 if (!strcmp(arg, "--advertise-refs")) {
801 advertise_refs = 1;
802 continue;
803 }
804 if (!strcmp(arg, "--stateless-rpc")) {
805 stateless_rpc = 1;
806 continue;
807 }
H. Peter Anvin960decc2005-10-19 14:27:01 -0700808 if (!strcmp(arg, "--strict")) {
809 strict = 1;
810 continue;
811 }
Junio C Hamanocc44c762007-02-20 01:53:29 -0800812 if (!prefixcmp(arg, "--timeout=")) {
H. Peter Anvin960decc2005-10-19 14:27:01 -0700813 timeout = atoi(arg+10);
Johannes Sixt9462e3f2009-06-16 20:41:16 +0200814 daemon_mode = 1;
H. Peter Anvin960decc2005-10-19 14:27:01 -0700815 continue;
816 }
817 if (!strcmp(arg, "--")) {
818 i++;
819 break;
820 }
821 }
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700822
H. Peter Anvin960decc2005-10-19 14:27:01 -0700823 if (i != argc-1)
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700824 usage(upload_pack_usage);
Johannes Sixt04b33052008-02-12 12:28:01 +0100825
Johannes Sixte1464ca2008-07-21 21:19:52 +0200826 setup_path();
Johannes Sixt04b33052008-02-12 12:28:01 +0100827
H. Peter Anvin960decc2005-10-19 14:27:01 -0700828 dir = argv[i];
Linus Torvalds113b9472005-07-08 16:22:22 -0700829
Andreas Ericsson8d630132005-11-17 20:37:14 +0100830 if (!enter_repo(dir, strict))
Jeff King05ac6b32009-03-04 03:32:29 -0500831 die("'%s' does not appear to be a git repository", dir);
Junio C Hamanoa0022ee2007-01-21 22:23:58 -0800832 if (is_repository_shallow())
833 die("attempt to fetch/clone from a shallow repository");
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500834 if (getenv("GIT_DEBUG_SEND_PACK"))
835 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700836 upload_pack();
837 return 0;
838}