2007-09-11 07:03:04 +04:00
|
|
|
#ifndef TRANSPORT_H
|
|
|
|
#define TRANSPORT_H
|
|
|
|
|
|
|
|
#include "cache.h"
|
2013-07-09 00:56:53 +04:00
|
|
|
#include "run-command.h"
|
2007-09-11 07:03:04 +04:00
|
|
|
#include "remote.h"
|
|
|
|
|
2009-12-09 18:26:30 +03:00
|
|
|
struct git_transport_options {
|
|
|
|
unsigned thin : 1;
|
|
|
|
unsigned keep : 1;
|
|
|
|
unsigned followtags : 1;
|
2013-05-26 05:16:17 +04:00
|
|
|
unsigned check_self_contained_and_connected : 1;
|
|
|
|
unsigned self_contained_and_connected : 1;
|
2013-12-05 17:02:42 +04:00
|
|
|
unsigned update_shallow : 1;
|
2009-12-09 18:26:30 +03:00
|
|
|
int depth;
|
|
|
|
const char *uploadpack;
|
|
|
|
const char *receivepack;
|
2013-07-09 22:01:06 +04:00
|
|
|
struct push_cas_option *cas;
|
2009-12-09 18:26:30 +03:00
|
|
|
};
|
|
|
|
|
2007-09-11 07:03:04 +04:00
|
|
|
struct transport {
|
|
|
|
struct remote *remote;
|
|
|
|
const char *url;
|
|
|
|
void *data;
|
2007-10-30 04:05:40 +03:00
|
|
|
const struct ref *remote_refs;
|
2007-09-11 07:03:04 +04:00
|
|
|
|
2010-02-16 10:18:21 +03:00
|
|
|
/**
|
|
|
|
* Indicates whether we already called get_refs_list(); set by
|
|
|
|
* transport.c::transport_get_remote_refs().
|
|
|
|
*/
|
|
|
|
unsigned got_remote_refs : 1;
|
|
|
|
|
fetch: work around "transport-take-over" hack
A Git-aware "connect" transport allows the "transport_take_over" to
redirect generic transport requests like fetch(), push_refs() and
get_refs_list() to the native Git transport handling methods. The
take-over process replaces transport->data with a fake data that
these method implementations understand.
While this hack works OK for a single request, it breaks when the
transport needs to make more than one requests. transport->data
that used to hold necessary information for the specific helper to
work correctly is destroyed during the take-over process.
One codepath that this matters is "git fetch" in auto-follow mode;
when it does not get all the tags that ought to point at the history
it got (which can be determined by looking at the peeled tags in the
initial advertisement) from the primary transfer, it internally
makes a second request to complete the fetch. Because "take-over"
hack has already destroyed the data necessary to talk to the
transport helper by the time this happens, the second request cannot
make a request to the helper to make another connection to fetch
these additional tags.
Mark such a transport as "cannot_reuse", and use a separate
transport to perform the backfill fetch in order to work around
this breakage.
Note that this problem does not manifest itself when running t5802,
because our upload-pack gives you all the necessary auto-followed
tags during the primary transfer. You would need to step through
"git fetch" in a debugger, stop immediately after the primary
transfer finishes and writes these auto-followed tags, remove the
tag references and repack/prune the repository to convince the
"find-non-local-tags" procedure that the primary transfer failed to
give us all the necessary tags, and then let it continue, in order
to trigger the bug in the secondary transfer this patch fixes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-08 02:47:18 +04:00
|
|
|
/*
|
|
|
|
* Transports that call take-over destroys the data specific to
|
|
|
|
* the transport type while doing so, and cannot be reused.
|
|
|
|
*/
|
|
|
|
unsigned cannot_reuse : 1;
|
|
|
|
|
2013-12-05 17:02:39 +04:00
|
|
|
/*
|
|
|
|
* A hint from caller that it will be performing a clone, not
|
|
|
|
* normal fetch. IOW the repository is guaranteed empty.
|
|
|
|
*/
|
|
|
|
unsigned cloning : 1;
|
|
|
|
|
2007-09-11 07:03:04 +04:00
|
|
|
/**
|
|
|
|
* Returns 0 if successful, positive if the option is not
|
|
|
|
* recognized or is inapplicable, and negative if the option
|
|
|
|
* is applicable but the value is invalid.
|
|
|
|
**/
|
|
|
|
int (*set_option)(struct transport *connection, const char *name,
|
|
|
|
const char *value);
|
|
|
|
|
2009-11-18 04:42:24 +03:00
|
|
|
/**
|
|
|
|
* Returns a list of the remote side's refs. In order to allow
|
|
|
|
* the transport to try to share connections, for_push is a
|
|
|
|
* hint as to whether the ultimate operation is a push or a fetch.
|
|
|
|
*
|
|
|
|
* If the transport is able to determine the remote hash for
|
|
|
|
* the ref without a huge amount of effort, it should store it
|
|
|
|
* in the ref's old_sha1 field; otherwise it should be all 0.
|
|
|
|
**/
|
2009-03-09 04:06:07 +03:00
|
|
|
struct ref *(*get_refs_list)(struct transport *transport, int for_push);
|
2009-11-18 04:42:24 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Fetch the objects for the given refs. Note that this gets
|
|
|
|
* an array, and should ignore the list structure.
|
|
|
|
*
|
|
|
|
* If the transport did not get hashes for refs in
|
|
|
|
* get_refs_list(), it should set the old_sha1 fields in the
|
|
|
|
* provided refs now.
|
|
|
|
**/
|
|
|
|
int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Push the objects and refs. Send the necessary objects, and
|
|
|
|
* then, for any refs where peer_ref is set and
|
|
|
|
* peer_ref->new_sha1 is different from old_sha1, tell the
|
|
|
|
* remote side to update each ref in the list from old_sha1 to
|
|
|
|
* peer_ref->new_sha1.
|
|
|
|
*
|
|
|
|
* Where possible, set the status for each ref appropriately.
|
|
|
|
*
|
|
|
|
* The transport must modify new_sha1 in the ref to the new
|
|
|
|
* value if the remote accepted the change. Note that this
|
|
|
|
* could be a different value from peer_ref->new_sha1 if the
|
|
|
|
* process involved generating new commits.
|
|
|
|
**/
|
2009-03-09 04:06:07 +03:00
|
|
|
int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
|
2007-09-11 07:03:04 +04:00
|
|
|
int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
|
2009-12-09 18:26:33 +03:00
|
|
|
int (*connect)(struct transport *connection, const char *name,
|
|
|
|
const char *executable, int fd[2]);
|
2007-09-11 07:03:04 +04:00
|
|
|
|
2009-11-18 04:42:24 +03:00
|
|
|
/** get_refs_list(), fetch(), and push_refs() can keep
|
2013-04-12 02:36:10 +04:00
|
|
|
* resources (such as a connection) reserved for further
|
2009-11-18 04:42:24 +03:00
|
|
|
* use. disconnect() releases these resources.
|
|
|
|
**/
|
2007-09-11 07:03:04 +04:00
|
|
|
int (*disconnect)(struct transport *connection);
|
2007-09-19 08:49:31 +04:00
|
|
|
char *pack_lockfile;
|
2009-10-31 03:47:27 +03:00
|
|
|
signed verbose : 3;
|
2010-02-24 15:50:26 +03:00
|
|
|
/**
|
|
|
|
* Transports should not set this directly, and should use this
|
|
|
|
* value without having to check isatty(2), -q/--quiet
|
|
|
|
* (transport->verbose < 0), etc. - checking has already been done
|
|
|
|
* in transport_set_verbosity().
|
|
|
|
**/
|
2008-10-09 03:40:32 +04:00
|
|
|
unsigned progress : 1;
|
2009-12-09 18:26:30 +03:00
|
|
|
/*
|
|
|
|
* If transport is at least potentially smart, this points to
|
|
|
|
* git_transport_options structure to use in case transport
|
|
|
|
* actually turns out to be smart.
|
|
|
|
*/
|
|
|
|
struct git_transport_options *smart_options;
|
2007-09-11 07:03:04 +04:00
|
|
|
};
|
|
|
|
|
2007-09-19 08:49:31 +04:00
|
|
|
#define TRANSPORT_PUSH_ALL 1
|
|
|
|
#define TRANSPORT_PUSH_FORCE 2
|
2007-10-16 08:15:25 +04:00
|
|
|
#define TRANSPORT_PUSH_DRY_RUN 4
|
2007-11-10 02:32:25 +03:00
|
|
|
#define TRANSPORT_PUSH_MIRROR 8
|
2010-02-24 15:50:29 +03:00
|
|
|
#define TRANSPORT_PUSH_PORCELAIN 16
|
|
|
|
#define TRANSPORT_PUSH_SET_UPSTREAM 32
|
2011-08-20 02:08:47 +04:00
|
|
|
#define TRANSPORT_RECURSE_SUBMODULES_CHECK 64
|
2012-02-23 02:43:41 +04:00
|
|
|
#define TRANSPORT_PUSH_PRUNE 128
|
2012-03-29 11:21:24 +04:00
|
|
|
#define TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND 256
|
2013-01-13 09:17:03 +04:00
|
|
|
#define TRANSPORT_PUSH_NO_HOOK 512
|
2013-03-05 00:09:50 +04:00
|
|
|
#define TRANSPORT_PUSH_FOLLOW_TAGS 1024
|
2007-09-19 08:49:31 +04:00
|
|
|
|
2010-02-17 02:42:52 +03:00
|
|
|
#define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
|
2012-09-04 14:39:35 +04:00
|
|
|
#define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)
|
2007-09-19 08:49:31 +04:00
|
|
|
|
2007-09-11 07:03:04 +04:00
|
|
|
/* Returns a transport suitable for the url */
|
2007-09-15 11:23:14 +04:00
|
|
|
struct transport *transport_get(struct remote *, const char *);
|
2007-09-11 07:03:04 +04:00
|
|
|
|
|
|
|
/* Transport options which apply to git:// and scp-style URLs */
|
|
|
|
|
2007-09-11 07:03:11 +04:00
|
|
|
/* The program to use on the remote side to send a pack */
|
|
|
|
#define TRANS_OPT_UPLOADPACK "uploadpack"
|
|
|
|
|
2007-09-11 07:03:04 +04:00
|
|
|
/* The program to use on the remote side to receive a pack */
|
|
|
|
#define TRANS_OPT_RECEIVEPACK "receivepack"
|
|
|
|
|
|
|
|
/* Transfer the data as a thin pack if not null */
|
|
|
|
#define TRANS_OPT_THIN "thin"
|
|
|
|
|
2013-07-09 22:01:06 +04:00
|
|
|
/* Check the current value of the remote ref */
|
|
|
|
#define TRANS_OPT_CAS "cas"
|
|
|
|
|
2007-09-11 07:03:11 +04:00
|
|
|
/* Keep the pack that was transferred if not null */
|
|
|
|
#define TRANS_OPT_KEEP "keep"
|
|
|
|
|
|
|
|
/* Limit the depth of the fetch if not null */
|
|
|
|
#define TRANS_OPT_DEPTH "depth"
|
|
|
|
|
2008-03-04 06:27:40 +03:00
|
|
|
/* Aggressively fetch annotated tags if possible */
|
|
|
|
#define TRANS_OPT_FOLLOWTAGS "followtags"
|
|
|
|
|
2013-12-05 17:02:42 +04:00
|
|
|
/* Accept refs that may update .git/shallow without --depth */
|
|
|
|
#define TRANS_OPT_UPDATE_SHALLOW "updateshallow"
|
|
|
|
|
2007-09-11 07:03:04 +04:00
|
|
|
/**
|
|
|
|
* Returns 0 if the option was used, non-zero otherwise. Prints a
|
|
|
|
* message to stderr if the option is not used.
|
|
|
|
**/
|
|
|
|
int transport_set_option(struct transport *transport, const char *name,
|
|
|
|
const char *value);
|
2010-02-24 15:50:26 +03:00
|
|
|
void transport_set_verbosity(struct transport *transport, int verbosity,
|
|
|
|
int force_progress);
|
2007-09-11 07:03:04 +04:00
|
|
|
|
2012-11-30 05:41:33 +04:00
|
|
|
#define REJECT_NON_FF_HEAD 0x01
|
|
|
|
#define REJECT_NON_FF_OTHER 0x02
|
2012-11-30 05:41:34 +04:00
|
|
|
#define REJECT_ALREADY_EXISTS 0x04
|
push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
When we push to update an existing ref, if:
* the object at the tip of the remote is not a commit; or
* the object we are pushing is not a commit,
it won't be correct to suggest to fetch, integrate and push again,
as the old and new objects will not "merge". We should explain that
the push must be forced when there is a non-committish object is
involved in such a case.
If we do not have the current object at the tip of the remote, we do
not even know that object, when fetched, is something that can be
merged. In such a case, suggesting to pull first just like
non-fast-forward case may not be technically correct, but in
practice, most such failures are seen when you try to push your work
to a branch without knowing that somebody else already pushed to
update the same branch since you forked, so "pull first" would work
as a suggestion most of the time. And if the object at the tip is
not a commit, "pull first" will fail, without making any permanent
damage. As a side effect, it also makes the error message the user
will get during the next "push" attempt easier to understand, now
the user is aware that a non-commit object is involved.
In these cases, the current code already rejects such a push on the
client end, but we used the same error and advice messages as the
ones used when rejecting a non-fast-forward push, i.e. pull from
there and integrate before pushing again.
Introduce new rejection reasons and reword the messages
appropriately.
[jc: with help by Peff on message details]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-24 01:55:30 +04:00
|
|
|
#define REJECT_FETCH_FIRST 0x08
|
|
|
|
#define REJECT_NEEDS_FORCE 0x10
|
2012-11-30 05:41:33 +04:00
|
|
|
|
2007-09-11 07:03:04 +04:00
|
|
|
int transport_push(struct transport *connection,
|
2009-08-08 11:51:08 +04:00
|
|
|
int refspec_nr, const char **refspec, int flags,
|
2012-11-30 05:41:33 +04:00
|
|
|
unsigned int * reject_reasons);
|
2007-09-11 07:03:04 +04:00
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
const struct ref *transport_get_remote_refs(struct transport *transport);
|
2007-09-11 07:03:11 +04:00
|
|
|
|
2009-11-18 04:42:24 +03:00
|
|
|
int transport_fetch_refs(struct transport *transport, struct ref *refs);
|
2007-09-14 11:31:23 +04:00
|
|
|
void transport_unlock_pack(struct transport *transport);
|
2007-09-11 07:03:04 +04:00
|
|
|
int transport_disconnect(struct transport *transport);
|
2009-04-17 12:20:11 +04:00
|
|
|
char *transport_anonymize_url(const char *url);
|
2009-12-09 18:26:31 +03:00
|
|
|
void transport_take_over(struct transport *transport,
|
|
|
|
struct child_process *child);
|
2007-09-11 07:03:04 +04:00
|
|
|
|
2009-12-09 18:26:33 +03:00
|
|
|
int transport_connect(struct transport *transport, const char *name,
|
|
|
|
const char *exec, int fd[2]);
|
|
|
|
|
2009-08-05 09:01:53 +04:00
|
|
|
/* Transport methods defined outside transport.c */
|
2009-09-04 06:13:49 +04:00
|
|
|
int transport_helper_init(struct transport *transport, const char *name);
|
2010-10-12 20:39:41 +04:00
|
|
|
int bidirectional_transfer_loop(int input, int output);
|
2009-08-05 09:01:53 +04:00
|
|
|
|
2013-06-18 21:44:58 +04:00
|
|
|
/* common methods used by transport.c and builtin/send-pack.c */
|
2010-02-17 02:42:52 +03:00
|
|
|
void transport_verify_remote_names(int nr_heads, const char **heads);
|
|
|
|
|
|
|
|
void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose);
|
|
|
|
|
|
|
|
int transport_refs_pushed(struct ref *ref);
|
|
|
|
|
|
|
|
void transport_print_push_status(const char *dest, struct ref *refs,
|
2012-11-30 05:41:33 +04:00
|
|
|
int verbose, int porcelain, unsigned int *reject_reasons);
|
2010-02-17 02:42:52 +03:00
|
|
|
|
2011-03-11 22:32:53 +03:00
|
|
|
typedef void alternate_ref_fn(const struct ref *, void *);
|
refactor refs_from_alternate_cb to allow passing extra data
The foreach_alt_odb function triggers a callback for each
alternate object db we have, with room for a single void
pointer as data. Currently, we always call refs_from_alternate_cb
as the callback function, and then pass another callback (to
receive each ref individually) as the void pointer.
This has two problems:
1. C technically forbids stuffing a function pointer into
a "void *". In practice, this probably doesn't matter
on any architectures git runs on, but it never hurts to
follow the letter of the law.
2. There is no room for an extra data pointer. Indeed, the
alternate_ref_fn that refs_from_alternate_cb calls
takes a void* for data, but we always pass it NULL.
Instead, let's properly stuff our function pointer into a
data struct, which also leaves room for an extra
caller-supplied data pointer. And to keep things simple for
existing callers, let's make a for_each_alternate_ref
function that takes care of creating the extra struct.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-20 01:33:17 +04:00
|
|
|
extern void for_each_alternate_ref(alternate_ref_fn, void *);
|
2007-09-11 07:03:04 +04:00
|
|
|
#endif
|