]>
Commit | Line | Data |
---|---|---|
5751f490 | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
5751f490 DB |
3 | #include "remote.h" |
4 | #include "refs.h" | |
6d21bf96 JH |
5 | #include "commit.h" |
6 | #include "diff.h" | |
7 | #include "revision.h" | |
8ca12c0d | 8 | #include "dir.h" |
ec8452d5 | 9 | #include "tag.h" |
73cf0822 | 10 | #include "string-list.h" |
ed81c76b | 11 | #include "mergesort.h" |
0b282cc4 | 12 | #include "argv-array.h" |
5751f490 | 13 | |
6ddba5e2 FC |
14 | enum map_direction { FROM_SRC, FROM_DST }; |
15 | ||
e0aaa29f DB |
16 | static struct refspec s_tag_refspec = { |
17 | 0, | |
18 | 1, | |
b84c343c | 19 | 0, |
6e7b66ee | 20 | 0, |
08fbdb30 DB |
21 | "refs/tags/*", |
22 | "refs/tags/*" | |
e0aaa29f DB |
23 | }; |
24 | ||
25 | const struct refspec *tag_refspec = &s_tag_refspec; | |
26 | ||
844112ca JH |
27 | struct counted_string { |
28 | size_t len; | |
29 | const char *s; | |
30 | }; | |
55029ae4 DB |
31 | struct rewrite { |
32 | const char *base; | |
844112ca JH |
33 | size_t baselen; |
34 | struct counted_string *instead_of; | |
55029ae4 DB |
35 | int instead_of_nr; |
36 | int instead_of_alloc; | |
37 | }; | |
d071d942 JT |
38 | struct rewrites { |
39 | struct rewrite **rewrite; | |
40 | int rewrite_alloc; | |
41 | int rewrite_nr; | |
42 | }; | |
55029ae4 | 43 | |
5751f490 | 44 | static struct remote **remotes; |
2d31347b DB |
45 | static int remotes_alloc; |
46 | static int remotes_nr; | |
d0da003d | 47 | static struct hashmap remotes_hash; |
5751f490 | 48 | |
cf818348 | 49 | static struct branch **branches; |
2d31347b DB |
50 | static int branches_alloc; |
51 | static int branches_nr; | |
cf818348 DB |
52 | |
53 | static struct branch *current_branch; | |
f24f715e | 54 | static const char *pushremote_name; |
cf818348 | 55 | |
d071d942 | 56 | static struct rewrites rewrites; |
1c2eafb8 | 57 | static struct rewrites rewrites_push; |
55029ae4 | 58 | |
0a4da29d DB |
59 | static int valid_remote(const struct remote *remote) |
60 | { | |
c578f51d | 61 | return (!!remote->url) || (!!remote->foreign_vcs); |
0a4da29d DB |
62 | } |
63 | ||
d071d942 | 64 | static const char *alias_url(const char *url, struct rewrites *r) |
55029ae4 DB |
65 | { |
66 | int i, j; | |
844112ca JH |
67 | struct counted_string *longest; |
68 | int longest_i; | |
69 | ||
70 | longest = NULL; | |
71 | longest_i = -1; | |
d071d942 JT |
72 | for (i = 0; i < r->rewrite_nr; i++) { |
73 | if (!r->rewrite[i]) | |
55029ae4 | 74 | continue; |
d071d942 | 75 | for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) { |
59556548 | 76 | if (starts_with(url, r->rewrite[i]->instead_of[j].s) && |
844112ca | 77 | (!longest || |
d071d942 JT |
78 | longest->len < r->rewrite[i]->instead_of[j].len)) { |
79 | longest = &(r->rewrite[i]->instead_of[j]); | |
844112ca | 80 | longest_i = i; |
55029ae4 DB |
81 | } |
82 | } | |
83 | } | |
844112ca JH |
84 | if (!longest) |
85 | return url; | |
86 | ||
75faa45a | 87 | return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len); |
55029ae4 DB |
88 | } |
89 | ||
5751f490 DB |
90 | static void add_push_refspec(struct remote *remote, const char *ref) |
91 | { | |
2d31347b DB |
92 | ALLOC_GROW(remote->push_refspec, |
93 | remote->push_refspec_nr + 1, | |
94 | remote->push_refspec_alloc); | |
95 | remote->push_refspec[remote->push_refspec_nr++] = ref; | |
5751f490 DB |
96 | } |
97 | ||
5d46c9d4 DB |
98 | static void add_fetch_refspec(struct remote *remote, const char *ref) |
99 | { | |
2d31347b DB |
100 | ALLOC_GROW(remote->fetch_refspec, |
101 | remote->fetch_refspec_nr + 1, | |
102 | remote->fetch_refspec_alloc); | |
103 | remote->fetch_refspec[remote->fetch_refspec_nr++] = ref; | |
5d46c9d4 DB |
104 | } |
105 | ||
28b91f8a | 106 | static void add_url(struct remote *remote, const char *url) |
5751f490 | 107 | { |
2d31347b DB |
108 | ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc); |
109 | remote->url[remote->url_nr++] = url; | |
5751f490 DB |
110 | } |
111 | ||
20346234 MG |
112 | static void add_pushurl(struct remote *remote, const char *pushurl) |
113 | { | |
114 | ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc); | |
115 | remote->pushurl[remote->pushurl_nr++] = pushurl; | |
116 | } | |
117 | ||
1c2eafb8 JT |
118 | static void add_pushurl_alias(struct remote *remote, const char *url) |
119 | { | |
120 | const char *pushurl = alias_url(url, &rewrites_push); | |
121 | if (pushurl != url) | |
122 | add_pushurl(remote, pushurl); | |
123 | } | |
124 | ||
125 | static void add_url_alias(struct remote *remote, const char *url) | |
126 | { | |
127 | add_url(remote, alias_url(url, &rewrites)); | |
128 | add_pushurl_alias(remote, url); | |
129 | } | |
130 | ||
d0da003d PR |
131 | struct remotes_hash_key { |
132 | const char *str; | |
133 | int len; | |
134 | }; | |
135 | ||
7663cdc8 | 136 | static int remotes_hash_cmp(const void *unused_cmp_data, |
45dcb35f SB |
137 | const void *entry, |
138 | const void *entry_or_key, | |
139 | const void *keydata) | |
d0da003d | 140 | { |
45dcb35f SB |
141 | const struct remote *a = entry; |
142 | const struct remote *b = entry_or_key; | |
143 | const struct remotes_hash_key *key = keydata; | |
144 | ||
d0da003d PR |
145 | if (key) |
146 | return strncmp(a->name, key->str, key->len) || a->name[key->len]; | |
147 | else | |
148 | return strcmp(a->name, b->name); | |
149 | } | |
150 | ||
151 | static inline void init_remotes_hash(void) | |
152 | { | |
153 | if (!remotes_hash.cmpfn) | |
45dcb35f | 154 | hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0); |
d0da003d PR |
155 | } |
156 | ||
5751f490 DB |
157 | static struct remote *make_remote(const char *name, int len) |
158 | { | |
d0da003d PR |
159 | struct remote *ret, *replaced; |
160 | struct remotes_hash_key lookup; | |
161 | struct hashmap_entry lookup_entry; | |
5751f490 | 162 | |
d0da003d PR |
163 | if (!len) |
164 | len = strlen(name); | |
165 | ||
166 | init_remotes_hash(); | |
167 | lookup.str = name; | |
168 | lookup.len = len; | |
169 | hashmap_entry_init(&lookup_entry, memhash(name, len)); | |
170 | ||
171 | if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL) | |
172 | return ret; | |
5751f490 | 173 | |
2d31347b | 174 | ret = xcalloc(1, sizeof(struct remote)); |
737c5a9c | 175 | ret->prune = -1; /* unspecified */ |
2d31347b DB |
176 | ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc); |
177 | remotes[remotes_nr++] = ret; | |
d0da003d PR |
178 | ret->name = xstrndup(name, len); |
179 | ||
180 | hashmap_entry_init(ret, lookup_entry.hash); | |
181 | replaced = hashmap_put(&remotes_hash, ret); | |
182 | assert(replaced == NULL); /* no previous entry overwritten */ | |
2d31347b | 183 | return ret; |
5751f490 DB |
184 | } |
185 | ||
cf818348 DB |
186 | static void add_merge(struct branch *branch, const char *name) |
187 | { | |
2d31347b DB |
188 | ALLOC_GROW(branch->merge_name, branch->merge_nr + 1, |
189 | branch->merge_alloc); | |
190 | branch->merge_name[branch->merge_nr++] = name; | |
cf818348 DB |
191 | } |
192 | ||
193 | static struct branch *make_branch(const char *name, int len) | |
194 | { | |
2d31347b DB |
195 | struct branch *ret; |
196 | int i; | |
cf818348 | 197 | |
2d31347b DB |
198 | for (i = 0; i < branches_nr; i++) { |
199 | if (len ? (!strncmp(name, branches[i]->name, len) && | |
200 | !branches[i]->name[len]) : | |
201 | !strcmp(name, branches[i]->name)) | |
202 | return branches[i]; | |
cf818348 DB |
203 | } |
204 | ||
2d31347b DB |
205 | ALLOC_GROW(branches, branches_nr + 1, branches_alloc); |
206 | ret = xcalloc(1, sizeof(struct branch)); | |
207 | branches[branches_nr++] = ret; | |
cf818348 | 208 | if (len) |
2d31347b | 209 | ret->name = xstrndup(name, len); |
cf818348 | 210 | else |
2d31347b | 211 | ret->name = xstrdup(name); |
fa3f60b7 | 212 | ret->refname = xstrfmt("refs/heads/%s", ret->name); |
cf818348 | 213 | |
2d31347b | 214 | return ret; |
cf818348 DB |
215 | } |
216 | ||
d071d942 | 217 | static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len) |
55029ae4 DB |
218 | { |
219 | struct rewrite *ret; | |
220 | int i; | |
221 | ||
d071d942 | 222 | for (i = 0; i < r->rewrite_nr; i++) { |
844112ca | 223 | if (len |
d071d942 JT |
224 | ? (len == r->rewrite[i]->baselen && |
225 | !strncmp(base, r->rewrite[i]->base, len)) | |
226 | : !strcmp(base, r->rewrite[i]->base)) | |
227 | return r->rewrite[i]; | |
55029ae4 DB |
228 | } |
229 | ||
d071d942 | 230 | ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc); |
55029ae4 | 231 | ret = xcalloc(1, sizeof(struct rewrite)); |
d071d942 | 232 | r->rewrite[r->rewrite_nr++] = ret; |
844112ca | 233 | if (len) { |
55029ae4 | 234 | ret->base = xstrndup(base, len); |
844112ca JH |
235 | ret->baselen = len; |
236 | } | |
237 | else { | |
55029ae4 | 238 | ret->base = xstrdup(base); |
844112ca JH |
239 | ret->baselen = strlen(base); |
240 | } | |
55029ae4 DB |
241 | return ret; |
242 | } | |
243 | ||
244 | static void add_instead_of(struct rewrite *rewrite, const char *instead_of) | |
245 | { | |
246 | ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc); | |
844112ca JH |
247 | rewrite->instead_of[rewrite->instead_of_nr].s = instead_of; |
248 | rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of); | |
249 | rewrite->instead_of_nr++; | |
55029ae4 DB |
250 | } |
251 | ||
0e265a92 JK |
252 | static const char *skip_spaces(const char *s) |
253 | { | |
254 | while (isspace(*s)) | |
255 | s++; | |
256 | return s; | |
257 | } | |
258 | ||
5751f490 DB |
259 | static void read_remotes_file(struct remote *remote) |
260 | { | |
0e265a92 | 261 | struct strbuf buf = STRBUF_INIT; |
e9d983f1 | 262 | FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r"); |
5751f490 DB |
263 | |
264 | if (!f) | |
265 | return; | |
e459b073 | 266 | remote->configured_in_repo = 1; |
89cf4c70 | 267 | remote->origin = REMOTE_REMOTES; |
18814d0e | 268 | while (strbuf_getline(&buf, f) != EOF) { |
0e265a92 | 269 | const char *v; |
5751f490 | 270 | |
0e265a92 | 271 | strbuf_rtrim(&buf); |
5751f490 | 272 | |
0e265a92 JK |
273 | if (skip_prefix(buf.buf, "URL:", &v)) |
274 | add_url_alias(remote, xstrdup(skip_spaces(v))); | |
275 | else if (skip_prefix(buf.buf, "Push:", &v)) | |
276 | add_push_refspec(remote, xstrdup(skip_spaces(v))); | |
277 | else if (skip_prefix(buf.buf, "Pull:", &v)) | |
278 | add_fetch_refspec(remote, xstrdup(skip_spaces(v))); | |
5751f490 | 279 | } |
0e265a92 | 280 | strbuf_release(&buf); |
5751f490 DB |
281 | fclose(f); |
282 | } | |
283 | ||
284 | static void read_branches_file(struct remote *remote) | |
285 | { | |
cf818348 | 286 | char *frag; |
f28e3ab2 | 287 | struct strbuf buf = STRBUF_INIT; |
e9d983f1 | 288 | FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r"); |
5751f490 DB |
289 | |
290 | if (!f) | |
291 | return; | |
f28e3ab2 | 292 | |
8f309aeb | 293 | strbuf_getline_lf(&buf, f); |
0fb19906 | 294 | fclose(f); |
f28e3ab2 JK |
295 | strbuf_trim(&buf); |
296 | if (!buf.len) { | |
297 | strbuf_release(&buf); | |
5751f490 | 298 | return; |
f28e3ab2 JK |
299 | } |
300 | ||
e459b073 | 301 | remote->configured_in_repo = 1; |
89cf4c70 | 302 | remote->origin = REMOTE_BRANCHES; |
472fa4cd DB |
303 | |
304 | /* | |
55cfde25 | 305 | * The branches file would have URL and optionally |
472fa4cd | 306 | * #branch specified. The "master" (or specified) branch is |
f28e3ab2 JK |
307 | * fetched and stored in the local branch matching the |
308 | * remote name. | |
472fa4cd | 309 | */ |
f28e3ab2 JK |
310 | frag = strchr(buf.buf, '#'); |
311 | if (frag) | |
cf818348 | 312 | *(frag++) = '\0'; |
f28e3ab2 JK |
313 | else |
314 | frag = "master"; | |
315 | ||
316 | add_url_alias(remote, strbuf_detach(&buf, NULL)); | |
317 | add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s", | |
318 | frag, remote->name)); | |
55cfde25 | 319 | |
18afe101 MK |
320 | /* |
321 | * Cogito compatible push: push current HEAD to remote #branch | |
322 | * (master if missing) | |
323 | */ | |
f28e3ab2 | 324 | add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag)); |
d71ab174 | 325 | remote->fetch_tags = 1; /* always auto-follow */ |
5751f490 DB |
326 | } |
327 | ||
ef90d6d4 | 328 | static int handle_config(const char *key, const char *value, void *cb) |
5751f490 DB |
329 | { |
330 | const char *name; | |
bc60f8a7 | 331 | int namelen; |
5751f490 DB |
332 | const char *subkey; |
333 | struct remote *remote; | |
cf818348 | 334 | struct branch *branch; |
bc60f8a7 TG |
335 | if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) { |
336 | if (!name) | |
cf818348 | 337 | return 0; |
bc60f8a7 TG |
338 | branch = make_branch(name, namelen); |
339 | if (!strcmp(subkey, "remote")) { | |
e41bf352 | 340 | return git_config_string(&branch->remote_name, key, value); |
bc60f8a7 | 341 | } else if (!strcmp(subkey, "pushremote")) { |
da66b274 | 342 | return git_config_string(&branch->pushremote_name, key, value); |
bc60f8a7 | 343 | } else if (!strcmp(subkey, "merge")) { |
d2370cc2 JH |
344 | if (!value) |
345 | return config_error_nonbool(key); | |
cf818348 | 346 | add_merge(branch, xstrdup(value)); |
d2370cc2 | 347 | } |
cf818348 | 348 | return 0; |
5751f490 | 349 | } |
bc60f8a7 | 350 | if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) { |
55029ae4 | 351 | struct rewrite *rewrite; |
bc60f8a7 | 352 | if (!name) |
55029ae4 | 353 | return 0; |
bc60f8a7 TG |
354 | if (!strcmp(subkey, "insteadof")) { |
355 | rewrite = make_rewrite(&rewrites, name, namelen); | |
1c2eafb8 JT |
356 | if (!value) |
357 | return config_error_nonbool(key); | |
358 | add_instead_of(rewrite, xstrdup(value)); | |
bc60f8a7 TG |
359 | } else if (!strcmp(subkey, "pushinsteadof")) { |
360 | rewrite = make_rewrite(&rewrites_push, name, namelen); | |
55029ae4 DB |
361 | if (!value) |
362 | return config_error_nonbool(key); | |
363 | add_instead_of(rewrite, xstrdup(value)); | |
364 | } | |
365 | } | |
224c2171 | 366 | |
bc60f8a7 | 367 | if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0) |
5751f490 | 368 | return 0; |
224c2171 RR |
369 | |
370 | /* Handle remote.* variables */ | |
bc60f8a7 | 371 | if (!name && !strcmp(subkey, "pushdefault")) |
224c2171 RR |
372 | return git_config_string(&pushremote_name, key, value); |
373 | ||
bc60f8a7 TG |
374 | if (!name) |
375 | return 0; | |
224c2171 | 376 | /* Handle remote.<name>.* variables */ |
c82efafc BC |
377 | if (*name == '/') { |
378 | warning("Config remote shorthand cannot begin with '/': %s", | |
379 | name); | |
380 | return 0; | |
381 | } | |
bc60f8a7 | 382 | remote = make_remote(name, namelen); |
89cf4c70 | 383 | remote->origin = REMOTE_CONFIG; |
e459b073 JS |
384 | if (current_config_scope() == CONFIG_SCOPE_REPO) |
385 | remote->configured_in_repo = 1; | |
bc60f8a7 | 386 | if (!strcmp(subkey, "mirror")) |
84bb2dfd | 387 | remote->mirror = git_config_bool(key, value); |
bc60f8a7 | 388 | else if (!strcmp(subkey, "skipdefaultupdate")) |
84bb2dfd | 389 | remote->skip_default_update = git_config_bool(key, value); |
bc60f8a7 | 390 | else if (!strcmp(subkey, "skipfetchall")) |
7cc91a2f | 391 | remote->skip_default_update = git_config_bool(key, value); |
bc60f8a7 | 392 | else if (!strcmp(subkey, "prune")) |
737c5a9c | 393 | remote->prune = git_config_bool(key, value); |
bc60f8a7 | 394 | else if (!strcmp(subkey, "url")) { |
84bb2dfd PB |
395 | const char *v; |
396 | if (git_config_string(&v, key, value)) | |
397 | return -1; | |
398 | add_url(remote, v); | |
bc60f8a7 | 399 | } else if (!strcmp(subkey, "pushurl")) { |
20346234 MG |
400 | const char *v; |
401 | if (git_config_string(&v, key, value)) | |
402 | return -1; | |
403 | add_pushurl(remote, v); | |
bc60f8a7 | 404 | } else if (!strcmp(subkey, "push")) { |
84bb2dfd PB |
405 | const char *v; |
406 | if (git_config_string(&v, key, value)) | |
407 | return -1; | |
408 | add_push_refspec(remote, v); | |
bc60f8a7 | 409 | } else if (!strcmp(subkey, "fetch")) { |
84bb2dfd PB |
410 | const char *v; |
411 | if (git_config_string(&v, key, value)) | |
412 | return -1; | |
413 | add_fetch_refspec(remote, v); | |
bc60f8a7 | 414 | } else if (!strcmp(subkey, "receivepack")) { |
84bb2dfd PB |
415 | const char *v; |
416 | if (git_config_string(&v, key, value)) | |
417 | return -1; | |
5751f490 | 418 | if (!remote->receivepack) |
84bb2dfd | 419 | remote->receivepack = v; |
5751f490 DB |
420 | else |
421 | error("more than one receivepack given, using the first"); | |
bc60f8a7 | 422 | } else if (!strcmp(subkey, "uploadpack")) { |
84bb2dfd PB |
423 | const char *v; |
424 | if (git_config_string(&v, key, value)) | |
425 | return -1; | |
0012ba21 | 426 | if (!remote->uploadpack) |
84bb2dfd | 427 | remote->uploadpack = v; |
0012ba21 DB |
428 | else |
429 | error("more than one uploadpack given, using the first"); | |
bc60f8a7 | 430 | } else if (!strcmp(subkey, "tagopt")) { |
d71ab174 DB |
431 | if (!strcmp(value, "--no-tags")) |
432 | remote->fetch_tags = -1; | |
944163a4 ST |
433 | else if (!strcmp(value, "--tags")) |
434 | remote->fetch_tags = 2; | |
bc60f8a7 | 435 | } else if (!strcmp(subkey, "proxy")) { |
84bb2dfd PB |
436 | return git_config_string((const char **)&remote->http_proxy, |
437 | key, value); | |
bc60f8a7 | 438 | } else if (!strcmp(subkey, "proxyauthmethod")) { |
ef976395 KF |
439 | return git_config_string((const char **)&remote->http_proxy_authmethod, |
440 | key, value); | |
bc60f8a7 | 441 | } else if (!strcmp(subkey, "vcs")) { |
c578f51d | 442 | return git_config_string(&remote->foreign_vcs, key, value); |
84bb2dfd | 443 | } |
5751f490 DB |
444 | return 0; |
445 | } | |
446 | ||
55029ae4 DB |
447 | static void alias_all_urls(void) |
448 | { | |
449 | int i, j; | |
450 | for (i = 0; i < remotes_nr; i++) { | |
1c2eafb8 | 451 | int add_pushurl_aliases; |
55029ae4 DB |
452 | if (!remotes[i]) |
453 | continue; | |
20346234 | 454 | for (j = 0; j < remotes[i]->pushurl_nr; j++) { |
d071d942 | 455 | remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites); |
20346234 | 456 | } |
1c2eafb8 JT |
457 | add_pushurl_aliases = remotes[i]->pushurl_nr == 0; |
458 | for (j = 0; j < remotes[i]->url_nr; j++) { | |
459 | if (add_pushurl_aliases) | |
460 | add_pushurl_alias(remotes[i], remotes[i]->url[j]); | |
461 | remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites); | |
462 | } | |
55029ae4 DB |
463 | } |
464 | } | |
465 | ||
5751f490 DB |
466 | static void read_config(void) |
467 | { | |
e41bf352 | 468 | static int loaded; |
5751f490 | 469 | int flag; |
e41bf352 JK |
470 | |
471 | if (loaded) | |
5751f490 | 472 | return; |
e41bf352 JK |
473 | loaded = 1; |
474 | ||
5751f490 | 475 | current_branch = NULL; |
f2f12d16 | 476 | if (startup_info->have_repository) { |
744c040b | 477 | const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag); |
f2f12d16 JK |
478 | if (head_ref && (flag & REF_ISSYMREF) && |
479 | skip_prefix(head_ref, "refs/heads/", &head_ref)) { | |
480 | current_branch = make_branch(head_ref, 0); | |
481 | } | |
5751f490 | 482 | } |
ef90d6d4 | 483 | git_config(handle_config, NULL); |
55029ae4 | 484 | alias_all_urls(); |
5751f490 DB |
485 | } |
486 | ||
24b6177e | 487 | static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify) |
6b62816c DB |
488 | { |
489 | int i; | |
da7a478b | 490 | struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs)); |
46220ca1 | 491 | |
6b62816c | 492 | for (i = 0; i < nr_refspec; i++) { |
47c6ef1c | 493 | size_t llen; |
46220ca1 JH |
494 | int is_glob; |
495 | const char *lhs, *rhs; | |
8d9c5010 | 496 | int flags; |
46220ca1 | 497 | |
8e76bf3f | 498 | is_glob = 0; |
46220ca1 JH |
499 | |
500 | lhs = refspec[i]; | |
501 | if (*lhs == '+') { | |
6b62816c | 502 | rs[i].force = 1; |
46220ca1 | 503 | lhs++; |
6b62816c | 504 | } |
46220ca1 JH |
505 | |
506 | rhs = strrchr(lhs, ':'); | |
a83619d6 PB |
507 | |
508 | /* | |
509 | * Before going on, special case ":" (or "+:") as a refspec | |
def24991 | 510 | * for pushing matching refs. |
a83619d6 PB |
511 | */ |
512 | if (!fetch && rhs == lhs && rhs[1] == '\0') { | |
513 | rs[i].matching = 1; | |
514 | continue; | |
515 | } | |
516 | ||
46220ca1 | 517 | if (rhs) { |
47c6ef1c | 518 | size_t rlen = strlen(++rhs); |
abd2bde7 | 519 | is_glob = (1 <= rlen && strchr(rhs, '*')); |
08fbdb30 | 520 | rs[i].dst = xstrndup(rhs, rlen); |
6b62816c | 521 | } |
ef00d150 | 522 | |
46220ca1 | 523 | llen = (rhs ? (rhs - lhs - 1) : strlen(lhs)); |
abd2bde7 | 524 | if (1 <= llen && memchr(lhs, '*', llen)) { |
7d19da46 JH |
525 | if ((rhs && !is_glob) || (!rhs && fetch)) |
526 | goto invalid; | |
527 | is_glob = 1; | |
7d19da46 JH |
528 | } else if (rhs && is_glob) { |
529 | goto invalid; | |
ef00d150 | 530 | } |
7d19da46 | 531 | |
46220ca1 JH |
532 | rs[i].pattern = is_glob; |
533 | rs[i].src = xstrndup(lhs, llen); | |
8d9c5010 | 534 | flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0); |
46220ca1 JH |
535 | |
536 | if (fetch) { | |
fcd30b13 | 537 | struct object_id unused; |
6e7b66ee | 538 | |
def24991 | 539 | /* LHS */ |
46220ca1 | 540 | if (!*rs[i].src) |
def24991 | 541 | ; /* empty is ok; it means "HEAD" */ |
fcd30b13 | 542 | else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused)) |
6e7b66ee | 543 | rs[i].exact_sha1 = 1; /* ok */ |
def24991 JH |
544 | else if (!check_refname_format(rs[i].src, flags)) |
545 | ; /* valid looking ref is ok */ | |
546 | else | |
8d9c5010 | 547 | goto invalid; |
def24991 | 548 | /* RHS */ |
8d9c5010 | 549 | if (!rs[i].dst) |
def24991 | 550 | ; /* missing is ok; it is the same as empty */ |
8d9c5010 | 551 | else if (!*rs[i].dst) |
def24991 JH |
552 | ; /* empty is ok; it means "do not store" */ |
553 | else if (!check_refname_format(rs[i].dst, flags)) | |
554 | ; /* valid looking ref is ok */ | |
555 | else | |
8d9c5010 | 556 | goto invalid; |
46220ca1 JH |
557 | } else { |
558 | /* | |
559 | * LHS | |
560 | * - empty is allowed; it means delete. | |
561 | * - when wildcarded, it must be a valid looking ref. | |
562 | * - otherwise, it must be an extended SHA-1, but | |
563 | * there is no existing way to validate this. | |
564 | */ | |
565 | if (!*rs[i].src) | |
566 | ; /* empty is ok */ | |
567 | else if (is_glob) { | |
8d9c5010 | 568 | if (check_refname_format(rs[i].src, flags)) |
46220ca1 JH |
569 | goto invalid; |
570 | } | |
571 | else | |
572 | ; /* anything goes, for now */ | |
573 | /* | |
574 | * RHS | |
575 | * - missing is allowed, but LHS then must be a | |
576 | * valid looking ref. | |
577 | * - empty is not allowed. | |
578 | * - otherwise it must be a valid looking ref. | |
579 | */ | |
580 | if (!rs[i].dst) { | |
8d9c5010 | 581 | if (check_refname_format(rs[i].src, flags)) |
46220ca1 JH |
582 | goto invalid; |
583 | } else if (!*rs[i].dst) { | |
584 | goto invalid; | |
585 | } else { | |
8d9c5010 | 586 | if (check_refname_format(rs[i].dst, flags)) |
46220ca1 JH |
587 | goto invalid; |
588 | } | |
ef00d150 | 589 | } |
6b62816c DB |
590 | } |
591 | return rs; | |
46220ca1 JH |
592 | |
593 | invalid: | |
24b6177e | 594 | if (verify) { |
2cb1f36d BC |
595 | /* |
596 | * nr_refspec must be greater than zero and i must be valid | |
597 | * since it is only possible to reach this point from within | |
598 | * the for loop above. | |
599 | */ | |
a56eea28 | 600 | free_refspec(i+1, rs); |
24b6177e JF |
601 | return NULL; |
602 | } | |
46220ca1 JH |
603 | die("Invalid refspec '%s'", refspec[i]); |
604 | } | |
605 | ||
24b6177e JF |
606 | int valid_fetch_refspec(const char *fetch_refspec_str) |
607 | { | |
24b6177e JF |
608 | struct refspec *refspec; |
609 | ||
66dbfd55 | 610 | refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1); |
a56eea28 | 611 | free_refspec(1, refspec); |
24b6177e JF |
612 | return !!refspec; |
613 | } | |
614 | ||
46220ca1 JH |
615 | struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec) |
616 | { | |
24b6177e | 617 | return parse_refspec_internal(nr_refspec, refspec, 1, 0); |
46220ca1 JH |
618 | } |
619 | ||
c19ae47a | 620 | struct refspec *parse_push_refspec(int nr_refspec, const char **refspec) |
46220ca1 | 621 | { |
24b6177e | 622 | return parse_refspec_internal(nr_refspec, refspec, 0, 0); |
6b62816c DB |
623 | } |
624 | ||
72ff8943 DB |
625 | void free_refspec(int nr_refspec, struct refspec *refspec) |
626 | { | |
627 | int i; | |
a56eea28 JK |
628 | |
629 | if (!refspec) | |
630 | return; | |
631 | ||
72ff8943 DB |
632 | for (i = 0; i < nr_refspec; i++) { |
633 | free(refspec[i].src); | |
634 | free(refspec[i].dst); | |
635 | } | |
636 | free(refspec); | |
637 | } | |
638 | ||
df93e33c DB |
639 | static int valid_remote_nick(const char *name) |
640 | { | |
8ca12c0d | 641 | if (!name[0] || is_dot_or_dotdot(name)) |
df93e33c | 642 | return 0; |
d9244ecf JS |
643 | |
644 | /* remote nicknames cannot contain slashes */ | |
645 | while (*name) | |
646 | if (is_dir_sep(*name++)) | |
647 | return 0; | |
648 | return 1; | |
df93e33c DB |
649 | } |
650 | ||
f052154d JK |
651 | const char *remote_for_branch(struct branch *branch, int *explicit) |
652 | { | |
653 | if (branch && branch->remote_name) { | |
654 | if (explicit) | |
655 | *explicit = 1; | |
656 | return branch->remote_name; | |
657 | } | |
658 | if (explicit) | |
659 | *explicit = 0; | |
660 | return "origin"; | |
661 | } | |
662 | ||
da66b274 JK |
663 | const char *pushremote_for_branch(struct branch *branch, int *explicit) |
664 | { | |
665 | if (branch && branch->pushremote_name) { | |
666 | if (explicit) | |
667 | *explicit = 1; | |
668 | return branch->pushremote_name; | |
669 | } | |
670 | if (pushremote_name) { | |
671 | if (explicit) | |
672 | *explicit = 1; | |
673 | return pushremote_name; | |
674 | } | |
675 | return remote_for_branch(branch, explicit); | |
676 | } | |
677 | ||
9700fae5 W |
678 | const char *remote_ref_for_branch(struct branch *branch, int for_push, |
679 | int *explicit) | |
680 | { | |
681 | if (branch) { | |
682 | if (!for_push) { | |
683 | if (branch->merge_nr) { | |
684 | if (explicit) | |
685 | *explicit = 1; | |
686 | return branch->merge_name[0]; | |
687 | } | |
688 | } else { | |
689 | const char *dst, *remote_name = | |
690 | pushremote_for_branch(branch, NULL); | |
691 | struct remote *remote = remote_get(remote_name); | |
692 | ||
693 | if (remote && remote->push_refspec_nr && | |
694 | (dst = apply_refspecs(remote->push, | |
695 | remote->push_refspec_nr, | |
696 | branch->refname))) { | |
697 | if (explicit) | |
698 | *explicit = 1; | |
699 | return dst; | |
700 | } | |
701 | } | |
702 | } | |
703 | if (explicit) | |
704 | *explicit = 0; | |
705 | return ""; | |
706 | } | |
707 | ||
da66b274 JK |
708 | static struct remote *remote_get_1(const char *name, |
709 | const char *(*get_default)(struct branch *, int *)) | |
5751f490 DB |
710 | { |
711 | struct remote *ret; | |
fa685bdf | 712 | int name_given = 0; |
5751f490 | 713 | |
8770e6fb JK |
714 | read_config(); |
715 | ||
fa685bdf DB |
716 | if (name) |
717 | name_given = 1; | |
da66b274 JK |
718 | else |
719 | name = get_default(current_branch, &name_given); | |
9326d494 | 720 | |
5751f490 | 721 | ret = make_remote(name, 0); |
4539c218 | 722 | if (valid_remote_nick(name) && have_git_dir()) { |
0a4da29d | 723 | if (!valid_remote(ret)) |
5751f490 | 724 | read_remotes_file(ret); |
0a4da29d | 725 | if (!valid_remote(ret)) |
5751f490 DB |
726 | read_branches_file(ret); |
727 | } | |
0a4da29d | 728 | if (name_given && !valid_remote(ret)) |
55029ae4 | 729 | add_url_alias(ret, name); |
0a4da29d | 730 | if (!valid_remote(ret)) |
5751f490 | 731 | return NULL; |
46220ca1 JH |
732 | ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec); |
733 | ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec); | |
5751f490 DB |
734 | return ret; |
735 | } | |
6b62816c | 736 | |
f24f715e RR |
737 | struct remote *remote_get(const char *name) |
738 | { | |
da66b274 | 739 | return remote_get_1(name, remote_for_branch); |
f24f715e RR |
740 | } |
741 | ||
742 | struct remote *pushremote_get(const char *name) | |
743 | { | |
da66b274 | 744 | return remote_get_1(name, pushremote_for_branch); |
f24f715e RR |
745 | } |
746 | ||
e459b073 | 747 | int remote_is_configured(struct remote *remote, int in_repo) |
9a23ba33 | 748 | { |
e459b073 JS |
749 | if (!remote) |
750 | return 0; | |
751 | if (in_repo) | |
752 | return remote->configured_in_repo; | |
753 | return !!remote->origin; | |
9a23ba33 FAG |
754 | } |
755 | ||
b42f6927 JS |
756 | int for_each_remote(each_remote_fn fn, void *priv) |
757 | { | |
758 | int i, result = 0; | |
759 | read_config(); | |
2d31347b | 760 | for (i = 0; i < remotes_nr && !result; i++) { |
b42f6927 JS |
761 | struct remote *r = remotes[i]; |
762 | if (!r) | |
763 | continue; | |
764 | if (!r->fetch) | |
46220ca1 JH |
765 | r->fetch = parse_fetch_refspec(r->fetch_refspec_nr, |
766 | r->fetch_refspec); | |
b42f6927 | 767 | if (!r->push) |
46220ca1 JH |
768 | r->push = parse_push_refspec(r->push_refspec_nr, |
769 | r->push_refspec); | |
b42f6927 JS |
770 | result = fn(r, priv); |
771 | } | |
772 | return result; | |
773 | } | |
774 | ||
df02ebda MH |
775 | static void handle_duplicate(struct ref *ref1, struct ref *ref2) |
776 | { | |
f096e6e8 MH |
777 | if (strcmp(ref1->name, ref2->name)) { |
778 | if (ref1->fetch_head_status != FETCH_HEAD_IGNORE && | |
779 | ref2->fetch_head_status != FETCH_HEAD_IGNORE) { | |
780 | die(_("Cannot fetch both %s and %s to %s"), | |
781 | ref1->name, ref2->name, ref2->peer_ref->name); | |
782 | } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE && | |
783 | ref2->fetch_head_status == FETCH_HEAD_IGNORE) { | |
784 | warning(_("%s usually tracks %s, not %s"), | |
785 | ref2->peer_ref->name, ref2->name, ref1->name); | |
786 | } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE && | |
787 | ref2->fetch_head_status == FETCH_HEAD_IGNORE) { | |
788 | die(_("%s tracks both %s and %s"), | |
789 | ref2->peer_ref->name, ref1->name, ref2->name); | |
790 | } else { | |
791 | /* | |
792 | * This last possibility doesn't occur because | |
793 | * FETCH_HEAD_IGNORE entries always appear at | |
794 | * the end of the list. | |
795 | */ | |
796 | die(_("Internal error")); | |
797 | } | |
798 | } | |
df02ebda MH |
799 | free(ref2->peer_ref); |
800 | free(ref2); | |
801 | } | |
802 | ||
b9afe665 | 803 | struct ref *ref_remove_duplicates(struct ref *ref_map) |
2467a4fa | 804 | { |
183113a5 | 805 | struct string_list refs = STRING_LIST_INIT_NODUP; |
b9afe665 MH |
806 | struct ref *retval = NULL; |
807 | struct ref **p = &retval; | |
73cf0822 | 808 | |
b9afe665 MH |
809 | while (ref_map) { |
810 | struct ref *ref = ref_map; | |
811 | ||
812 | ref_map = ref_map->next; | |
813 | ref->next = NULL; | |
73cf0822 | 814 | |
b9afe665 MH |
815 | if (!ref->peer_ref) { |
816 | *p = ref; | |
817 | p = &ref->next; | |
09ea1f8e | 818 | } else { |
b9afe665 MH |
819 | struct string_list_item *item = |
820 | string_list_insert(&refs, ref->peer_ref->name); | |
821 | ||
822 | if (item->util) { | |
823 | /* Entry already existed */ | |
df02ebda | 824 | handle_duplicate((struct ref *)item->util, ref); |
b9afe665 MH |
825 | } else { |
826 | *p = ref; | |
827 | p = &ref->next; | |
828 | item->util = ref; | |
829 | } | |
2467a4fa DB |
830 | } |
831 | } | |
b9afe665 | 832 | |
73cf0822 | 833 | string_list_clear(&refs, 0); |
b9afe665 | 834 | return retval; |
2467a4fa DB |
835 | } |
836 | ||
28b91f8a | 837 | int remote_has_url(struct remote *remote, const char *url) |
5d46c9d4 DB |
838 | { |
839 | int i; | |
28b91f8a SP |
840 | for (i = 0; i < remote->url_nr; i++) { |
841 | if (!strcmp(remote->url[i], url)) | |
5d46c9d4 DB |
842 | return 1; |
843 | } | |
844 | return 0; | |
845 | } | |
846 | ||
e928213f DB |
847 | static int match_name_with_pattern(const char *key, const char *name, |
848 | const char *value, char **result) | |
a3c84239 | 849 | { |
08fbdb30 DB |
850 | const char *kstar = strchr(key, '*'); |
851 | size_t klen; | |
abd2bde7 DB |
852 | size_t ksuffixlen; |
853 | size_t namelen; | |
08fbdb30 DB |
854 | int ret; |
855 | if (!kstar) | |
856 | die("Key '%s' of pattern had no '*'", key); | |
857 | klen = kstar - key; | |
abd2bde7 DB |
858 | ksuffixlen = strlen(kstar + 1); |
859 | namelen = strlen(name); | |
860 | ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen && | |
861 | !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen); | |
e928213f | 862 | if (ret && value) { |
07bfa575 | 863 | struct strbuf sb = STRBUF_INIT; |
08fbdb30 | 864 | const char *vstar = strchr(value, '*'); |
08fbdb30 DB |
865 | if (!vstar) |
866 | die("Value '%s' of pattern has no '*'", value); | |
07bfa575 RS |
867 | strbuf_add(&sb, value, vstar - value); |
868 | strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen); | |
869 | strbuf_addstr(&sb, vstar + 1); | |
870 | *result = strbuf_detach(&sb, NULL); | |
e928213f | 871 | } |
a3c84239 DB |
872 | return ret; |
873 | } | |
874 | ||
e6f63712 CMN |
875 | static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results) |
876 | { | |
877 | int i; | |
878 | int find_src = !query->src; | |
879 | ||
880 | if (find_src && !query->dst) | |
881 | error("query_refspecs_multiple: need either src or dst"); | |
882 | ||
883 | for (i = 0; i < ref_count; i++) { | |
884 | struct refspec *refspec = &refs[i]; | |
885 | const char *key = find_src ? refspec->dst : refspec->src; | |
886 | const char *value = find_src ? refspec->src : refspec->dst; | |
887 | const char *needle = find_src ? query->dst : query->src; | |
888 | char **result = find_src ? &query->src : &query->dst; | |
889 | ||
890 | if (!refspec->dst) | |
891 | continue; | |
892 | if (refspec->pattern) { | |
893 | if (match_name_with_pattern(key, needle, value, result)) | |
894 | string_list_append_nodup(results, *result); | |
895 | } else if (!strcmp(needle, key)) { | |
896 | string_list_append(results, value); | |
897 | } | |
898 | } | |
899 | } | |
900 | ||
ca02465b | 901 | int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query) |
72ff8943 DB |
902 | { |
903 | int i; | |
c500352e | 904 | int find_src = !query->src; |
049bff8f MH |
905 | const char *needle = find_src ? query->dst : query->src; |
906 | char **result = find_src ? &query->src : &query->dst; | |
72ff8943 | 907 | |
c500352e CMN |
908 | if (find_src && !query->dst) |
909 | return error("query_refspecs: need either src or dst"); | |
b42f6927 | 910 | |
c500352e CMN |
911 | for (i = 0; i < ref_count; i++) { |
912 | struct refspec *refspec = &refs[i]; | |
913 | const char *key = find_src ? refspec->dst : refspec->src; | |
914 | const char *value = find_src ? refspec->src : refspec->dst; | |
b42f6927 | 915 | |
c500352e | 916 | if (!refspec->dst) |
5d46c9d4 | 917 | continue; |
c500352e | 918 | if (refspec->pattern) { |
e928213f | 919 | if (match_name_with_pattern(key, needle, value, result)) { |
c500352e | 920 | query->force = refspec->force; |
5d46c9d4 DB |
921 | return 0; |
922 | } | |
b42f6927 JS |
923 | } else if (!strcmp(needle, key)) { |
924 | *result = xstrdup(value); | |
c500352e | 925 | query->force = refspec->force; |
b42f6927 | 926 | return 0; |
5d46c9d4 DB |
927 | } |
928 | } | |
5d46c9d4 DB |
929 | return -1; |
930 | } | |
931 | ||
c500352e CMN |
932 | char *apply_refspecs(struct refspec *refspecs, int nr_refspec, |
933 | const char *name) | |
934 | { | |
935 | struct refspec query; | |
936 | ||
937 | memset(&query, 0, sizeof(struct refspec)); | |
938 | query.src = (char *)name; | |
939 | ||
940 | if (query_refspecs(refspecs, nr_refspec, &query)) | |
941 | return NULL; | |
942 | ||
943 | return query.dst; | |
944 | } | |
945 | ||
946 | int remote_find_tracking(struct remote *remote, struct refspec *refspec) | |
947 | { | |
948 | return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec); | |
949 | } | |
950 | ||
8009768e RS |
951 | static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen, |
952 | const char *name) | |
953 | { | |
954 | size_t len = strlen(name); | |
50a6c8ef | 955 | struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1)); |
8009768e RS |
956 | memcpy(ref->name, prefix, prefixlen); |
957 | memcpy(ref->name + prefixlen, name, len); | |
958 | return ref; | |
959 | } | |
960 | ||
59c69c0c | 961 | struct ref *alloc_ref(const char *name) |
dfd255dd | 962 | { |
59c69c0c | 963 | return alloc_ref_with_prefix("", 0, name); |
737922aa KK |
964 | } |
965 | ||
59a57757 | 966 | struct ref *copy_ref(const struct ref *ref) |
d71ab174 | 967 | { |
7b3db095 JS |
968 | struct ref *cpy; |
969 | size_t len; | |
970 | if (!ref) | |
971 | return NULL; | |
50a6c8ef JK |
972 | len = st_add3(sizeof(struct ref), strlen(ref->name), 1); |
973 | cpy = xmalloc(len); | |
974 | memcpy(cpy, ref, len); | |
7b3db095 | 975 | cpy->next = NULL; |
8c53f071 JK |
976 | cpy->symref = xstrdup_or_null(ref->symref); |
977 | cpy->remote_status = xstrdup_or_null(ref->remote_status); | |
7b3db095 JS |
978 | cpy->peer_ref = copy_ref(ref->peer_ref); |
979 | return cpy; | |
d71ab174 DB |
980 | } |
981 | ||
4577370e DB |
982 | struct ref *copy_ref_list(const struct ref *ref) |
983 | { | |
984 | struct ref *ret = NULL; | |
985 | struct ref **tail = &ret; | |
986 | while (ref) { | |
987 | *tail = copy_ref(ref); | |
988 | ref = ref->next; | |
989 | tail = &((*tail)->next); | |
990 | } | |
991 | return ret; | |
992 | } | |
993 | ||
697d7f5d | 994 | static void free_ref(struct ref *ref) |
be885d96 DB |
995 | { |
996 | if (!ref) | |
997 | return; | |
7b3db095 | 998 | free_ref(ref->peer_ref); |
be885d96 DB |
999 | free(ref->remote_status); |
1000 | free(ref->symref); | |
1001 | free(ref); | |
1002 | } | |
1003 | ||
dfd255dd DB |
1004 | void free_refs(struct ref *ref) |
1005 | { | |
1006 | struct ref *next; | |
1007 | while (ref) { | |
1008 | next = ref->next; | |
be885d96 | 1009 | free_ref(ref); |
dfd255dd DB |
1010 | ref = next; |
1011 | } | |
1012 | } | |
1013 | ||
ed81c76b JK |
1014 | int ref_compare_name(const void *va, const void *vb) |
1015 | { | |
1016 | const struct ref *a = va, *b = vb; | |
1017 | return strcmp(a->name, b->name); | |
1018 | } | |
1019 | ||
1020 | static void *ref_list_get_next(const void *a) | |
1021 | { | |
1022 | return ((const struct ref *)a)->next; | |
1023 | } | |
1024 | ||
1025 | static void ref_list_set_next(void *a, void *next) | |
1026 | { | |
1027 | ((struct ref *)a)->next = next; | |
1028 | } | |
1029 | ||
1030 | void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *)) | |
1031 | { | |
1032 | *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp); | |
1033 | } | |
1034 | ||
ca02465b JH |
1035 | int count_refspec_match(const char *pattern, |
1036 | struct ref *refs, | |
1037 | struct ref **matched_ref) | |
6b62816c DB |
1038 | { |
1039 | int patlen = strlen(pattern); | |
1040 | struct ref *matched_weak = NULL; | |
1041 | struct ref *matched = NULL; | |
1042 | int weak_match = 0; | |
1043 | int match = 0; | |
1044 | ||
1045 | for (weak_match = match = 0; refs; refs = refs->next) { | |
1046 | char *name = refs->name; | |
1047 | int namelen = strlen(name); | |
6b62816c | 1048 | |
54457fe5 | 1049 | if (!refname_match(pattern, name)) |
6b62816c DB |
1050 | continue; |
1051 | ||
1052 | /* A match is "weak" if it is with refs outside | |
1053 | * heads or tags, and did not specify the pattern | |
1054 | * in full (e.g. "refs/remotes/origin/master") or at | |
1055 | * least from the toplevel (e.g. "remotes/origin/master"); | |
1056 | * otherwise "git push $URL master" would result in | |
1057 | * ambiguity between remotes/origin/master and heads/master | |
1058 | * at the remote site. | |
1059 | */ | |
1060 | if (namelen != patlen && | |
1061 | patlen != namelen - 5 && | |
59556548 CC |
1062 | !starts_with(name, "refs/heads/") && |
1063 | !starts_with(name, "refs/tags/")) { | |
6b62816c DB |
1064 | /* We want to catch the case where only weak |
1065 | * matches are found and there are multiple | |
1066 | * matches, and where more than one strong | |
1067 | * matches are found, as ambiguous. One | |
1068 | * strong match with zero or more weak matches | |
1069 | * are acceptable as a unique match. | |
1070 | */ | |
1071 | matched_weak = refs; | |
1072 | weak_match++; | |
1073 | } | |
1074 | else { | |
1075 | matched = refs; | |
1076 | match++; | |
1077 | } | |
1078 | } | |
1079 | if (!matched) { | |
471fd3fe JK |
1080 | if (matched_ref) |
1081 | *matched_ref = matched_weak; | |
6b62816c DB |
1082 | return weak_match; |
1083 | } | |
1084 | else { | |
471fd3fe JK |
1085 | if (matched_ref) |
1086 | *matched_ref = matched; | |
6b62816c DB |
1087 | return match; |
1088 | } | |
1089 | } | |
1090 | ||
1d735267 | 1091 | static void tail_link_ref(struct ref *ref, struct ref ***tail) |
6b62816c DB |
1092 | { |
1093 | **tail = ref; | |
1d735267 DB |
1094 | while (ref->next) |
1095 | ref = ref->next; | |
6b62816c | 1096 | *tail = &ref->next; |
6b62816c DB |
1097 | } |
1098 | ||
67655246 FC |
1099 | static struct ref *alloc_delete_ref(void) |
1100 | { | |
1101 | struct ref *ref = alloc_ref("(delete)"); | |
f4e54d02 | 1102 | oidclr(&ref->new_oid); |
67655246 FC |
1103 | return ref; |
1104 | } | |
1105 | ||
471fd3fe JK |
1106 | static int try_explicit_object_name(const char *name, |
1107 | struct ref **match) | |
6b62816c | 1108 | { |
fcd30b13 | 1109 | struct object_id oid; |
6b62816c | 1110 | |
471fd3fe JK |
1111 | if (!*name) { |
1112 | if (match) | |
1113 | *match = alloc_delete_ref(); | |
1114 | return 0; | |
1115 | } | |
1116 | ||
e82caf38 | 1117 | if (get_oid(name, &oid)) |
471fd3fe JK |
1118 | return -1; |
1119 | ||
1120 | if (match) { | |
1121 | *match = alloc_ref(name); | |
fcd30b13 | 1122 | oidcpy(&(*match)->new_oid, &oid); |
471fd3fe JK |
1123 | } |
1124 | return 0; | |
6b62816c DB |
1125 | } |
1126 | ||
1d735267 | 1127 | static struct ref *make_linked_ref(const char *name, struct ref ***tail) |
6b62816c | 1128 | { |
59c69c0c | 1129 | struct ref *ret = alloc_ref(name); |
1d735267 DB |
1130 | tail_link_ref(ret, tail); |
1131 | return ret; | |
163f0ee5 | 1132 | } |
8558fd9e | 1133 | |
f8aae120 JK |
1134 | static char *guess_ref(const char *name, struct ref *peer) |
1135 | { | |
1136 | struct strbuf buf = STRBUF_INIT; | |
f8aae120 | 1137 | |
7695d118 | 1138 | const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING, |
744c040b | 1139 | NULL, NULL); |
f8aae120 JK |
1140 | if (!r) |
1141 | return NULL; | |
1142 | ||
59556548 | 1143 | if (starts_with(r, "refs/heads/")) |
f8aae120 | 1144 | strbuf_addstr(&buf, "refs/heads/"); |
59556548 | 1145 | else if (starts_with(r, "refs/tags/")) |
f8aae120 JK |
1146 | strbuf_addstr(&buf, "refs/tags/"); |
1147 | else | |
1148 | return NULL; | |
1149 | ||
1150 | strbuf_addstr(&buf, name); | |
1151 | return strbuf_detach(&buf, NULL); | |
1152 | } | |
1153 | ||
f7ade3d3 JK |
1154 | static int match_explicit_lhs(struct ref *src, |
1155 | struct refspec *rs, | |
1156 | struct ref **match, | |
1157 | int *allocated_match) | |
1158 | { | |
1159 | switch (count_refspec_match(rs->src, src, match)) { | |
1160 | case 1: | |
471fd3fe JK |
1161 | if (allocated_match) |
1162 | *allocated_match = 0; | |
f7ade3d3 JK |
1163 | return 0; |
1164 | case 0: | |
1165 | /* The source could be in the get_sha1() format | |
1166 | * not a reference name. :refs/other is a | |
1167 | * way to delete 'other' ref at the remote end. | |
1168 | */ | |
471fd3fe | 1169 | if (try_explicit_object_name(rs->src, match) < 0) |
f7ade3d3 | 1170 | return error("src refspec %s does not match any.", rs->src); |
471fd3fe JK |
1171 | if (allocated_match) |
1172 | *allocated_match = 1; | |
f7ade3d3 JK |
1173 | return 0; |
1174 | default: | |
1175 | return error("src refspec %s matches more than one.", rs->src); | |
1176 | } | |
1177 | } | |
1178 | ||
54a8ad92 JH |
1179 | static int match_explicit(struct ref *src, struct ref *dst, |
1180 | struct ref ***dst_tail, | |
9a7bbd1d | 1181 | struct refspec *rs) |
6b62816c | 1182 | { |
54a8ad92 | 1183 | struct ref *matched_src, *matched_dst; |
f7ade3d3 | 1184 | int allocated_src; |
8558fd9e | 1185 | |
54a8ad92 | 1186 | const char *dst_value = rs->dst; |
f8aae120 | 1187 | char *dst_guess; |
6b62816c | 1188 | |
a83619d6 | 1189 | if (rs->pattern || rs->matching) |
9a7bbd1d | 1190 | return 0; |
8558fd9e | 1191 | |
54a8ad92 | 1192 | matched_src = matched_dst = NULL; |
f7ade3d3 JK |
1193 | if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0) |
1194 | return -1; | |
3c8b7df1 | 1195 | |
4491e62a | 1196 | if (!dst_value) { |
9f0ea7e8 DB |
1197 | int flag; |
1198 | ||
7695d118 RS |
1199 | dst_value = resolve_ref_unsafe(matched_src->name, |
1200 | RESOLVE_REF_READING, | |
744c040b | 1201 | NULL, &flag); |
9f0ea7e8 DB |
1202 | if (!dst_value || |
1203 | ((flag & REF_ISSYMREF) && | |
59556548 | 1204 | !starts_with(dst_value, "refs/heads/"))) |
9f0ea7e8 DB |
1205 | die("%s cannot be resolved to branch.", |
1206 | matched_src->name); | |
4491e62a | 1207 | } |
3c8b7df1 | 1208 | |
54a8ad92 JH |
1209 | switch (count_refspec_match(dst_value, dst, &matched_dst)) { |
1210 | case 1: | |
1211 | break; | |
1212 | case 0: | |
50e19a83 | 1213 | if (starts_with(dst_value, "refs/")) |
1d735267 | 1214 | matched_dst = make_linked_ref(dst_value, dst_tail); |
f4e54d02 | 1215 | else if (is_null_oid(&matched_src->new_oid)) |
5742c82b JK |
1216 | error("unable to delete '%s': remote ref does not exist", |
1217 | dst_value); | |
3dc7ea91 | 1218 | else if ((dst_guess = guess_ref(dst_value, matched_src))) { |
f8aae120 | 1219 | matched_dst = make_linked_ref(dst_guess, dst_tail); |
3dc7ea91 JS |
1220 | free(dst_guess); |
1221 | } else | |
f8aae120 JK |
1222 | error("unable to push to unqualified destination: %s\n" |
1223 | "The destination refspec neither matches an " | |
1224 | "existing ref on the remote nor\n" | |
1225 | "begins with refs/, and we are unable to " | |
1226 | "guess a prefix based on the source ref.", | |
1227 | dst_value); | |
54a8ad92 JH |
1228 | break; |
1229 | default: | |
3c8b7df1 | 1230 | matched_dst = NULL; |
54a8ad92 JH |
1231 | error("dst refspec %s matches more than one.", |
1232 | dst_value); | |
1233 | break; | |
1234 | } | |
9a7bbd1d JK |
1235 | if (!matched_dst) |
1236 | return -1; | |
1237 | if (matched_dst->peer_ref) | |
1238 | return error("dst ref %s receives from more than one src.", | |
54a8ad92 | 1239 | matched_dst->name); |
54a8ad92 | 1240 | else { |
f7ade3d3 JK |
1241 | matched_dst->peer_ref = allocated_src ? |
1242 | matched_src : | |
1243 | copy_ref(matched_src); | |
54a8ad92 | 1244 | matched_dst->force = rs->force; |
6b62816c | 1245 | } |
9a7bbd1d | 1246 | return 0; |
54a8ad92 JH |
1247 | } |
1248 | ||
1249 | static int match_explicit_refs(struct ref *src, struct ref *dst, | |
1250 | struct ref ***dst_tail, struct refspec *rs, | |
1251 | int rs_nr) | |
1252 | { | |
1253 | int i, errs; | |
1254 | for (i = errs = 0; i < rs_nr; i++) | |
9a7bbd1d JK |
1255 | errs += match_explicit(src, dst, dst_tail, &rs[i]); |
1256 | return errs; | |
6b62816c DB |
1257 | } |
1258 | ||
db70a04c | 1259 | static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref, |
6ddba5e2 | 1260 | int send_mirror, int direction, const struct refspec **ret_pat) |
8558fd9e | 1261 | { |
db70a04c FC |
1262 | const struct refspec *pat; |
1263 | char *name; | |
8558fd9e | 1264 | int i; |
a83619d6 | 1265 | int matching_refs = -1; |
8558fd9e | 1266 | for (i = 0; i < rs_nr; i++) { |
a83619d6 PB |
1267 | if (rs[i].matching && |
1268 | (matching_refs == -1 || rs[i].force)) { | |
1269 | matching_refs = i; | |
1270 | continue; | |
1271 | } | |
1272 | ||
db70a04c FC |
1273 | if (rs[i].pattern) { |
1274 | const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src; | |
6ddba5e2 FC |
1275 | int match; |
1276 | if (direction == FROM_SRC) | |
1277 | match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name); | |
1278 | else | |
1279 | match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name); | |
1280 | if (match) { | |
db70a04c FC |
1281 | matching_refs = i; |
1282 | break; | |
1283 | } | |
1284 | } | |
8558fd9e | 1285 | } |
db70a04c | 1286 | if (matching_refs == -1) |
a83619d6 | 1287 | return NULL; |
db70a04c FC |
1288 | |
1289 | pat = rs + matching_refs; | |
1290 | if (pat->matching) { | |
1291 | /* | |
1292 | * "matching refs"; traditionally we pushed everything | |
1293 | * including refs outside refs/heads/ hierarchy, but | |
1294 | * that does not make much sense these days. | |
1295 | */ | |
59556548 | 1296 | if (!send_mirror && !starts_with(ref->name, "refs/heads/")) |
db70a04c FC |
1297 | return NULL; |
1298 | name = xstrdup(ref->name); | |
1299 | } | |
1300 | if (ret_pat) | |
1301 | *ret_pat = pat; | |
1302 | return name; | |
8558fd9e DB |
1303 | } |
1304 | ||
6d2bf96e CB |
1305 | static struct ref **tail_ref(struct ref **head) |
1306 | { | |
1307 | struct ref **tail = head; | |
1308 | while (*tail) | |
1309 | tail = &((*tail)->next); | |
1310 | return tail; | |
1311 | } | |
1312 | ||
c2aba155 JH |
1313 | struct tips { |
1314 | struct commit **tip; | |
1315 | int nr, alloc; | |
1316 | }; | |
1317 | ||
fcd30b13 | 1318 | static void add_to_tips(struct tips *tips, const struct object_id *oid) |
c2aba155 JH |
1319 | { |
1320 | struct commit *commit; | |
1321 | ||
fcd30b13 | 1322 | if (is_null_oid(oid)) |
c2aba155 | 1323 | return; |
bc83266a | 1324 | commit = lookup_commit_reference_gently(oid, 1); |
c2aba155 JH |
1325 | if (!commit || (commit->object.flags & TMP_MARK)) |
1326 | return; | |
1327 | commit->object.flags |= TMP_MARK; | |
1328 | ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc); | |
1329 | tips->tip[tips->nr++] = commit; | |
1330 | } | |
1331 | ||
1332 | static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail) | |
1333 | { | |
1334 | struct string_list dst_tag = STRING_LIST_INIT_NODUP; | |
1335 | struct string_list src_tag = STRING_LIST_INIT_NODUP; | |
1336 | struct string_list_item *item; | |
1337 | struct ref *ref; | |
1338 | struct tips sent_tips; | |
1339 | ||
1340 | /* | |
1341 | * Collect everything we know they would have at the end of | |
1342 | * this push, and collect all tags they have. | |
1343 | */ | |
1344 | memset(&sent_tips, 0, sizeof(sent_tips)); | |
1345 | for (ref = *dst; ref; ref = ref->next) { | |
1346 | if (ref->peer_ref && | |
f4e54d02 | 1347 | !is_null_oid(&ref->peer_ref->new_oid)) |
fcd30b13 | 1348 | add_to_tips(&sent_tips, &ref->peer_ref->new_oid); |
c2aba155 | 1349 | else |
fcd30b13 | 1350 | add_to_tips(&sent_tips, &ref->old_oid); |
59556548 | 1351 | if (starts_with(ref->name, "refs/tags/")) |
c2aba155 JH |
1352 | string_list_append(&dst_tag, ref->name); |
1353 | } | |
1354 | clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK); | |
1355 | ||
3383e199 | 1356 | string_list_sort(&dst_tag); |
c2aba155 JH |
1357 | |
1358 | /* Collect tags they do not have. */ | |
1359 | for (ref = src; ref; ref = ref->next) { | |
59556548 | 1360 | if (!starts_with(ref->name, "refs/tags/")) |
c2aba155 JH |
1361 | continue; /* not a tag */ |
1362 | if (string_list_has_string(&dst_tag, ref->name)) | |
1363 | continue; /* they already have it */ | |
f4e54d02 | 1364 | if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG) |
c2aba155 JH |
1365 | continue; /* be conservative */ |
1366 | item = string_list_append(&src_tag, ref->name); | |
1367 | item->util = ref; | |
1368 | } | |
1369 | string_list_clear(&dst_tag, 0); | |
1370 | ||
1371 | /* | |
1372 | * At this point, src_tag lists tags that are missing from | |
1373 | * dst, and sent_tips lists the tips we are pushing or those | |
1374 | * that we know they already have. An element in the src_tag | |
1375 | * that is an ancestor of any of the sent_tips needs to be | |
1376 | * sent to the other side. | |
1377 | */ | |
1378 | if (sent_tips.nr) { | |
1379 | for_each_string_list_item(item, &src_tag) { | |
1380 | struct ref *ref = item->util; | |
1381 | struct ref *dst_ref; | |
1382 | struct commit *commit; | |
1383 | ||
f4e54d02 | 1384 | if (is_null_oid(&ref->new_oid)) |
c2aba155 | 1385 | continue; |
bc83266a | 1386 | commit = lookup_commit_reference_gently(&ref->new_oid, |
1387 | 1); | |
c2aba155 JH |
1388 | if (!commit) |
1389 | /* not pushing a commit, which is not an error */ | |
1390 | continue; | |
1391 | ||
1392 | /* | |
1393 | * Is this tag, which they do not have, reachable from | |
1394 | * any of the commits we are sending? | |
1395 | */ | |
1396 | if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip)) | |
1397 | continue; | |
1398 | ||
1399 | /* Add it in */ | |
1400 | dst_ref = make_linked_ref(ref->name, dst_tail); | |
f4e54d02 | 1401 | oidcpy(&dst_ref->new_oid, &ref->new_oid); |
c2aba155 JH |
1402 | dst_ref->peer_ref = copy_ref(ref); |
1403 | } | |
1404 | } | |
1405 | string_list_clear(&src_tag, 0); | |
1406 | free(sent_tips.tip); | |
1407 | } | |
1408 | ||
47a59185 JH |
1409 | struct ref *find_ref_by_name(const struct ref *list, const char *name) |
1410 | { | |
1411 | for ( ; list; list = list->next) | |
1412 | if (!strcmp(list->name, name)) | |
1413 | return (struct ref *)list; | |
1414 | return NULL; | |
1415 | } | |
1416 | ||
f1bd15ab BC |
1417 | static void prepare_ref_index(struct string_list *ref_index, struct ref *ref) |
1418 | { | |
1419 | for ( ; ref; ref = ref->next) | |
1420 | string_list_append_nodup(ref_index, ref->name)->util = ref; | |
1421 | ||
3383e199 | 1422 | string_list_sort(ref_index); |
f1bd15ab BC |
1423 | } |
1424 | ||
ba928c13 JK |
1425 | /* |
1426 | * Given only the set of local refs, sanity-check the set of push | |
1427 | * refspecs. We can't catch all errors that match_push_refs would, | |
1428 | * but we can catch some errors early before even talking to the | |
1429 | * remote side. | |
1430 | */ | |
1431 | int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names) | |
1432 | { | |
1433 | struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names); | |
1434 | int ret = 0; | |
1435 | int i; | |
1436 | ||
1437 | for (i = 0; i < nr_refspec; i++) { | |
1438 | struct refspec *rs = refspec + i; | |
1439 | ||
1440 | if (rs->pattern || rs->matching) | |
1441 | continue; | |
1442 | ||
1443 | ret |= match_explicit_lhs(src, rs, NULL, NULL); | |
1444 | } | |
1445 | ||
1446 | free_refspec(nr_refspec, refspec); | |
1447 | return ret; | |
1448 | } | |
1449 | ||
54a8ad92 | 1450 | /* |
29753cdd JH |
1451 | * Given the set of refs the local repository has, the set of refs the |
1452 | * remote repository has, and the refspec used for push, determine | |
1453 | * what remote refs we will update and with what value by setting | |
1454 | * peer_ref (which object is being pushed) and force (if the push is | |
1455 | * forced) in elements of "dst". The function may add new elements to | |
1456 | * dst (e.g. pushing to a new branch, done in match_explicit_refs). | |
54a8ad92 | 1457 | */ |
29753cdd JH |
1458 | int match_push_refs(struct ref *src, struct ref **dst, |
1459 | int nr_refspec, const char **refspec, int flags) | |
6b62816c | 1460 | { |
a83619d6 | 1461 | struct refspec *rs; |
28b9d6e5 AW |
1462 | int send_all = flags & MATCH_REFS_ALL; |
1463 | int send_mirror = flags & MATCH_REFS_MIRROR; | |
6ddba5e2 | 1464 | int send_prune = flags & MATCH_REFS_PRUNE; |
5f48cb95 | 1465 | int errs; |
2af202be | 1466 | static const char *default_refspec[] = { ":", NULL }; |
b1d8b1f3 | 1467 | struct ref *ref, **dst_tail = tail_ref(dst); |
f1bd15ab | 1468 | struct string_list dst_ref_index = STRING_LIST_INIT_NODUP; |
6b62816c | 1469 | |
a83619d6 PB |
1470 | if (!nr_refspec) { |
1471 | nr_refspec = 1; | |
1472 | refspec = default_refspec; | |
1473 | } | |
1474 | rs = parse_push_refspec(nr_refspec, (const char **) refspec); | |
6d2bf96e | 1475 | errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec); |
6b62816c DB |
1476 | |
1477 | /* pick the remainder */ | |
b1d8b1f3 | 1478 | for (ref = src; ref; ref = ref->next) { |
f1bd15ab | 1479 | struct string_list_item *dst_item; |
6b62816c | 1480 | struct ref *dst_peer; |
6e66bf3c AR |
1481 | const struct refspec *pat = NULL; |
1482 | char *dst_name; | |
db70a04c | 1483 | |
6ddba5e2 | 1484 | dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat); |
db70a04c | 1485 | if (!dst_name) |
a83619d6 PB |
1486 | continue; |
1487 | ||
f1bd15ab BC |
1488 | if (!dst_ref_index.nr) |
1489 | prepare_ref_index(&dst_ref_index, *dst); | |
1490 | ||
1491 | dst_item = string_list_lookup(&dst_ref_index, dst_name); | |
1492 | dst_peer = dst_item ? dst_item->util : NULL; | |
a83619d6 PB |
1493 | if (dst_peer) { |
1494 | if (dst_peer->peer_ref) | |
1495 | /* We're already sending something to this ref. */ | |
1496 | goto free_name; | |
a83619d6 PB |
1497 | } else { |
1498 | if (pat->matching && !(send_all || send_mirror)) | |
1499 | /* | |
1500 | * Remote doesn't have it, and we have no | |
1501 | * explicit pattern, and we don't have | |
01689909 | 1502 | * --all or --mirror. |
a83619d6 PB |
1503 | */ |
1504 | goto free_name; | |
28b9d6e5 | 1505 | |
6b62816c | 1506 | /* Create a new one and link it */ |
6d2bf96e | 1507 | dst_peer = make_linked_ref(dst_name, &dst_tail); |
f4e54d02 | 1508 | oidcpy(&dst_peer->new_oid, &ref->new_oid); |
f1bd15ab BC |
1509 | string_list_insert(&dst_ref_index, |
1510 | dst_peer->name)->util = dst_peer; | |
6b62816c | 1511 | } |
b1d8b1f3 | 1512 | dst_peer->peer_ref = copy_ref(ref); |
a83619d6 | 1513 | dst_peer->force = pat->force; |
6e66bf3c AR |
1514 | free_name: |
1515 | free(dst_name); | |
6b62816c | 1516 | } |
c2aba155 | 1517 | |
f1bd15ab BC |
1518 | string_list_clear(&dst_ref_index, 0); |
1519 | ||
c2aba155 JH |
1520 | if (flags & MATCH_REFS_FOLLOW_TAGS) |
1521 | add_missing_tags(src, dst, &dst_tail); | |
1522 | ||
6ddba5e2 | 1523 | if (send_prune) { |
f1bd15ab | 1524 | struct string_list src_ref_index = STRING_LIST_INIT_NODUP; |
6ddba5e2 FC |
1525 | /* check for missing refs on the remote */ |
1526 | for (ref = *dst; ref; ref = ref->next) { | |
1527 | char *src_name; | |
1528 | ||
1529 | if (ref->peer_ref) | |
1530 | /* We're already sending something to this ref. */ | |
1531 | continue; | |
1532 | ||
1533 | src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL); | |
1534 | if (src_name) { | |
f1bd15ab BC |
1535 | if (!src_ref_index.nr) |
1536 | prepare_ref_index(&src_ref_index, src); | |
1537 | if (!string_list_has_string(&src_ref_index, | |
1538 | src_name)) | |
6ddba5e2 FC |
1539 | ref->peer_ref = alloc_delete_ref(); |
1540 | free(src_name); | |
1541 | } | |
1542 | } | |
f1bd15ab | 1543 | string_list_clear(&src_ref_index, 0); |
6ddba5e2 | 1544 | } |
5f48cb95 JS |
1545 | if (errs) |
1546 | return -1; | |
6b62816c DB |
1547 | return 0; |
1548 | } | |
cf818348 | 1549 | |
20e8b465 | 1550 | void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, |
631b5ef2 | 1551 | int force_update) |
20e8b465 TRC |
1552 | { |
1553 | struct ref *ref; | |
1554 | ||
1555 | for (ref = remote_refs; ref; ref = ref->next) { | |
8c5f6f71 | 1556 | int force_ref_update = ref->force || force_update; |
631b5ef2 | 1557 | int reject_reason = 0; |
8c5f6f71 | 1558 | |
20e8b465 | 1559 | if (ref->peer_ref) |
f4e54d02 | 1560 | oidcpy(&ref->new_oid, &ref->peer_ref->new_oid); |
20e8b465 TRC |
1561 | else if (!send_mirror) |
1562 | continue; | |
1563 | ||
f4e54d02 | 1564 | ref->deletion = is_null_oid(&ref->new_oid); |
20e8b465 | 1565 | if (!ref->deletion && |
f4e54d02 | 1566 | !oidcmp(&ref->old_oid, &ref->new_oid)) { |
20e8b465 TRC |
1567 | ref->status = REF_STATUS_UPTODATE; |
1568 | continue; | |
1569 | } | |
1570 | ||
a272b289 | 1571 | /* |
b2e93f88 AW |
1572 | * If the remote ref has moved and is now different |
1573 | * from what we expect, reject any push. | |
631b5ef2 JH |
1574 | * |
1575 | * It also is an error if the user told us to check | |
1576 | * with the remote-tracking branch to find the value | |
1577 | * to expect, but we did not have such a tracking | |
1578 | * branch. | |
1579 | */ | |
1580 | if (ref->expect_old_sha1) { | |
64ac39af | 1581 | if (oidcmp(&ref->old_oid, &ref->old_oid_expect)) |
631b5ef2 | 1582 | reject_reason = REF_STATUS_REJECT_STALE; |
b2e93f88 AW |
1583 | else |
1584 | /* If the ref isn't stale then force the update. */ | |
1585 | force_ref_update = 1; | |
631b5ef2 JH |
1586 | } |
1587 | ||
1588 | /* | |
b2e93f88 AW |
1589 | * If the update isn't already rejected then check |
1590 | * the usual "must fast-forward" rules. | |
631b5ef2 | 1591 | * |
256b9d70 JH |
1592 | * Decide whether an individual refspec A:B can be |
1593 | * pushed. The push will succeed if any of the | |
1594 | * following are true: | |
20e8b465 | 1595 | * |
a272b289 | 1596 | * (1) the remote reference B does not exist |
20e8b465 | 1597 | * |
a272b289 CR |
1598 | * (2) the remote reference B is being removed (i.e., |
1599 | * pushing :B where no source is specified) | |
20e8b465 | 1600 | * |
256b9d70 JH |
1601 | * (3) the destination is not under refs/tags/, and |
1602 | * if the old and new value is a commit, the new | |
1603 | * is a descendant of the old. | |
20e8b465 | 1604 | * |
a272b289 CR |
1605 | * (4) it is forced using the +A:B notation, or by |
1606 | * passing the --force argument | |
20e8b465 TRC |
1607 | */ |
1608 | ||
b2e93f88 | 1609 | if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) { |
59556548 | 1610 | if (starts_with(ref->name, "refs/tags/")) |
631b5ef2 | 1611 | reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS; |
f4e54d02 | 1612 | else if (!has_object_file(&ref->old_oid)) |
631b5ef2 | 1613 | reject_reason = REF_STATUS_REJECT_FETCH_FIRST; |
bc83266a | 1614 | else if (!lookup_commit_reference_gently(&ref->old_oid, 1) || |
1615 | !lookup_commit_reference_gently(&ref->new_oid, 1)) | |
631b5ef2 | 1616 | reject_reason = REF_STATUS_REJECT_NEEDS_FORCE; |
6f3d57b6 | 1617 | else if (!ref_newer(&ref->new_oid, &ref->old_oid)) |
631b5ef2 | 1618 | reject_reason = REF_STATUS_REJECT_NONFASTFORWARD; |
20e8b465 | 1619 | } |
631b5ef2 JH |
1620 | |
1621 | /* | |
1622 | * "--force" will defeat any rejection implemented | |
1623 | * by the rules above. | |
1624 | */ | |
1625 | if (!force_ref_update) | |
1626 | ref->status = reject_reason; | |
1627 | else if (reject_reason) | |
1628 | ref->forced_update = 1; | |
20e8b465 TRC |
1629 | } |
1630 | } | |
1631 | ||
05e73682 JH |
1632 | static void set_merge(struct branch *ret) |
1633 | { | |
9e3751d4 | 1634 | struct remote *remote; |
05e73682 | 1635 | char *ref; |
fcd30b13 | 1636 | struct object_id oid; |
05e73682 JH |
1637 | int i; |
1638 | ||
ee2499fe JK |
1639 | if (!ret) |
1640 | return; /* no branch */ | |
1641 | if (ret->merge) | |
1642 | return; /* already run */ | |
1643 | if (!ret->remote_name || !ret->merge_nr) { | |
1644 | /* | |
1645 | * no merge config; let's make sure we don't confuse callers | |
1646 | * with a non-zero merge_nr but a NULL merge | |
1647 | */ | |
1648 | ret->merge_nr = 0; | |
1649 | return; | |
1650 | } | |
1651 | ||
9e3751d4 JK |
1652 | remote = remote_get(ret->remote_name); |
1653 | ||
05e73682 JH |
1654 | ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge)); |
1655 | for (i = 0; i < ret->merge_nr; i++) { | |
1656 | ret->merge[i] = xcalloc(1, sizeof(**ret->merge)); | |
1657 | ret->merge[i]->src = xstrdup(ret->merge_name[i]); | |
9e3751d4 | 1658 | if (!remote_find_tracking(remote, ret->merge[i]) || |
05e73682 JH |
1659 | strcmp(ret->remote_name, ".")) |
1660 | continue; | |
1661 | if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]), | |
cca5fa64 | 1662 | &oid, &ref) == 1) |
05e73682 JH |
1663 | ret->merge[i]->dst = ref; |
1664 | else | |
1665 | ret->merge[i]->dst = xstrdup(ret->merge_name[i]); | |
1666 | } | |
1667 | } | |
1668 | ||
cf818348 DB |
1669 | struct branch *branch_get(const char *name) |
1670 | { | |
1671 | struct branch *ret; | |
1672 | ||
1673 | read_config(); | |
1674 | if (!name || !*name || !strcmp(name, "HEAD")) | |
1675 | ret = current_branch; | |
1676 | else | |
1677 | ret = make_branch(name, 0); | |
ee2499fe | 1678 | set_merge(ret); |
cf818348 DB |
1679 | return ret; |
1680 | } | |
1681 | ||
1682 | int branch_has_merge_config(struct branch *branch) | |
1683 | { | |
1684 | return branch && !!branch->merge; | |
1685 | } | |
1686 | ||
85682c19 SP |
1687 | int branch_merge_matches(struct branch *branch, |
1688 | int i, | |
1689 | const char *refname) | |
cf818348 | 1690 | { |
85682c19 | 1691 | if (!branch || i < 0 || i >= branch->merge_nr) |
cf818348 | 1692 | return 0; |
54457fe5 | 1693 | return refname_match(branch->merge[i]->src, refname); |
cf818348 | 1694 | } |
d71ab174 | 1695 | |
060e7766 | 1696 | __attribute__((format (printf,2,3))) |
3a429d0a JK |
1697 | static const char *error_buf(struct strbuf *err, const char *fmt, ...) |
1698 | { | |
1699 | if (err) { | |
1700 | va_list ap; | |
1701 | va_start(ap, fmt); | |
1702 | strbuf_vaddf(err, fmt, ap); | |
1703 | va_end(ap); | |
1704 | } | |
1705 | return NULL; | |
1706 | } | |
1707 | ||
1708 | const char *branch_get_upstream(struct branch *branch, struct strbuf *err) | |
1709 | { | |
1710 | if (!branch) | |
1711 | return error_buf(err, _("HEAD does not point to a branch")); | |
1ca41a19 JK |
1712 | |
1713 | if (!branch->merge || !branch->merge[0]) { | |
1714 | /* | |
1715 | * no merge config; is it because the user didn't define any, | |
1716 | * or because it is not a real branch, and get_branch | |
1717 | * auto-vivified it? | |
1718 | */ | |
3a429d0a JK |
1719 | if (!ref_exists(branch->refname)) |
1720 | return error_buf(err, _("no such branch: '%s'"), | |
1721 | branch->name); | |
1ca41a19 JK |
1722 | return error_buf(err, |
1723 | _("no upstream configured for branch '%s'"), | |
1724 | branch->name); | |
1725 | } | |
1726 | ||
1727 | if (!branch->merge[0]->dst) | |
3a429d0a JK |
1728 | return error_buf(err, |
1729 | _("upstream branch '%s' not stored as a remote-tracking branch"), | |
1730 | branch->merge[0]->src); | |
3a429d0a | 1731 | |
a9f9f8cc JK |
1732 | return branch->merge[0]->dst; |
1733 | } | |
1734 | ||
e291c75a JK |
1735 | static const char *tracking_for_push_dest(struct remote *remote, |
1736 | const char *refname, | |
1737 | struct strbuf *err) | |
1738 | { | |
1739 | char *ret; | |
1740 | ||
1741 | ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname); | |
1742 | if (!ret) | |
1743 | return error_buf(err, | |
1744 | _("push destination '%s' on remote '%s' has no local tracking branch"), | |
1745 | refname, remote->name); | |
1746 | return ret; | |
1747 | } | |
1748 | ||
1749 | static const char *branch_get_push_1(struct branch *branch, struct strbuf *err) | |
1750 | { | |
1751 | struct remote *remote; | |
1752 | ||
e291c75a JK |
1753 | remote = remote_get(pushremote_for_branch(branch, NULL)); |
1754 | if (!remote) | |
1755 | return error_buf(err, | |
1756 | _("branch '%s' has no remote for pushing"), | |
1757 | branch->name); | |
1758 | ||
1759 | if (remote->push_refspec_nr) { | |
1760 | char *dst; | |
1761 | const char *ret; | |
1762 | ||
1763 | dst = apply_refspecs(remote->push, remote->push_refspec_nr, | |
1764 | branch->refname); | |
1765 | if (!dst) | |
1766 | return error_buf(err, | |
1767 | _("push refspecs for '%s' do not include '%s'"), | |
1768 | remote->name, branch->name); | |
1769 | ||
1770 | ret = tracking_for_push_dest(remote, dst, err); | |
1771 | free(dst); | |
1772 | return ret; | |
1773 | } | |
1774 | ||
1775 | if (remote->mirror) | |
1776 | return tracking_for_push_dest(remote, branch->refname, err); | |
1777 | ||
1778 | switch (push_default) { | |
1779 | case PUSH_DEFAULT_NOTHING: | |
1780 | return error_buf(err, _("push has no destination (push.default is 'nothing')")); | |
1781 | ||
1782 | case PUSH_DEFAULT_MATCHING: | |
1783 | case PUSH_DEFAULT_CURRENT: | |
1784 | return tracking_for_push_dest(remote, branch->refname, err); | |
1785 | ||
1786 | case PUSH_DEFAULT_UPSTREAM: | |
1787 | return branch_get_upstream(branch, err); | |
1788 | ||
1789 | case PUSH_DEFAULT_UNSPECIFIED: | |
1790 | case PUSH_DEFAULT_SIMPLE: | |
1791 | { | |
1792 | const char *up, *cur; | |
1793 | ||
1794 | up = branch_get_upstream(branch, err); | |
1795 | if (!up) | |
1796 | return NULL; | |
1797 | cur = tracking_for_push_dest(remote, branch->refname, err); | |
1798 | if (!cur) | |
1799 | return NULL; | |
1800 | if (strcmp(cur, up)) | |
1801 | return error_buf(err, | |
1802 | _("cannot resolve 'simple' push to a single destination")); | |
1803 | return cur; | |
1804 | } | |
1805 | } | |
1806 | ||
1807 | die("BUG: unhandled push situation"); | |
1808 | } | |
1809 | ||
1810 | const char *branch_get_push(struct branch *branch, struct strbuf *err) | |
1811 | { | |
b10731f4 KM |
1812 | if (!branch) |
1813 | return error_buf(err, _("HEAD does not point to a branch")); | |
1814 | ||
e291c75a JK |
1815 | if (!branch->push_tracking_ref) |
1816 | branch->push_tracking_ref = branch_get_push_1(branch, err); | |
1817 | return branch->push_tracking_ref; | |
1818 | } | |
1819 | ||
f8fb971e JH |
1820 | static int ignore_symref_update(const char *refname) |
1821 | { | |
f8fb971e JH |
1822 | int flag; |
1823 | ||
744c040b | 1824 | if (!resolve_ref_unsafe(refname, 0, NULL, &flag)) |
f8fb971e JH |
1825 | return 0; /* non-existing refs are OK */ |
1826 | return (flag & REF_ISSYMREF); | |
1827 | } | |
1828 | ||
f166db26 MH |
1829 | /* |
1830 | * Create and return a list of (struct ref) consisting of copies of | |
1831 | * each remote_ref that matches refspec. refspec must be a pattern. | |
1832 | * Fill in the copies' peer_ref to describe the local tracking refs to | |
1833 | * which they map. Omit any references that would map to an existing | |
1834 | * local symbolic ref. | |
1835 | */ | |
4577370e | 1836 | static struct ref *get_expanded_map(const struct ref *remote_refs, |
d71ab174 DB |
1837 | const struct refspec *refspec) |
1838 | { | |
4577370e | 1839 | const struct ref *ref; |
d71ab174 DB |
1840 | struct ref *ret = NULL; |
1841 | struct ref **tail = &ret; | |
1842 | ||
d71ab174 | 1843 | for (ref = remote_refs; ref; ref = ref->next) { |
e31a17f7 MH |
1844 | char *expn_name = NULL; |
1845 | ||
d71ab174 DB |
1846 | if (strchr(ref->name, '^')) |
1847 | continue; /* a dereference item */ | |
e928213f | 1848 | if (match_name_with_pattern(refspec->src, ref->name, |
f8fb971e JH |
1849 | refspec->dst, &expn_name) && |
1850 | !ignore_symref_update(expn_name)) { | |
d71ab174 | 1851 | struct ref *cpy = copy_ref(ref); |
d71ab174 | 1852 | |
e928213f | 1853 | cpy->peer_ref = alloc_ref(expn_name); |
d71ab174 DB |
1854 | if (refspec->force) |
1855 | cpy->peer_ref->force = 1; | |
1856 | *tail = cpy; | |
1857 | tail = &cpy->next; | |
1858 | } | |
e31a17f7 | 1859 | free(expn_name); |
d71ab174 DB |
1860 | } |
1861 | ||
1862 | return ret; | |
1863 | } | |
1864 | ||
4577370e | 1865 | static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name) |
d71ab174 | 1866 | { |
4577370e | 1867 | const struct ref *ref; |
d71ab174 | 1868 | for (ref = refs; ref; ref = ref->next) { |
54457fe5 | 1869 | if (refname_match(name, ref->name)) |
d71ab174 DB |
1870 | return ref; |
1871 | } | |
1872 | return NULL; | |
1873 | } | |
1874 | ||
4577370e | 1875 | struct ref *get_remote_ref(const struct ref *remote_refs, const char *name) |
d71ab174 | 1876 | { |
4577370e | 1877 | const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name); |
d71ab174 DB |
1878 | |
1879 | if (!ref) | |
9ad7c5ae | 1880 | return NULL; |
d71ab174 DB |
1881 | |
1882 | return copy_ref(ref); | |
1883 | } | |
1884 | ||
1885 | static struct ref *get_local_ref(const char *name) | |
1886 | { | |
3eb96997 | 1887 | if (!name || name[0] == '\0') |
d71ab174 DB |
1888 | return NULL; |
1889 | ||
59556548 | 1890 | if (starts_with(name, "refs/")) |
59c69c0c | 1891 | return alloc_ref(name); |
d71ab174 | 1892 | |
59556548 CC |
1893 | if (starts_with(name, "heads/") || |
1894 | starts_with(name, "tags/") || | |
1895 | starts_with(name, "remotes/")) | |
8009768e | 1896 | return alloc_ref_with_prefix("refs/", 5, name); |
d71ab174 | 1897 | |
8009768e | 1898 | return alloc_ref_with_prefix("refs/heads/", 11, name); |
d71ab174 DB |
1899 | } |
1900 | ||
4577370e | 1901 | int get_fetch_map(const struct ref *remote_refs, |
d71ab174 | 1902 | const struct refspec *refspec, |
9ad7c5ae JH |
1903 | struct ref ***tail, |
1904 | int missing_ok) | |
d71ab174 | 1905 | { |
ef00d150 | 1906 | struct ref *ref_map, **rmp; |
d71ab174 DB |
1907 | |
1908 | if (refspec->pattern) { | |
1909 | ref_map = get_expanded_map(remote_refs, refspec); | |
1910 | } else { | |
9ad7c5ae JH |
1911 | const char *name = refspec->src[0] ? refspec->src : "HEAD"; |
1912 | ||
6e7b66ee JH |
1913 | if (refspec->exact_sha1) { |
1914 | ref_map = alloc_ref(name); | |
f4e54d02 | 1915 | get_oid_hex(name, &ref_map->old_oid); |
6e7b66ee JH |
1916 | } else { |
1917 | ref_map = get_remote_ref(remote_refs, name); | |
1918 | } | |
9ad7c5ae JH |
1919 | if (!missing_ok && !ref_map) |
1920 | die("Couldn't find remote ref %s", name); | |
1921 | if (ref_map) { | |
1922 | ref_map->peer_ref = get_local_ref(refspec->dst); | |
1923 | if (ref_map->peer_ref && refspec->force) | |
1924 | ref_map->peer_ref->force = 1; | |
1925 | } | |
d71ab174 DB |
1926 | } |
1927 | ||
ef00d150 DB |
1928 | for (rmp = &ref_map; *rmp; ) { |
1929 | if ((*rmp)->peer_ref) { | |
59556548 | 1930 | if (!starts_with((*rmp)->peer_ref->name, "refs/") || |
5c08c1f2 | 1931 | check_refname_format((*rmp)->peer_ref->name, 0)) { |
ef00d150 DB |
1932 | struct ref *ignore = *rmp; |
1933 | error("* Ignoring funny ref '%s' locally", | |
1934 | (*rmp)->peer_ref->name); | |
1935 | *rmp = (*rmp)->next; | |
1936 | free(ignore->peer_ref); | |
1937 | free(ignore); | |
1938 | continue; | |
1939 | } | |
1940 | } | |
1941 | rmp = &((*rmp)->next); | |
d71ab174 DB |
1942 | } |
1943 | ||
8f70a765 AR |
1944 | if (ref_map) |
1945 | tail_link_ref(ref_map, tail); | |
d71ab174 DB |
1946 | |
1947 | return 0; | |
1948 | } | |
be885d96 DB |
1949 | |
1950 | int resolve_remote_symref(struct ref *ref, struct ref *list) | |
1951 | { | |
1952 | if (!ref->symref) | |
1953 | return 0; | |
1954 | for (; list; list = list->next) | |
1955 | if (!strcmp(ref->symref, list->name)) { | |
f4e54d02 | 1956 | oidcpy(&ref->old_oid, &list->old_oid); |
be885d96 DB |
1957 | return 0; |
1958 | } | |
1959 | return 1; | |
1960 | } | |
6d21bf96 | 1961 | |
ec8452d5 JS |
1962 | static void unmark_and_free(struct commit_list *list, unsigned int mark) |
1963 | { | |
1964 | while (list) { | |
e510ab89 RS |
1965 | struct commit *commit = pop_commit(&list); |
1966 | commit->object.flags &= ~mark; | |
ec8452d5 JS |
1967 | } |
1968 | } | |
1969 | ||
6f3d57b6 | 1970 | int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) |
ec8452d5 JS |
1971 | { |
1972 | struct object *o; | |
1973 | struct commit *old, *new; | |
1974 | struct commit_list *list, *used; | |
1975 | int found = 0; | |
1976 | ||
75e5c0dc JH |
1977 | /* |
1978 | * Both new and old must be commit-ish and new is descendant of | |
ec8452d5 JS |
1979 | * old. Otherwise we require --force. |
1980 | */ | |
c251c83d | 1981 | o = deref_tag(parse_object(old_oid), NULL, 0); |
ec8452d5 JS |
1982 | if (!o || o->type != OBJ_COMMIT) |
1983 | return 0; | |
1984 | old = (struct commit *) o; | |
1985 | ||
c251c83d | 1986 | o = deref_tag(parse_object(new_oid), NULL, 0); |
ec8452d5 JS |
1987 | if (!o || o->type != OBJ_COMMIT) |
1988 | return 0; | |
1989 | new = (struct commit *) o; | |
1990 | ||
1991 | if (parse_commit(new) < 0) | |
1992 | return 0; | |
1993 | ||
1994 | used = list = NULL; | |
1995 | commit_list_insert(new, &list); | |
1996 | while (list) { | |
1997 | new = pop_most_recent_commit(&list, TMP_MARK); | |
1998 | commit_list_insert(new, &used); | |
1999 | if (new == old) { | |
2000 | found = 1; | |
2001 | break; | |
2002 | } | |
2003 | } | |
2004 | unmark_and_free(list, TMP_MARK); | |
2005 | unmark_and_free(used, TMP_MARK); | |
2006 | return found; | |
2007 | } | |
2008 | ||
6d21bf96 | 2009 | /* |
f2e08739 | 2010 | * Compare a branch with its upstream, and save their differences (number |
979cb245 JK |
2011 | * of commits) in *num_ours and *num_theirs. The name of the upstream branch |
2012 | * (or NULL if no upstream is defined) is returned via *upstream_name, if it | |
2013 | * is not itself NULL. | |
f2e08739 | 2014 | * |
979cb245 JK |
2015 | * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no |
2016 | * upstream defined, or ref does not exist), 0 otherwise. | |
6d21bf96 | 2017 | */ |
979cb245 JK |
2018 | int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, |
2019 | const char **upstream_name) | |
6d21bf96 | 2020 | { |
fcd30b13 | 2021 | struct object_id oid; |
6d21bf96 | 2022 | struct commit *ours, *theirs; |
6d21bf96 | 2023 | struct rev_info revs; |
0b282cc4 JK |
2024 | const char *base; |
2025 | struct argv_array argv = ARGV_ARRAY_INIT; | |
6d21bf96 | 2026 | |
f2e08739 | 2027 | /* Cannot stat unless we are marked to build on top of somebody else. */ |
3a429d0a | 2028 | base = branch_get_upstream(branch, NULL); |
979cb245 JK |
2029 | if (upstream_name) |
2030 | *upstream_name = base; | |
a9f9f8cc | 2031 | if (!base) |
979cb245 | 2032 | return -1; |
6d21bf96 | 2033 | |
f2e08739 | 2034 | /* Cannot stat if what we used to build on no longer exists */ |
34c290a6 | 2035 | if (read_ref(base, &oid)) |
f2e08739 | 2036 | return -1; |
bc83266a | 2037 | theirs = lookup_commit_reference(&oid); |
6d21bf96 | 2038 | if (!theirs) |
f2e08739 | 2039 | return -1; |
6d21bf96 | 2040 | |
34c290a6 | 2041 | if (read_ref(branch->refname, &oid)) |
f2e08739 | 2042 | return -1; |
bc83266a | 2043 | ours = lookup_commit_reference(&oid); |
6d21bf96 | 2044 | if (!ours) |
f2e08739 | 2045 | return -1; |
6d21bf96 JH |
2046 | |
2047 | /* are we the same? */ | |
f2e08739 JX |
2048 | if (theirs == ours) { |
2049 | *num_theirs = *num_ours = 0; | |
979cb245 | 2050 | return 0; |
f2e08739 | 2051 | } |
6d21bf96 | 2052 | |
8fbf879e | 2053 | /* Run "rev-list --left-right ours...theirs" internally... */ |
0b282cc4 JK |
2054 | argv_array_push(&argv, ""); /* ignored */ |
2055 | argv_array_push(&argv, "--left-right"); | |
2056 | argv_array_pushf(&argv, "%s...%s", | |
f2fd0760 | 2057 | oid_to_hex(&ours->object.oid), |
2058 | oid_to_hex(&theirs->object.oid)); | |
0b282cc4 | 2059 | argv_array_push(&argv, "--"); |
6d21bf96 JH |
2060 | |
2061 | init_revisions(&revs, NULL); | |
0b282cc4 | 2062 | setup_revisions(argv.argc, argv.argv, &revs, NULL); |
81c3ce3c SB |
2063 | if (prepare_revision_walk(&revs)) |
2064 | die("revision walk setup failed"); | |
6d21bf96 JH |
2065 | |
2066 | /* ... and count the commits on each side. */ | |
2067 | *num_ours = 0; | |
2068 | *num_theirs = 0; | |
2069 | while (1) { | |
2070 | struct commit *c = get_revision(&revs); | |
2071 | if (!c) | |
2072 | break; | |
2073 | if (c->object.flags & SYMMETRIC_LEFT) | |
2074 | (*num_ours)++; | |
2075 | else | |
2076 | (*num_theirs)++; | |
2077 | } | |
c0234b2e JH |
2078 | |
2079 | /* clear object flags smudged by the above traversal */ | |
2080 | clear_commit_marks(ours, ALL_REV_FLAGS); | |
2081 | clear_commit_marks(theirs, ALL_REV_FLAGS); | |
0b282cc4 JK |
2082 | |
2083 | argv_array_clear(&argv); | |
979cb245 | 2084 | return 0; |
6d21bf96 JH |
2085 | } |
2086 | ||
2087 | /* | |
2088 | * Return true when there is anything to report, otherwise false. | |
2089 | */ | |
2090 | int format_tracking_info(struct branch *branch, struct strbuf *sb) | |
2091 | { | |
f2e08739 | 2092 | int ours, theirs; |
979cb245 | 2093 | const char *full_base; |
2f50babe | 2094 | char *base; |
f2e08739 | 2095 | int upstream_is_gone = 0; |
6d21bf96 | 2096 | |
979cb245 JK |
2097 | if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) { |
2098 | if (!full_base) | |
2099 | return 0; | |
f2e08739 | 2100 | upstream_is_gone = 1; |
f2e08739 | 2101 | } |
6d21bf96 | 2102 | |
979cb245 | 2103 | base = shorten_unambiguous_ref(full_base, 0); |
f2e08739 JX |
2104 | if (upstream_is_gone) { |
2105 | strbuf_addf(sb, | |
2106 | _("Your branch is based on '%s', but the upstream is gone.\n"), | |
2107 | base); | |
2108 | if (advice_status_hints) | |
a22ae753 | 2109 | strbuf_addstr(sb, |
f2e08739 | 2110 | _(" (use \"git branch --unset-upstream\" to fixup)\n")); |
f223459b JX |
2111 | } else if (!ours && !theirs) { |
2112 | strbuf_addf(sb, | |
7560f547 | 2113 | _("Your branch is up to date with '%s'.\n"), |
f223459b | 2114 | base); |
f2e08739 | 2115 | } else if (!theirs) { |
8a5b7494 JX |
2116 | strbuf_addf(sb, |
2117 | Q_("Your branch is ahead of '%s' by %d commit.\n", | |
2118 | "Your branch is ahead of '%s' by %d commits.\n", | |
f2e08739 JX |
2119 | ours), |
2120 | base, ours); | |
491e3075 | 2121 | if (advice_status_hints) |
a22ae753 | 2122 | strbuf_addstr(sb, |
491e3075 | 2123 | _(" (use \"git push\" to publish your local commits)\n")); |
f2e08739 | 2124 | } else if (!ours) { |
8a5b7494 JX |
2125 | strbuf_addf(sb, |
2126 | Q_("Your branch is behind '%s' by %d commit, " | |
2127 | "and can be fast-forwarded.\n", | |
2128 | "Your branch is behind '%s' by %d commits, " | |
2129 | "and can be fast-forwarded.\n", | |
f2e08739 JX |
2130 | theirs), |
2131 | base, theirs); | |
491e3075 | 2132 | if (advice_status_hints) |
a22ae753 | 2133 | strbuf_addstr(sb, |
491e3075 | 2134 | _(" (use \"git pull\" to update your local branch)\n")); |
c190ced6 | 2135 | } else { |
8a5b7494 JX |
2136 | strbuf_addf(sb, |
2137 | Q_("Your branch and '%s' have diverged,\n" | |
2138 | "and have %d and %d different commit each, " | |
2139 | "respectively.\n", | |
2140 | "Your branch and '%s' have diverged,\n" | |
2141 | "and have %d and %d different commits each, " | |
2142 | "respectively.\n", | |
f54bea44 | 2143 | ours + theirs), |
f2e08739 | 2144 | base, ours, theirs); |
491e3075 | 2145 | if (advice_status_hints) |
a22ae753 | 2146 | strbuf_addstr(sb, |
491e3075 | 2147 | _(" (use \"git pull\" to merge the remote branch into yours)\n")); |
c190ced6 | 2148 | } |
2f50babe | 2149 | free(base); |
6d21bf96 JH |
2150 | return 1; |
2151 | } | |
454e2025 | 2152 | |
455ade65 MH |
2153 | static int one_local_ref(const char *refname, const struct object_id *oid, |
2154 | int flag, void *cb_data) | |
454e2025 JS |
2155 | { |
2156 | struct ref ***local_tail = cb_data; | |
2157 | struct ref *ref; | |
454e2025 JS |
2158 | |
2159 | /* we already know it starts with refs/ to get here */ | |
8d9c5010 | 2160 | if (check_refname_format(refname + 5, 0)) |
454e2025 JS |
2161 | return 0; |
2162 | ||
96ffc06f | 2163 | ref = alloc_ref(refname); |
f4e54d02 | 2164 | oidcpy(&ref->new_oid, oid); |
454e2025 JS |
2165 | **local_tail = ref; |
2166 | *local_tail = &ref->next; | |
2167 | return 0; | |
2168 | } | |
2169 | ||
2170 | struct ref *get_local_heads(void) | |
2171 | { | |
55f0566f | 2172 | struct ref *local_refs = NULL, **local_tail = &local_refs; |
2b2a5be3 | 2173 | |
454e2025 JS |
2174 | for_each_ref(one_local_ref, &local_tail); |
2175 | return local_refs; | |
2176 | } | |
8ef51733 | 2177 | |
4229f1fa JS |
2178 | struct ref *guess_remote_head(const struct ref *head, |
2179 | const struct ref *refs, | |
2180 | int all) | |
8ef51733 | 2181 | { |
8ef51733 | 2182 | const struct ref *r; |
4229f1fa JS |
2183 | struct ref *list = NULL; |
2184 | struct ref **tail = &list; | |
8ef51733 | 2185 | |
6cb4e6cc | 2186 | if (!head) |
8ef51733 JS |
2187 | return NULL; |
2188 | ||
fbb074c2 JK |
2189 | /* |
2190 | * Some transports support directly peeking at | |
2191 | * where HEAD points; if that is the case, then | |
2192 | * we don't have to guess. | |
2193 | */ | |
2194 | if (head->symref) | |
2195 | return copy_ref(find_ref_by_name(refs, head->symref)); | |
2196 | ||
8ef51733 | 2197 | /* If refs/heads/master could be right, it is. */ |
4229f1fa JS |
2198 | if (!all) { |
2199 | r = find_ref_by_name(refs, "refs/heads/master"); | |
f4e54d02 | 2200 | if (r && !oidcmp(&r->old_oid, &head->old_oid)) |
4229f1fa JS |
2201 | return copy_ref(r); |
2202 | } | |
8ef51733 JS |
2203 | |
2204 | /* Look for another ref that points there */ | |
4229f1fa | 2205 | for (r = refs; r; r = r->next) { |
61adfd30 | 2206 | if (r != head && |
59556548 | 2207 | starts_with(r->name, "refs/heads/") && |
f4e54d02 | 2208 | !oidcmp(&r->old_oid, &head->old_oid)) { |
4229f1fa JS |
2209 | *tail = copy_ref(r); |
2210 | tail = &((*tail)->next); | |
2211 | if (!all) | |
2212 | break; | |
2213 | } | |
2214 | } | |
8ef51733 | 2215 | |
4229f1fa | 2216 | return list; |
8ef51733 | 2217 | } |
f2ef6075 JS |
2218 | |
2219 | struct stale_heads_info { | |
f2ef6075 JS |
2220 | struct string_list *ref_names; |
2221 | struct ref **stale_refs_tail; | |
ed43de6e CMN |
2222 | struct refspec *refs; |
2223 | int ref_count; | |
f2ef6075 JS |
2224 | }; |
2225 | ||
455ade65 MH |
2226 | static int get_stale_heads_cb(const char *refname, const struct object_id *oid, |
2227 | int flags, void *cb_data) | |
f2ef6075 JS |
2228 | { |
2229 | struct stale_heads_info *info = cb_data; | |
e6f63712 | 2230 | struct string_list matches = STRING_LIST_INIT_DUP; |
ed43de6e | 2231 | struct refspec query; |
e6f63712 | 2232 | int i, stale = 1; |
ed43de6e CMN |
2233 | memset(&query, 0, sizeof(struct refspec)); |
2234 | query.dst = (char *)refname; | |
2235 | ||
e6f63712 CMN |
2236 | query_refspecs_multiple(info->refs, info->ref_count, &query, &matches); |
2237 | if (matches.nr == 0) | |
2238 | goto clean_exit; /* No matches */ | |
ed43de6e CMN |
2239 | |
2240 | /* | |
2241 | * If we did find a suitable refspec and it's not a symref and | |
2242 | * it's not in the list of refs that currently exist in that | |
e6f63712 CMN |
2243 | * remote, we consider it to be stale. In order to deal with |
2244 | * overlapping refspecs, we need to go over all of the | |
2245 | * matching refs. | |
ed43de6e | 2246 | */ |
e6f63712 CMN |
2247 | if (flags & REF_ISSYMREF) |
2248 | goto clean_exit; | |
2249 | ||
2250 | for (i = 0; stale && i < matches.nr; i++) | |
2251 | if (string_list_has_string(info->ref_names, matches.items[i].string)) | |
2252 | stale = 0; | |
2253 | ||
2254 | if (stale) { | |
ed43de6e | 2255 | struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); |
f4e54d02 | 2256 | oidcpy(&ref->new_oid, oid); |
f2ef6075 | 2257 | } |
ed43de6e | 2258 | |
e6f63712 CMN |
2259 | clean_exit: |
2260 | string_list_clear(&matches, 0); | |
f2ef6075 JS |
2261 | return 0; |
2262 | } | |
2263 | ||
ed43de6e | 2264 | struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map) |
f2ef6075 JS |
2265 | { |
2266 | struct ref *ref, *stale_refs = NULL; | |
183113a5 | 2267 | struct string_list ref_names = STRING_LIST_INIT_NODUP; |
f2ef6075 | 2268 | struct stale_heads_info info; |
2b2a5be3 | 2269 | |
f2ef6075 JS |
2270 | info.ref_names = &ref_names; |
2271 | info.stale_refs_tail = &stale_refs; | |
ed43de6e CMN |
2272 | info.refs = refs; |
2273 | info.ref_count = ref_count; | |
f2ef6075 | 2274 | for (ref = fetch_map; ref; ref = ref->next) |
1d2f80fa | 2275 | string_list_append(&ref_names, ref->name); |
3383e199 | 2276 | string_list_sort(&ref_names); |
f2ef6075 JS |
2277 | for_each_ref(get_stale_heads_cb, &info); |
2278 | string_list_clear(&ref_names, 0); | |
2279 | return stale_refs; | |
2280 | } | |
28f5d176 JH |
2281 | |
2282 | /* | |
2283 | * Compare-and-swap | |
2284 | */ | |
a355b11d | 2285 | static void clear_cas_option(struct push_cas_option *cas) |
28f5d176 JH |
2286 | { |
2287 | int i; | |
2288 | ||
2289 | for (i = 0; i < cas->nr; i++) | |
2290 | free(cas->entry[i].refname); | |
2291 | free(cas->entry); | |
2292 | memset(cas, 0, sizeof(*cas)); | |
2293 | } | |
2294 | ||
2295 | static struct push_cas *add_cas_entry(struct push_cas_option *cas, | |
2296 | const char *refname, | |
2297 | size_t refnamelen) | |
2298 | { | |
2299 | struct push_cas *entry; | |
2300 | ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc); | |
2301 | entry = &cas->entry[cas->nr++]; | |
2302 | memset(entry, 0, sizeof(*entry)); | |
2303 | entry->refname = xmemdupz(refname, refnamelen); | |
2304 | return entry; | |
2305 | } | |
2306 | ||
8668976b | 2307 | static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset) |
28f5d176 JH |
2308 | { |
2309 | const char *colon; | |
2310 | struct push_cas *entry; | |
2311 | ||
2312 | if (unset) { | |
2313 | /* "--no-<option>" */ | |
2314 | clear_cas_option(cas); | |
2315 | return 0; | |
2316 | } | |
2317 | ||
2318 | if (!arg) { | |
2319 | /* just "--<option>" */ | |
2320 | cas->use_tracking_for_rest = 1; | |
2321 | return 0; | |
2322 | } | |
2323 | ||
2324 | /* "--<option>=refname" or "--<option>=refname:value" */ | |
2325 | colon = strchrnul(arg, ':'); | |
2326 | entry = add_cas_entry(cas, arg, colon - arg); | |
2327 | if (!*colon) | |
2328 | entry->use_tracking = 1; | |
eee98e74 | 2329 | else if (!colon[1]) |
b8566f8f | 2330 | oidclr(&entry->expect); |
2331 | else if (get_oid(colon + 1, &entry->expect)) | |
28f5d176 JH |
2332 | return error("cannot parse expected object name '%s'", colon + 1); |
2333 | return 0; | |
2334 | } | |
2335 | ||
2336 | int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset) | |
2337 | { | |
2338 | return parse_push_cas_option(opt->value, arg, unset); | |
2339 | } | |
91048a95 JH |
2340 | |
2341 | int is_empty_cas(const struct push_cas_option *cas) | |
2342 | { | |
2343 | return !cas->use_tracking_for_rest && !cas->nr; | |
2344 | } | |
2345 | ||
2346 | /* | |
2347 | * Look at remote.fetch refspec and see if we have a remote | |
2348 | * tracking branch for the refname there. Fill its current | |
2349 | * value in sha1[]. | |
2350 | * If we cannot do so, return negative to signal an error. | |
2351 | */ | |
2352 | static int remote_tracking(struct remote *remote, const char *refname, | |
fcd30b13 | 2353 | struct object_id *oid) |
91048a95 JH |
2354 | { |
2355 | char *dst; | |
2356 | ||
2357 | dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname); | |
2358 | if (!dst) | |
2359 | return -1; /* no tracking ref for refname at remote */ | |
34c290a6 | 2360 | if (read_ref(dst, oid)) |
91048a95 JH |
2361 | return -1; /* we know what the tracking ref is but we cannot read it */ |
2362 | return 0; | |
2363 | } | |
2364 | ||
2365 | static void apply_cas(struct push_cas_option *cas, | |
2366 | struct remote *remote, | |
2367 | struct ref *ref) | |
2368 | { | |
2369 | int i; | |
2370 | ||
2371 | /* Find an explicit --<option>=<name>[:<value>] entry */ | |
2372 | for (i = 0; i < cas->nr; i++) { | |
2373 | struct push_cas *entry = &cas->entry[i]; | |
54457fe5 | 2374 | if (!refname_match(entry->refname, ref->name)) |
91048a95 JH |
2375 | continue; |
2376 | ref->expect_old_sha1 = 1; | |
2377 | if (!entry->use_tracking) | |
b8566f8f | 2378 | oidcpy(&ref->old_oid_expect, &entry->expect); |
fcd30b13 | 2379 | else if (remote_tracking(remote, ref->name, &ref->old_oid_expect)) |
64ac39af | 2380 | oidclr(&ref->old_oid_expect); |
91048a95 JH |
2381 | return; |
2382 | } | |
2383 | ||
2384 | /* Are we using "--<option>" to cover all? */ | |
2385 | if (!cas->use_tracking_for_rest) | |
2386 | return; | |
2387 | ||
2388 | ref->expect_old_sha1 = 1; | |
fcd30b13 | 2389 | if (remote_tracking(remote, ref->name, &ref->old_oid_expect)) |
64ac39af | 2390 | oidclr(&ref->old_oid_expect); |
91048a95 JH |
2391 | } |
2392 | ||
2393 | void apply_push_cas(struct push_cas_option *cas, | |
2394 | struct remote *remote, | |
2395 | struct ref *remote_refs) | |
2396 | { | |
2397 | struct ref *ref; | |
2398 | for (ref = remote_refs; ref; ref = ref->next) | |
2399 | apply_cas(cas, remote, ref); | |
2400 | } |