merge-recursive: check for directory level conflicts
[git/git-svn.git] / remote.h
blobf09c01969d6b0d701140ceb9cb2e8f9e68533c96
1 #ifndef REMOTE_H
2 #define REMOTE_H
4 #include "parse-options.h"
5 #include "hashmap.h"
7 enum {
8 REMOTE_UNCONFIGURED = 0,
9 REMOTE_CONFIG,
10 REMOTE_REMOTES,
11 REMOTE_BRANCHES
14 struct remote {
15 struct hashmap_entry ent; /* must be first */
17 const char *name;
18 int origin, configured_in_repo;
20 const char *foreign_vcs;
22 const char **url;
23 int url_nr;
24 int url_alloc;
26 const char **pushurl;
27 int pushurl_nr;
28 int pushurl_alloc;
30 const char **push_refspec;
31 struct refspec *push;
32 int push_refspec_nr;
33 int push_refspec_alloc;
35 const char **fetch_refspec;
36 struct refspec *fetch;
37 int fetch_refspec_nr;
38 int fetch_refspec_alloc;
41 * -1 to never fetch tags
42 * 0 to auto-follow tags on heuristic (default)
43 * 1 to always auto-follow tags
44 * 2 to always fetch tags
46 int fetch_tags;
47 int skip_default_update;
48 int mirror;
49 int prune;
50 int prune_tags;
52 const char *receivepack;
53 const char *uploadpack;
56 * for curl remotes only
58 char *http_proxy;
59 char *http_proxy_authmethod;
62 struct remote *remote_get(const char *name);
63 struct remote *pushremote_get(const char *name);
64 int remote_is_configured(struct remote *remote, int in_repo);
66 typedef int each_remote_fn(struct remote *remote, void *priv);
67 int for_each_remote(each_remote_fn fn, void *priv);
69 int remote_has_url(struct remote *remote, const char *url);
71 struct refspec {
72 unsigned force : 1;
73 unsigned pattern : 1;
74 unsigned matching : 1;
75 unsigned exact_sha1 : 1;
77 char *src;
78 char *dst;
81 extern const struct refspec *tag_refspec;
83 struct ref {
84 struct ref *next;
85 struct object_id old_oid;
86 struct object_id new_oid;
87 struct object_id old_oid_expect; /* used by expect-old */
88 char *symref;
89 unsigned int
90 force:1,
91 forced_update:1,
92 expect_old_sha1:1,
93 deletion:1;
95 enum {
96 REF_NOT_MATCHED = 0, /* initial value */
97 REF_MATCHED,
98 REF_UNADVERTISED_NOT_ALLOWED
99 } match_status;
102 * Order is important here, as we write to FETCH_HEAD
103 * in numeric order. And the default NOT_FOR_MERGE
104 * should be 0, so that xcalloc'd structures get it
105 * by default.
107 enum {
108 FETCH_HEAD_MERGE = -1,
109 FETCH_HEAD_NOT_FOR_MERGE = 0,
110 FETCH_HEAD_IGNORE = 1
111 } fetch_head_status;
113 enum {
114 REF_STATUS_NONE = 0,
115 REF_STATUS_OK,
116 REF_STATUS_REJECT_NONFASTFORWARD,
117 REF_STATUS_REJECT_ALREADY_EXISTS,
118 REF_STATUS_REJECT_NODELETE,
119 REF_STATUS_REJECT_FETCH_FIRST,
120 REF_STATUS_REJECT_NEEDS_FORCE,
121 REF_STATUS_REJECT_STALE,
122 REF_STATUS_REJECT_SHALLOW,
123 REF_STATUS_UPTODATE,
124 REF_STATUS_REMOTE_REJECT,
125 REF_STATUS_EXPECTING_REPORT,
126 REF_STATUS_ATOMIC_PUSH_FAILED
127 } status;
128 char *remote_status;
129 struct ref *peer_ref; /* when renaming */
130 char name[FLEX_ARRAY]; /* more */
133 #define REF_NORMAL (1u << 0)
134 #define REF_HEADS (1u << 1)
135 #define REF_TAGS (1u << 2)
137 extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
139 struct ref *alloc_ref(const char *name);
140 struct ref *copy_ref(const struct ref *ref);
141 struct ref *copy_ref_list(const struct ref *ref);
142 void sort_ref_list(struct ref **, int (*cmp)(const void *, const void *));
143 extern int count_refspec_match(const char *, struct ref *refs, struct ref **matched_ref);
144 int ref_compare_name(const void *, const void *);
146 int check_ref_type(const struct ref *ref, int flags);
149 * Frees the entire list and peers of elements.
151 void free_refs(struct ref *ref);
153 struct oid_array;
154 extern struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
155 struct ref **list, unsigned int flags,
156 struct oid_array *extra_have,
157 struct oid_array *shallow);
159 int resolve_remote_symref(struct ref *ref, struct ref *list);
160 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);
163 * Remove and free all but the first of any entries in the input list
164 * that map the same remote reference to the same local reference. If
165 * there are two entries that map different remote references to the
166 * same local reference, emit an error message and die. Return a
167 * pointer to the head of the resulting list.
169 struct ref *ref_remove_duplicates(struct ref *ref_map);
171 int valid_fetch_refspec(const char *refspec);
172 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec);
173 extern struct refspec *parse_push_refspec(int nr_refspec, const char **refspec);
175 void free_refspec(int nr_refspec, struct refspec *refspec);
177 extern int query_refspecs(struct refspec *specs, int nr, struct refspec *query);
178 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
179 const char *name);
181 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec);
182 int match_push_refs(struct ref *src, struct ref **dst,
183 int nr_refspec, const char **refspec, int all);
184 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
185 int force_update);
188 * Given a list of the remote refs and the specification of things to
189 * fetch, makes a (separate) list of the refs to fetch and the local
190 * refs to store into.
192 * *tail is the pointer to the tail pointer of the list of results
193 * beforehand, and will be set to the tail pointer of the list of
194 * results afterward.
196 * missing_ok is usually false, but when we are adding branch.$name.merge
197 * it is Ok if the branch is not at the remote anymore.
199 int get_fetch_map(const struct ref *remote_refs, const struct refspec *refspec,
200 struct ref ***tail, int missing_ok);
202 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name);
205 * For the given remote, reads the refspec's src and sets the other fields.
207 int remote_find_tracking(struct remote *remote, struct refspec *refspec);
209 struct branch {
210 const char *name;
211 const char *refname;
213 const char *remote_name;
214 const char *pushremote_name;
216 const char **merge_name;
217 struct refspec **merge;
218 int merge_nr;
219 int merge_alloc;
221 const char *push_tracking_ref;
224 struct branch *branch_get(const char *name);
225 const char *remote_for_branch(struct branch *branch, int *explicit);
226 const char *pushremote_for_branch(struct branch *branch, int *explicit);
227 const char *remote_ref_for_branch(struct branch *branch, int for_push,
228 int *explicit);
230 int branch_has_merge_config(struct branch *branch);
231 int branch_merge_matches(struct branch *, int n, const char *);
234 * Return the fully-qualified refname of the tracking branch for `branch`.
235 * I.e., what "branch@{upstream}" would give you. Returns NULL if no
236 * upstream is defined.
238 * If `err` is not NULL and no upstream is defined, a more specific error
239 * message is recorded there (if the function does not return NULL, then
240 * `err` is not touched).
242 const char *branch_get_upstream(struct branch *branch, struct strbuf *err);
245 * Return the tracking branch that corresponds to the ref we would push to
246 * given a bare `git push` while `branch` is checked out.
248 * The return value and `err` conventions match those of `branch_get_upstream`.
250 const char *branch_get_push(struct branch *branch, struct strbuf *err);
252 /* Flags to match_refs. */
253 enum match_refs_flags {
254 MATCH_REFS_NONE = 0,
255 MATCH_REFS_ALL = (1 << 0),
256 MATCH_REFS_MIRROR = (1 << 1),
257 MATCH_REFS_PRUNE = (1 << 2),
258 MATCH_REFS_FOLLOW_TAGS = (1 << 3)
261 /* Flags for --ahead-behind option. */
262 enum ahead_behind_flags {
263 AHEAD_BEHIND_UNSPECIFIED = -1,
264 AHEAD_BEHIND_QUICK = 0, /* just eq/neq reporting */
265 AHEAD_BEHIND_FULL = 1, /* traditional a/b reporting */
268 /* Reporting of tracking info */
269 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
270 const char **upstream_name, enum ahead_behind_flags abf);
271 int format_tracking_info(struct branch *branch, struct strbuf *sb,
272 enum ahead_behind_flags abf);
274 struct ref *get_local_heads(void);
276 * Find refs from a list which are likely to be pointed to by the given HEAD
277 * ref. If 'all' is false, returns the most likely ref; otherwise, returns a
278 * list of all candidate refs. If no match is found (or 'head' is NULL),
279 * returns NULL. All returns are newly allocated and should be freed.
281 struct ref *guess_remote_head(const struct ref *head,
282 const struct ref *refs,
283 int all);
285 /* Return refs which no longer exist on remote */
286 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map);
289 * Compare-and-swap
291 #define CAS_OPT_NAME "force-with-lease"
293 struct push_cas_option {
294 unsigned use_tracking_for_rest:1;
295 struct push_cas {
296 struct object_id expect;
297 unsigned use_tracking:1;
298 char *refname;
299 } *entry;
300 int nr;
301 int alloc;
304 extern int parseopt_push_cas_option(const struct option *, const char *arg, int unset);
306 extern int is_empty_cas(const struct push_cas_option *);
307 void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);
309 #define TAG_REFSPEC "refs/tags/*:refs/tags/*"
311 void add_prune_tags_to_fetch_refspec(struct remote *remote);
313 #endif