?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
branch: give a more helpful message on redundant arguments
[git/raj.git] / transport.c
blob0750a5fbbee7f192ce90d3d800921435cbb6208a
1 #include "cache.h"
2 #include "transport.h"
3 #include "run-command.h"
4 #include "pkt-line.h"
5 #include "fetch-pack.h"
6 #include "send-pack.h"
7 #include "walker.h"
8 #include "bundle.h"
9 #include "dir.h"
10 #include "refs.h"
11 #include "branch.h"
12 #include "url.h"
13 #include "submodule.h"
14 #include "string-list.h"
15
16 /* rsync support */
17
18 /*
19 * We copy packed-refs and refs/ into a temporary file, then read the
20 * loose refs recursively (sorting whenever possible), and then inserting
21 * those packed refs that are not yet in the list (not validating, but
22 * assuming that the file is sorted).
23 *
24 * Appears refactoring this from refs.c is too cumbersome.
25 */
26
27 static int str_cmp(const void *a, const void *b)
28 {
29 const char *s1 = a;
30 const char *s2 = b;
31
32 return strcmp(s1, s2);
33 }
34
35 /* path->buf + name_offset is expected to point to "refs/" */
36
37 static int read_loose_refs(struct strbuf *path, int name_offset,
38 struct ref **tail)
39 {
40 DIR *dir = opendir(path->buf);
41 struct dirent *de;
42 struct {
43 char **entries;
44 int nr, alloc;
45 } list;
46 int i, pathlen;
47
48 if (!dir)
49 return -1;
50
51 memset (&list, 0, sizeof(list));
52
53 while ((de = readdir(dir))) {
54 if (is_dot_or_dotdot(de->d_name))
55 continue;
56 ALLOC_GROW(list.entries, list.nr + 1, list.alloc);
57 list.entries[list.nr++] = xstrdup(de->d_name);
58 }
59 closedir(dir);
60
61 /* sort the list */
62
63 qsort(list.entries, list.nr, sizeof(char *), str_cmp);
64
65 pathlen = path->len;
66 strbuf_addch(path, '/');
67
68 for (i = 0; i < list.nr; i++, strbuf_setlen(path, pathlen + 1)) {
69 strbuf_addstr(path, list.entries[i]);
70 if (read_loose_refs(path, name_offset, tail)) {
71 int fd = open(path->buf, O_RDONLY);
72 char buffer[40];
73 struct ref *next;
74
75 if (fd < 0)
76 continue;
77 next = alloc_ref(path->buf + name_offset);
78 if (read_in_full(fd, buffer, 40) != 40 ||
79 get_sha1_hex(buffer, next->old_sha1)) {
80 close(fd);
81 free(next);
82 continue;
83 }
84 close(fd);
85 (*tail)->next = next;
86 *tail = next;
87 }
88 }
89 strbuf_setlen(path, pathlen);
90
91 for (i = 0; i < list.nr; i++)
92 free(list.entries[i]);
93 free(list.entries);
94
95 return 0;
96 }
97
98 /* insert the packed refs for which no loose refs were found */
99
100 static void insert_packed_refs(const char *packed_refs, struct ref **list)
101 {
102 FILE *f = fopen(packed_refs, "r");
103 static char buffer[PATH_MAX];
104
105 if (!f)
106 return;
107
108 for (;;) {
109 int cmp = cmp, len;
110
111 if (!fgets(buffer, sizeof(buffer), f)) {
112 fclose(f);
113 return;
114 }
115
116 if (hexval(buffer[0]) > 0xf)
117 continue;
118 len = strlen(buffer);
119 if (len && buffer[len - 1] == '\n')
120 buffer[--len] = '\0';
121 if (len < 41)
122 continue;
123 while ((*list)->next &&
124 (cmp = strcmp(buffer + 41,
125 (*list)->next->name)) > 0)
126 list = &(*list)->next;
127 if (!(*list)->next || cmp < 0) {
128 struct ref *next = alloc_ref(buffer + 41);
129 buffer[40] = '\0';
130 if (get_sha1_hex(buffer, next->old_sha1)) {
131 warning ("invalid SHA-1: %s", buffer);
132 free(next);
133 continue;
134 }
135 next->next = (*list)->next;
136 (*list)->next = next;
137 list = &(*list)->next;
138 }
139 }
140 }
141
142 static void set_upstreams(struct transport *transport, struct ref *refs,
143 int pretend)
144 {
145 struct ref *ref;
146 for (ref = refs; ref; ref = ref->next) {
147 const char *localname;
148 const char *tmp;
149 const char *remotename;
150 unsigned char sha[20];
151 int flag = 0;
152 /*
153 * Check suitability for tracking. Must be successful /
154 * already up-to-date ref create/modify (not delete).
155 */
156 if (ref->status != REF_STATUS_OK &&
157 ref->status != REF_STATUS_UPTODATE)
158 continue;
159 if (!ref->peer_ref)
160 continue;
161 if (is_null_sha1(ref->new_sha1))
162 continue;
163
164 /* Follow symbolic refs (mainly for HEAD). */
165 localname = ref->peer_ref->name;
166 remotename = ref->name;
167 tmp = resolve_ref_unsafe(localname, sha, 1, &flag);
168 if (tmp && flag & REF_ISSYMREF &&
169 !prefixcmp(tmp, "refs/heads/"))
170 localname = tmp;
171
172 /* Both source and destination must be local branches. */
173 if (!localname || prefixcmp(localname, "refs/heads/"))
174 continue;
175 if (!remotename || prefixcmp(remotename, "refs/heads/"))
176 continue;
177
178 if (!pretend)
179 install_branch_config(BRANCH_CONFIG_VERBOSE,
180 localname + 11, transport->remote->name,
181 remotename);
182 else
183 printf("Would set upstream of '%s' to '%s' of '%s'\n",
184 localname + 11, remotename + 11,
185 transport->remote->name);
186 }
187 }
188
189 static const char *rsync_url(const char *url)
190 {
191 return prefixcmp(url, "rsync://") ? skip_prefix(url, "rsync:") : url;
192 }
193
194 static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
195 {
196 struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
197 struct ref dummy = {NULL}, *tail = &dummy;
198 struct child_process rsync;
199 const char *args[5];
200 int temp_dir_len;
201
202 if (for_push)
203 return NULL;
204
205 /* copy the refs to the temporary directory */
206
207 strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX"));
208 if (!mkdtemp(temp_dir.buf))
209 die_errno ("Could not make temporary directory");
210 temp_dir_len = temp_dir.len;
211
212 strbuf_addstr(&buf, rsync_url(transport->url));
213 strbuf_addstr(&buf, "/refs");
214
215 memset(&rsync, 0, sizeof(rsync));
216 rsync.argv = args;
217 rsync.stdout_to_stderr = 1;
218 args[0] = "rsync";
219 args[1] = (transport->verbose > 1) ? "-rv" : "-r";
220 args[2] = buf.buf;
221 args[3] = temp_dir.buf;
222 args[4] = NULL;
223
224 if (run_command(&rsync))
225 die ("Could not run rsync to get refs");
226
227 strbuf_reset(&buf);
228 strbuf_addstr(&buf, rsync_url(transport->url));
229 strbuf_addstr(&buf, "/packed-refs");
230
231 args[2] = buf.buf;
232
233 if (run_command(&rsync))
234 die ("Could not run rsync to get refs");
235
236 /* read the copied refs */
237
238 strbuf_addstr(&temp_dir, "/refs");
239 read_loose_refs(&temp_dir, temp_dir_len + 1, &tail);
240 strbuf_setlen(&temp_dir, temp_dir_len);
241
242 tail = &dummy;
243 strbuf_addstr(&temp_dir, "/packed-refs");
244 insert_packed_refs(temp_dir.buf, &tail);
245 strbuf_setlen(&temp_dir, temp_dir_len);
246
247 if (remove_dir_recursively(&temp_dir, 0))
248 warning ("Error removing temporary directory %s.",
249 temp_dir.buf);
250
251 strbuf_release(&buf);
252 strbuf_release(&temp_dir);
253
254 return dummy.next;
255 }
256
257 static int fetch_objs_via_rsync(struct transport *transport,
258 int nr_objs, struct ref **to_fetch)
259 {
260 struct strbuf buf = STRBUF_INIT;
261 struct child_process rsync;
262 const char *args[8];
263 int result;
264
265 strbuf_addstr(&buf, rsync_url(transport->url));
266 strbuf_addstr(&buf, "/objects/");
267
268 memset(&rsync, 0, sizeof(rsync));
269 rsync.argv = args;
270 rsync.stdout_to_stderr = 1;
271 args[0] = "rsync";
272 args[1] = (transport->verbose > 1) ? "-rv" : "-r";
273 args[2] = "--ignore-existing";
274 args[3] = "--exclude";
275 args[4] = "info";
276 args[5] = buf.buf;
277 args[6] = get_object_directory();
278 args[7] = NULL;
279
280 /* NEEDSWORK: handle one level of alternates */
281 result = run_command(&rsync);
282
283 strbuf_release(&buf);
284
285 return result;
286 }
287
288 static int write_one_ref(const char *name, const unsigned char *sha1,
289 int flags, void *data)
290 {
291 struct strbuf *buf = data;
292 int len = buf->len;
293 FILE *f;
294
295 /* when called via for_each_ref(), flags is non-zero */
296 if (flags && prefixcmp(name, "refs/heads/") &&
297 prefixcmp(name, "refs/tags/"))
298 return 0;
299
300 strbuf_addstr(buf, name);
301 if (safe_create_leading_directories(buf->buf) ||
302 !(f = fopen(buf->buf, "w")) ||
303 fprintf(f, "%s\n", sha1_to_hex(sha1)) < 0 ||
304 fclose(f))
305 return error("problems writing temporary file %s", buf->buf);
306 strbuf_setlen(buf, len);
307 return 0;
308 }
309
310 static int write_refs_to_temp_dir(struct strbuf *temp_dir,
311 int refspec_nr, const char **refspec)
312 {
313 int i;
314
315 for (i = 0; i < refspec_nr; i++) {
316 unsigned char sha1[20];
317 char *ref;
318
319 if (dwim_ref(refspec[i], strlen(refspec[i]), sha1, &ref) != 1)
320 return error("Could not get ref %s", refspec[i]);
321
322 if (write_one_ref(ref, sha1, 0, temp_dir)) {
323 free(ref);
324 return -1;
325 }
326 free(ref);
327 }
328 return 0;
329 }
330
331 static int rsync_transport_push(struct transport *transport,
332 int refspec_nr, const char **refspec, int flags)
333 {
334 struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
335 int result = 0, i;
336 struct child_process rsync;
337 const char *args[10];
338
339 if (flags & TRANSPORT_PUSH_MIRROR)
340 return error("rsync transport does not support mirror mode");
341
342 /* first push the objects */
343
344 strbuf_addstr(&buf, rsync_url(transport->url));
345 strbuf_addch(&buf, '/');
346
347 memset(&rsync, 0, sizeof(rsync));
348 rsync.argv = args;
349 rsync.stdout_to_stderr = 1;
350 i = 0;
351 args[i++] = "rsync";
352 args[i++] = "-a";
353 if (flags & TRANSPORT_PUSH_DRY_RUN)
354 args[i++] = "--dry-run";
355 if (transport->verbose > 1)
356 args[i++] = "-v";
357 args[i++] = "--ignore-existing";
358 args[i++] = "--exclude";
359 args[i++] = "info";
360 args[i++] = get_object_directory();
361 args[i++] = buf.buf;
362 args[i++] = NULL;
363
364 if (run_command(&rsync))
365 return error("Could not push objects to %s",
366 rsync_url(transport->url));
367
368 /* copy the refs to the temporary directory; they could be packed. */
369
370 strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX"));
371 if (!mkdtemp(temp_dir.buf))
372 die_errno ("Could not make temporary directory");
373 strbuf_addch(&temp_dir, '/');
374
375 if (flags & TRANSPORT_PUSH_ALL) {
376 if (for_each_ref(write_one_ref, &temp_dir))
377 return -1;
378 } else if (write_refs_to_temp_dir(&temp_dir, refspec_nr, refspec))
379 return -1;
380
381 i = 2;
382 if (flags & TRANSPORT_PUSH_DRY_RUN)
383 args[i++] = "--dry-run";
384 if (!(flags & TRANSPORT_PUSH_FORCE))
385 args[i++] = "--ignore-existing";
386 args[i++] = temp_dir.buf;
387 args[i++] = rsync_url(transport->url);
388 args[i++] = NULL;
389 if (run_command(&rsync))
390 result = error("Could not push to %s",
391 rsync_url(transport->url));
392
393 if (remove_dir_recursively(&temp_dir, 0))
394 warning ("Could not remove temporary directory %s.",
395 temp_dir.buf);
396
397 strbuf_release(&buf);
398 strbuf_release(&temp_dir);
399
400 return result;
401 }
402
403 struct bundle_transport_data {
404 int fd;
405 struct bundle_header header;
406 };
407
408 static struct ref *get_refs_from_bundle(struct transport *transport, int for_push)
409 {
410 struct bundle_transport_data *data = transport->data;
411 struct ref *result = NULL;
412 int i;
413
414 if (for_push)
415 return NULL;
416
417 if (data->fd > 0)
418 close(data->fd);
419 data->fd = read_bundle_header(transport->url, &data->header);
420 if (data->fd < 0)
421 die ("Could not read bundle '%s'.", transport->url);
422 for (i = 0; i < data->header.references.nr; i++) {
423 struct ref_list_entry *e = data->header.references.list + i;
424 struct ref *ref = alloc_ref(e->name);
425 hashcpy(ref->old_sha1, e->sha1);
426 ref->next = result;
427 result = ref;
428 }
429 return result;
430 }
431
432 static int fetch_refs_from_bundle(struct transport *transport,
433 int nr_heads, struct ref **to_fetch)
434 {
435 struct bundle_transport_data *data = transport->data;
436 return unbundle(&data->header, data->fd,
437 transport->progress ? BUNDLE_VERBOSE : 0);
438 }
439
440 static int close_bundle(struct transport *transport)
441 {
442 struct bundle_transport_data *data = transport->data;
443 if (data->fd > 0)
444 close(data->fd);
445 free(data);
446 return 0;
447 }
448
449 struct git_transport_data {
450 struct git_transport_options options;
451 struct child_process *conn;
452 int fd[2];
453 unsigned got_remote_heads : 1;
454 struct extra_have_objects extra_have;
455 };
456
457 static int set_git_option(struct git_transport_options *opts,
458 const char *name, const char *value)
459 {
460 if (!strcmp(name, TRANS_OPT_UPLOADPACK)) {
461 opts->uploadpack = value;
462 return 0;
463 } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) {
464 opts->receivepack = value;
465 return 0;
466 } else if (!strcmp(name, TRANS_OPT_THIN)) {
467 opts->thin = !!value;
468 return 0;
469 } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) {
470 opts->followtags = !!value;
471 return 0;
472 } else if (!strcmp(name, TRANS_OPT_KEEP)) {
473 opts->keep = !!value;
474 return 0;
475 } else if (!strcmp(name, TRANS_OPT_DEPTH)) {
476 if (!value)
477 opts->depth = 0;
478 else {
479 char *end;
480 opts->depth = strtol(value, &end, 0);
481 if (*end)
482 die("transport: invalid depth option '%s'", value);
483 }
484 return 0;
485 }
486 return 1;
487 }
488
489 static int connect_setup(struct transport *transport, int for_push, int verbose)
490 {
491 struct git_transport_data *data = transport->data;
492
493 if (data->conn)
494 return 0;
495
496 data->conn = git_connect(data->fd, transport->url,
497 for_push ? data->options.receivepack :
498 data->options.uploadpack,
499 verbose ? CONNECT_VERBOSE : 0);
500
501 return 0;
502 }
503
504 static struct ref *get_refs_via_connect(struct transport *transport, int for_push)
505 {
506 struct git_transport_data *data = transport->data;
507 struct ref *refs;
508
509 connect_setup(transport, for_push, 0);
510 get_remote_heads(data->fd[0], &refs,
511 for_push ? REF_NORMAL : 0, &data->extra_have);
512 data->got_remote_heads = 1;
513
514 return refs;
515 }
516
517 static int fetch_refs_via_pack(struct transport *transport,
518 int nr_heads, struct ref **to_fetch)
519 {
520 struct git_transport_data *data = transport->data;
521 struct string_list sought = STRING_LIST_INIT_DUP;
522 const struct ref *refs;
523 char *dest = xstrdup(transport->url);
524 struct fetch_pack_args args;
525 int i;
526 struct ref *refs_tmp = NULL;
527
528 memset(&args, 0, sizeof(args));
529 args.uploadpack = data->options.uploadpack;
530 args.keep_pack = data->options.keep;
531 args.lock_pack = 1;
532 args.use_thin_pack = data->options.thin;
533 args.include_tag = data->options.followtags;
534 args.verbose = (transport->verbose > 1);
535 args.quiet = (transport->verbose < 0);
536 args.no_progress = !transport->progress;
537 args.depth = data->options.depth;
538
539 for (i = 0; i < nr_heads; i++)
540 string_list_append(&sought, to_fetch[i]->name);
541
542 if (!data->got_remote_heads) {
543 connect_setup(transport, 0, 0);
544 get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
545 data->got_remote_heads = 1;
546 }
547
548 refs = fetch_pack(&args, data->fd, data->conn,
549 refs_tmp ? refs_tmp : transport->remote_refs,
550 dest, &sought, &transport->pack_lockfile);
551 close(data->fd[0]);
552 close(data->fd[1]);
553 if (finish_connect(data->conn))
554 refs = NULL;
555 data->conn = NULL;
556 data->got_remote_heads = 0;
557
558 free_refs(refs_tmp);
559
560 string_list_clear(&sought, 0);
561 free(dest);
562 return (refs ? 0 : -1);
563 }
564
565 static int push_had_errors(struct ref *ref)
566 {
567 for (; ref; ref = ref->next) {
568 switch (ref->status) {
569 case REF_STATUS_NONE:
570 case REF_STATUS_UPTODATE:
571 case REF_STATUS_OK:
572 break;
573 default:
574 return 1;
575 }
576 }
577 return 0;
578 }
579
580 int transport_refs_pushed(struct ref *ref)
581 {
582 for (; ref; ref = ref->next) {
583 switch(ref->status) {
584 case REF_STATUS_NONE:
585 case REF_STATUS_UPTODATE:
586 break;
587 default:
588 return 1;
589 }
590 }
591 return 0;
592 }
593
594 void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose)
595 {
596 struct refspec rs;
597
598 if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
599 return;
600
601 rs.src = ref->name;
602 rs.dst = NULL;
603
604 if (!remote_find_tracking(remote, &rs)) {
605 if (verbose)
606 fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
607 if (ref->deletion) {
608 delete_ref(rs.dst, NULL, 0);
609 } else
610 update_ref("update by push", rs.dst,
611 ref->new_sha1, NULL, 0, 0);
612 free(rs.dst);
613 }
614 }
615
616 static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg, int porcelain)
617 {
618 if (porcelain) {
619 if (from)
620 fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name);
621 else
622 fprintf(stdout, "%c\t:%s\t", flag, to->name);
623 if (msg)
624 fprintf(stdout, "%s (%s)\n", summary, msg);
625 else
626 fprintf(stdout, "%s\n", summary);
627 } else {
628 fprintf(stderr, " %c %-*s ", flag, TRANSPORT_SUMMARY_WIDTH, summary);
629 if (from)
630 fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
631 else
632 fputs(prettify_refname(to->name), stderr);
633 if (msg) {
634 fputs(" (", stderr);
635 fputs(msg, stderr);
636 fputc(')', stderr);
637 }
638 fputc('\n', stderr);
639 }
640 }
641
642 static const char *status_abbrev(unsigned char sha1[20])
643 {
644 return find_unique_abbrev(sha1, DEFAULT_ABBREV);
645 }
646
647 static void print_ok_ref_status(struct ref *ref, int porcelain)
648 {
649 if (ref->deletion)
650 print_ref_status('-', "[deleted]", ref, NULL, NULL, porcelain);
651 else if (is_null_sha1(ref->old_sha1))
652 print_ref_status('*',
653 (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
654 "[new branch]"),
655 ref, ref->peer_ref, NULL, porcelain);
656 else {
657 char quickref[84];
658 char type;
659 const char *msg;
660
661 strcpy(quickref, status_abbrev(ref->old_sha1));
662 if (ref->requires_force) {
663 strcat(quickref, "...");
664 type = '+';
665 msg = "forced update";
666 } else {
667 strcat(quickref, "..");
668 type = ' ';
669 msg = NULL;
670 }
671 strcat(quickref, status_abbrev(ref->new_sha1));
672
673 print_ref_status(type, quickref, ref, ref->peer_ref, msg, porcelain);
674 }
675 }
676
677 static int print_one_push_status(struct ref *ref, const char *dest, int count, int porcelain)
678 {
679 if (!count)
680 fprintf(porcelain ? stdout : stderr, "To %s\n", dest);
681
682 switch(ref->status) {
683 case REF_STATUS_NONE:
684 print_ref_status('X', "[no match]", ref, NULL, NULL, porcelain);
685 break;
686 case REF_STATUS_REJECT_NODELETE:
687 print_ref_status('!', "[rejected]", ref, NULL,
688 "remote does not support deleting refs", porcelain);
689 break;
690 case REF_STATUS_UPTODATE:
691 print_ref_status('=', "[up to date]", ref,
692 ref->peer_ref, NULL, porcelain);
693 break;
694 case REF_STATUS_REJECT_NONFASTFORWARD:
695 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
696 "non-fast-forward", porcelain);
697 break;
698 case REF_STATUS_REJECT_ALREADY_EXISTS:
699 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
700 "already exists", porcelain);
701 break;
702 case REF_STATUS_REMOTE_REJECT:
703 print_ref_status('!', "[remote rejected]", ref,
704 ref->deletion ? NULL : ref->peer_ref,
705 ref->remote_status, porcelain);
706 break;
707 case REF_STATUS_EXPECTING_REPORT:
708 print_ref_status('!', "[remote failure]", ref,
709 ref->deletion ? NULL : ref->peer_ref,
710 "remote failed to report status", porcelain);
711 break;
712 case REF_STATUS_OK:
713 print_ok_ref_status(ref, porcelain);
714 break;
715 }
716
717 return 1;
718 }
719
720 void transport_print_push_status(const char *dest, struct ref *refs,
721 int verbose, int porcelain, unsigned int *reject_reasons)
722 {
723 struct ref *ref;
724 int n = 0;
725 unsigned char head_sha1[20];
726 char *head;
727
728 head = resolve_refdup("HEAD", head_sha1, 1, NULL);
729
730 if (verbose) {
731 for (ref = refs; ref; ref = ref->next)
732 if (ref->status == REF_STATUS_UPTODATE)
733 n += print_one_push_status(ref, dest, n, porcelain);
734 }
735
736 for (ref = refs; ref; ref = ref->next)
737 if (ref->status == REF_STATUS_OK)
738 n += print_one_push_status(ref, dest, n, porcelain);
739
740 *reject_reasons = 0;
741 for (ref = refs; ref; ref = ref->next) {
742 if (ref->status != REF_STATUS_NONE &&
743 ref->status != REF_STATUS_UPTODATE &&
744 ref->status != REF_STATUS_OK)
745 n += print_one_push_status(ref, dest, n, porcelain);
746 if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) {
747 if (!strcmp(head, ref->name))
748 *reject_reasons |= REJECT_NON_FF_HEAD;
749 else
750 *reject_reasons |= REJECT_NON_FF_OTHER;
751 } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) {
752 *reject_reasons |= REJECT_ALREADY_EXISTS;
753 }
754 }
755 }
756
757 void transport_verify_remote_names(int nr_heads, const char **heads)
758 {
759 int i;
760
761 for (i = 0; i < nr_heads; i++) {
762 const char *local = heads[i];
763 const char *remote = strrchr(heads[i], ':');
764
765 if (*local == '+')
766 local++;
767
768 /* A matching refspec is okay. */
769 if (remote == local && remote[1] == '\0')
770 continue;
771
772 remote = remote ? (remote + 1) : local;
773 if (check_refname_format(remote,
774 REFNAME_ALLOW_ONELEVEL|REFNAME_REFSPEC_PATTERN))
775 die("remote part of refspec is not a valid name in %s",
776 heads[i]);
777 }
778 }
779
780 static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags)
781 {
782 struct git_transport_data *data = transport->data;
783 struct send_pack_args args;
784 int ret;
785
786 if (!data->got_remote_heads) {
787 struct ref *tmp_refs;
788 connect_setup(transport, 1, 0);
789
790 get_remote_heads(data->fd[0], &tmp_refs, REF_NORMAL, NULL);
791 data->got_remote_heads = 1;
792 }
793
794 memset(&args, 0, sizeof(args));
795 args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR);
796 args.force_update = !!(flags & TRANSPORT_PUSH_FORCE);
797 args.use_thin_pack = data->options.thin;
798 args.verbose = (transport->verbose > 0);
799 args.quiet = (transport->verbose < 0);
800 args.progress = transport->progress;
801 args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
802 args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
803
804 ret = send_pack(&args, data->fd, data->conn, remote_refs,
805 &data->extra_have);
806
807 close(data->fd[1]);
808 close(data->fd[0]);
809 ret |= finish_connect(data->conn);
810 data->conn = NULL;
811 data->got_remote_heads = 0;
812
813 return ret;
814 }
815
816 static int connect_git(struct transport *transport, const char *name,
817 const char *executable, int fd[2])
818 {
819 struct git_transport_data *data = transport->data;
820 data->conn = git_connect(data->fd, transport->url,
821 executable, 0);
822 fd[0] = data->fd[0];
823 fd[1] = data->fd[1];
824 return 0;
825 }
826
827 static int disconnect_git(struct transport *transport)
828 {
829 struct git_transport_data *data = transport->data;
830 if (data->conn) {
831 if (data->got_remote_heads)
832 packet_flush(data->fd[1]);
833 close(data->fd[0]);
834 close(data->fd[1]);
835 finish_connect(data->conn);
836 }
837
838 free(data);
839 return 0;
840 }
841
842 void transport_take_over(struct transport *transport,
843 struct child_process *child)
844 {
845 struct git_transport_data *data;
846
847 if (!transport->smart_options)
848 die("Bug detected: Taking over transport requires non-NULL "
849 "smart_options field.");
850
851 data = xcalloc(1, sizeof(*data));
852 data->options = *transport->smart_options;
853 data->conn = child;
854 data->fd[0] = data->conn->out;
855 data->fd[1] = data->conn->in;
856 data->got_remote_heads = 0;
857 transport->data = data;
858
859 transport->set_option = NULL;
860 transport->get_refs_list = get_refs_via_connect;
861 transport->fetch = fetch_refs_via_pack;
862 transport->push = NULL;
863 transport->push_refs = git_transport_push;
864 transport->disconnect = disconnect_git;
865 transport->smart_options = &(data->options);
866 }
867
868 static int is_local(const char *url)
869 {
870 const char *colon = strchr(url, ':');
871 const char *slash = strchr(url, '/');
872 return !colon || (slash && slash < colon) ||
873 has_dos_drive_prefix(url);
874 }
875
876 static int is_file(const char *url)
877 {
878 struct stat buf;
879 if (stat(url, &buf))
880 return 0;
881 return S_ISREG(buf.st_mode);
882 }
883
884 static int external_specification_len(const char *url)
885 {
886 return strchr(url, ':') - url;
887 }
888
889 struct transport *transport_get(struct remote *remote, const char *url)
890 {
891 const char *helper;
892 struct transport *ret = xcalloc(1, sizeof(*ret));
893
894 ret->progress = isatty(2);
895
896 if (!remote)
897 die("No remote provided to transport_get()");
898
899 ret->got_remote_refs = 0;
900 ret->remote = remote;
901 helper = remote->foreign_vcs;
902
903 if (!url && remote->url)
904 url = remote->url[0];
905 ret->url = url;
906
907 /* maybe it is a foreign URL? */
908 if (url) {
909 const char *p = url;
910
911 while (is_urlschemechar(p == url, *p))
912 p++;
913 if (!prefixcmp(p, "::"))
914 helper = xstrndup(url, p - url);
915 }
916
917 if (helper) {
918 transport_helper_init(ret, helper);
919 } else if (!prefixcmp(url, "rsync:")) {
920 ret->get_refs_list = get_refs_via_rsync;
921 ret->fetch = fetch_objs_via_rsync;
922 ret->push = rsync_transport_push;
923 ret->smart_options = NULL;
924 } else if (is_local(url) && is_file(url) && is_bundle(url, 1)) {
925 struct bundle_transport_data *data = xcalloc(1, sizeof(*data));
926 ret->data = data;
927 ret->get_refs_list = get_refs_from_bundle;
928 ret->fetch = fetch_refs_from_bundle;
929 ret->disconnect = close_bundle;
930 ret->smart_options = NULL;
931 } else if (!is_url(url)
932 || !prefixcmp(url, "file://")
933 || !prefixcmp(url, "git://")
934 || !prefixcmp(url, "ssh://")
935 || !prefixcmp(url, "git+ssh://")
936 || !prefixcmp(url, "ssh+git://")) {
937 /* These are builtin smart transports. */
938 struct git_transport_data *data = xcalloc(1, sizeof(*data));
939 ret->data = data;
940 ret->set_option = NULL;
941 ret->get_refs_list = get_refs_via_connect;
942 ret->fetch = fetch_refs_via_pack;
943 ret->push_refs = git_transport_push;
944 ret->connect = connect_git;
945 ret->disconnect = disconnect_git;
946 ret->smart_options = &(data->options);
947
948 data->conn = NULL;
949 data->got_remote_heads = 0;
950 } else {
951 /* Unknown protocol in URL. Pass to external handler. */
952 int len = external_specification_len(url);
953 char *handler = xmalloc(len + 1);
954 handler[len] = 0;
955 strncpy(handler, url, len);
956 transport_helper_init(ret, handler);
957 }
958
959 if (ret->smart_options) {
960 ret->smart_options->thin = 1;
961 ret->smart_options->uploadpack = "git-upload-pack";
962 if (remote->uploadpack)
963 ret->smart_options->uploadpack = remote->uploadpack;
964 ret->smart_options->receivepack = "git-receive-pack";
965 if (remote->receivepack)
966 ret->smart_options->receivepack = remote->receivepack;
967 }
968
969 return ret;
970 }
971
972 int transport_set_option(struct transport *transport,
973 const char *name, const char *value)
974 {
975 int git_reports = 1, protocol_reports = 1;
976
977 if (transport->smart_options)
978 git_reports = set_git_option(transport->smart_options,
979 name, value);
980
981 if (transport->set_option)
982 protocol_reports = transport->set_option(transport, name,
983 value);
984
985 /* If either report is 0, report 0 (success). */
986 if (!git_reports || !protocol_reports)
987 return 0;
988 /* If either reports -1 (invalid value), report -1. */
989 if ((git_reports == -1) || (protocol_reports == -1))
990 return -1;
991 /* Otherwise if both report unknown, report unknown. */
992 return 1;
993 }
994
995 void transport_set_verbosity(struct transport *transport, int verbosity,
996 int force_progress)
997 {
998 if (verbosity >= 1)
999 transport->verbose = verbosity <= 3 ? verbosity : 3;
1000 if (verbosity < 0)
1001 transport->verbose = -1;
1002
1003 /**
1004 * Rules used to determine whether to report progress (processing aborts
1005 * when a rule is satisfied):
1006 *
1007 * . Report progress, if force_progress is 1 (ie. --progress).
1008 * . Don't report progress, if force_progress is 0 (ie. --no-progress).
1009 * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ).
1010 * . Report progress if isatty(2) is 1.
1011 **/
1012 if (force_progress >= 0)
1013 transport->progress = !!force_progress;
1014 else
1015 transport->progress = verbosity >= 0 && isatty(2);
1016 }
1017
1018 static void die_with_unpushed_submodules(struct string_list *needs_pushing)
1019 {
1020 int i;
1021
1022 fprintf(stderr, "The following submodule paths contain changes that can\n"
1023 "not be found on any remote:\n");
1024 for (i = 0; i < needs_pushing->nr; i++)
1025 printf(" %s\n", needs_pushing->items[i].string);
1026 fprintf(stderr, "\nPlease try\n\n"
1027 " git push --recurse-submodules=on-demand\n\n"
1028 "or cd to the path and use\n\n"
1029 " git push\n\n"
1030 "to push them to a remote.\n\n");
1031
1032 string_list_clear(needs_pushing, 0);
1033
1034 die("Aborting.");
1035 }
1036
1037 static int run_pre_push_hook(struct transport *transport,
1038 struct ref *remote_refs)
1039 {
1040 int ret = 0, x;
1041 struct ref *r;
1042 struct child_process proc;
1043 struct strbuf buf;
1044 const char *argv[4];
1045
1046 if (!(argv[0] = find_hook("pre-push")))
1047 return 0;
1048
1049 argv[1] = transport->remote->name;
1050 argv[2] = transport->url;
1051 argv[3] = NULL;
1052
1053 memset(&proc, 0, sizeof(proc));
1054 proc.argv = argv;
1055 proc.in = -1;
1056
1057 if (start_command(&proc)) {
1058 finish_command(&proc);
1059 return -1;
1060 }
1061
1062 strbuf_init(&buf, 256);
1063
1064 for (r = remote_refs; r; r = r->next) {
1065 if (!r->peer_ref) continue;
1066 if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue;
1067 if (r->status == REF_STATUS_UPTODATE) continue;
1068
1069 strbuf_reset(&buf);
1070 strbuf_addf( &buf, "%s %s %s %s\n",
1071 r->peer_ref->name, sha1_to_hex(r->new_sha1),
1072 r->name, sha1_to_hex(r->old_sha1));
1073
1074 if (write_in_full(proc.in, buf.buf, buf.len) != buf.len) {
1075 ret = -1;
1076 break;
1077 }
1078 }
1079
1080 strbuf_release(&buf);
1081
1082 x = close(proc.in);
1083 if (!ret)
1084 ret = x;
1085
1086 x = finish_command(&proc);
1087 if (!ret)
1088 ret = x;
1089
1090 return ret;
1091 }
1092
1093 int transport_push(struct transport *transport,
1094 int refspec_nr, const char **refspec, int flags,
1095 unsigned int *reject_reasons)
1096 {
1097 *reject_reasons = 0;
1098 transport_verify_remote_names(refspec_nr, refspec);
1099
1100 if (transport->push) {
1101 /* Maybe FIXME. But no important transport uses this case. */
1102 if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
1103 die("This transport does not support using --set-upstream");
1104
1105 return transport->push(transport, refspec_nr, refspec, flags);
1106 } else if (transport->push_refs) {
1107 struct ref *remote_refs =
1108 transport->get_refs_list(transport, 1);
1109 struct ref *local_refs = get_local_heads();
1110 int match_flags = MATCH_REFS_NONE;
1111 int verbose = (transport->verbose > 0);
1112 int quiet = (transport->verbose < 0);
1113 int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
1114 int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
1115 int push_ret, ret, err;
1116
1117 if (flags & TRANSPORT_PUSH_ALL)
1118 match_flags |= MATCH_REFS_ALL;
1119 if (flags & TRANSPORT_PUSH_MIRROR)
1120 match_flags |= MATCH_REFS_MIRROR;
1121 if (flags & TRANSPORT_PUSH_PRUNE)
1122 match_flags |= MATCH_REFS_PRUNE;
1123
1124 if (match_push_refs(local_refs, &remote_refs,
1125 refspec_nr, refspec, match_flags)) {
1126 return -1;
1127 }
1128
1129 set_ref_status_for_push(remote_refs,
1130 flags & TRANSPORT_PUSH_MIRROR,
1131 flags & TRANSPORT_PUSH_FORCE);
1132
1133 if (!(flags & TRANSPORT_PUSH_NO_HOOK))
1134 if (run_pre_push_hook(transport, remote_refs))
1135 return -1;
1136
1137 if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) {
1138 struct ref *ref = remote_refs;
1139 for (; ref; ref = ref->next)
1140 if (!is_null_sha1(ref->new_sha1) &&
1141 !push_unpushed_submodules(ref->new_sha1,
1142 transport->remote->name))
1143 die ("Failed to push all needed submodules!");
1144 }
1145
1146 if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
1147 TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) {
1148 struct ref *ref = remote_refs;
1149 struct string_list needs_pushing;
1150
1151 memset(&needs_pushing, 0, sizeof(struct string_list));
1152 needs_pushing.strdup_strings = 1;
1153 for (; ref; ref = ref->next)
1154 if (!is_null_sha1(ref->new_sha1) &&
1155 find_unpushed_submodules(ref->new_sha1,
1156 transport->remote->name, &needs_pushing))
1157 die_with_unpushed_submodules(&needs_pushing);
1158 }
1159
1160 push_ret = transport->push_refs(transport, remote_refs, flags);
1161 err = push_had_errors(remote_refs);
1162 ret = push_ret | err;
1163
1164 if (!quiet || err)
1165 transport_print_push_status(transport->url, remote_refs,
1166 verbose | porcelain, porcelain,
1167 reject_reasons);
1168
1169 if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
1170 set_upstreams(transport, remote_refs, pretend);
1171
1172 if (!(flags & TRANSPORT_PUSH_DRY_RUN)) {
1173 struct ref *ref;
1174 for (ref = remote_refs; ref; ref = ref->next)
1175 transport_update_tracking_ref(transport->remote, ref, verbose);
1176 }
1177
1178 if (porcelain && !push_ret)
1179 puts("Done");
1180 else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
1181 fprintf(stderr, "Everything up-to-date\n");
1182
1183 return ret;
1184 }
1185 return 1;
1186 }
1187
1188 const struct ref *transport_get_remote_refs(struct transport *transport)
1189 {
1190 if (!transport->got_remote_refs) {
1191 transport->remote_refs = transport->get_refs_list(transport, 0);
1192 transport->got_remote_refs = 1;
1193 }
1194
1195 return transport->remote_refs;
1196 }
1197
1198 int transport_fetch_refs(struct transport *transport, struct ref *refs)
1199 {
1200 int rc;
1201 int nr_heads = 0, nr_alloc = 0, nr_refs = 0;
1202 struct ref **heads = NULL;
1203 struct ref *rm;
1204
1205 for (rm = refs; rm; rm = rm->next) {
1206 nr_refs++;
1207 if (rm->peer_ref &&
1208 !is_null_sha1(rm->old_sha1) &&
1209 !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1))
1210 continue;
1211 ALLOC_GROW(heads, nr_heads + 1, nr_alloc);
1212 heads[nr_heads++] = rm;
1213 }
1214
1215 if (!nr_heads) {
1216 /*
1217 * When deepening of a shallow repository is requested,
1218 * then local and remote refs are likely to still be equal.
1219 * Just feed them all to the fetch method in that case.
1220 * This condition shouldn't be met in a non-deepening fetch
1221 * (see builtin-fetch.c:quickfetch()).
1222 */
1223 heads = xmalloc(nr_refs * sizeof(*heads));
1224 for (rm = refs; rm; rm = rm->next)
1225 heads[nr_heads++] = rm;
1226 }
1227
1228 rc = transport->fetch(transport, nr_heads, heads);
1229
1230 free(heads);
1231 return rc;
1232 }
1233
1234 void transport_unlock_pack(struct transport *transport)
1235 {
1236 if (transport->pack_lockfile) {
1237 unlink_or_warn(transport->pack_lockfile);
1238 free(transport->pack_lockfile);
1239 transport->pack_lockfile = NULL;
1240 }
1241 }
1242
1243 int transport_connect(struct transport *transport, const char *name,
1244 const char *exec, int fd[2])
1245 {
1246 if (transport->connect)
1247 return transport->connect(transport, name, exec, fd);
1248 else
1249 die("Operation not supported by protocol");
1250 }
1251
1252 int transport_disconnect(struct transport *transport)
1253 {
1254 int ret = 0;
1255 if (transport->disconnect)
1256 ret = transport->disconnect(transport);
1257 free(transport);
1258 return ret;
1259 }
1260
1261 /*
1262 * Strip username (and password) from a URL and return
1263 * it in a newly allocated string.
1264 */
1265 char *transport_anonymize_url(const char *url)
1266 {
1267 char *anon_url, *scheme_prefix, *anon_part;
1268 size_t anon_len, prefix_len = 0;
1269
1270 anon_part = strchr(url, '@');
1271 if (is_local(url) || !anon_part)
1272 goto literal_copy;
1273
1274 anon_len = strlen(++anon_part);
1275 scheme_prefix = strstr(url, "://");
1276 if (!scheme_prefix) {
1277 if (!strchr(anon_part, ':'))
1278 /* cannot be "me@there:/path/name" */
1279 goto literal_copy;
1280 } else {
1281 const char *cp;
1282 /* make sure scheme is reasonable */
1283 for (cp = url; cp < scheme_prefix; cp++) {
1284 switch (*cp) {
1285 /* RFC 1738 2.1 */
1286 case '+': case '.': case '-':
1287 break; /* ok */
1288 default:
1289 if (isalnum(*cp))
1290 break;
1291 /* it isn't */
1292 goto literal_copy;
1293 }
1294 }
1295 /* @ past the first slash does not count */
1296 cp = strchr(scheme_prefix + 3, '/');
1297 if (cp && cp < anon_part)
1298 goto literal_copy;
1299 prefix_len = scheme_prefix - url + 3;
1300 }
1301 anon_url = xcalloc(1, 1 + prefix_len + anon_len);
1302 memcpy(anon_url, url, prefix_len);
1303 memcpy(anon_url + prefix_len, anon_part, anon_len);
1304 return anon_url;
1305 literal_copy:
1306 return xstrdup(url);
1307 }
1308
1309 struct alternate_refs_data {
1310 alternate_ref_fn *fn;
1311 void *data;
1312 };
1313
1314 static int refs_from_alternate_cb(struct alternate_object_database *e,
1315 void *data)
1316 {
1317 char *other;
1318 size_t len;
1319 struct remote *remote;
1320 struct transport *transport;
1321 const struct ref *extra;
1322 struct alternate_refs_data *cb = data;
1323
1324 e->name[-1] = '\0';
1325 other = xstrdup(real_path(e->base));
1326 e->name[-1] = '/';
1327 len = strlen(other);
1328
1329 while (other[len-1] == '/')
1330 other[--len] = '\0';
1331 if (len < 8 || memcmp(other + len - 8, "/objects", 8))
1332 return 0;
1333 /* Is this a git repository with refs? */
1334 memcpy(other + len - 8, "/refs", 6);
1335 if (!is_directory(other))
1336 return 0;
1337 other[len - 8] = '\0';
1338 remote = remote_get(other);
1339 transport = transport_get(remote, other);
1340 for (extra = transport_get_remote_refs(transport);
1341 extra;
1342 extra = extra->next)
1343 cb->fn(extra, cb->data);
1344 transport_disconnect(transport);
1345 free(other);
1346 return 0;
1347 }
1348
1349 void for_each_alternate_ref(alternate_ref_fn fn, void *data)
1350 {
1351 struct alternate_refs_data cb;
1352 cb.fn = fn;
1353 cb.data = data;
1354 foreach_alt_odb(refs_from_alternate_cb, &cb);
1355 }
ramsay's fork of git