Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 1 | #ifndef REMOTE_H |
| 2 | #define REMOTE_H |
| 3 | |
Elijah Newren | ef3ca95 | 2018-08-15 10:54:05 -0700 | [diff] [blame] | 4 | #include "cache.h" |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 5 | #include "parse-options.h" |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 6 | #include "hashmap.h" |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 7 | #include "refspec.h" |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 8 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 9 | /** |
| 10 | * The API gives access to the configuration related to remotes. It handles |
| 11 | * all three configuration mechanisms historically and currently used by Git, |
| 12 | * and presents the information in a uniform fashion. Note that the code also |
| 13 | * handles plain URLs without any configuration, giving them just the default |
| 14 | * information. |
| 15 | */ |
| 16 | |
Miklos Vajna | 89cf4c7 | 2008-11-10 21:43:00 +0100 | [diff] [blame] | 17 | enum { |
Thomas Gummerer | 674468b | 2016-02-16 10:47:50 +0100 | [diff] [blame] | 18 | REMOTE_UNCONFIGURED = 0, |
Miklos Vajna | 89cf4c7 | 2008-11-10 21:43:00 +0100 | [diff] [blame] | 19 | REMOTE_CONFIG, |
| 20 | REMOTE_REMOTES, |
| 21 | REMOTE_BRANCHES |
| 22 | }; |
| 23 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 24 | struct remote { |
Eric Wong | e2b5038 | 2019-10-06 23:30:43 +0000 | [diff] [blame] | 25 | struct hashmap_entry ent; |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 26 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 27 | /* The user's nickname for the remote */ |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 28 | const char *name; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 29 | |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 30 | int origin, configured_in_repo; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 31 | |
Daniel Barkalow | c578f51 | 2009-11-18 02:42:25 +0100 | [diff] [blame] | 32 | const char *foreign_vcs; |
| 33 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 34 | /* An array of all of the url_nr URLs configured for the remote */ |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 35 | const char **url; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 36 | |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 37 | int url_nr; |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 38 | int url_alloc; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 39 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 40 | /* An array of all of the pushurl_nr push URLs configured for the remote */ |
Michael J Gruber | 2034623 | 2009-06-09 18:01:34 +0200 | [diff] [blame] | 41 | const char **pushurl; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 42 | |
Michael J Gruber | 2034623 | 2009-06-09 18:01:34 +0200 | [diff] [blame] | 43 | int pushurl_nr; |
| 44 | int pushurl_alloc; |
| 45 | |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 46 | struct refspec push; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 47 | |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 48 | struct refspec fetch; |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 49 | |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 50 | /* |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 51 | * The setting for whether to fetch tags (as a separate rule from the |
| 52 | * configured refspecs); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 53 | * -1 to never fetch tags |
| 54 | * 0 to auto-follow tags on heuristic (default) |
| 55 | * 1 to always auto-follow tags |
| 56 | * 2 to always fetch tags |
| 57 | */ |
| 58 | int fetch_tags; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 59 | |
Johannes Schindelin | 211c896 | 2008-02-29 01:45:45 +0000 | [diff] [blame] | 60 | int skip_default_update; |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 61 | int mirror; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 62 | int prune; |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 63 | int prune_tags; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 64 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 65 | /** |
| 66 | * The configured helper programs to run on the remote side, for |
| 67 | * Git-native protocols. |
| 68 | */ |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 69 | const char *receivepack; |
Daniel Barkalow | 0012ba2 | 2007-09-10 23:02:51 -0400 | [diff] [blame] | 70 | const char *uploadpack; |
Sam Vilain | 14c9821 | 2007-12-04 10:48:54 +1300 | [diff] [blame] | 71 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 72 | /* The proxy to use for curl (http, https, ftp, etc.) URLs. */ |
Sam Vilain | 14c9821 | 2007-12-04 10:48:54 +1300 | [diff] [blame] | 73 | char *http_proxy; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 74 | |
| 75 | /* The method used for authenticating against `http_proxy`. */ |
Knut Franke | ef97639 | 2016-01-26 13:02:47 +0000 | [diff] [blame] | 76 | char *http_proxy_authmethod; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 77 | }; |
| 78 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 79 | /** |
| 80 | * struct remotes can be found by name with remote_get(). |
| 81 | * remote_get(NULL) will return the default remote, given the current branch |
| 82 | * and configuration. |
| 83 | */ |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 84 | struct remote *remote_get(const char *name); |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 85 | |
Ramkumar Ramachandra | f24f715 | 2013-04-02 13:10:32 +0530 | [diff] [blame] | 86 | struct remote *pushremote_get(const char *name); |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 87 | int remote_is_configured(struct remote *remote, int in_repo); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 88 | |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 89 | typedef int each_remote_fn(struct remote *remote, void *priv); |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 90 | |
| 91 | /* iterate through struct remotes */ |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 92 | int for_each_remote(each_remote_fn fn, void *priv); |
| 93 | |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 94 | int remote_has_url(struct remote *remote, const char *url); |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 95 | |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 96 | struct ref { |
| 97 | struct ref *next; |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 98 | struct object_id old_oid; |
| 99 | struct object_id new_oid; |
| 100 | struct object_id old_oid_expect; /* used by expect-old */ |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 101 | char *symref; |
| 102 | unsigned int |
| 103 | force:1, |
| 104 | forced_update:1, |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 105 | expect_old_sha1:1, |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 106 | exact_oid:1, |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 107 | deletion:1; |
| 108 | |
| 109 | enum { |
| 110 | REF_NOT_MATCHED = 0, /* initial value */ |
| 111 | REF_MATCHED, |
| 112 | REF_UNADVERTISED_NOT_ALLOWED |
| 113 | } match_status; |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 114 | |
| 115 | /* |
| 116 | * Order is important here, as we write to FETCH_HEAD |
| 117 | * in numeric order. And the default NOT_FOR_MERGE |
| 118 | * should be 0, so that xcalloc'd structures get it |
| 119 | * by default. |
| 120 | */ |
| 121 | enum { |
| 122 | FETCH_HEAD_MERGE = -1, |
| 123 | FETCH_HEAD_NOT_FOR_MERGE = 0, |
| 124 | FETCH_HEAD_IGNORE = 1 |
| 125 | } fetch_head_status; |
| 126 | |
| 127 | enum { |
| 128 | REF_STATUS_NONE = 0, |
| 129 | REF_STATUS_OK, |
| 130 | REF_STATUS_REJECT_NONFASTFORWARD, |
| 131 | REF_STATUS_REJECT_ALREADY_EXISTS, |
| 132 | REF_STATUS_REJECT_NODELETE, |
| 133 | REF_STATUS_REJECT_FETCH_FIRST, |
| 134 | REF_STATUS_REJECT_NEEDS_FORCE, |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 135 | REF_STATUS_REJECT_STALE, |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 136 | REF_STATUS_REJECT_SHALLOW, |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 137 | REF_STATUS_UPTODATE, |
| 138 | REF_STATUS_REMOTE_REJECT, |
Ronnie Sahlberg | 4ff17f1 | 2015-01-07 19:23:22 -0800 | [diff] [blame] | 139 | REF_STATUS_EXPECTING_REPORT, |
| 140 | REF_STATUS_ATOMIC_PUSH_FAILED |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 141 | } status; |
| 142 | char *remote_status; |
| 143 | struct ref *peer_ref; /* when renaming */ |
| 144 | char name[FLEX_ARRAY]; /* more */ |
| 145 | }; |
| 146 | |
| 147 | #define REF_NORMAL (1u << 0) |
| 148 | #define REF_HEADS (1u << 1) |
| 149 | #define REF_TAGS (1u << 2) |
| 150 | |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 151 | struct ref *find_ref_by_name(const struct ref *list, const char *name); |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 152 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 153 | struct ref *alloc_ref(const char *name); |
Jeff King | 59a5775 | 2011-06-07 19:03:03 -0400 | [diff] [blame] | 154 | struct ref *copy_ref(const struct ref *ref); |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 155 | struct ref *copy_ref_list(const struct ref *ref); |
Jeff King | ed81c76 | 2012-05-21 18:19:28 -0400 | [diff] [blame] | 156 | void sort_ref_list(struct ref **, int (*cmp)(const void *, const void *)); |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 157 | int count_refspec_match(const char *, struct ref *refs, struct ref **matched_ref); |
Jeff King | ed81c76 | 2012-05-21 18:19:28 -0400 | [diff] [blame] | 158 | int ref_compare_name(const void *, const void *); |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 159 | |
| 160 | int check_ref_type(const struct ref *ref, int flags); |
| 161 | |
Daniel Barkalow | dfd255d | 2007-07-10 00:47:23 -0400 | [diff] [blame] | 162 | /* |
Jeff King | 1027186 | 2019-04-13 01:54:31 -0400 | [diff] [blame] | 163 | * Free a single ref and its peer, or an entire list of refs and their peers, |
| 164 | * respectively. |
Daniel Barkalow | dfd255d | 2007-07-10 00:47:23 -0400 | [diff] [blame] | 165 | */ |
Jeff King | 1027186 | 2019-04-13 01:54:31 -0400 | [diff] [blame] | 166 | void free_one_ref(struct ref *ref); |
Daniel Barkalow | dfd255d | 2007-07-10 00:47:23 -0400 | [diff] [blame] | 167 | void free_refs(struct ref *ref); |
| 168 | |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 169 | struct oid_array; |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 170 | struct packet_reader; |
Jeff King | 873cd28 | 2020-07-28 16:23:25 -0400 | [diff] [blame] | 171 | struct strvec; |
Brandon Williams | ff47322 | 2018-04-23 15:46:23 -0700 | [diff] [blame] | 172 | struct string_list; |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 173 | struct ref **get_remote_heads(struct packet_reader *reader, |
Denton Liu | ad6dad0 | 2019-04-29 04:28:23 -0400 | [diff] [blame] | 174 | struct ref **list, unsigned int flags, |
| 175 | struct oid_array *extra_have, |
| 176 | struct oid_array *shallow_points); |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 177 | |
Brandon Williams | e52449b | 2018-03-15 10:31:21 -0700 | [diff] [blame] | 178 | /* Used for protocol v2 in order to retrieve refs from a remote */ |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 179 | struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, |
Denton Liu | ad6dad0 | 2019-04-29 04:28:23 -0400 | [diff] [blame] | 180 | struct ref **list, int for_push, |
Jeff King | 873cd28 | 2020-07-28 16:23:25 -0400 | [diff] [blame] | 181 | const struct strvec *ref_prefixes, |
Denton Liu | b0df0c1 | 2020-05-19 06:54:00 -0400 | [diff] [blame] | 182 | const struct string_list *server_options, |
| 183 | int stateless_rpc); |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 184 | |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 185 | int resolve_remote_symref(struct ref *ref, struct ref *list); |
| 186 | |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 187 | /* |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 188 | * Remove and free all but the first of any entries in the input list |
| 189 | * that map the same remote reference to the same local reference. If |
| 190 | * there are two entries that map different remote references to the |
| 191 | * same local reference, emit an error message and die. Return a |
| 192 | * pointer to the head of the resulting list. |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 193 | */ |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 194 | struct ref *ref_remove_duplicates(struct ref *ref_map); |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 195 | |
Brandon Williams | 86baf82 | 2018-05-16 15:58:12 -0700 | [diff] [blame] | 196 | int query_refspecs(struct refspec *rs, struct refspec_item *query); |
Brandon Williams | d000414 | 2018-05-16 15:58:11 -0700 | [diff] [blame] | 197 | char *apply_refspecs(struct refspec *rs, const char *name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 198 | |
Brandon Williams | afb1aed | 2018-05-16 15:58:22 -0700 | [diff] [blame] | 199 | int check_push_refs(struct ref *src, struct refspec *rs); |
Junio C Hamano | 29753cd | 2011-09-09 11:54:58 -0700 | [diff] [blame] | 200 | int match_push_refs(struct ref *src, struct ref **dst, |
Brandon Williams | 5c7ec84 | 2018-05-16 15:58:21 -0700 | [diff] [blame] | 201 | struct refspec *rs, int flags); |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 202 | void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, |
| 203 | int force_update); |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 204 | |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 205 | /* |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 206 | * Given a list of the remote refs and the specification of things to |
| 207 | * fetch, makes a (separate) list of the refs to fetch and the local |
| 208 | * refs to store into. |
| 209 | * |
| 210 | * *tail is the pointer to the tail pointer of the list of results |
| 211 | * beforehand, and will be set to the tail pointer of the list of |
| 212 | * results afterward. |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 213 | * |
| 214 | * missing_ok is usually false, but when we are adding branch.$name.merge |
| 215 | * it is Ok if the branch is not at the remote anymore. |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 216 | */ |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 217 | int get_fetch_map(const struct ref *remote_refs, const struct refspec_item *refspec, |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 218 | struct ref ***tail, int missing_ok); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 219 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 220 | struct ref *get_remote_ref(const struct ref *remote_refs, const char *name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 221 | |
| 222 | /* |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 223 | * For the given remote, reads the refspec's src and sets the other fields. |
| 224 | */ |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 225 | int remote_find_tracking(struct remote *remote, struct refspec_item *refspec); |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 226 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 227 | /** |
| 228 | * struct branch holds the configuration for a branch. It can be looked up with |
| 229 | * branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD. |
| 230 | */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 231 | struct branch { |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 232 | |
| 233 | /* The short name of the branch. */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 234 | const char *name; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 235 | |
| 236 | /* The full path for the branch ref. */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 237 | const char *refname; |
| 238 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 239 | /* The name of the remote listed in the configuration. */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 240 | const char *remote_name; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 241 | |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 242 | const char *pushremote_name; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 243 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 244 | /* An array of the "merge" lines in the configuration. */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 245 | const char **merge_name; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 246 | |
| 247 | /** |
| 248 | * An array of the struct refspecs used for the merge lines. That is, |
| 249 | * merge[i]->dst is a local tracking ref which should be merged into this |
| 250 | * branch by default. |
| 251 | */ |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 252 | struct refspec_item **merge; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 253 | |
| 254 | /* The number of merge configurations */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 255 | int merge_nr; |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 256 | |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 257 | int merge_alloc; |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 258 | |
| 259 | const char *push_tracking_ref; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 260 | }; |
| 261 | |
| 262 | struct branch *branch_get(const char *name); |
Jeff King | f052154 | 2015-05-21 00:45:16 -0400 | [diff] [blame] | 263 | const char *remote_for_branch(struct branch *branch, int *explicit); |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 264 | const char *pushremote_for_branch(struct branch *branch, int *explicit); |
Jeff King | af8ccd8 | 2020-03-03 17:12:22 +0100 | [diff] [blame] | 265 | const char *remote_ref_for_branch(struct branch *branch, int for_push); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 266 | |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 267 | /* returns true if the given branch has merge configuration given. */ |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 268 | int branch_has_merge_config(struct branch *branch); |
Heba Waly | d27eb35 | 2019-11-17 21:04:45 +0000 | [diff] [blame] | 269 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 270 | int branch_merge_matches(struct branch *, int n, const char *); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 271 | |
Jeff King | a9f9f8c | 2015-05-21 00:45:28 -0400 | [diff] [blame] | 272 | /** |
| 273 | * Return the fully-qualified refname of the tracking branch for `branch`. |
| 274 | * I.e., what "branch@{upstream}" would give you. Returns NULL if no |
| 275 | * upstream is defined. |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 276 | * |
| 277 | * If `err` is not NULL and no upstream is defined, a more specific error |
| 278 | * message is recorded there (if the function does not return NULL, then |
| 279 | * `err` is not touched). |
Jeff King | a9f9f8c | 2015-05-21 00:45:28 -0400 | [diff] [blame] | 280 | */ |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 281 | const char *branch_get_upstream(struct branch *branch, struct strbuf *err); |
Jeff King | a9f9f8c | 2015-05-21 00:45:28 -0400 | [diff] [blame] | 282 | |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 283 | /** |
| 284 | * Return the tracking branch that corresponds to the ref we would push to |
| 285 | * given a bare `git push` while `branch` is checked out. |
| 286 | * |
| 287 | * The return value and `err` conventions match those of `branch_get_upstream`. |
| 288 | */ |
| 289 | const char *branch_get_push(struct branch *branch, struct strbuf *err); |
| 290 | |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 291 | /* Flags to match_refs. */ |
| 292 | enum match_refs_flags { |
| 293 | MATCH_REFS_NONE = 0, |
| 294 | MATCH_REFS_ALL = (1 << 0), |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 295 | MATCH_REFS_MIRROR = (1 << 1), |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 296 | MATCH_REFS_PRUNE = (1 << 2), |
| 297 | MATCH_REFS_FOLLOW_TAGS = (1 << 3) |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 298 | }; |
| 299 | |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 300 | /* Flags for --ahead-behind option. */ |
| 301 | enum ahead_behind_flags { |
Jeff Hostetler | fd9b544 | 2018-01-09 18:50:16 +0000 | [diff] [blame] | 302 | AHEAD_BEHIND_UNSPECIFIED = -1, |
| 303 | AHEAD_BEHIND_QUICK = 0, /* just eq/neq reporting */ |
| 304 | AHEAD_BEHIND_FULL = 1, /* traditional a/b reporting */ |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 305 | }; |
| 306 | |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 307 | /* Reporting of tracking info */ |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 308 | int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, |
Damien Robert | c646d09 | 2019-04-16 14:16:46 +0200 | [diff] [blame] | 309 | const char **upstream_name, int for_push, |
| 310 | enum ahead_behind_flags abf); |
Jeff Hostetler | f39a757 | 2018-01-09 18:50:18 +0000 | [diff] [blame] | 311 | int format_tracking_info(struct branch *branch, struct strbuf *sb, |
| 312 | enum ahead_behind_flags abf); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 313 | |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 314 | struct ref *get_local_heads(void); |
Jay Soffian | 6cb4e6c | 2009-02-25 03:32:14 -0500 | [diff] [blame] | 315 | /* |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 316 | * Find refs from a list which are likely to be pointed to by the given HEAD |
| 317 | * ref. If 'all' is false, returns the most likely ref; otherwise, returns a |
| 318 | * list of all candidate refs. If no match is found (or 'head' is NULL), |
| 319 | * returns NULL. All returns are newly allocated and should be freed. |
Jay Soffian | 6cb4e6c | 2009-02-25 03:32:14 -0500 | [diff] [blame] | 320 | */ |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 321 | struct ref *guess_remote_head(const struct ref *head, |
| 322 | const struct ref *refs, |
| 323 | int all); |
| 324 | |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 325 | /* Return refs which no longer exist on remote */ |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 326 | struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map); |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 327 | |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 328 | /* |
| 329 | * Compare-and-swap |
| 330 | */ |
| 331 | #define CAS_OPT_NAME "force-with-lease" |
| 332 | |
| 333 | struct push_cas_option { |
| 334 | unsigned use_tracking_for_rest:1; |
| 335 | struct push_cas { |
brian m. carlson | b8566f8 | 2017-07-13 23:49:21 +0000 | [diff] [blame] | 336 | struct object_id expect; |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 337 | unsigned use_tracking:1; |
| 338 | char *refname; |
| 339 | } *entry; |
| 340 | int nr; |
| 341 | int alloc; |
| 342 | }; |
| 343 | |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 344 | int parseopt_push_cas_option(const struct option *, const char *arg, int unset); |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 345 | |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 346 | int is_empty_cas(const struct push_cas_option *); |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 347 | void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *); |
| 348 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 349 | #endif |