upload-pack: pass upload_pack_data to deepen_by_rev_list()
[git] / upload-pack.c
1 #include "cache.h"
2 #include "config.h"
3 #include "refs.h"
4 #include "pkt-line.h"
5 #include "sideband.h"
6 #include "repository.h"
7 #include "object-store.h"
8 #include "tag.h"
9 #include "object.h"
10 #include "commit.h"
11 #include "diff.h"
12 #include "revision.h"
13 #include "list-objects.h"
14 #include "list-objects-filter.h"
15 #include "list-objects-filter-options.h"
16 #include "run-command.h"
17 #include "connect.h"
18 #include "sigchain.h"
19 #include "version.h"
20 #include "string-list.h"
21 #include "argv-array.h"
22 #include "prio-queue.h"
23 #include "protocol.h"
24 #include "quote.h"
25 #include "upload-pack.h"
26 #include "serve.h"
27 #include "commit-graph.h"
28 #include "commit-reach.h"
29 #include "shallow.h"
30
31 /* Remember to update object flag allocation in object.h */
32 #define THEY_HAVE       (1u << 11)
33 #define OUR_REF         (1u << 12)
34 #define WANTED          (1u << 13)
35 #define COMMON_KNOWN    (1u << 14)
36
37 #define SHALLOW         (1u << 16)
38 #define NOT_SHALLOW     (1u << 17)
39 #define CLIENT_SHALLOW  (1u << 18)
40 #define HIDDEN_REF      (1u << 19)
41
42 #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \
43                 NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF)
44
45 static timestamp_t oldest_have;
46
47 /* Allow specifying sha1 if it is a ref tip. */
48 #define ALLOW_TIP_SHA1  01
49 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
50 #define ALLOW_REACHABLE_SHA1    02
51 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
52 #define ALLOW_ANY_SHA1  07
53 static unsigned int allow_unadvertised_object_request;
54 static int shallow_nr;
55 static struct object_array extra_edge_obj;
56
57 /*
58  * Please annotate, and if possible group together, fields used only
59  * for protocol v0 or only for protocol v2.
60  */
61 struct upload_pack_data {
62         struct string_list symref;                              /* v0 only */
63         struct object_array want_obj;
64         struct object_array have_obj;
65         struct oid_array haves;                                 /* v2 only */
66         struct string_list wanted_refs;                         /* v2 only */
67
68         struct object_array shallows;
69         struct string_list deepen_not;
70         int depth;
71         timestamp_t deepen_since;
72         int deepen_rev_list;
73         int deepen_relative;
74         int keepalive;
75
76         unsigned int timeout;                                   /* v0 only */
77         enum {
78                 NO_MULTI_ACK = 0,
79                 MULTI_ACK = 1,
80                 MULTI_ACK_DETAILED = 2
81         } multi_ack;                                            /* v0 only */
82
83         /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
84         int use_sideband;
85
86         struct list_objects_filter_options filter_options;
87
88         struct packet_writer writer;
89
90         const char *pack_objects_hook;
91
92         unsigned stateless_rpc : 1;                             /* v0 only */
93         unsigned no_done : 1;                                   /* v0 only */
94         unsigned daemon_mode : 1;                               /* v0 only */
95         unsigned filter_capability_requested : 1;               /* v0 only */
96
97         unsigned use_thin_pack : 1;
98         unsigned use_ofs_delta : 1;
99         unsigned no_progress : 1;
100         unsigned use_include_tag : 1;
101         unsigned allow_filter : 1;
102
103         unsigned done : 1;                                      /* v2 only */
104         unsigned allow_ref_in_want : 1;                         /* v2 only */
105         unsigned allow_sideband_all : 1;                        /* v2 only */
106 };
107
108 static void upload_pack_data_init(struct upload_pack_data *data)
109 {
110         struct string_list symref = STRING_LIST_INIT_DUP;
111         struct string_list wanted_refs = STRING_LIST_INIT_DUP;
112         struct object_array want_obj = OBJECT_ARRAY_INIT;
113         struct object_array have_obj = OBJECT_ARRAY_INIT;
114         struct oid_array haves = OID_ARRAY_INIT;
115         struct object_array shallows = OBJECT_ARRAY_INIT;
116         struct string_list deepen_not = STRING_LIST_INIT_DUP;
117
118         memset(data, 0, sizeof(*data));
119         data->symref = symref;
120         data->wanted_refs = wanted_refs;
121         data->want_obj = want_obj;
122         data->have_obj = have_obj;
123         data->haves = haves;
124         data->shallows = shallows;
125         data->deepen_not = deepen_not;
126         packet_writer_init(&data->writer, 1);
127
128         data->keepalive = 5;
129 }
130
131 static void upload_pack_data_clear(struct upload_pack_data *data)
132 {
133         string_list_clear(&data->symref, 1);
134         string_list_clear(&data->wanted_refs, 1);
135         object_array_clear(&data->want_obj);
136         object_array_clear(&data->have_obj);
137         oid_array_clear(&data->haves);
138         object_array_clear(&data->shallows);
139         string_list_clear(&data->deepen_not, 0);
140         list_objects_filter_release(&data->filter_options);
141
142         free((char *)data->pack_objects_hook);
143 }
144
145 static void reset_timeout(unsigned int timeout)
146 {
147         alarm(timeout);
148 }
149
150 static void send_client_data(int fd, const char *data, ssize_t sz,
151                              int use_sideband)
152 {
153         if (use_sideband) {
154                 send_sideband(1, fd, data, sz, use_sideband);
155                 return;
156         }
157         if (fd == 3)
158                 /* emergency quit */
159                 fd = 2;
160         if (fd == 2) {
161                 /* XXX: are we happy to lose stuff here? */
162                 xwrite(fd, data, sz);
163                 return;
164         }
165         write_or_die(fd, data, sz);
166 }
167
168 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
169 {
170         FILE *fp = cb_data;
171         if (graft->nr_parent == -1)
172                 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
173         return 0;
174 }
175
176 static void create_pack_file(struct upload_pack_data *pack_data)
177 {
178         struct child_process pack_objects = CHILD_PROCESS_INIT;
179         char data[8193], progress[128];
180         char abort_msg[] = "aborting due to possible repository "
181                 "corruption on the remote side.";
182         int buffered = -1;
183         ssize_t sz;
184         int i;
185         FILE *pipe_fd;
186
187         if (!pack_data->pack_objects_hook)
188                 pack_objects.git_cmd = 1;
189         else {
190                 argv_array_push(&pack_objects.args, pack_data->pack_objects_hook);
191                 argv_array_push(&pack_objects.args, "git");
192                 pack_objects.use_shell = 1;
193         }
194
195         if (shallow_nr) {
196                 argv_array_push(&pack_objects.args, "--shallow-file");
197                 argv_array_push(&pack_objects.args, "");
198         }
199         argv_array_push(&pack_objects.args, "pack-objects");
200         argv_array_push(&pack_objects.args, "--revs");
201         if (pack_data->use_thin_pack)
202                 argv_array_push(&pack_objects.args, "--thin");
203
204         argv_array_push(&pack_objects.args, "--stdout");
205         if (shallow_nr)
206                 argv_array_push(&pack_objects.args, "--shallow");
207         if (!pack_data->no_progress)
208                 argv_array_push(&pack_objects.args, "--progress");
209         if (pack_data->use_ofs_delta)
210                 argv_array_push(&pack_objects.args, "--delta-base-offset");
211         if (pack_data->use_include_tag)
212                 argv_array_push(&pack_objects.args, "--include-tag");
213         if (pack_data->filter_options.choice) {
214                 const char *spec =
215                         expand_list_objects_filter_spec(&pack_data->filter_options);
216                 if (pack_objects.use_shell) {
217                         struct strbuf buf = STRBUF_INIT;
218                         sq_quote_buf(&buf, spec);
219                         argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
220                         strbuf_release(&buf);
221                 } else {
222                         argv_array_pushf(&pack_objects.args, "--filter=%s",
223                                          spec);
224                 }
225         }
226
227         pack_objects.in = -1;
228         pack_objects.out = -1;
229         pack_objects.err = -1;
230
231         if (start_command(&pack_objects))
232                 die("git upload-pack: unable to fork git-pack-objects");
233
234         pipe_fd = xfdopen(pack_objects.in, "w");
235
236         if (shallow_nr)
237                 for_each_commit_graft(write_one_shallow, pipe_fd);
238
239         for (i = 0; i < pack_data->want_obj.nr; i++)
240                 fprintf(pipe_fd, "%s\n",
241                         oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
242         fprintf(pipe_fd, "--not\n");
243         for (i = 0; i < pack_data->have_obj.nr; i++)
244                 fprintf(pipe_fd, "%s\n",
245                         oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
246         for (i = 0; i < extra_edge_obj.nr; i++)
247                 fprintf(pipe_fd, "%s\n",
248                         oid_to_hex(&extra_edge_obj.objects[i].item->oid));
249         fprintf(pipe_fd, "\n");
250         fflush(pipe_fd);
251         fclose(pipe_fd);
252
253         /* We read from pack_objects.err to capture stderr output for
254          * progress bar, and pack_objects.out to capture the pack data.
255          */
256
257         while (1) {
258                 struct pollfd pfd[2];
259                 int pe, pu, pollsize, polltimeout;
260                 int ret;
261
262                 reset_timeout(pack_data->timeout);
263
264                 pollsize = 0;
265                 pe = pu = -1;
266
267                 if (0 <= pack_objects.out) {
268                         pfd[pollsize].fd = pack_objects.out;
269                         pfd[pollsize].events = POLLIN;
270                         pu = pollsize;
271                         pollsize++;
272                 }
273                 if (0 <= pack_objects.err) {
274                         pfd[pollsize].fd = pack_objects.err;
275                         pfd[pollsize].events = POLLIN;
276                         pe = pollsize;
277                         pollsize++;
278                 }
279
280                 if (!pollsize)
281                         break;
282
283                 polltimeout = pack_data->keepalive < 0
284                         ? -1
285                         : 1000 * pack_data->keepalive;
286
287                 ret = poll(pfd, pollsize, polltimeout);
288
289                 if (ret < 0) {
290                         if (errno != EINTR) {
291                                 error_errno("poll failed, resuming");
292                                 sleep(1);
293                         }
294                         continue;
295                 }
296                 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
297                         /* Status ready; we ship that in the side-band
298                          * or dump to the standard error.
299                          */
300                         sz = xread(pack_objects.err, progress,
301                                   sizeof(progress));
302                         if (0 < sz)
303                                 send_client_data(2, progress, sz,
304                                                  pack_data->use_sideband);
305                         else if (sz == 0) {
306                                 close(pack_objects.err);
307                                 pack_objects.err = -1;
308                         }
309                         else
310                                 goto fail;
311                         /* give priority to status messages */
312                         continue;
313                 }
314                 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
315                         /* Data ready; we keep the last byte to ourselves
316                          * in case we detect broken rev-list, so that we
317                          * can leave the stream corrupted.  This is
318                          * unfortunate -- unpack-objects would happily
319                          * accept a valid packdata with trailing garbage,
320                          * so appending garbage after we pass all the
321                          * pack data is not good enough to signal
322                          * breakage to downstream.
323                          */
324                         char *cp = data;
325                         ssize_t outsz = 0;
326                         if (0 <= buffered) {
327                                 *cp++ = buffered;
328                                 outsz++;
329                         }
330                         sz = xread(pack_objects.out, cp,
331                                   sizeof(data) - outsz);
332                         if (0 < sz)
333                                 ;
334                         else if (sz == 0) {
335                                 close(pack_objects.out);
336                                 pack_objects.out = -1;
337                         }
338                         else
339                                 goto fail;
340                         sz += outsz;
341                         if (1 < sz) {
342                                 buffered = data[sz-1] & 0xFF;
343                                 sz--;
344                         }
345                         else
346                                 buffered = -1;
347                         send_client_data(1, data, sz,
348                                          pack_data->use_sideband);
349                 }
350
351                 /*
352                  * We hit the keepalive timeout without saying anything; send
353                  * an empty message on the data sideband just to let the other
354                  * side know we're still working on it, but don't have any data
355                  * yet.
356                  *
357                  * If we don't have a sideband channel, there's no room in the
358                  * protocol to say anything, so those clients are just out of
359                  * luck.
360                  */
361                 if (!ret && pack_data->use_sideband) {
362                         static const char buf[] = "0005\1";
363                         write_or_die(1, buf, 5);
364                 }
365         }
366
367         if (finish_command(&pack_objects)) {
368                 error("git upload-pack: git-pack-objects died with error.");
369                 goto fail;
370         }
371
372         /* flush the data */
373         if (0 <= buffered) {
374                 data[0] = buffered;
375                 send_client_data(1, data, 1,
376                                  pack_data->use_sideband);
377                 fprintf(stderr, "flushed.\n");
378         }
379         if (pack_data->use_sideband)
380                 packet_flush(1);
381         return;
382
383  fail:
384         send_client_data(3, abort_msg, sizeof(abort_msg),
385                          pack_data->use_sideband);
386         die("git upload-pack: %s", abort_msg);
387 }
388
389 static int got_oid(const char *hex, struct object_id *oid,
390                    struct object_array *have_obj)
391 {
392         struct object *o;
393         int we_knew_they_have = 0;
394
395         if (get_oid_hex(hex, oid))
396                 die("git upload-pack: expected SHA1 object, got '%s'", hex);
397         if (!has_object_file(oid))
398                 return -1;
399
400         o = parse_object(the_repository, oid);
401         if (!o)
402                 die("oops (%s)", oid_to_hex(oid));
403         if (o->type == OBJ_COMMIT) {
404                 struct commit_list *parents;
405                 struct commit *commit = (struct commit *)o;
406                 if (o->flags & THEY_HAVE)
407                         we_knew_they_have = 1;
408                 else
409                         o->flags |= THEY_HAVE;
410                 if (!oldest_have || (commit->date < oldest_have))
411                         oldest_have = commit->date;
412                 for (parents = commit->parents;
413                      parents;
414                      parents = parents->next)
415                         parents->item->object.flags |= THEY_HAVE;
416         }
417         if (!we_knew_they_have) {
418                 add_object_array(o, NULL, have_obj);
419                 return 1;
420         }
421         return 0;
422 }
423
424 static int ok_to_give_up(const struct object_array *have_obj,
425                          struct object_array *want_obj)
426 {
427         uint32_t min_generation = GENERATION_NUMBER_ZERO;
428
429         if (!have_obj->nr)
430                 return 0;
431
432         return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
433                                             COMMON_KNOWN, oldest_have,
434                                             min_generation);
435 }
436
437 static int get_common_commits(struct upload_pack_data *data,
438                               struct packet_reader *reader)
439 {
440         struct object_id oid;
441         char last_hex[GIT_MAX_HEXSZ + 1];
442         int got_common = 0;
443         int got_other = 0;
444         int sent_ready = 0;
445
446         save_commit_buffer = 0;
447
448         for (;;) {
449                 const char *arg;
450
451                 reset_timeout(data->timeout);
452
453                 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
454                         if (data->multi_ack == MULTI_ACK_DETAILED
455                             && got_common
456                             && !got_other
457                             && ok_to_give_up(&data->have_obj, &data->want_obj)) {
458                                 sent_ready = 1;
459                                 packet_write_fmt(1, "ACK %s ready\n", last_hex);
460                         }
461                         if (data->have_obj.nr == 0 || data->multi_ack)
462                                 packet_write_fmt(1, "NAK\n");
463
464                         if (data->no_done && sent_ready) {
465                                 packet_write_fmt(1, "ACK %s\n", last_hex);
466                                 return 0;
467                         }
468                         if (data->stateless_rpc)
469                                 exit(0);
470                         got_common = 0;
471                         got_other = 0;
472                         continue;
473                 }
474                 if (skip_prefix(reader->line, "have ", &arg)) {
475                         switch (got_oid(arg, &oid, &data->have_obj)) {
476                         case -1: /* they have what we do not */
477                                 got_other = 1;
478                                 if (data->multi_ack
479                                     && ok_to_give_up(&data->have_obj, &data->want_obj)) {
480                                         const char *hex = oid_to_hex(&oid);
481                                         if (data->multi_ack == MULTI_ACK_DETAILED) {
482                                                 sent_ready = 1;
483                                                 packet_write_fmt(1, "ACK %s ready\n", hex);
484                                         } else
485                                                 packet_write_fmt(1, "ACK %s continue\n", hex);
486                                 }
487                                 break;
488                         default:
489                                 got_common = 1;
490                                 oid_to_hex_r(last_hex, &oid);
491                                 if (data->multi_ack == MULTI_ACK_DETAILED)
492                                         packet_write_fmt(1, "ACK %s common\n", last_hex);
493                                 else if (data->multi_ack)
494                                         packet_write_fmt(1, "ACK %s continue\n", last_hex);
495                                 else if (data->have_obj.nr == 1)
496                                         packet_write_fmt(1, "ACK %s\n", last_hex);
497                                 break;
498                         }
499                         continue;
500                 }
501                 if (!strcmp(reader->line, "done")) {
502                         if (data->have_obj.nr > 0) {
503                                 if (data->multi_ack)
504                                         packet_write_fmt(1, "ACK %s\n", last_hex);
505                                 return 0;
506                         }
507                         packet_write_fmt(1, "NAK\n");
508                         return -1;
509                 }
510                 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
511         }
512 }
513
514 static int is_our_ref(struct object *o)
515 {
516         int allow_hidden_ref = (allow_unadvertised_object_request &
517                         (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
518         return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
519 }
520
521 /*
522  * on successful case, it's up to the caller to close cmd->out
523  */
524 static int do_reachable_revlist(struct child_process *cmd,
525                                 struct object_array *src,
526                                 struct object_array *reachable)
527 {
528         static const char *argv[] = {
529                 "rev-list", "--stdin", NULL,
530         };
531         struct object *o;
532         char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
533         int i;
534         const unsigned hexsz = the_hash_algo->hexsz;
535
536         cmd->argv = argv;
537         cmd->git_cmd = 1;
538         cmd->no_stderr = 1;
539         cmd->in = -1;
540         cmd->out = -1;
541
542         /*
543          * If the next rev-list --stdin encounters an unknown commit,
544          * it terminates, which will cause SIGPIPE in the write loop
545          * below.
546          */
547         sigchain_push(SIGPIPE, SIG_IGN);
548
549         if (start_command(cmd))
550                 goto error;
551
552         namebuf[0] = '^';
553         namebuf[hexsz + 1] = '\n';
554         for (i = get_max_object_index(); 0 < i; ) {
555                 o = get_indexed_object(--i);
556                 if (!o)
557                         continue;
558                 if (reachable && o->type == OBJ_COMMIT)
559                         o->flags &= ~TMP_MARK;
560                 if (!is_our_ref(o))
561                         continue;
562                 memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
563                 if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
564                         goto error;
565         }
566         namebuf[hexsz] = '\n';
567         for (i = 0; i < src->nr; i++) {
568                 o = src->objects[i].item;
569                 if (is_our_ref(o)) {
570                         if (reachable)
571                                 add_object_array(o, NULL, reachable);
572                         continue;
573                 }
574                 if (reachable && o->type == OBJ_COMMIT)
575                         o->flags |= TMP_MARK;
576                 memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
577                 if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
578                         goto error;
579         }
580         close(cmd->in);
581         cmd->in = -1;
582         sigchain_pop(SIGPIPE);
583
584         return 0;
585
586 error:
587         sigchain_pop(SIGPIPE);
588
589         if (cmd->in >= 0)
590                 close(cmd->in);
591         if (cmd->out >= 0)
592                 close(cmd->out);
593         return -1;
594 }
595
596 static int get_reachable_list(struct object_array *src,
597                               struct object_array *reachable)
598 {
599         struct child_process cmd = CHILD_PROCESS_INIT;
600         int i;
601         struct object *o;
602         char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
603         const unsigned hexsz = the_hash_algo->hexsz;
604
605         if (do_reachable_revlist(&cmd, src, reachable) < 0)
606                 return -1;
607
608         while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
609                 struct object_id oid;
610                 const char *p;
611
612                 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
613                         break;
614
615                 o = lookup_object(the_repository, &oid);
616                 if (o && o->type == OBJ_COMMIT) {
617                         o->flags &= ~TMP_MARK;
618                 }
619         }
620         for (i = get_max_object_index(); 0 < i; i--) {
621                 o = get_indexed_object(i - 1);
622                 if (o && o->type == OBJ_COMMIT &&
623                     (o->flags & TMP_MARK)) {
624                         add_object_array(o, NULL, reachable);
625                                 o->flags &= ~TMP_MARK;
626                 }
627         }
628         close(cmd.out);
629
630         if (finish_command(&cmd))
631                 return -1;
632
633         return 0;
634 }
635
636 static int has_unreachable(struct object_array *src)
637 {
638         struct child_process cmd = CHILD_PROCESS_INIT;
639         char buf[1];
640         int i;
641
642         if (do_reachable_revlist(&cmd, src, NULL) < 0)
643                 return 1;
644
645         /*
646          * The commits out of the rev-list are not ancestors of
647          * our ref.
648          */
649         i = read_in_full(cmd.out, buf, 1);
650         if (i)
651                 goto error;
652         close(cmd.out);
653         cmd.out = -1;
654
655         /*
656          * rev-list may have died by encountering a bad commit
657          * in the history, in which case we do want to bail out
658          * even when it showed no commit.
659          */
660         if (finish_command(&cmd))
661                 goto error;
662
663         /* All the non-tip ones are ancestors of what we advertised */
664         return 0;
665
666 error:
667         sigchain_pop(SIGPIPE);
668         if (cmd.out >= 0)
669                 close(cmd.out);
670         return 1;
671 }
672
673 static void check_non_tip(struct upload_pack_data *data)
674 {
675         int i;
676
677         /*
678          * In the normal in-process case without
679          * uploadpack.allowReachableSHA1InWant,
680          * non-tip requests can never happen.
681          */
682         if (!data->stateless_rpc
683             && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
684                 goto error;
685         if (!has_unreachable(&data->want_obj))
686                 /* All the non-tip ones are ancestors of what we advertised */
687                 return;
688
689 error:
690         /* Pick one of them (we know there at least is one) */
691         for (i = 0; i < data->want_obj.nr; i++) {
692                 struct object *o = data->want_obj.objects[i].item;
693                 if (!is_our_ref(o)) {
694                         packet_writer_error(&data->writer,
695                                             "upload-pack: not our ref %s",
696                                             oid_to_hex(&o->oid));
697                         die("git upload-pack: not our ref %s",
698                             oid_to_hex(&o->oid));
699                 }
700         }
701 }
702
703 static void send_shallow(struct packet_writer *writer,
704                          struct commit_list *result)
705 {
706         while (result) {
707                 struct object *object = &result->item->object;
708                 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
709                         packet_writer_write(writer, "shallow %s",
710                                             oid_to_hex(&object->oid));
711                         register_shallow(the_repository, &object->oid);
712                         shallow_nr++;
713                 }
714                 result = result->next;
715         }
716 }
717
718 static void send_unshallow(struct packet_writer *writer,
719                            const struct object_array *shallows,
720                            struct object_array *want_obj)
721 {
722         int i;
723
724         for (i = 0; i < shallows->nr; i++) {
725                 struct object *object = shallows->objects[i].item;
726                 if (object->flags & NOT_SHALLOW) {
727                         struct commit_list *parents;
728                         packet_writer_write(writer, "unshallow %s",
729                                             oid_to_hex(&object->oid));
730                         object->flags &= ~CLIENT_SHALLOW;
731                         /*
732                          * We want to _register_ "object" as shallow, but we
733                          * also need to traverse object's parents to deepen a
734                          * shallow clone. Unregister it for now so we can
735                          * parse and add the parents to the want list, then
736                          * re-register it.
737                          */
738                         unregister_shallow(&object->oid);
739                         object->parsed = 0;
740                         parse_commit_or_die((struct commit *)object);
741                         parents = ((struct commit *)object)->parents;
742                         while (parents) {
743                                 add_object_array(&parents->item->object,
744                                                  NULL, want_obj);
745                                 parents = parents->next;
746                         }
747                         add_object_array(object, NULL, &extra_edge_obj);
748                 }
749                 /* make sure commit traversal conforms to client */
750                 register_shallow(the_repository, &object->oid);
751         }
752 }
753
754 static int check_ref(const char *refname_full, const struct object_id *oid,
755                      int flag, void *cb_data);
756 static void deepen(struct upload_pack_data *data, int depth)
757 {
758         if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
759                 int i;
760
761                 for (i = 0; i < data->shallows.nr; i++) {
762                         struct object *object = data->shallows.objects[i].item;
763                         object->flags |= NOT_SHALLOW;
764                 }
765         } else if (data->deepen_relative) {
766                 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
767                 struct commit_list *result;
768
769                 /*
770                  * Checking for reachable shallows requires that our refs be
771                  * marked with OUR_REF.
772                  */
773                 head_ref_namespaced(check_ref, NULL);
774                 for_each_namespaced_ref(check_ref, NULL);
775
776                 get_reachable_list(&data->shallows, &reachable_shallows);
777                 result = get_shallow_commits(&reachable_shallows,
778                                              depth + 1,
779                                              SHALLOW, NOT_SHALLOW);
780                 send_shallow(&data->writer, result);
781                 free_commit_list(result);
782                 object_array_clear(&reachable_shallows);
783         } else {
784                 struct commit_list *result;
785
786                 result = get_shallow_commits(&data->want_obj, depth,
787                                              SHALLOW, NOT_SHALLOW);
788                 send_shallow(&data->writer, result);
789                 free_commit_list(result);
790         }
791
792         send_unshallow(&data->writer, &data->shallows, &data->want_obj);
793 }
794
795 static void deepen_by_rev_list(struct upload_pack_data *data,
796                                int ac,
797                                const char **av)
798 {
799         struct commit_list *result;
800
801         disable_commit_graph(the_repository);
802         result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
803         send_shallow(&data->writer, result);
804         free_commit_list(result);
805         send_unshallow(&data->writer, &data->shallows, &data->want_obj);
806 }
807
808 /* Returns 1 if a shallow list is sent or 0 otherwise */
809 static int send_shallow_list(struct upload_pack_data *data)
810 {
811         int ret = 0;
812
813         if (data->depth > 0 && data->deepen_rev_list)
814                 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
815         if (data->depth > 0) {
816                 deepen(data, data->depth);
817                 ret = 1;
818         } else if (data->deepen_rev_list) {
819                 struct argv_array av = ARGV_ARRAY_INIT;
820                 int i;
821
822                 argv_array_push(&av, "rev-list");
823                 if (data->deepen_since)
824                         argv_array_pushf(&av, "--max-age=%"PRItime, data->deepen_since);
825                 if (data->deepen_not.nr) {
826                         argv_array_push(&av, "--not");
827                         for (i = 0; i < data->deepen_not.nr; i++) {
828                                 struct string_list_item *s = data->deepen_not.items + i;
829                                 argv_array_push(&av, s->string);
830                         }
831                         argv_array_push(&av, "--not");
832                 }
833                 for (i = 0; i < data->want_obj.nr; i++) {
834                         struct object *o = data->want_obj.objects[i].item;
835                         argv_array_push(&av, oid_to_hex(&o->oid));
836                 }
837                 deepen_by_rev_list(data, av.argc, av.argv);
838                 argv_array_clear(&av);
839                 ret = 1;
840         } else {
841                 if (data->shallows.nr > 0) {
842                         int i;
843                         for (i = 0; i < data->shallows.nr; i++)
844                                 register_shallow(the_repository,
845                                                  &data->shallows.objects[i].item->oid);
846                 }
847         }
848
849         shallow_nr += data->shallows.nr;
850         return ret;
851 }
852
853 static int process_shallow(const char *line, struct object_array *shallows)
854 {
855         const char *arg;
856         if (skip_prefix(line, "shallow ", &arg)) {
857                 struct object_id oid;
858                 struct object *object;
859                 if (get_oid_hex(arg, &oid))
860                         die("invalid shallow line: %s", line);
861                 object = parse_object(the_repository, &oid);
862                 if (!object)
863                         return 1;
864                 if (object->type != OBJ_COMMIT)
865                         die("invalid shallow object %s", oid_to_hex(&oid));
866                 if (!(object->flags & CLIENT_SHALLOW)) {
867                         object->flags |= CLIENT_SHALLOW;
868                         add_object_array(object, NULL, shallows);
869                 }
870                 return 1;
871         }
872
873         return 0;
874 }
875
876 static int process_deepen(const char *line, int *depth)
877 {
878         const char *arg;
879         if (skip_prefix(line, "deepen ", &arg)) {
880                 char *end = NULL;
881                 *depth = (int)strtol(arg, &end, 0);
882                 if (!end || *end || *depth <= 0)
883                         die("Invalid deepen: %s", line);
884                 return 1;
885         }
886
887         return 0;
888 }
889
890 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
891 {
892         const char *arg;
893         if (skip_prefix(line, "deepen-since ", &arg)) {
894                 char *end = NULL;
895                 *deepen_since = parse_timestamp(arg, &end, 0);
896                 if (!end || *end || !deepen_since ||
897                     /* revisions.c's max_age -1 is special */
898                     *deepen_since == -1)
899                         die("Invalid deepen-since: %s", line);
900                 *deepen_rev_list = 1;
901                 return 1;
902         }
903         return 0;
904 }
905
906 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
907 {
908         const char *arg;
909         if (skip_prefix(line, "deepen-not ", &arg)) {
910                 char *ref = NULL;
911                 struct object_id oid;
912                 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
913                         die("git upload-pack: ambiguous deepen-not: %s", line);
914                 string_list_append(deepen_not, ref);
915                 free(ref);
916                 *deepen_rev_list = 1;
917                 return 1;
918         }
919         return 0;
920 }
921
922 static void receive_needs(struct upload_pack_data *data,
923                           struct packet_reader *reader)
924 {
925         int has_non_tip = 0;
926
927         shallow_nr = 0;
928         for (;;) {
929                 struct object *o;
930                 const char *features;
931                 struct object_id oid_buf;
932                 const char *arg;
933
934                 reset_timeout(data->timeout);
935                 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
936                         break;
937
938                 if (process_shallow(reader->line, &data->shallows))
939                         continue;
940                 if (process_deepen(reader->line, &data->depth))
941                         continue;
942                 if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
943                         continue;
944                 if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
945                         continue;
946
947                 if (skip_prefix(reader->line, "filter ", &arg)) {
948                         if (!data->filter_capability_requested)
949                                 die("git upload-pack: filtering capability not negotiated");
950                         list_objects_filter_die_if_populated(&data->filter_options);
951                         parse_list_objects_filter(&data->filter_options, arg);
952                         continue;
953                 }
954
955                 if (!skip_prefix(reader->line, "want ", &arg) ||
956                     parse_oid_hex(arg, &oid_buf, &features))
957                         die("git upload-pack: protocol error, "
958                             "expected to get object ID, not '%s'", reader->line);
959
960                 if (parse_feature_request(features, "deepen-relative"))
961                         data->deepen_relative = 1;
962                 if (parse_feature_request(features, "multi_ack_detailed"))
963                         data->multi_ack = MULTI_ACK_DETAILED;
964                 else if (parse_feature_request(features, "multi_ack"))
965                         data->multi_ack = MULTI_ACK;
966                 if (parse_feature_request(features, "no-done"))
967                         data->no_done = 1;
968                 if (parse_feature_request(features, "thin-pack"))
969                         data->use_thin_pack = 1;
970                 if (parse_feature_request(features, "ofs-delta"))
971                         data->use_ofs_delta = 1;
972                 if (parse_feature_request(features, "side-band-64k"))
973                         data->use_sideband = LARGE_PACKET_MAX;
974                 else if (parse_feature_request(features, "side-band"))
975                         data->use_sideband = DEFAULT_PACKET_MAX;
976                 if (parse_feature_request(features, "no-progress"))
977                         data->no_progress = 1;
978                 if (parse_feature_request(features, "include-tag"))
979                         data->use_include_tag = 1;
980                 if (data->allow_filter &&
981                     parse_feature_request(features, "filter"))
982                         data->filter_capability_requested = 1;
983
984                 o = parse_object(the_repository, &oid_buf);
985                 if (!o) {
986                         packet_writer_error(&data->writer,
987                                             "upload-pack: not our ref %s",
988                                             oid_to_hex(&oid_buf));
989                         die("git upload-pack: not our ref %s",
990                             oid_to_hex(&oid_buf));
991                 }
992                 if (!(o->flags & WANTED)) {
993                         o->flags |= WANTED;
994                         if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
995                               || is_our_ref(o)))
996                                 has_non_tip = 1;
997                         add_object_array(o, NULL, &data->want_obj);
998                 }
999         }
1000
1001         /*
1002          * We have sent all our refs already, and the other end
1003          * should have chosen out of them. When we are operating
1004          * in the stateless RPC mode, however, their choice may
1005          * have been based on the set of older refs advertised
1006          * by another process that handled the initial request.
1007          */
1008         if (has_non_tip)
1009                 check_non_tip(data);
1010
1011         if (!data->use_sideband && data->daemon_mode)
1012                 data->no_progress = 1;
1013
1014         if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
1015                 return;
1016
1017         if (send_shallow_list(data))
1018                 packet_flush(1);
1019 }
1020
1021 /* return non-zero if the ref is hidden, otherwise 0 */
1022 static int mark_our_ref(const char *refname, const char *refname_full,
1023                         const struct object_id *oid)
1024 {
1025         struct object *o = lookup_unknown_object(oid);
1026
1027         if (ref_is_hidden(refname, refname_full)) {
1028                 o->flags |= HIDDEN_REF;
1029                 return 1;
1030         }
1031         o->flags |= OUR_REF;
1032         return 0;
1033 }
1034
1035 static int check_ref(const char *refname_full, const struct object_id *oid,
1036                      int flag, void *cb_data)
1037 {
1038         const char *refname = strip_namespace(refname_full);
1039
1040         mark_our_ref(refname, refname_full, oid);
1041         return 0;
1042 }
1043
1044 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1045 {
1046         struct string_list_item *item;
1047
1048         if (!symref->nr)
1049                 return;
1050         for_each_string_list_item(item, symref)
1051                 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1052 }
1053
1054 static int send_ref(const char *refname, const struct object_id *oid,
1055                     int flag, void *cb_data)
1056 {
1057         static const char *capabilities = "multi_ack thin-pack side-band"
1058                 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1059                 " deepen-relative no-progress include-tag multi_ack_detailed";
1060         const char *refname_nons = strip_namespace(refname);
1061         struct object_id peeled;
1062         struct upload_pack_data *data = cb_data;
1063
1064         if (mark_our_ref(refname_nons, refname, oid))
1065                 return 0;
1066
1067         if (capabilities) {
1068                 struct strbuf symref_info = STRBUF_INIT;
1069
1070                 format_symref_info(&symref_info, &data->symref);
1071                 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1072                              oid_to_hex(oid), refname_nons,
1073                              0, capabilities,
1074                              (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1075                                      " allow-tip-sha1-in-want" : "",
1076                              (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1077                                      " allow-reachable-sha1-in-want" : "",
1078                              data->stateless_rpc ? " no-done" : "",
1079                              symref_info.buf,
1080                              data->allow_filter ? " filter" : "",
1081                              git_user_agent_sanitized());
1082                 strbuf_release(&symref_info);
1083         } else {
1084                 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1085         }
1086         capabilities = NULL;
1087         if (!peel_ref(refname, &peeled))
1088                 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1089         return 0;
1090 }
1091
1092 static int find_symref(const char *refname, const struct object_id *oid,
1093                        int flag, void *cb_data)
1094 {
1095         const char *symref_target;
1096         struct string_list_item *item;
1097
1098         if ((flag & REF_ISSYMREF) == 0)
1099                 return 0;
1100         symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1101         if (!symref_target || (flag & REF_ISSYMREF) == 0)
1102                 die("'%s' is a symref but it is not?", refname);
1103         item = string_list_append(cb_data, strip_namespace(refname));
1104         item->util = xstrdup(strip_namespace(symref_target));
1105         return 0;
1106 }
1107
1108 static int upload_pack_config(const char *var, const char *value, void *cb_data)
1109 {
1110         struct upload_pack_data *data = cb_data;
1111
1112         if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1113                 if (git_config_bool(var, value))
1114                         allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1115                 else
1116                         allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1117         } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1118                 if (git_config_bool(var, value))
1119                         allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1120                 else
1121                         allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1122         } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1123                 if (git_config_bool(var, value))
1124                         allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1125                 else
1126                         allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1127         } else if (!strcmp("uploadpack.keepalive", var)) {
1128                 data->keepalive = git_config_int(var, value);
1129                 if (!data->keepalive)
1130                         data->keepalive = -1;
1131         } else if (!strcmp("uploadpack.allowfilter", var)) {
1132                 data->allow_filter = git_config_bool(var, value);
1133         } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1134                 data->allow_ref_in_want = git_config_bool(var, value);
1135         } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1136                 data->allow_sideband_all = git_config_bool(var, value);
1137         } else if (!strcmp("core.precomposeunicode", var)) {
1138                 precomposed_unicode = git_config_bool(var, value);
1139         }
1140
1141         if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1142         current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1143                 if (!strcmp("uploadpack.packobjectshook", var))
1144                         return git_config_string(&data->pack_objects_hook, var, value);
1145         }
1146
1147         return parse_hide_refs_config(var, value, "uploadpack");
1148 }
1149
1150 void upload_pack(struct upload_pack_options *options)
1151 {
1152         struct packet_reader reader;
1153         struct upload_pack_data data;
1154
1155         upload_pack_data_init(&data);
1156
1157         git_config(upload_pack_config, &data);
1158
1159         data.stateless_rpc = options->stateless_rpc;
1160         data.daemon_mode = options->daemon_mode;
1161         data.timeout = options->timeout;
1162
1163         head_ref_namespaced(find_symref, &data.symref);
1164
1165         if (options->advertise_refs || !data.stateless_rpc) {
1166                 reset_timeout(data.timeout);
1167                 head_ref_namespaced(send_ref, &data);
1168                 for_each_namespaced_ref(send_ref, &data);
1169                 advertise_shallow_grafts(1);
1170                 packet_flush(1);
1171         } else {
1172                 head_ref_namespaced(check_ref, NULL);
1173                 for_each_namespaced_ref(check_ref, NULL);
1174         }
1175
1176         if (!options->advertise_refs) {
1177                 packet_reader_init(&reader, 0, NULL, 0,
1178                                    PACKET_READ_CHOMP_NEWLINE |
1179                                    PACKET_READ_DIE_ON_ERR_PACKET);
1180
1181                 receive_needs(&data, &reader);
1182                 if (data.want_obj.nr) {
1183                         get_common_commits(&data, &reader);
1184                         create_pack_file(&data);
1185                 }
1186         }
1187
1188         upload_pack_data_clear(&data);
1189 }
1190
1191 static int parse_want(struct packet_writer *writer, const char *line,
1192                       struct object_array *want_obj)
1193 {
1194         const char *arg;
1195         if (skip_prefix(line, "want ", &arg)) {
1196                 struct object_id oid;
1197                 struct object *o;
1198
1199                 if (get_oid_hex(arg, &oid))
1200                         die("git upload-pack: protocol error, "
1201                             "expected to get oid, not '%s'", line);
1202
1203                 o = parse_object(the_repository, &oid);
1204                 if (!o) {
1205                         packet_writer_error(writer,
1206                                             "upload-pack: not our ref %s",
1207                                             oid_to_hex(&oid));
1208                         die("git upload-pack: not our ref %s",
1209                             oid_to_hex(&oid));
1210                 }
1211
1212                 if (!(o->flags & WANTED)) {
1213                         o->flags |= WANTED;
1214                         add_object_array(o, NULL, want_obj);
1215                 }
1216
1217                 return 1;
1218         }
1219
1220         return 0;
1221 }
1222
1223 static int parse_want_ref(struct packet_writer *writer, const char *line,
1224                           struct string_list *wanted_refs,
1225                           struct object_array *want_obj)
1226 {
1227         const char *arg;
1228         if (skip_prefix(line, "want-ref ", &arg)) {
1229                 struct object_id oid;
1230                 struct string_list_item *item;
1231                 struct object *o;
1232
1233                 if (read_ref(arg, &oid)) {
1234                         packet_writer_error(writer, "unknown ref %s", arg);
1235                         die("unknown ref %s", arg);
1236                 }
1237
1238                 item = string_list_append(wanted_refs, arg);
1239                 item->util = oiddup(&oid);
1240
1241                 o = parse_object_or_die(&oid, arg);
1242                 if (!(o->flags & WANTED)) {
1243                         o->flags |= WANTED;
1244                         add_object_array(o, NULL, want_obj);
1245                 }
1246
1247                 return 1;
1248         }
1249
1250         return 0;
1251 }
1252
1253 static int parse_have(const char *line, struct oid_array *haves)
1254 {
1255         const char *arg;
1256         if (skip_prefix(line, "have ", &arg)) {
1257                 struct object_id oid;
1258
1259                 if (get_oid_hex(arg, &oid))
1260                         die("git upload-pack: expected SHA1 object, got '%s'", arg);
1261                 oid_array_append(haves, &oid);
1262                 return 1;
1263         }
1264
1265         return 0;
1266 }
1267
1268 static void process_args(struct packet_reader *request,
1269                          struct upload_pack_data *data)
1270 {
1271         while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1272                 const char *arg = request->line;
1273                 const char *p;
1274
1275                 /* process want */
1276                 if (parse_want(&data->writer, arg, &data->want_obj))
1277                         continue;
1278                 if (data->allow_ref_in_want &&
1279                     parse_want_ref(&data->writer, arg, &data->wanted_refs,
1280                                    &data->want_obj))
1281                         continue;
1282                 /* process have line */
1283                 if (parse_have(arg, &data->haves))
1284                         continue;
1285
1286                 /* process args like thin-pack */
1287                 if (!strcmp(arg, "thin-pack")) {
1288                         data->use_thin_pack = 1;
1289                         continue;
1290                 }
1291                 if (!strcmp(arg, "ofs-delta")) {
1292                         data->use_ofs_delta = 1;
1293                         continue;
1294                 }
1295                 if (!strcmp(arg, "no-progress")) {
1296                         data->no_progress = 1;
1297                         continue;
1298                 }
1299                 if (!strcmp(arg, "include-tag")) {
1300                         data->use_include_tag = 1;
1301                         continue;
1302                 }
1303                 if (!strcmp(arg, "done")) {
1304                         data->done = 1;
1305                         continue;
1306                 }
1307
1308                 /* Shallow related arguments */
1309                 if (process_shallow(arg, &data->shallows))
1310                         continue;
1311                 if (process_deepen(arg, &data->depth))
1312                         continue;
1313                 if (process_deepen_since(arg, &data->deepen_since,
1314                                          &data->deepen_rev_list))
1315                         continue;
1316                 if (process_deepen_not(arg, &data->deepen_not,
1317                                        &data->deepen_rev_list))
1318                         continue;
1319                 if (!strcmp(arg, "deepen-relative")) {
1320                         data->deepen_relative = 1;
1321                         continue;
1322                 }
1323
1324                 if (data->allow_filter && skip_prefix(arg, "filter ", &p)) {
1325                         list_objects_filter_die_if_populated(&data->filter_options);
1326                         parse_list_objects_filter(&data->filter_options, p);
1327                         continue;
1328                 }
1329
1330                 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1331                      data->allow_sideband_all) &&
1332                     !strcmp(arg, "sideband-all")) {
1333                         data->writer.use_sideband = 1;
1334                         continue;
1335                 }
1336
1337                 /* ignore unknown lines maybe? */
1338                 die("unexpected line: '%s'", arg);
1339         }
1340
1341         if (request->status != PACKET_READ_FLUSH)
1342                 die(_("expected flush after fetch arguments"));
1343 }
1344
1345 static int process_haves(struct oid_array *haves, struct oid_array *common,
1346                          struct object_array *have_obj)
1347 {
1348         int i;
1349
1350         /* Process haves */
1351         for (i = 0; i < haves->nr; i++) {
1352                 const struct object_id *oid = &haves->oid[i];
1353                 struct object *o;
1354                 int we_knew_they_have = 0;
1355
1356                 if (!has_object_file(oid))
1357                         continue;
1358
1359                 oid_array_append(common, oid);
1360
1361                 o = parse_object(the_repository, oid);
1362                 if (!o)
1363                         die("oops (%s)", oid_to_hex(oid));
1364                 if (o->type == OBJ_COMMIT) {
1365                         struct commit_list *parents;
1366                         struct commit *commit = (struct commit *)o;
1367                         if (o->flags & THEY_HAVE)
1368                                 we_knew_they_have = 1;
1369                         else
1370                                 o->flags |= THEY_HAVE;
1371                         if (!oldest_have || (commit->date < oldest_have))
1372                                 oldest_have = commit->date;
1373                         for (parents = commit->parents;
1374                              parents;
1375                              parents = parents->next)
1376                                 parents->item->object.flags |= THEY_HAVE;
1377                 }
1378                 if (!we_knew_they_have)
1379                         add_object_array(o, NULL, have_obj);
1380         }
1381
1382         return 0;
1383 }
1384
1385 static int send_acks(struct packet_writer *writer, struct oid_array *acks,
1386                      const struct object_array *have_obj,
1387                      struct object_array *want_obj)
1388 {
1389         int i;
1390
1391         packet_writer_write(writer, "acknowledgments\n");
1392
1393         /* Send Acks */
1394         if (!acks->nr)
1395                 packet_writer_write(writer, "NAK\n");
1396
1397         for (i = 0; i < acks->nr; i++) {
1398                 packet_writer_write(writer, "ACK %s\n",
1399                                     oid_to_hex(&acks->oid[i]));
1400         }
1401
1402         if (ok_to_give_up(have_obj, want_obj)) {
1403                 /* Send Ready */
1404                 packet_writer_write(writer, "ready\n");
1405                 return 1;
1406         }
1407
1408         return 0;
1409 }
1410
1411 static int process_haves_and_send_acks(struct upload_pack_data *data)
1412 {
1413         struct oid_array common = OID_ARRAY_INIT;
1414         int ret = 0;
1415
1416         process_haves(&data->haves, &common, &data->have_obj);
1417         if (data->done) {
1418                 ret = 1;
1419         } else if (send_acks(&data->writer, &common,
1420                              &data->have_obj, &data->want_obj)) {
1421                 packet_writer_delim(&data->writer);
1422                 ret = 1;
1423         } else {
1424                 /* Add Flush */
1425                 packet_writer_flush(&data->writer);
1426                 ret = 0;
1427         }
1428
1429         oid_array_clear(&data->haves);
1430         oid_array_clear(&common);
1431         return ret;
1432 }
1433
1434 static void send_wanted_ref_info(struct upload_pack_data *data)
1435 {
1436         const struct string_list_item *item;
1437
1438         if (!data->wanted_refs.nr)
1439                 return;
1440
1441         packet_writer_write(&data->writer, "wanted-refs\n");
1442
1443         for_each_string_list_item(item, &data->wanted_refs) {
1444                 packet_writer_write(&data->writer, "%s %s\n",
1445                                     oid_to_hex(item->util),
1446                                     item->string);
1447         }
1448
1449         packet_writer_delim(&data->writer);
1450 }
1451
1452 static void send_shallow_info(struct upload_pack_data *data)
1453 {
1454         /* No shallow info needs to be sent */
1455         if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1456             !is_repository_shallow(the_repository))
1457                 return;
1458
1459         packet_writer_write(&data->writer, "shallow-info\n");
1460
1461         if (!send_shallow_list(data) &&
1462             is_repository_shallow(the_repository))
1463                 deepen(data, INFINITE_DEPTH);
1464
1465         packet_delim(1);
1466 }
1467
1468 enum fetch_state {
1469         FETCH_PROCESS_ARGS = 0,
1470         FETCH_SEND_ACKS,
1471         FETCH_SEND_PACK,
1472         FETCH_DONE,
1473 };
1474
1475 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1476                    struct packet_reader *request)
1477 {
1478         enum fetch_state state = FETCH_PROCESS_ARGS;
1479         struct upload_pack_data data;
1480
1481         clear_object_flags(ALL_FLAGS);
1482
1483         upload_pack_data_init(&data);
1484         data.use_sideband = LARGE_PACKET_MAX;
1485
1486         git_config(upload_pack_config, &data);
1487
1488         while (state != FETCH_DONE) {
1489                 switch (state) {
1490                 case FETCH_PROCESS_ARGS:
1491                         process_args(request, &data);
1492
1493                         if (!data.want_obj.nr) {
1494                                 /*
1495                                  * Request didn't contain any 'want' lines,
1496                                  * guess they didn't want anything.
1497                                  */
1498                                 state = FETCH_DONE;
1499                         } else if (data.haves.nr) {
1500                                 /*
1501                                  * Request had 'have' lines, so lets ACK them.
1502                                  */
1503                                 state = FETCH_SEND_ACKS;
1504                         } else {
1505                                 /*
1506                                  * Request had 'want's but no 'have's so we can
1507                                  * immedietly go to construct and send a pack.
1508                                  */
1509                                 state = FETCH_SEND_PACK;
1510                         }
1511                         break;
1512                 case FETCH_SEND_ACKS:
1513                         if (process_haves_and_send_acks(&data))
1514                                 state = FETCH_SEND_PACK;
1515                         else
1516                                 state = FETCH_DONE;
1517                         break;
1518                 case FETCH_SEND_PACK:
1519                         send_wanted_ref_info(&data);
1520                         send_shallow_info(&data);
1521
1522                         packet_writer_write(&data.writer, "packfile\n");
1523                         create_pack_file(&data);
1524                         state = FETCH_DONE;
1525                         break;
1526                 case FETCH_DONE:
1527                         continue;
1528                 }
1529         }
1530
1531         upload_pack_data_clear(&data);
1532         return 0;
1533 }
1534
1535 int upload_pack_advertise(struct repository *r,
1536                           struct strbuf *value)
1537 {
1538         if (value) {
1539                 int allow_filter_value;
1540                 int allow_ref_in_want;
1541                 int allow_sideband_all_value;
1542
1543                 strbuf_addstr(value, "shallow");
1544
1545                 if (!repo_config_get_bool(the_repository,
1546                                          "uploadpack.allowfilter",
1547                                          &allow_filter_value) &&
1548                     allow_filter_value)
1549                         strbuf_addstr(value, " filter");
1550
1551                 if (!repo_config_get_bool(the_repository,
1552                                          "uploadpack.allowrefinwant",
1553                                          &allow_ref_in_want) &&
1554                     allow_ref_in_want)
1555                         strbuf_addstr(value, " ref-in-want");
1556
1557                 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1558                     (!repo_config_get_bool(the_repository,
1559                                            "uploadpack.allowsidebandall",
1560                                            &allow_sideband_all_value) &&
1561                      allow_sideband_all_value))
1562                         strbuf_addstr(value, " sideband-all");
1563         }
1564
1565         return 1;
1566 }