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