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