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