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