4 #include "run-command.h"
9 #include "string-list.h"
10 #include "thread-utils.h"
15 #include "transport-internal.h"
22 struct child_process
*helper
;
31 stateless_connect
: 1,
33 check_connectivity
: 1,
34 no_disconnect_req
: 1,
35 no_private_update
: 1,
39 * As an optimization, the transport code may invoke fetch before
40 * get_refs_list. If this happens, and if the transport helper doesn't
41 * support connect or stateless_connect, we need to invoke
42 * get_refs_list ourselves if we haven't already done so. Keep track of
43 * whether we have invoked get_refs_list.
45 unsigned get_refs_list_called
: 1;
49 /* These go from remote name (as in "list") to private name */
51 /* Transport options for fetch-pack/send-pack (should one of
54 struct git_transport_options transport_options
;
57 static void sendline(struct helper_data
*helper
, struct strbuf
*buffer
)
60 fprintf(stderr
, "Debug: Remote helper: -> %s", buffer
->buf
);
61 if (write_in_full(helper
->helper
->in
, buffer
->buf
, buffer
->len
) < 0)
62 die_errno(_("full write to remote helper failed"));
65 static int recvline_fh(FILE *helper
, struct strbuf
*buffer
)
69 fprintf(stderr
, "Debug: Remote helper: Waiting...\n");
70 if (strbuf_getline(buffer
, helper
) == EOF
) {
72 fprintf(stderr
, "Debug: Remote helper quit.\n");
77 fprintf(stderr
, "Debug: Remote helper: <- %s\n", buffer
->buf
);
81 static int recvline(struct helper_data
*helper
, struct strbuf
*buffer
)
83 return recvline_fh(helper
->out
, buffer
);
86 static void write_constant(int fd
, const char *str
)
89 fprintf(stderr
, "Debug: Remote helper: -> %s", str
);
90 if (write_in_full(fd
, str
, strlen(str
)) < 0)
91 die_errno(_("full write to remote helper failed"));
94 static const char *remove_ext_force(const char *url
)
97 const char *colon
= strchr(url
, ':');
98 if (colon
&& colon
[1] == ':')
104 static void do_take_over(struct transport
*transport
)
106 struct helper_data
*data
;
107 data
= (struct helper_data
*)transport
->data
;
108 transport_take_over(transport
, data
->helper
);
113 static void standard_options(struct transport
*t
);
115 static struct child_process
*get_helper(struct transport
*transport
)
117 struct helper_data
*data
= transport
->data
;
118 struct strbuf buf
= STRBUF_INIT
;
119 struct child_process
*helper
;
126 helper
= xmalloc(sizeof(*helper
));
127 child_process_init(helper
);
131 strvec_pushf(&helper
->args
, "remote-%s", data
->name
);
132 strvec_push(&helper
->args
, transport
->remote
->name
);
133 strvec_push(&helper
->args
, remove_ext_force(transport
->url
));
135 helper
->silent_exec_failure
= 1;
138 strvec_pushf(&helper
->env_array
, "%s=%s",
139 GIT_DIR_ENVIRONMENT
, get_git_dir());
141 helper
->trace2_child_class
= helper
->args
.v
[0]; /* "remote-<name>" */
143 code
= start_command(helper
);
144 if (code
< 0 && errno
== ENOENT
)
145 die(_("unable to find remote helper for '%s'"), data
->name
);
149 data
->helper
= helper
;
150 data
->no_disconnect_req
= 0;
151 refspec_init(&data
->rs
, REFSPEC_FETCH
);
154 * Open the output as FILE* so strbuf_getline_*() family of
155 * functions can be used.
156 * Do this with duped fd because fclose() will close the fd,
157 * and stuff like taking over will require the fd to remain.
159 duped
= dup(helper
->out
);
161 die_errno(_("can't dup helper output fd"));
162 data
->out
= xfdopen(duped
, "r");
164 write_constant(helper
->in
, "capabilities\n");
167 const char *capname
, *arg
;
169 if (recvline(data
, &buf
))
175 if (*buf
.buf
== '*') {
176 capname
= buf
.buf
+ 1;
182 fprintf(stderr
, "Debug: Got cap %s\n", capname
);
183 if (!strcmp(capname
, "fetch"))
185 else if (!strcmp(capname
, "option"))
187 else if (!strcmp(capname
, "push"))
189 else if (!strcmp(capname
, "import"))
191 else if (!strcmp(capname
, "bidi-import"))
192 data
->bidi_import
= 1;
193 else if (!strcmp(capname
, "export"))
195 else if (!strcmp(capname
, "check-connectivity"))
196 data
->check_connectivity
= 1;
197 else if (skip_prefix(capname
, "refspec ", &arg
)) {
198 refspec_append(&data
->rs
, arg
);
199 } else if (!strcmp(capname
, "connect")) {
201 } else if (!strcmp(capname
, "stateless-connect")) {
202 data
->stateless_connect
= 1;
203 } else if (!strcmp(capname
, "signed-tags")) {
204 data
->signed_tags
= 1;
205 } else if (skip_prefix(capname
, "export-marks ", &arg
)) {
206 data
->export_marks
= xstrdup(arg
);
207 } else if (skip_prefix(capname
, "import-marks ", &arg
)) {
208 data
->import_marks
= xstrdup(arg
);
209 } else if (starts_with(capname
, "no-private-update")) {
210 data
->no_private_update
= 1;
211 } else if (starts_with(capname
, "object-format")) {
212 data
->object_format
= 1;
213 } else if (mandatory
) {
214 die(_("unknown mandatory capability %s; this remote "
215 "helper probably needs newer version of Git"),
219 if (!data
->rs
.nr
&& (data
->import
|| data
->bidi_import
|| data
->export
)) {
220 warning(_("this remote helper should implement refspec capability"));
222 strbuf_release(&buf
);
224 fprintf(stderr
, "Debug: Capabilities complete.\n");
225 standard_options(transport
);
229 static int disconnect_helper(struct transport
*transport
)
231 struct helper_data
*data
= transport
->data
;
236 fprintf(stderr
, "Debug: Disconnecting.\n");
237 if (!data
->no_disconnect_req
) {
239 * Ignore write errors; there's nothing we can do,
240 * since we're about to close the pipe anyway. And the
241 * most likely error is EPIPE due to the helper dying
242 * to report an error itself.
244 sigchain_push(SIGPIPE
, SIG_IGN
);
245 xwrite(data
->helper
->in
, "\n", 1);
246 sigchain_pop(SIGPIPE
);
248 close(data
->helper
->in
);
249 close(data
->helper
->out
);
251 res
= finish_command(data
->helper
);
252 FREE_AND_NULL(data
->helper
);
257 static const char *unsupported_options
[] = {
258 TRANS_OPT_UPLOADPACK
,
259 TRANS_OPT_RECEIVEPACK
,
264 static const char *boolean_options
[] = {
267 TRANS_OPT_FOLLOWTAGS
,
268 TRANS_OPT_DEEPEN_RELATIVE
271 static int strbuf_set_helper_option(struct helper_data
*data
,
277 if (recvline(data
, buf
))
280 if (!strcmp(buf
->buf
, "ok"))
282 else if (starts_with(buf
->buf
, "error"))
284 else if (!strcmp(buf
->buf
, "unsupported"))
287 warning(_("%s unexpectedly said: '%s'"), data
->name
, buf
->buf
);
293 static int string_list_set_helper_option(struct helper_data
*data
,
295 struct string_list
*list
)
297 struct strbuf buf
= STRBUF_INIT
;
300 for (i
= 0; i
< list
->nr
; i
++) {
301 strbuf_addf(&buf
, "option %s ", name
);
302 quote_c_style(list
->items
[i
].string
, &buf
, NULL
, 0);
303 strbuf_addch(&buf
, '\n');
305 if ((ret
= strbuf_set_helper_option(data
, &buf
)))
309 strbuf_release(&buf
);
313 static int set_helper_option(struct transport
*transport
,
314 const char *name
, const char *value
)
316 struct helper_data
*data
= transport
->data
;
317 struct strbuf buf
= STRBUF_INIT
;
318 int i
, ret
, is_bool
= 0;
320 get_helper(transport
);
325 if (!strcmp(name
, "deepen-not"))
326 return string_list_set_helper_option(data
, name
,
327 (struct string_list
*)value
);
329 for (i
= 0; i
< ARRAY_SIZE(unsupported_options
); i
++) {
330 if (!strcmp(name
, unsupported_options
[i
]))
334 for (i
= 0; i
< ARRAY_SIZE(boolean_options
); i
++) {
335 if (!strcmp(name
, boolean_options
[i
])) {
341 strbuf_addf(&buf
, "option %s ", name
);
343 strbuf_addstr(&buf
, value
? "true" : "false");
345 quote_c_style(value
, &buf
, NULL
, 0);
346 strbuf_addch(&buf
, '\n');
348 ret
= strbuf_set_helper_option(data
, &buf
);
349 strbuf_release(&buf
);
353 static void standard_options(struct transport
*t
)
358 set_helper_option(t
, "progress", t
->progress
? "true" : "false");
360 xsnprintf(buf
, sizeof(buf
), "%d", v
+ 1);
361 set_helper_option(t
, "verbosity", buf
);
364 case TRANSPORT_FAMILY_ALL
:
366 * this is already the default,
367 * do not break old remote helpers by setting "all" here
370 case TRANSPORT_FAMILY_IPV4
:
371 set_helper_option(t
, "family", "ipv4");
373 case TRANSPORT_FAMILY_IPV6
:
374 set_helper_option(t
, "family", "ipv6");
379 static int release_helper(struct transport
*transport
)
382 struct helper_data
*data
= transport
->data
;
383 refspec_clear(&data
->rs
);
384 res
= disconnect_helper(transport
);
385 free(transport
->data
);
389 static int fetch_with_fetch(struct transport
*transport
,
390 int nr_heads
, struct ref
**to_fetch
)
392 struct helper_data
*data
= transport
->data
;
394 struct strbuf buf
= STRBUF_INIT
;
396 for (i
= 0; i
< nr_heads
; i
++) {
397 const struct ref
*posn
= to_fetch
[i
];
398 if (posn
->status
& REF_STATUS_UPTODATE
)
401 strbuf_addf(&buf
, "fetch %s %s\n",
402 oid_to_hex(&posn
->old_oid
),
403 posn
->symref
? posn
->symref
: posn
->name
);
406 strbuf_addch(&buf
, '\n');
407 sendline(data
, &buf
);
412 if (recvline(data
, &buf
))
415 if (skip_prefix(buf
.buf
, "lock ", &name
)) {
416 if (transport
->pack_lockfiles
.nr
)
417 warning(_("%s also locked %s"), data
->name
, name
);
419 string_list_append(&transport
->pack_lockfiles
,
422 else if (data
->check_connectivity
&&
423 data
->transport_options
.check_self_contained_and_connected
&&
424 !strcmp(buf
.buf
, "connectivity-ok"))
425 data
->transport_options
.self_contained_and_connected
= 1;
429 warning(_("%s unexpectedly said: '%s'"), data
->name
, buf
.buf
);
431 strbuf_release(&buf
);
435 static int get_importer(struct transport
*transport
, struct child_process
*fastimport
)
437 struct child_process
*helper
= get_helper(transport
);
438 struct helper_data
*data
= transport
->data
;
439 int cat_blob_fd
, code
;
440 child_process_init(fastimport
);
441 fastimport
->in
= xdup(helper
->out
);
442 strvec_push(&fastimport
->args
, "fast-import");
443 strvec_push(&fastimport
->args
, "--allow-unsafe-features");
444 strvec_push(&fastimport
->args
, debug
? "--stats" : "--quiet");
446 if (data
->bidi_import
) {
447 cat_blob_fd
= xdup(helper
->in
);
448 strvec_pushf(&fastimport
->args
, "--cat-blob-fd=%d", cat_blob_fd
);
450 fastimport
->git_cmd
= 1;
452 code
= start_command(fastimport
);
456 static int get_exporter(struct transport
*transport
,
457 struct child_process
*fastexport
,
458 struct string_list
*revlist_args
)
460 struct helper_data
*data
= transport
->data
;
461 struct child_process
*helper
= get_helper(transport
);
464 child_process_init(fastexport
);
466 /* we need to duplicate helper->in because we want to use it after
467 * fastexport is done with it. */
468 fastexport
->out
= dup(helper
->in
);
469 strvec_push(&fastexport
->args
, "fast-export");
470 strvec_push(&fastexport
->args
, "--use-done-feature");
471 strvec_push(&fastexport
->args
, data
->signed_tags
?
472 "--signed-tags=verbatim" : "--signed-tags=warn-strip");
473 if (data
->export_marks
)
474 strvec_pushf(&fastexport
->args
, "--export-marks=%s.tmp", data
->export_marks
);
475 if (data
->import_marks
)
476 strvec_pushf(&fastexport
->args
, "--import-marks=%s", data
->import_marks
);
478 for (i
= 0; i
< revlist_args
->nr
; i
++)
479 strvec_push(&fastexport
->args
, revlist_args
->items
[i
].string
);
481 fastexport
->git_cmd
= 1;
482 return start_command(fastexport
);
485 static int fetch_with_import(struct transport
*transport
,
486 int nr_heads
, struct ref
**to_fetch
)
488 struct child_process fastimport
;
489 struct helper_data
*data
= transport
->data
;
492 struct strbuf buf
= STRBUF_INIT
;
494 get_helper(transport
);
496 if (get_importer(transport
, &fastimport
))
497 die(_("couldn't run fast-import"));
499 for (i
= 0; i
< nr_heads
; i
++) {
501 if (posn
->status
& REF_STATUS_UPTODATE
)
504 strbuf_addf(&buf
, "import %s\n",
505 posn
->symref
? posn
->symref
: posn
->name
);
506 sendline(data
, &buf
);
510 write_constant(data
->helper
->in
, "\n");
512 * remote-helpers that advertise the bidi-import capability are required to
513 * buffer the complete batch of import commands until this newline before
514 * sending data to fast-import.
515 * These helpers read back data from fast-import on their stdin, which could
516 * be mixed with import commands, otherwise.
519 if (finish_command(&fastimport
))
520 die(_("error while running fast-import"));
523 * The fast-import stream of a remote helper that advertises
524 * the "refspec" capability writes to the refs named after the
525 * right hand side of the first refspec matching each ref we
528 * (If no "refspec" capability was specified, for historical
529 * reasons we default to the equivalent of *:*.)
531 * Store the result in to_fetch[i].old_sha1. Callers such
532 * as "git fetch" can use the value to write feedback to the
533 * terminal, populate FETCH_HEAD, and determine what new value
534 * should be written to peer_ref if the update is a
535 * fast-forward or this is a forced update.
537 for (i
= 0; i
< nr_heads
; i
++) {
538 char *private, *name
;
540 if (posn
->status
& REF_STATUS_UPTODATE
)
542 name
= posn
->symref
? posn
->symref
: posn
->name
;
544 private = apply_refspecs(&data
->rs
, name
);
546 private = xstrdup(name
);
548 if (read_ref(private, &posn
->old_oid
) < 0)
549 die(_("could not read ref %s"), private);
553 strbuf_release(&buf
);
557 static int run_connect(struct transport
*transport
, struct strbuf
*cmdbuf
)
559 struct helper_data
*data
= transport
->data
;
563 struct child_process
*helper
;
565 helper
= get_helper(transport
);
568 * Yes, dup the pipe another time, as we need unbuffered version
569 * of input pipe as FILE*. fclose() closes the underlying fd and
570 * stream buffering only can be changed before first I/O operation
573 duped
= dup(helper
->out
);
575 die_errno(_("can't dup helper output fd"));
576 input
= xfdopen(duped
, "r");
577 setvbuf(input
, NULL
, _IONBF
, 0);
579 sendline(data
, cmdbuf
);
580 if (recvline_fh(input
, cmdbuf
))
583 if (!strcmp(cmdbuf
->buf
, "")) {
584 data
->no_disconnect_req
= 1;
586 fprintf(stderr
, "Debug: Smart transport connection "
589 } else if (!strcmp(cmdbuf
->buf
, "fallback")) {
591 fprintf(stderr
, "Debug: Falling back to dumb "
594 die(_("unknown response to connect: %s"),
602 static int process_connect_service(struct transport
*transport
,
603 const char *name
, const char *exec
)
605 struct helper_data
*data
= transport
->data
;
606 struct strbuf cmdbuf
= STRBUF_INIT
;
610 * Handle --upload-pack and friends. This is fire and forget...
611 * just warn if it fails.
613 if (strcmp(name
, exec
)) {
614 int r
= set_helper_option(transport
, "servpath", exec
);
616 warning(_("setting remote service path not supported by protocol"));
618 warning(_("invalid remote service path"));
622 strbuf_addf(&cmdbuf
, "connect %s\n", name
);
623 ret
= run_connect(transport
, &cmdbuf
);
624 } else if (data
->stateless_connect
&&
625 (get_protocol_version_config() == protocol_v2
) &&
626 !strcmp("git-upload-pack", name
)) {
627 strbuf_addf(&cmdbuf
, "stateless-connect %s\n", name
);
628 ret
= run_connect(transport
, &cmdbuf
);
630 transport
->stateless_rpc
= 1;
633 strbuf_release(&cmdbuf
);
637 static int process_connect(struct transport
*transport
,
640 struct helper_data
*data
= transport
->data
;
644 name
= for_push
? "git-receive-pack" : "git-upload-pack";
646 exec
= data
->transport_options
.receivepack
;
648 exec
= data
->transport_options
.uploadpack
;
650 return process_connect_service(transport
, name
, exec
);
653 static int connect_helper(struct transport
*transport
, const char *name
,
654 const char *exec
, int fd
[2])
656 struct helper_data
*data
= transport
->data
;
658 /* Get_helper so connect is inited. */
659 get_helper(transport
);
661 die(_("operation not supported by protocol"));
663 if (!process_connect_service(transport
, name
, exec
))
664 die(_("can't connect to subservice %s"), name
);
666 fd
[0] = data
->helper
->out
;
667 fd
[1] = data
->helper
->in
;
671 static struct ref
*get_refs_list_using_list(struct transport
*transport
,
674 static int fetch(struct transport
*transport
,
675 int nr_heads
, struct ref
**to_fetch
)
677 struct helper_data
*data
= transport
->data
;
680 get_helper(transport
);
682 if (process_connect(transport
, 0)) {
683 do_take_over(transport
);
684 return transport
->vtable
->fetch(transport
, nr_heads
, to_fetch
);
688 * If we reach here, then the server, the client, and/or the transport
689 * helper does not support protocol v2. --negotiate-only requires
692 if (data
->transport_options
.acked_commits
) {
693 warning(_("--negotiate-only requires protocol v2"));
697 if (!data
->get_refs_list_called
)
698 get_refs_list_using_list(transport
, 0);
701 for (i
= 0; i
< nr_heads
; i
++)
702 if (!(to_fetch
[i
]->status
& REF_STATUS_UPTODATE
))
708 if (data
->check_connectivity
&&
709 data
->transport_options
.check_self_contained_and_connected
)
710 set_helper_option(transport
, "check-connectivity", "true");
712 if (transport
->cloning
)
713 set_helper_option(transport
, "cloning", "true");
715 if (data
->transport_options
.update_shallow
)
716 set_helper_option(transport
, "update-shallow", "true");
718 if (data
->transport_options
.filter_options
.choice
) {
719 const char *spec
= expand_list_objects_filter_spec(
720 &data
->transport_options
.filter_options
);
721 set_helper_option(transport
, "filter", spec
);
724 if (data
->transport_options
.negotiation_tips
)
725 warning("Ignoring --negotiation-tip because the protocol does not support it.");
728 return fetch_with_fetch(transport
, nr_heads
, to_fetch
);
731 return fetch_with_import(transport
, nr_heads
, to_fetch
);
736 struct push_update_ref_state
{
738 struct ref_push_report
*report
;
742 static int push_update_ref_status(struct strbuf
*buf
,
743 struct push_update_ref_state
*state
,
744 struct ref
*remote_refs
)
747 int status
, forced
= 0;
749 if (starts_with(buf
->buf
, "option ")) {
750 struct object_id old_oid
, new_oid
;
751 const char *key
, *val
;
754 if (!state
->hint
|| !(state
->report
|| state
->new_report
))
755 die(_("'option' without a matching 'ok/error' directive"));
756 if (state
->new_report
) {
757 if (!state
->hint
->report
) {
758 CALLOC_ARRAY(state
->hint
->report
, 1);
759 state
->report
= state
->hint
->report
;
761 state
->report
= state
->hint
->report
;
762 while (state
->report
->next
)
763 state
->report
= state
->report
->next
;
764 CALLOC_ARRAY(state
->report
->next
, 1);
765 state
->report
= state
->report
->next
;
767 state
->new_report
= 0;
770 p
= strchr(key
, ' ');
774 if (!strcmp(key
, "refname"))
775 state
->report
->ref_name
= xstrdup_or_null(val
);
776 else if (!strcmp(key
, "old-oid") && val
&&
777 !parse_oid_hex(val
, &old_oid
, &val
))
778 state
->report
->old_oid
= oiddup(&old_oid
);
779 else if (!strcmp(key
, "new-oid") && val
&&
780 !parse_oid_hex(val
, &new_oid
, &val
))
781 state
->report
->new_oid
= oiddup(&new_oid
);
782 else if (!strcmp(key
, "forced-update"))
783 state
->report
->forced_update
= 1;
784 /* Not update remote namespace again. */
788 state
->report
= NULL
;
789 state
->new_report
= 0;
791 if (starts_with(buf
->buf
, "ok ")) {
792 status
= REF_STATUS_OK
;
793 refname
= buf
->buf
+ 3;
794 } else if (starts_with(buf
->buf
, "error ")) {
795 status
= REF_STATUS_REMOTE_REJECT
;
796 refname
= buf
->buf
+ 6;
798 die(_("expected ok/error, helper said '%s'"), buf
->buf
);
800 msg
= strchr(refname
, ' ');
802 struct strbuf msg_buf
= STRBUF_INIT
;
806 if (!unquote_c_style(&msg_buf
, msg
, &end
))
807 msg
= strbuf_detach(&msg_buf
, NULL
);
810 strbuf_release(&msg_buf
);
812 if (!strcmp(msg
, "no match")) {
813 status
= REF_STATUS_NONE
;
816 else if (!strcmp(msg
, "up to date")) {
817 status
= REF_STATUS_UPTODATE
;
820 else if (!strcmp(msg
, "non-fast forward")) {
821 status
= REF_STATUS_REJECT_NONFASTFORWARD
;
824 else if (!strcmp(msg
, "already exists")) {
825 status
= REF_STATUS_REJECT_ALREADY_EXISTS
;
828 else if (!strcmp(msg
, "fetch first")) {
829 status
= REF_STATUS_REJECT_FETCH_FIRST
;
832 else if (!strcmp(msg
, "needs force")) {
833 status
= REF_STATUS_REJECT_NEEDS_FORCE
;
836 else if (!strcmp(msg
, "stale info")) {
837 status
= REF_STATUS_REJECT_STALE
;
840 else if (!strcmp(msg
, "remote ref updated since checkout")) {
841 status
= REF_STATUS_REJECT_REMOTE_UPDATED
;
844 else if (!strcmp(msg
, "forced update")) {
851 state
->hint
= find_ref_by_name(state
->hint
, refname
);
853 state
->hint
= find_ref_by_name(remote_refs
, refname
);
855 warning(_("helper reported unexpected status of %s"), refname
);
859 if (state
->hint
->status
!= REF_STATUS_NONE
) {
861 * Earlier, the ref was marked not to be pushed, so ignore the ref
862 * status reported by the remote helper if the latter is 'no match'.
864 if (status
== REF_STATUS_NONE
)
868 if (status
== REF_STATUS_OK
)
869 state
->new_report
= 1;
870 state
->hint
->status
= status
;
871 state
->hint
->forced_update
|= forced
;
872 state
->hint
->remote_status
= msg
;
873 return !(status
== REF_STATUS_OK
);
876 static int push_update_refs_status(struct helper_data
*data
,
877 struct ref
*remote_refs
,
881 struct ref_push_report
*report
;
882 struct strbuf buf
= STRBUF_INIT
;
883 struct push_update_ref_state state
= { remote_refs
, NULL
, 0 };
886 if (recvline(data
, &buf
)) {
887 strbuf_release(&buf
);
892 push_update_ref_status(&buf
, &state
, remote_refs
);
894 strbuf_release(&buf
);
896 if (flags
& TRANSPORT_PUSH_DRY_RUN
|| !data
->rs
.nr
|| data
->no_private_update
)
899 /* propagate back the update to the remote namespace */
900 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
903 if (ref
->status
!= REF_STATUS_OK
)
907 private = apply_refspecs(&data
->rs
, ref
->name
);
910 update_ref("update by helper", private, &(ref
->new_oid
),
914 for (report
= ref
->report
; report
; report
= report
->next
) {
915 private = apply_refspecs(&data
->rs
,
921 update_ref("update by helper", private,
933 static void set_common_push_options(struct transport
*transport
,
934 const char *name
, int flags
)
936 if (flags
& TRANSPORT_PUSH_DRY_RUN
) {
937 if (set_helper_option(transport
, "dry-run", "true") != 0)
938 die(_("helper %s does not support dry-run"), name
);
939 } else if (flags
& TRANSPORT_PUSH_CERT_ALWAYS
) {
940 if (set_helper_option(transport
, TRANS_OPT_PUSH_CERT
, "true") != 0)
941 die(_("helper %s does not support --signed"), name
);
942 } else if (flags
& TRANSPORT_PUSH_CERT_IF_ASKED
) {
943 if (set_helper_option(transport
, TRANS_OPT_PUSH_CERT
, "if-asked") != 0)
944 die(_("helper %s does not support --signed=if-asked"), name
);
947 if (flags
& TRANSPORT_PUSH_ATOMIC
)
948 if (set_helper_option(transport
, TRANS_OPT_ATOMIC
, "true") != 0)
949 die(_("helper %s does not support --atomic"), name
);
951 if (flags
& TRANSPORT_PUSH_FORCE_IF_INCLUDES
)
952 if (set_helper_option(transport
, TRANS_OPT_FORCE_IF_INCLUDES
, "true") != 0)
953 die(_("helper %s does not support --%s"),
954 name
, TRANS_OPT_FORCE_IF_INCLUDES
);
956 if (flags
& TRANSPORT_PUSH_OPTIONS
) {
957 struct string_list_item
*item
;
958 for_each_string_list_item(item
, transport
->push_options
)
959 if (set_helper_option(transport
, "push-option", item
->string
) != 0)
960 die(_("helper %s does not support 'push-option'"), name
);
964 static int push_refs_with_push(struct transport
*transport
,
965 struct ref
*remote_refs
, int flags
)
967 int force_all
= flags
& TRANSPORT_PUSH_FORCE
;
968 int mirror
= flags
& TRANSPORT_PUSH_MIRROR
;
969 int atomic
= flags
& TRANSPORT_PUSH_ATOMIC
;
970 struct helper_data
*data
= transport
->data
;
971 struct strbuf buf
= STRBUF_INIT
;
973 struct string_list cas_options
= STRING_LIST_INIT_DUP
;
974 struct string_list_item
*cas_option
;
976 get_helper(transport
);
980 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
981 if (!ref
->peer_ref
&& !mirror
)
984 /* Check for statuses set by set_ref_status_for_push() */
985 switch (ref
->status
) {
986 case REF_STATUS_REJECT_NONFASTFORWARD
:
987 case REF_STATUS_REJECT_STALE
:
988 case REF_STATUS_REJECT_ALREADY_EXISTS
:
989 case REF_STATUS_REJECT_REMOTE_UPDATED
:
991 reject_atomic_push(remote_refs
, mirror
);
992 string_list_clear(&cas_options
, 0);
996 case REF_STATUS_UPTODATE
:
1005 strbuf_addstr(&buf
, "push ");
1006 if (!ref
->deletion
) {
1008 strbuf_addch(&buf
, '+');
1010 strbuf_addstr(&buf
, ref
->peer_ref
->name
);
1012 strbuf_addstr(&buf
, oid_to_hex(&ref
->new_oid
));
1014 strbuf_addch(&buf
, ':');
1015 strbuf_addstr(&buf
, ref
->name
);
1016 strbuf_addch(&buf
, '\n');
1019 * The "--force-with-lease" options without explicit
1020 * values to expect have already been expanded into
1021 * the ref->old_oid_expect[] field; we can ignore
1022 * transport->smart_options->cas altogether and instead
1023 * can enumerate them from the refs.
1025 if (ref
->expect_old_sha1
) {
1026 struct strbuf cas
= STRBUF_INIT
;
1027 strbuf_addf(&cas
, "%s:%s",
1028 ref
->name
, oid_to_hex(&ref
->old_oid_expect
));
1029 string_list_append_nodup(&cas_options
,
1030 strbuf_detach(&cas
, NULL
));
1034 string_list_clear(&cas_options
, 0);
1038 for_each_string_list_item(cas_option
, &cas_options
)
1039 set_helper_option(transport
, "cas", cas_option
->string
);
1040 set_common_push_options(transport
, data
->name
, flags
);
1042 strbuf_addch(&buf
, '\n');
1043 sendline(data
, &buf
);
1044 strbuf_release(&buf
);
1045 string_list_clear(&cas_options
, 0);
1047 return push_update_refs_status(data
, remote_refs
, flags
);
1050 static int push_refs_with_export(struct transport
*transport
,
1051 struct ref
*remote_refs
, int flags
)
1054 struct child_process
*helper
, exporter
;
1055 struct helper_data
*data
= transport
->data
;
1056 struct string_list revlist_args
= STRING_LIST_INIT_DUP
;
1057 struct strbuf buf
= STRBUF_INIT
;
1060 die(_("remote-helper doesn't support push; refspec needed"));
1062 set_common_push_options(transport
, data
->name
, flags
);
1063 if (flags
& TRANSPORT_PUSH_FORCE
) {
1064 if (set_helper_option(transport
, "force", "true") != 0)
1065 warning(_("helper %s does not support 'force'"), data
->name
);
1068 helper
= get_helper(transport
);
1070 write_constant(helper
->in
, "export\n");
1072 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1074 struct object_id oid
;
1076 private = apply_refspecs(&data
->rs
, ref
->name
);
1077 if (private && !get_oid(private, &oid
)) {
1078 strbuf_addf(&buf
, "^%s", private);
1079 string_list_append_nodup(&revlist_args
,
1080 strbuf_detach(&buf
, NULL
));
1081 oidcpy(&ref
->old_oid
, &oid
);
1085 if (ref
->peer_ref
) {
1086 if (strcmp(ref
->name
, ref
->peer_ref
->name
)) {
1087 if (!ref
->deletion
) {
1091 /* Follow symbolic refs (mainly for HEAD). */
1092 name
= resolve_ref_unsafe(ref
->peer_ref
->name
,
1093 RESOLVE_REF_READING
,
1095 if (!name
|| !(flag
& REF_ISSYMREF
))
1096 name
= ref
->peer_ref
->name
;
1098 strbuf_addf(&buf
, "%s:%s", name
, ref
->name
);
1100 strbuf_addf(&buf
, ":%s", ref
->name
);
1102 string_list_append(&revlist_args
, "--refspec");
1103 string_list_append(&revlist_args
, buf
.buf
);
1104 strbuf_release(&buf
);
1107 string_list_append(&revlist_args
, ref
->peer_ref
->name
);
1111 if (get_exporter(transport
, &exporter
, &revlist_args
))
1112 die(_("couldn't run fast-export"));
1114 string_list_clear(&revlist_args
, 1);
1116 if (finish_command(&exporter
))
1117 die(_("error while running fast-export"));
1118 if (push_update_refs_status(data
, remote_refs
, flags
))
1121 if (data
->export_marks
) {
1122 strbuf_addf(&buf
, "%s.tmp", data
->export_marks
);
1123 rename(buf
.buf
, data
->export_marks
);
1124 strbuf_release(&buf
);
1130 static int push_refs(struct transport
*transport
,
1131 struct ref
*remote_refs
, int flags
)
1133 struct helper_data
*data
= transport
->data
;
1135 if (process_connect(transport
, 1)) {
1136 do_take_over(transport
);
1137 return transport
->vtable
->push_refs(transport
, remote_refs
, flags
);
1142 _("No refs in common and none specified; doing nothing.\n"
1143 "Perhaps you should specify a branch.\n"));
1148 return push_refs_with_push(transport
, remote_refs
, flags
);
1151 return push_refs_with_export(transport
, remote_refs
, flags
);
1157 static int has_attribute(const char *attrs
, const char *attr
)
1165 const char *space
= strchrnul(attrs
, ' ');
1166 if (len
== space
- attrs
&& !strncmp(attrs
, attr
, len
))
1174 static struct ref
*get_refs_list(struct transport
*transport
, int for_push
,
1175 struct transport_ls_refs_options
*transport_options
)
1177 get_helper(transport
);
1179 if (process_connect(transport
, for_push
)) {
1180 do_take_over(transport
);
1181 return transport
->vtable
->get_refs_list(transport
, for_push
,
1185 return get_refs_list_using_list(transport
, for_push
);
1188 static struct ref
*get_refs_list_using_list(struct transport
*transport
,
1191 struct helper_data
*data
= transport
->data
;
1192 struct child_process
*helper
;
1193 struct ref
*ret
= NULL
;
1194 struct ref
**tail
= &ret
;
1196 struct strbuf buf
= STRBUF_INIT
;
1198 data
->get_refs_list_called
= 1;
1199 helper
= get_helper(transport
);
1201 if (data
->object_format
) {
1202 write_str_in_full(helper
->in
, "option object-format\n");
1203 if (recvline(data
, &buf
) || strcmp(buf
.buf
, "ok"))
1207 if (data
->push
&& for_push
)
1208 write_str_in_full(helper
->in
, "list for-push\n");
1210 write_str_in_full(helper
->in
, "list\n");
1214 if (recvline(data
, &buf
))
1219 else if (buf
.buf
[0] == ':') {
1221 if (skip_prefix(buf
.buf
, ":object-format ", &value
)) {
1222 int algo
= hash_algo_by_name(value
);
1223 if (algo
== GIT_HASH_UNKNOWN
)
1224 die(_("unsupported object format '%s'"),
1226 transport
->hash_algo
= &hash_algos
[algo
];
1231 eov
= strchr(buf
.buf
, ' ');
1233 die(_("malformed response in ref list: %s"), buf
.buf
);
1234 eon
= strchr(eov
+ 1, ' ');
1238 *tail
= alloc_ref(eov
+ 1);
1239 if (buf
.buf
[0] == '@')
1240 (*tail
)->symref
= xstrdup(buf
.buf
+ 1);
1241 else if (buf
.buf
[0] != '?')
1242 get_oid_hex_algop(buf
.buf
, &(*tail
)->old_oid
, transport
->hash_algo
);
1244 if (has_attribute(eon
+ 1, "unchanged")) {
1245 (*tail
)->status
|= REF_STATUS_UPTODATE
;
1246 if (read_ref((*tail
)->name
, &(*tail
)->old_oid
) < 0)
1247 die(_("could not read ref %s"),
1251 tail
= &((*tail
)->next
);
1254 fprintf(stderr
, "Debug: Read ref listing.\n");
1255 strbuf_release(&buf
);
1257 for (posn
= ret
; posn
; posn
= posn
->next
)
1258 resolve_remote_symref(posn
, ret
);
1263 static struct transport_vtable vtable
= {
1272 int transport_helper_init(struct transport
*transport
, const char *name
)
1274 struct helper_data
*data
= xcalloc(1, sizeof(*data
));
1277 transport_check_allowed(name
);
1279 if (getenv("GIT_TRANSPORT_HELPER_DEBUG"))
1282 transport
->data
= data
;
1283 transport
->vtable
= &vtable
;
1284 transport
->smart_options
= &(data
->transport_options
);
1289 * Linux pipes can buffer 65536 bytes at once (and most platforms can
1290 * buffer less), so attempt reads and writes with up to that size.
1292 #define BUFFERSIZE 65536
1293 /* This should be enough to hold debugging message. */
1294 #define PBUFFERSIZE 8192
1296 /* Print bidirectional transfer loop debug message. */
1297 __attribute__((format (printf
, 1, 2)))
1298 static void transfer_debug(const char *fmt
, ...)
1301 * NEEDSWORK: This function is sometimes used from multiple threads, and
1302 * we end up using debug_enabled racily. That "should not matter" since
1303 * we always write the same value, but it's still wrong. This function
1304 * is listed in .tsan-suppressions for the time being.
1308 char msgbuf
[PBUFFERSIZE
];
1309 static int debug_enabled
= -1;
1311 if (debug_enabled
< 0)
1312 debug_enabled
= getenv("GIT_TRANSLOOP_DEBUG") ? 1 : 0;
1316 va_start(args
, fmt
);
1317 vsnprintf(msgbuf
, PBUFFERSIZE
, fmt
, args
);
1319 fprintf(stderr
, "Transfer loop debugging: %s\n", msgbuf
);
1322 /* Stream state: More data may be coming in this direction. */
1323 #define SSTATE_TRANSFERRING 0
1325 * Stream state: No more data coming in this direction, flushing rest of
1328 #define SSTATE_FLUSHING 1
1329 /* Stream state: Transfer in this direction finished. */
1330 #define SSTATE_FINISHED 2
1332 #define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)
1333 #define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)
1334 #define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)
1336 /* Unidirectional transfer. */
1337 struct unidirectional_transfer
{
1342 /* Is source socket? */
1344 /* Is destination socket? */
1346 /* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */
1349 char buf
[BUFFERSIZE
];
1352 /* Name of source. */
1353 const char *src_name
;
1354 /* Name of destination. */
1355 const char *dest_name
;
1358 /* Closes the target (for writing) if transfer has finished. */
1359 static void udt_close_if_finished(struct unidirectional_transfer
*t
)
1361 if (STATE_NEEDS_CLOSING(t
->state
) && !t
->bufuse
) {
1362 t
->state
= SSTATE_FINISHED
;
1363 if (t
->dest_is_sock
)
1364 shutdown(t
->dest
, SHUT_WR
);
1367 transfer_debug("Closed %s.", t
->dest_name
);
1372 * Tries to read data from source into buffer. If buffer is full,
1373 * no data is read. Returns 0 on success, -1 on error.
1375 static int udt_do_read(struct unidirectional_transfer
*t
)
1379 if (t
->bufuse
== BUFFERSIZE
)
1380 return 0; /* No space for more. */
1382 transfer_debug("%s is readable", t
->src_name
);
1383 bytes
= xread(t
->src
, t
->buf
+ t
->bufuse
, BUFFERSIZE
- t
->bufuse
);
1385 error_errno(_("read(%s) failed"), t
->src_name
);
1387 } else if (bytes
== 0) {
1388 transfer_debug("%s EOF (with %i bytes in buffer)",
1389 t
->src_name
, (int)t
->bufuse
);
1390 t
->state
= SSTATE_FLUSHING
;
1391 } else if (bytes
> 0) {
1393 transfer_debug("Read %i bytes from %s (buffer now at %i)",
1394 (int)bytes
, t
->src_name
, (int)t
->bufuse
);
1399 /* Tries to write data from buffer into destination. If buffer is empty,
1400 * no data is written. Returns 0 on success, -1 on error.
1402 static int udt_do_write(struct unidirectional_transfer
*t
)
1407 return 0; /* Nothing to write. */
1409 transfer_debug("%s is writable", t
->dest_name
);
1410 bytes
= xwrite(t
->dest
, t
->buf
, t
->bufuse
);
1412 error_errno(_("write(%s) failed"), t
->dest_name
);
1414 } else if (bytes
> 0) {
1417 memmove(t
->buf
, t
->buf
+ bytes
, t
->bufuse
);
1418 transfer_debug("Wrote %i bytes to %s (buffer now at %i)",
1419 (int)bytes
, t
->dest_name
, (int)t
->bufuse
);
1425 /* State of bidirectional transfer loop. */
1426 struct bidirectional_transfer_state
{
1427 /* Direction from program to git. */
1428 struct unidirectional_transfer ptg
;
1429 /* Direction from git to program. */
1430 struct unidirectional_transfer gtp
;
1433 static void *udt_copy_task_routine(void *udt
)
1435 struct unidirectional_transfer
*t
= (struct unidirectional_transfer
*)udt
;
1436 while (t
->state
!= SSTATE_FINISHED
) {
1437 if (STATE_NEEDS_READING(t
->state
))
1440 if (STATE_NEEDS_WRITING(t
->state
))
1441 if (udt_do_write(t
))
1443 if (STATE_NEEDS_CLOSING(t
->state
))
1444 udt_close_if_finished(t
);
1446 return udt
; /* Just some non-NULL value. */
1452 * Join thread, with appropriate errors on failure. Name is name for the
1453 * thread (for error messages). Returns 0 on success, 1 on failure.
1455 static int tloop_join(pthread_t thread
, const char *name
)
1459 err
= pthread_join(thread
, &tret
);
1461 error(_("%s thread failed"), name
);
1465 error(_("%s thread failed to join: %s"), name
, strerror(err
));
1472 * Spawn the transfer tasks and then wait for them. Returns 0 on success,
1475 static int tloop_spawnwait_tasks(struct bidirectional_transfer_state
*s
)
1477 pthread_t gtp_thread
;
1478 pthread_t ptg_thread
;
1481 err
= pthread_create(>p_thread
, NULL
, udt_copy_task_routine
,
1484 die(_("can't start thread for copying data: %s"), strerror(err
));
1485 err
= pthread_create(&ptg_thread
, NULL
, udt_copy_task_routine
,
1488 die(_("can't start thread for copying data: %s"), strerror(err
));
1490 ret
|= tloop_join(gtp_thread
, "Git to program copy");
1491 ret
|= tloop_join(ptg_thread
, "Program to git copy");
1496 /* Close the source and target (for writing) for transfer. */
1497 static void udt_kill_transfer(struct unidirectional_transfer
*t
)
1499 t
->state
= SSTATE_FINISHED
;
1501 * Socket read end left open isn't a disaster if nobody
1502 * attempts to read from it (mingw compat headers do not
1505 * We can't fully close the socket since otherwise gtp
1506 * task would first close the socket it sends data to
1507 * while closing the ptg file descriptors.
1509 if (!t
->src_is_sock
)
1511 if (t
->dest_is_sock
)
1512 shutdown(t
->dest
, SHUT_WR
);
1518 * Join process, with appropriate errors on failure. Name is name for the
1519 * process (for error messages). Returns 0 on success, 1 on failure.
1521 static int tloop_join(pid_t pid
, const char *name
)
1524 if (waitpid(pid
, &tret
, 0) < 0) {
1525 error_errno(_("%s process failed to wait"), name
);
1528 if (!WIFEXITED(tret
) || WEXITSTATUS(tret
)) {
1529 error(_("%s process failed"), name
);
1536 * Spawn the transfer tasks and then wait for them. Returns 0 on success,
1539 static int tloop_spawnwait_tasks(struct bidirectional_transfer_state
*s
)
1544 /* Fork thread #1: git to program. */
1547 die_errno(_("can't start thread for copying data"));
1548 else if (pid1
== 0) {
1549 udt_kill_transfer(&s
->ptg
);
1550 exit(udt_copy_task_routine(&s
->gtp
) ? 0 : 1);
1553 /* Fork thread #2: program to git. */
1556 die_errno(_("can't start thread for copying data"));
1557 else if (pid2
== 0) {
1558 udt_kill_transfer(&s
->gtp
);
1559 exit(udt_copy_task_routine(&s
->ptg
) ? 0 : 1);
1563 * Close both streams in parent as to not interfere with
1564 * end of file detection and wait for both tasks to finish.
1566 udt_kill_transfer(&s
->gtp
);
1567 udt_kill_transfer(&s
->ptg
);
1568 ret
|= tloop_join(pid1
, "Git to program copy");
1569 ret
|= tloop_join(pid2
, "Program to git copy");
1575 * Copies data from stdin to output and from input to stdout simultaneously.
1576 * Additionally filtering through given filter. If filter is NULL, uses
1579 int bidirectional_transfer_loop(int input
, int output
)
1581 struct bidirectional_transfer_state state
;
1583 /* Fill the state fields. */
1584 state
.ptg
.src
= input
;
1586 state
.ptg
.src_is_sock
= (input
== output
);
1587 state
.ptg
.dest_is_sock
= 0;
1588 state
.ptg
.state
= SSTATE_TRANSFERRING
;
1589 state
.ptg
.bufuse
= 0;
1590 state
.ptg
.src_name
= "remote input";
1591 state
.ptg
.dest_name
= "stdout";
1594 state
.gtp
.dest
= output
;
1595 state
.gtp
.src_is_sock
= 0;
1596 state
.gtp
.dest_is_sock
= (input
== output
);
1597 state
.gtp
.state
= SSTATE_TRANSFERRING
;
1598 state
.gtp
.bufuse
= 0;
1599 state
.gtp
.src_name
= "stdin";
1600 state
.gtp
.dest_name
= "remote output";
1602 return tloop_spawnwait_tasks(&state
);
1605 void reject_atomic_push(struct ref
*remote_refs
, int mirror_mode
)
1609 /* Mark other refs as failed */
1610 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1611 if (!ref
->peer_ref
&& !mirror_mode
)
1614 switch (ref
->status
) {
1615 case REF_STATUS_NONE
:
1617 case REF_STATUS_EXPECTING_REPORT
:
1618 ref
->status
= REF_STATUS_ATOMIC_PUSH_FAILED
;
1621 break; /* do nothing */