]>
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" |
5751f490 | 11 | |
6ddba5e2 FC |
12 | enum map_direction { FROM_SRC, FROM_DST }; |
13 | ||
e0aaa29f DB |
14 | static struct refspec s_tag_refspec = { |
15 | 0, | |
16 | 1, | |
b84c343c | 17 | 0, |
6e7b66ee | 18 | 0, |
08fbdb30 DB |
19 | "refs/tags/*", |
20 | "refs/tags/*" | |
e0aaa29f DB |
21 | }; |
22 | ||
23 | const struct refspec *tag_refspec = &s_tag_refspec; | |
24 | ||
844112ca JH |
25 | struct counted_string { |
26 | size_t len; | |
27 | const char *s; | |
28 | }; | |
55029ae4 DB |
29 | struct rewrite { |
30 | const char *base; | |
844112ca JH |
31 | size_t baselen; |
32 | struct counted_string *instead_of; | |
55029ae4 DB |
33 | int instead_of_nr; |
34 | int instead_of_alloc; | |
35 | }; | |
d071d942 JT |
36 | struct rewrites { |
37 | struct rewrite **rewrite; | |
38 | int rewrite_alloc; | |
39 | int rewrite_nr; | |
40 | }; | |
55029ae4 | 41 | |
5751f490 | 42 | static struct remote **remotes; |
2d31347b DB |
43 | static int remotes_alloc; |
44 | static int remotes_nr; | |
5751f490 | 45 | |
cf818348 | 46 | static struct branch **branches; |
2d31347b DB |
47 | static int branches_alloc; |
48 | static int branches_nr; | |
cf818348 DB |
49 | |
50 | static struct branch *current_branch; | |
51 | static const char *default_remote_name; | |
fa685bdf | 52 | static int explicit_default_remote_name; |
cf818348 | 53 | |
d071d942 | 54 | static struct rewrites rewrites; |
1c2eafb8 | 55 | static struct rewrites rewrites_push; |
55029ae4 | 56 | |
5751f490 DB |
57 | #define BUF_SIZE (2048) |
58 | static char buffer[BUF_SIZE]; | |
59 | ||
0a4da29d DB |
60 | static int valid_remote(const struct remote *remote) |
61 | { | |
c578f51d | 62 | return (!!remote->url) || (!!remote->foreign_vcs); |
0a4da29d DB |
63 | } |
64 | ||
d071d942 | 65 | static const char *alias_url(const char *url, struct rewrites *r) |
55029ae4 DB |
66 | { |
67 | int i, j; | |
844112ca JH |
68 | char *ret; |
69 | struct counted_string *longest; | |
70 | int longest_i; | |
71 | ||
72 | longest = NULL; | |
73 | longest_i = -1; | |
d071d942 JT |
74 | for (i = 0; i < r->rewrite_nr; i++) { |
75 | if (!r->rewrite[i]) | |
55029ae4 | 76 | continue; |
d071d942 JT |
77 | for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) { |
78 | if (!prefixcmp(url, r->rewrite[i]->instead_of[j].s) && | |
844112ca | 79 | (!longest || |
d071d942 JT |
80 | longest->len < r->rewrite[i]->instead_of[j].len)) { |
81 | longest = &(r->rewrite[i]->instead_of[j]); | |
844112ca | 82 | longest_i = i; |
55029ae4 DB |
83 | } |
84 | } | |
85 | } | |
844112ca JH |
86 | if (!longest) |
87 | return url; | |
88 | ||
d071d942 | 89 | ret = xmalloc(r->rewrite[longest_i]->baselen + |
844112ca | 90 | (strlen(url) - longest->len) + 1); |
d071d942 JT |
91 | strcpy(ret, r->rewrite[longest_i]->base); |
92 | strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len); | |
844112ca | 93 | return ret; |
55029ae4 DB |
94 | } |
95 | ||
5751f490 DB |
96 | static void add_push_refspec(struct remote *remote, const char *ref) |
97 | { | |
2d31347b DB |
98 | ALLOC_GROW(remote->push_refspec, |
99 | remote->push_refspec_nr + 1, | |
100 | remote->push_refspec_alloc); | |
101 | remote->push_refspec[remote->push_refspec_nr++] = ref; | |
5751f490 DB |
102 | } |
103 | ||
5d46c9d4 DB |
104 | static void add_fetch_refspec(struct remote *remote, const char *ref) |
105 | { | |
2d31347b DB |
106 | ALLOC_GROW(remote->fetch_refspec, |
107 | remote->fetch_refspec_nr + 1, | |
108 | remote->fetch_refspec_alloc); | |
109 | remote->fetch_refspec[remote->fetch_refspec_nr++] = ref; | |
5d46c9d4 DB |
110 | } |
111 | ||
28b91f8a | 112 | static void add_url(struct remote *remote, const char *url) |
5751f490 | 113 | { |
2d31347b DB |
114 | ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc); |
115 | remote->url[remote->url_nr++] = url; | |
5751f490 DB |
116 | } |
117 | ||
20346234 MG |
118 | static void add_pushurl(struct remote *remote, const char *pushurl) |
119 | { | |
120 | ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc); | |
121 | remote->pushurl[remote->pushurl_nr++] = pushurl; | |
122 | } | |
123 | ||
1c2eafb8 JT |
124 | static void add_pushurl_alias(struct remote *remote, const char *url) |
125 | { | |
126 | const char *pushurl = alias_url(url, &rewrites_push); | |
127 | if (pushurl != url) | |
128 | add_pushurl(remote, pushurl); | |
129 | } | |
130 | ||
131 | static void add_url_alias(struct remote *remote, const char *url) | |
132 | { | |
133 | add_url(remote, alias_url(url, &rewrites)); | |
134 | add_pushurl_alias(remote, url); | |
135 | } | |
136 | ||
5751f490 DB |
137 | static struct remote *make_remote(const char *name, int len) |
138 | { | |
2d31347b DB |
139 | struct remote *ret; |
140 | int i; | |
5751f490 | 141 | |
2d31347b DB |
142 | for (i = 0; i < remotes_nr; i++) { |
143 | if (len ? (!strncmp(name, remotes[i]->name, len) && | |
144 | !remotes[i]->name[len]) : | |
145 | !strcmp(name, remotes[i]->name)) | |
146 | return remotes[i]; | |
5751f490 DB |
147 | } |
148 | ||
2d31347b DB |
149 | ret = xcalloc(1, sizeof(struct remote)); |
150 | ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc); | |
151 | remotes[remotes_nr++] = ret; | |
5751f490 | 152 | if (len) |
2d31347b | 153 | ret->name = xstrndup(name, len); |
5751f490 | 154 | else |
2d31347b DB |
155 | ret->name = xstrdup(name); |
156 | return ret; | |
5751f490 DB |
157 | } |
158 | ||
cf818348 DB |
159 | static void add_merge(struct branch *branch, const char *name) |
160 | { | |
2d31347b DB |
161 | ALLOC_GROW(branch->merge_name, branch->merge_nr + 1, |
162 | branch->merge_alloc); | |
163 | branch->merge_name[branch->merge_nr++] = name; | |
cf818348 DB |
164 | } |
165 | ||
166 | static struct branch *make_branch(const char *name, int len) | |
167 | { | |
2d31347b DB |
168 | struct branch *ret; |
169 | int i; | |
cf818348 DB |
170 | char *refname; |
171 | ||
2d31347b DB |
172 | for (i = 0; i < branches_nr; i++) { |
173 | if (len ? (!strncmp(name, branches[i]->name, len) && | |
174 | !branches[i]->name[len]) : | |
175 | !strcmp(name, branches[i]->name)) | |
176 | return branches[i]; | |
cf818348 DB |
177 | } |
178 | ||
2d31347b DB |
179 | ALLOC_GROW(branches, branches_nr + 1, branches_alloc); |
180 | ret = xcalloc(1, sizeof(struct branch)); | |
181 | branches[branches_nr++] = ret; | |
cf818348 | 182 | if (len) |
2d31347b | 183 | ret->name = xstrndup(name, len); |
cf818348 | 184 | else |
2d31347b | 185 | ret->name = xstrdup(name); |
e8eec71d | 186 | refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1); |
cf818348 | 187 | strcpy(refname, "refs/heads/"); |
2d31347b DB |
188 | strcpy(refname + strlen("refs/heads/"), ret->name); |
189 | ret->refname = refname; | |
cf818348 | 190 | |
2d31347b | 191 | return ret; |
cf818348 DB |
192 | } |
193 | ||
d071d942 | 194 | static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len) |
55029ae4 DB |
195 | { |
196 | struct rewrite *ret; | |
197 | int i; | |
198 | ||
d071d942 | 199 | for (i = 0; i < r->rewrite_nr; i++) { |
844112ca | 200 | if (len |
d071d942 JT |
201 | ? (len == r->rewrite[i]->baselen && |
202 | !strncmp(base, r->rewrite[i]->base, len)) | |
203 | : !strcmp(base, r->rewrite[i]->base)) | |
204 | return r->rewrite[i]; | |
55029ae4 DB |
205 | } |
206 | ||
d071d942 | 207 | ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc); |
55029ae4 | 208 | ret = xcalloc(1, sizeof(struct rewrite)); |
d071d942 | 209 | r->rewrite[r->rewrite_nr++] = ret; |
844112ca | 210 | if (len) { |
55029ae4 | 211 | ret->base = xstrndup(base, len); |
844112ca JH |
212 | ret->baselen = len; |
213 | } | |
214 | else { | |
55029ae4 | 215 | ret->base = xstrdup(base); |
844112ca JH |
216 | ret->baselen = strlen(base); |
217 | } | |
55029ae4 DB |
218 | return ret; |
219 | } | |
220 | ||
221 | static void add_instead_of(struct rewrite *rewrite, const char *instead_of) | |
222 | { | |
223 | ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc); | |
844112ca JH |
224 | rewrite->instead_of[rewrite->instead_of_nr].s = instead_of; |
225 | rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of); | |
226 | rewrite->instead_of_nr++; | |
55029ae4 DB |
227 | } |
228 | ||
5751f490 DB |
229 | static void read_remotes_file(struct remote *remote) |
230 | { | |
231 | FILE *f = fopen(git_path("remotes/%s", remote->name), "r"); | |
232 | ||
233 | if (!f) | |
234 | return; | |
89cf4c70 | 235 | remote->origin = REMOTE_REMOTES; |
5751f490 DB |
236 | while (fgets(buffer, BUF_SIZE, f)) { |
237 | int value_list; | |
238 | char *s, *p; | |
239 | ||
240 | if (!prefixcmp(buffer, "URL:")) { | |
241 | value_list = 0; | |
242 | s = buffer + 4; | |
243 | } else if (!prefixcmp(buffer, "Push:")) { | |
244 | value_list = 1; | |
245 | s = buffer + 5; | |
5d46c9d4 DB |
246 | } else if (!prefixcmp(buffer, "Pull:")) { |
247 | value_list = 2; | |
248 | s = buffer + 5; | |
5751f490 DB |
249 | } else |
250 | continue; | |
251 | ||
252 | while (isspace(*s)) | |
253 | s++; | |
254 | if (!*s) | |
255 | continue; | |
256 | ||
257 | p = s + strlen(s); | |
258 | while (isspace(p[-1])) | |
259 | *--p = 0; | |
260 | ||
261 | switch (value_list) { | |
262 | case 0: | |
55029ae4 | 263 | add_url_alias(remote, xstrdup(s)); |
5751f490 DB |
264 | break; |
265 | case 1: | |
266 | add_push_refspec(remote, xstrdup(s)); | |
267 | break; | |
5d46c9d4 DB |
268 | case 2: |
269 | add_fetch_refspec(remote, xstrdup(s)); | |
270 | break; | |
5751f490 DB |
271 | } |
272 | } | |
273 | fclose(f); | |
274 | } | |
275 | ||
276 | static void read_branches_file(struct remote *remote) | |
277 | { | |
278 | const char *slash = strchr(remote->name, '/'); | |
cf818348 | 279 | char *frag; |
f285a2d7 | 280 | struct strbuf branch = STRBUF_INIT; |
5751f490 DB |
281 | int n = slash ? slash - remote->name : 1000; |
282 | FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r"); | |
283 | char *s, *p; | |
284 | int len; | |
285 | ||
286 | if (!f) | |
287 | return; | |
288 | s = fgets(buffer, BUF_SIZE, f); | |
289 | fclose(f); | |
290 | if (!s) | |
291 | return; | |
292 | while (isspace(*s)) | |
293 | s++; | |
294 | if (!*s) | |
295 | return; | |
89cf4c70 | 296 | remote->origin = REMOTE_BRANCHES; |
5751f490 DB |
297 | p = s + strlen(s); |
298 | while (isspace(p[-1])) | |
299 | *--p = 0; | |
300 | len = p - s; | |
301 | if (slash) | |
302 | len += strlen(slash); | |
303 | p = xmalloc(len + 1); | |
304 | strcpy(p, s); | |
305 | if (slash) | |
306 | strcat(p, slash); | |
472fa4cd DB |
307 | |
308 | /* | |
309 | * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when | |
310 | * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from | |
311 | * the partial URL obtained from the branches file plus | |
312 | * "/netdev-2.6" and does not store it in any tracking ref. | |
313 | * #branch specifier in the file is ignored. | |
314 | * | |
315 | * Otherwise, the branches file would have URL and optionally | |
316 | * #branch specified. The "master" (or specified) branch is | |
317 | * fetched and stored in the local branch of the same name. | |
318 | */ | |
cf818348 DB |
319 | frag = strchr(p, '#'); |
320 | if (frag) { | |
321 | *(frag++) = '\0'; | |
472fa4cd DB |
322 | strbuf_addf(&branch, "refs/heads/%s", frag); |
323 | } else | |
324 | strbuf_addstr(&branch, "refs/heads/master"); | |
325 | if (!slash) { | |
326 | strbuf_addf(&branch, ":refs/heads/%s", remote->name); | |
cf818348 | 327 | } else { |
472fa4cd DB |
328 | strbuf_reset(&branch); |
329 | strbuf_addstr(&branch, "HEAD:"); | |
cf818348 | 330 | } |
55029ae4 | 331 | add_url_alias(remote, p); |
2af202be | 332 | add_fetch_refspec(remote, strbuf_detach(&branch, NULL)); |
18afe101 MK |
333 | /* |
334 | * Cogito compatible push: push current HEAD to remote #branch | |
335 | * (master if missing) | |
336 | */ | |
337 | strbuf_init(&branch, 0); | |
338 | strbuf_addstr(&branch, "HEAD"); | |
339 | if (frag) | |
340 | strbuf_addf(&branch, ":refs/heads/%s", frag); | |
341 | else | |
342 | strbuf_addstr(&branch, ":refs/heads/master"); | |
2af202be | 343 | add_push_refspec(remote, strbuf_detach(&branch, NULL)); |
d71ab174 | 344 | remote->fetch_tags = 1; /* always auto-follow */ |
5751f490 DB |
345 | } |
346 | ||
ef90d6d4 | 347 | static int handle_config(const char *key, const char *value, void *cb) |
5751f490 DB |
348 | { |
349 | const char *name; | |
350 | const char *subkey; | |
351 | struct remote *remote; | |
cf818348 DB |
352 | struct branch *branch; |
353 | if (!prefixcmp(key, "branch.")) { | |
354 | name = key + 7; | |
355 | subkey = strrchr(name, '.'); | |
cf818348 DB |
356 | if (!subkey) |
357 | return 0; | |
896c0535 | 358 | branch = make_branch(name, subkey - name); |
cf818348 | 359 | if (!strcmp(subkey, ".remote")) { |
d2370cc2 JH |
360 | if (!value) |
361 | return config_error_nonbool(key); | |
cf818348 | 362 | branch->remote_name = xstrdup(value); |
fa685bdf | 363 | if (branch == current_branch) { |
cf818348 | 364 | default_remote_name = branch->remote_name; |
fa685bdf DB |
365 | explicit_default_remote_name = 1; |
366 | } | |
d2370cc2 JH |
367 | } else if (!strcmp(subkey, ".merge")) { |
368 | if (!value) | |
369 | return config_error_nonbool(key); | |
cf818348 | 370 | add_merge(branch, xstrdup(value)); |
d2370cc2 | 371 | } |
cf818348 | 372 | return 0; |
5751f490 | 373 | } |
55029ae4 DB |
374 | if (!prefixcmp(key, "url.")) { |
375 | struct rewrite *rewrite; | |
60e3aba9 | 376 | name = key + 4; |
55029ae4 DB |
377 | subkey = strrchr(name, '.'); |
378 | if (!subkey) | |
379 | return 0; | |
55029ae4 | 380 | if (!strcmp(subkey, ".insteadof")) { |
1c2eafb8 JT |
381 | rewrite = make_rewrite(&rewrites, name, subkey - name); |
382 | if (!value) | |
383 | return config_error_nonbool(key); | |
384 | add_instead_of(rewrite, xstrdup(value)); | |
385 | } else if (!strcmp(subkey, ".pushinsteadof")) { | |
386 | rewrite = make_rewrite(&rewrites_push, name, subkey - name); | |
55029ae4 DB |
387 | if (!value) |
388 | return config_error_nonbool(key); | |
389 | add_instead_of(rewrite, xstrdup(value)); | |
390 | } | |
391 | } | |
5751f490 DB |
392 | if (prefixcmp(key, "remote.")) |
393 | return 0; | |
394 | name = key + 7; | |
c82efafc BC |
395 | if (*name == '/') { |
396 | warning("Config remote shorthand cannot begin with '/': %s", | |
397 | name); | |
398 | return 0; | |
399 | } | |
5751f490 DB |
400 | subkey = strrchr(name, '.'); |
401 | if (!subkey) | |
cd294bc3 | 402 | return 0; |
5751f490 | 403 | remote = make_remote(name, subkey - name); |
89cf4c70 | 404 | remote->origin = REMOTE_CONFIG; |
84bb2dfd PB |
405 | if (!strcmp(subkey, ".mirror")) |
406 | remote->mirror = git_config_bool(key, value); | |
407 | else if (!strcmp(subkey, ".skipdefaultupdate")) | |
408 | remote->skip_default_update = git_config_bool(key, value); | |
7cc91a2f BG |
409 | else if (!strcmp(subkey, ".skipfetchall")) |
410 | remote->skip_default_update = git_config_bool(key, value); | |
84bb2dfd PB |
411 | else if (!strcmp(subkey, ".url")) { |
412 | const char *v; | |
413 | if (git_config_string(&v, key, value)) | |
414 | return -1; | |
415 | add_url(remote, v); | |
20346234 MG |
416 | } else if (!strcmp(subkey, ".pushurl")) { |
417 | const char *v; | |
418 | if (git_config_string(&v, key, value)) | |
419 | return -1; | |
420 | add_pushurl(remote, v); | |
5751f490 | 421 | } else if (!strcmp(subkey, ".push")) { |
84bb2dfd PB |
422 | const char *v; |
423 | if (git_config_string(&v, key, value)) | |
424 | return -1; | |
425 | add_push_refspec(remote, v); | |
5d46c9d4 | 426 | } else if (!strcmp(subkey, ".fetch")) { |
84bb2dfd PB |
427 | const char *v; |
428 | if (git_config_string(&v, key, value)) | |
429 | return -1; | |
430 | add_fetch_refspec(remote, v); | |
5751f490 | 431 | } else if (!strcmp(subkey, ".receivepack")) { |
84bb2dfd PB |
432 | const char *v; |
433 | if (git_config_string(&v, key, value)) | |
434 | return -1; | |
5751f490 | 435 | if (!remote->receivepack) |
84bb2dfd | 436 | remote->receivepack = v; |
5751f490 DB |
437 | else |
438 | error("more than one receivepack given, using the first"); | |
0012ba21 | 439 | } else if (!strcmp(subkey, ".uploadpack")) { |
84bb2dfd PB |
440 | const char *v; |
441 | if (git_config_string(&v, key, value)) | |
442 | return -1; | |
0012ba21 | 443 | if (!remote->uploadpack) |
84bb2dfd | 444 | remote->uploadpack = v; |
0012ba21 DB |
445 | else |
446 | error("more than one uploadpack given, using the first"); | |
d71ab174 DB |
447 | } else if (!strcmp(subkey, ".tagopt")) { |
448 | if (!strcmp(value, "--no-tags")) | |
449 | remote->fetch_tags = -1; | |
944163a4 ST |
450 | else if (!strcmp(value, "--tags")) |
451 | remote->fetch_tags = 2; | |
14c98218 | 452 | } else if (!strcmp(subkey, ".proxy")) { |
84bb2dfd PB |
453 | return git_config_string((const char **)&remote->http_proxy, |
454 | key, value); | |
c578f51d DB |
455 | } else if (!strcmp(subkey, ".vcs")) { |
456 | return git_config_string(&remote->foreign_vcs, key, value); | |
84bb2dfd | 457 | } |
5751f490 DB |
458 | return 0; |
459 | } | |
460 | ||
55029ae4 DB |
461 | static void alias_all_urls(void) |
462 | { | |
463 | int i, j; | |
464 | for (i = 0; i < remotes_nr; i++) { | |
1c2eafb8 | 465 | int add_pushurl_aliases; |
55029ae4 DB |
466 | if (!remotes[i]) |
467 | continue; | |
20346234 | 468 | for (j = 0; j < remotes[i]->pushurl_nr; j++) { |
d071d942 | 469 | remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites); |
20346234 | 470 | } |
1c2eafb8 JT |
471 | add_pushurl_aliases = remotes[i]->pushurl_nr == 0; |
472 | for (j = 0; j < remotes[i]->url_nr; j++) { | |
473 | if (add_pushurl_aliases) | |
474 | add_pushurl_alias(remotes[i], remotes[i]->url[j]); | |
475 | remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites); | |
476 | } | |
55029ae4 DB |
477 | } |
478 | } | |
479 | ||
5751f490 DB |
480 | static void read_config(void) |
481 | { | |
482 | unsigned char sha1[20]; | |
483 | const char *head_ref; | |
484 | int flag; | |
2543d9b6 | 485 | if (default_remote_name) /* did this already */ |
5751f490 DB |
486 | return; |
487 | default_remote_name = xstrdup("origin"); | |
488 | current_branch = NULL; | |
8cad4744 | 489 | head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag); |
5751f490 DB |
490 | if (head_ref && (flag & REF_ISSYMREF) && |
491 | !prefixcmp(head_ref, "refs/heads/")) { | |
cf818348 DB |
492 | current_branch = |
493 | make_branch(head_ref + strlen("refs/heads/"), 0); | |
5751f490 | 494 | } |
ef90d6d4 | 495 | git_config(handle_config, NULL); |
55029ae4 | 496 | alias_all_urls(); |
5751f490 DB |
497 | } |
498 | ||
2cb1f36d BC |
499 | /* |
500 | * This function frees a refspec array. | |
501 | * Warning: code paths should be checked to ensure that the src | |
502 | * and dst pointers are always freeable pointers as well | |
503 | * as the refspec pointer itself. | |
504 | */ | |
697d7f5d | 505 | static void free_refspecs(struct refspec *refspec, int nr_refspec) |
2cb1f36d BC |
506 | { |
507 | int i; | |
508 | ||
509 | if (!refspec) | |
510 | return; | |
511 | ||
512 | for (i = 0; i < nr_refspec; i++) { | |
513 | free(refspec[i].src); | |
514 | free(refspec[i].dst); | |
515 | } | |
516 | free(refspec); | |
517 | } | |
518 | ||
24b6177e | 519 | static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify) |
6b62816c DB |
520 | { |
521 | int i; | |
522 | struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec); | |
46220ca1 | 523 | |
6b62816c | 524 | for (i = 0; i < nr_refspec; i++) { |
47c6ef1c | 525 | size_t llen; |
46220ca1 JH |
526 | int is_glob; |
527 | const char *lhs, *rhs; | |
8d9c5010 | 528 | int flags; |
46220ca1 | 529 | |
8e76bf3f | 530 | is_glob = 0; |
46220ca1 JH |
531 | |
532 | lhs = refspec[i]; | |
533 | if (*lhs == '+') { | |
6b62816c | 534 | rs[i].force = 1; |
46220ca1 | 535 | lhs++; |
6b62816c | 536 | } |
46220ca1 JH |
537 | |
538 | rhs = strrchr(lhs, ':'); | |
a83619d6 PB |
539 | |
540 | /* | |
541 | * Before going on, special case ":" (or "+:") as a refspec | |
def24991 | 542 | * for pushing matching refs. |
a83619d6 PB |
543 | */ |
544 | if (!fetch && rhs == lhs && rhs[1] == '\0') { | |
545 | rs[i].matching = 1; | |
546 | continue; | |
547 | } | |
548 | ||
46220ca1 | 549 | if (rhs) { |
47c6ef1c | 550 | size_t rlen = strlen(++rhs); |
abd2bde7 | 551 | is_glob = (1 <= rlen && strchr(rhs, '*')); |
08fbdb30 | 552 | rs[i].dst = xstrndup(rhs, rlen); |
6b62816c | 553 | } |
ef00d150 | 554 | |
46220ca1 | 555 | llen = (rhs ? (rhs - lhs - 1) : strlen(lhs)); |
abd2bde7 | 556 | if (1 <= llen && memchr(lhs, '*', llen)) { |
7d19da46 JH |
557 | if ((rhs && !is_glob) || (!rhs && fetch)) |
558 | goto invalid; | |
559 | is_glob = 1; | |
7d19da46 JH |
560 | } else if (rhs && is_glob) { |
561 | goto invalid; | |
ef00d150 | 562 | } |
7d19da46 | 563 | |
46220ca1 JH |
564 | rs[i].pattern = is_glob; |
565 | rs[i].src = xstrndup(lhs, llen); | |
8d9c5010 | 566 | flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0); |
46220ca1 JH |
567 | |
568 | if (fetch) { | |
6e7b66ee JH |
569 | unsigned char unused[40]; |
570 | ||
def24991 | 571 | /* LHS */ |
46220ca1 | 572 | if (!*rs[i].src) |
def24991 | 573 | ; /* empty is ok; it means "HEAD" */ |
6e7b66ee JH |
574 | else if (llen == 40 && !get_sha1_hex(rs[i].src, unused)) |
575 | rs[i].exact_sha1 = 1; /* ok */ | |
def24991 JH |
576 | else if (!check_refname_format(rs[i].src, flags)) |
577 | ; /* valid looking ref is ok */ | |
578 | else | |
8d9c5010 | 579 | goto invalid; |
def24991 | 580 | /* RHS */ |
8d9c5010 | 581 | if (!rs[i].dst) |
def24991 | 582 | ; /* missing is ok; it is the same as empty */ |
8d9c5010 | 583 | else if (!*rs[i].dst) |
def24991 JH |
584 | ; /* empty is ok; it means "do not store" */ |
585 | else if (!check_refname_format(rs[i].dst, flags)) | |
586 | ; /* valid looking ref is ok */ | |
587 | else | |
8d9c5010 | 588 | goto invalid; |
46220ca1 JH |
589 | } else { |
590 | /* | |
591 | * LHS | |
592 | * - empty is allowed; it means delete. | |
593 | * - when wildcarded, it must be a valid looking ref. | |
594 | * - otherwise, it must be an extended SHA-1, but | |
595 | * there is no existing way to validate this. | |
596 | */ | |
597 | if (!*rs[i].src) | |
598 | ; /* empty is ok */ | |
599 | else if (is_glob) { | |
8d9c5010 | 600 | if (check_refname_format(rs[i].src, flags)) |
46220ca1 JH |
601 | goto invalid; |
602 | } | |
603 | else | |
604 | ; /* anything goes, for now */ | |
605 | /* | |
606 | * RHS | |
607 | * - missing is allowed, but LHS then must be a | |
608 | * valid looking ref. | |
609 | * - empty is not allowed. | |
610 | * - otherwise it must be a valid looking ref. | |
611 | */ | |
612 | if (!rs[i].dst) { | |
8d9c5010 | 613 | if (check_refname_format(rs[i].src, flags)) |
46220ca1 JH |
614 | goto invalid; |
615 | } else if (!*rs[i].dst) { | |
616 | goto invalid; | |
617 | } else { | |
8d9c5010 | 618 | if (check_refname_format(rs[i].dst, flags)) |
46220ca1 JH |
619 | goto invalid; |
620 | } | |
ef00d150 | 621 | } |
6b62816c DB |
622 | } |
623 | return rs; | |
46220ca1 JH |
624 | |
625 | invalid: | |
24b6177e | 626 | if (verify) { |
2cb1f36d BC |
627 | /* |
628 | * nr_refspec must be greater than zero and i must be valid | |
629 | * since it is only possible to reach this point from within | |
630 | * the for loop above. | |
631 | */ | |
632 | free_refspecs(rs, i+1); | |
24b6177e JF |
633 | return NULL; |
634 | } | |
46220ca1 JH |
635 | die("Invalid refspec '%s'", refspec[i]); |
636 | } | |
637 | ||
24b6177e JF |
638 | int valid_fetch_refspec(const char *fetch_refspec_str) |
639 | { | |
24b6177e JF |
640 | struct refspec *refspec; |
641 | ||
66dbfd55 | 642 | refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1); |
2cb1f36d | 643 | free_refspecs(refspec, 1); |
24b6177e JF |
644 | return !!refspec; |
645 | } | |
646 | ||
46220ca1 JH |
647 | struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec) |
648 | { | |
24b6177e | 649 | return parse_refspec_internal(nr_refspec, refspec, 1, 0); |
46220ca1 JH |
650 | } |
651 | ||
697d7f5d | 652 | static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec) |
46220ca1 | 653 | { |
24b6177e | 654 | return parse_refspec_internal(nr_refspec, refspec, 0, 0); |
6b62816c DB |
655 | } |
656 | ||
72ff8943 DB |
657 | void free_refspec(int nr_refspec, struct refspec *refspec) |
658 | { | |
659 | int i; | |
660 | for (i = 0; i < nr_refspec; i++) { | |
661 | free(refspec[i].src); | |
662 | free(refspec[i].dst); | |
663 | } | |
664 | free(refspec); | |
665 | } | |
666 | ||
df93e33c DB |
667 | static int valid_remote_nick(const char *name) |
668 | { | |
8ca12c0d | 669 | if (!name[0] || is_dot_or_dotdot(name)) |
df93e33c DB |
670 | return 0; |
671 | return !strchr(name, '/'); /* no slash */ | |
672 | } | |
673 | ||
5751f490 DB |
674 | struct remote *remote_get(const char *name) |
675 | { | |
676 | struct remote *ret; | |
fa685bdf | 677 | int name_given = 0; |
5751f490 DB |
678 | |
679 | read_config(); | |
fa685bdf DB |
680 | if (name) |
681 | name_given = 1; | |
682 | else { | |
5751f490 | 683 | name = default_remote_name; |
fa685bdf DB |
684 | name_given = explicit_default_remote_name; |
685 | } | |
9326d494 | 686 | |
5751f490 | 687 | ret = make_remote(name, 0); |
df93e33c | 688 | if (valid_remote_nick(name)) { |
0a4da29d | 689 | if (!valid_remote(ret)) |
5751f490 | 690 | read_remotes_file(ret); |
0a4da29d | 691 | if (!valid_remote(ret)) |
5751f490 DB |
692 | read_branches_file(ret); |
693 | } | |
0a4da29d | 694 | if (name_given && !valid_remote(ret)) |
55029ae4 | 695 | add_url_alias(ret, name); |
0a4da29d | 696 | if (!valid_remote(ret)) |
5751f490 | 697 | return NULL; |
46220ca1 JH |
698 | ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec); |
699 | ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec); | |
5751f490 DB |
700 | return ret; |
701 | } | |
6b62816c | 702 | |
9a23ba33 FAG |
703 | int remote_is_configured(const char *name) |
704 | { | |
705 | int i; | |
706 | read_config(); | |
707 | ||
708 | for (i = 0; i < remotes_nr; i++) | |
709 | if (!strcmp(name, remotes[i]->name)) | |
710 | return 1; | |
711 | return 0; | |
712 | } | |
713 | ||
b42f6927 JS |
714 | int for_each_remote(each_remote_fn fn, void *priv) |
715 | { | |
716 | int i, result = 0; | |
717 | read_config(); | |
2d31347b | 718 | for (i = 0; i < remotes_nr && !result; i++) { |
b42f6927 JS |
719 | struct remote *r = remotes[i]; |
720 | if (!r) | |
721 | continue; | |
722 | if (!r->fetch) | |
46220ca1 JH |
723 | r->fetch = parse_fetch_refspec(r->fetch_refspec_nr, |
724 | r->fetch_refspec); | |
b42f6927 | 725 | if (!r->push) |
46220ca1 JH |
726 | r->push = parse_push_refspec(r->push_refspec_nr, |
727 | r->push_refspec); | |
b42f6927 JS |
728 | result = fn(r, priv); |
729 | } | |
730 | return result; | |
731 | } | |
732 | ||
2467a4fa DB |
733 | void ref_remove_duplicates(struct ref *ref_map) |
734 | { | |
183113a5 | 735 | struct string_list refs = STRING_LIST_INIT_NODUP; |
73cf0822 JP |
736 | struct string_list_item *item = NULL; |
737 | struct ref *prev = NULL, *next = NULL; | |
738 | for (; ref_map; prev = ref_map, ref_map = next) { | |
739 | next = ref_map->next; | |
2467a4fa DB |
740 | if (!ref_map->peer_ref) |
741 | continue; | |
73cf0822 | 742 | |
e8c8b713 | 743 | item = string_list_lookup(&refs, ref_map->peer_ref->name); |
73cf0822 JP |
744 | if (item) { |
745 | if (strcmp(((struct ref *)item->util)->name, | |
746 | ref_map->name)) | |
747 | die("%s tracks both %s and %s", | |
748 | ref_map->peer_ref->name, | |
749 | ((struct ref *)item->util)->name, | |
750 | ref_map->name); | |
751 | prev->next = ref_map->next; | |
752 | free(ref_map->peer_ref); | |
753 | free(ref_map); | |
95c96d48 JP |
754 | ref_map = prev; /* skip this; we freed it */ |
755 | continue; | |
2467a4fa | 756 | } |
73cf0822 | 757 | |
78a395d3 | 758 | item = string_list_insert(&refs, ref_map->peer_ref->name); |
73cf0822 | 759 | item->util = ref_map; |
2467a4fa | 760 | } |
73cf0822 | 761 | string_list_clear(&refs, 0); |
2467a4fa DB |
762 | } |
763 | ||
28b91f8a | 764 | int remote_has_url(struct remote *remote, const char *url) |
5d46c9d4 DB |
765 | { |
766 | int i; | |
28b91f8a SP |
767 | for (i = 0; i < remote->url_nr; i++) { |
768 | if (!strcmp(remote->url[i], url)) | |
5d46c9d4 DB |
769 | return 1; |
770 | } | |
771 | return 0; | |
772 | } | |
773 | ||
e928213f DB |
774 | static int match_name_with_pattern(const char *key, const char *name, |
775 | const char *value, char **result) | |
a3c84239 | 776 | { |
08fbdb30 DB |
777 | const char *kstar = strchr(key, '*'); |
778 | size_t klen; | |
abd2bde7 DB |
779 | size_t ksuffixlen; |
780 | size_t namelen; | |
08fbdb30 DB |
781 | int ret; |
782 | if (!kstar) | |
783 | die("Key '%s' of pattern had no '*'", key); | |
784 | klen = kstar - key; | |
abd2bde7 DB |
785 | ksuffixlen = strlen(kstar + 1); |
786 | namelen = strlen(name); | |
787 | ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen && | |
788 | !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen); | |
e928213f | 789 | if (ret && value) { |
08fbdb30 DB |
790 | const char *vstar = strchr(value, '*'); |
791 | size_t vlen; | |
abd2bde7 | 792 | size_t vsuffixlen; |
08fbdb30 DB |
793 | if (!vstar) |
794 | die("Value '%s' of pattern has no '*'", value); | |
795 | vlen = vstar - value; | |
abd2bde7 DB |
796 | vsuffixlen = strlen(vstar + 1); |
797 | *result = xmalloc(vlen + vsuffixlen + | |
e928213f | 798 | strlen(name) - |
abd2bde7 DB |
799 | klen - ksuffixlen + 1); |
800 | strncpy(*result, value, vlen); | |
801 | strncpy(*result + vlen, | |
802 | name + klen, namelen - klen - ksuffixlen); | |
803 | strcpy(*result + vlen + namelen - klen - ksuffixlen, | |
804 | vstar + 1); | |
e928213f | 805 | } |
a3c84239 DB |
806 | return ret; |
807 | } | |
808 | ||
c500352e | 809 | static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query) |
72ff8943 DB |
810 | { |
811 | int i; | |
c500352e | 812 | int find_src = !query->src; |
72ff8943 | 813 | |
c500352e CMN |
814 | if (find_src && !query->dst) |
815 | return error("query_refspecs: need either src or dst"); | |
b42f6927 | 816 | |
c500352e CMN |
817 | for (i = 0; i < ref_count; i++) { |
818 | struct refspec *refspec = &refs[i]; | |
819 | const char *key = find_src ? refspec->dst : refspec->src; | |
820 | const char *value = find_src ? refspec->src : refspec->dst; | |
821 | const char *needle = find_src ? query->dst : query->src; | |
822 | char **result = find_src ? &query->src : &query->dst; | |
b42f6927 | 823 | |
c500352e | 824 | if (!refspec->dst) |
5d46c9d4 | 825 | continue; |
c500352e | 826 | if (refspec->pattern) { |
e928213f | 827 | if (match_name_with_pattern(key, needle, value, result)) { |
c500352e | 828 | query->force = refspec->force; |
5d46c9d4 DB |
829 | return 0; |
830 | } | |
b42f6927 JS |
831 | } else if (!strcmp(needle, key)) { |
832 | *result = xstrdup(value); | |
c500352e | 833 | query->force = refspec->force; |
b42f6927 | 834 | return 0; |
5d46c9d4 DB |
835 | } |
836 | } | |
5d46c9d4 DB |
837 | return -1; |
838 | } | |
839 | ||
c500352e CMN |
840 | char *apply_refspecs(struct refspec *refspecs, int nr_refspec, |
841 | const char *name) | |
842 | { | |
843 | struct refspec query; | |
844 | ||
845 | memset(&query, 0, sizeof(struct refspec)); | |
846 | query.src = (char *)name; | |
847 | ||
848 | if (query_refspecs(refspecs, nr_refspec, &query)) | |
849 | return NULL; | |
850 | ||
851 | return query.dst; | |
852 | } | |
853 | ||
854 | int remote_find_tracking(struct remote *remote, struct refspec *refspec) | |
855 | { | |
856 | return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec); | |
857 | } | |
858 | ||
8009768e RS |
859 | static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen, |
860 | const char *name) | |
861 | { | |
862 | size_t len = strlen(name); | |
863 | struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1); | |
864 | memcpy(ref->name, prefix, prefixlen); | |
865 | memcpy(ref->name + prefixlen, name, len); | |
866 | return ref; | |
867 | } | |
868 | ||
59c69c0c | 869 | struct ref *alloc_ref(const char *name) |
dfd255dd | 870 | { |
59c69c0c | 871 | return alloc_ref_with_prefix("", 0, name); |
737922aa KK |
872 | } |
873 | ||
59a57757 | 874 | struct ref *copy_ref(const struct ref *ref) |
d71ab174 | 875 | { |
7b3db095 JS |
876 | struct ref *cpy; |
877 | size_t len; | |
878 | if (!ref) | |
879 | return NULL; | |
880 | len = strlen(ref->name); | |
881 | cpy = xmalloc(sizeof(struct ref) + len + 1); | |
882 | memcpy(cpy, ref, sizeof(struct ref) + len + 1); | |
883 | cpy->next = NULL; | |
884 | cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL; | |
885 | cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL; | |
886 | cpy->peer_ref = copy_ref(ref->peer_ref); | |
887 | return cpy; | |
d71ab174 DB |
888 | } |
889 | ||
4577370e DB |
890 | struct ref *copy_ref_list(const struct ref *ref) |
891 | { | |
892 | struct ref *ret = NULL; | |
893 | struct ref **tail = &ret; | |
894 | while (ref) { | |
895 | *tail = copy_ref(ref); | |
896 | ref = ref->next; | |
897 | tail = &((*tail)->next); | |
898 | } | |
899 | return ret; | |
900 | } | |
901 | ||
697d7f5d | 902 | static void free_ref(struct ref *ref) |
be885d96 DB |
903 | { |
904 | if (!ref) | |
905 | return; | |
7b3db095 | 906 | free_ref(ref->peer_ref); |
be885d96 DB |
907 | free(ref->remote_status); |
908 | free(ref->symref); | |
909 | free(ref); | |
910 | } | |
911 | ||
dfd255dd DB |
912 | void free_refs(struct ref *ref) |
913 | { | |
914 | struct ref *next; | |
915 | while (ref) { | |
916 | next = ref->next; | |
be885d96 | 917 | free_ref(ref); |
dfd255dd DB |
918 | ref = next; |
919 | } | |
920 | } | |
921 | ||
ed81c76b JK |
922 | int ref_compare_name(const void *va, const void *vb) |
923 | { | |
924 | const struct ref *a = va, *b = vb; | |
925 | return strcmp(a->name, b->name); | |
926 | } | |
927 | ||
928 | static void *ref_list_get_next(const void *a) | |
929 | { | |
930 | return ((const struct ref *)a)->next; | |
931 | } | |
932 | ||
933 | static void ref_list_set_next(void *a, void *next) | |
934 | { | |
935 | ((struct ref *)a)->next = next; | |
936 | } | |
937 | ||
938 | void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *)) | |
939 | { | |
940 | *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp); | |
941 | } | |
942 | ||
6b62816c DB |
943 | static int count_refspec_match(const char *pattern, |
944 | struct ref *refs, | |
945 | struct ref **matched_ref) | |
946 | { | |
947 | int patlen = strlen(pattern); | |
948 | struct ref *matched_weak = NULL; | |
949 | struct ref *matched = NULL; | |
950 | int weak_match = 0; | |
951 | int match = 0; | |
952 | ||
953 | for (weak_match = match = 0; refs; refs = refs->next) { | |
954 | char *name = refs->name; | |
955 | int namelen = strlen(name); | |
6b62816c | 956 | |
ae36bdcf | 957 | if (!refname_match(pattern, name, ref_rev_parse_rules)) |
6b62816c DB |
958 | continue; |
959 | ||
960 | /* A match is "weak" if it is with refs outside | |
961 | * heads or tags, and did not specify the pattern | |
962 | * in full (e.g. "refs/remotes/origin/master") or at | |
963 | * least from the toplevel (e.g. "remotes/origin/master"); | |
964 | * otherwise "git push $URL master" would result in | |
965 | * ambiguity between remotes/origin/master and heads/master | |
966 | * at the remote site. | |
967 | */ | |
968 | if (namelen != patlen && | |
969 | patlen != namelen - 5 && | |
970 | prefixcmp(name, "refs/heads/") && | |
971 | prefixcmp(name, "refs/tags/")) { | |
972 | /* We want to catch the case where only weak | |
973 | * matches are found and there are multiple | |
974 | * matches, and where more than one strong | |
975 | * matches are found, as ambiguous. One | |
976 | * strong match with zero or more weak matches | |
977 | * are acceptable as a unique match. | |
978 | */ | |
979 | matched_weak = refs; | |
980 | weak_match++; | |
981 | } | |
982 | else { | |
983 | matched = refs; | |
984 | match++; | |
985 | } | |
986 | } | |
987 | if (!matched) { | |
988 | *matched_ref = matched_weak; | |
989 | return weak_match; | |
990 | } | |
991 | else { | |
992 | *matched_ref = matched; | |
993 | return match; | |
994 | } | |
995 | } | |
996 | ||
1d735267 | 997 | static void tail_link_ref(struct ref *ref, struct ref ***tail) |
6b62816c DB |
998 | { |
999 | **tail = ref; | |
1d735267 DB |
1000 | while (ref->next) |
1001 | ref = ref->next; | |
6b62816c | 1002 | *tail = &ref->next; |
6b62816c DB |
1003 | } |
1004 | ||
67655246 FC |
1005 | static struct ref *alloc_delete_ref(void) |
1006 | { | |
1007 | struct ref *ref = alloc_ref("(delete)"); | |
1008 | hashclr(ref->new_sha1); | |
1009 | return ref; | |
1010 | } | |
1011 | ||
6b62816c DB |
1012 | static struct ref *try_explicit_object_name(const char *name) |
1013 | { | |
1014 | unsigned char sha1[20]; | |
1015 | struct ref *ref; | |
6b62816c | 1016 | |
67655246 FC |
1017 | if (!*name) |
1018 | return alloc_delete_ref(); | |
6b62816c DB |
1019 | if (get_sha1(name, sha1)) |
1020 | return NULL; | |
59c69c0c | 1021 | ref = alloc_ref(name); |
6b62816c DB |
1022 | hashcpy(ref->new_sha1, sha1); |
1023 | return ref; | |
1024 | } | |
1025 | ||
1d735267 | 1026 | static struct ref *make_linked_ref(const char *name, struct ref ***tail) |
6b62816c | 1027 | { |
59c69c0c | 1028 | struct ref *ret = alloc_ref(name); |
1d735267 DB |
1029 | tail_link_ref(ret, tail); |
1030 | return ret; | |
163f0ee5 | 1031 | } |
8558fd9e | 1032 | |
f8aae120 JK |
1033 | static char *guess_ref(const char *name, struct ref *peer) |
1034 | { | |
1035 | struct strbuf buf = STRBUF_INIT; | |
1036 | unsigned char sha1[20]; | |
1037 | ||
8cad4744 | 1038 | const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL); |
f8aae120 JK |
1039 | if (!r) |
1040 | return NULL; | |
1041 | ||
1042 | if (!prefixcmp(r, "refs/heads/")) | |
1043 | strbuf_addstr(&buf, "refs/heads/"); | |
1044 | else if (!prefixcmp(r, "refs/tags/")) | |
1045 | strbuf_addstr(&buf, "refs/tags/"); | |
1046 | else | |
1047 | return NULL; | |
1048 | ||
1049 | strbuf_addstr(&buf, name); | |
1050 | return strbuf_detach(&buf, NULL); | |
1051 | } | |
1052 | ||
54a8ad92 JH |
1053 | static int match_explicit(struct ref *src, struct ref *dst, |
1054 | struct ref ***dst_tail, | |
9a7bbd1d | 1055 | struct refspec *rs) |
6b62816c | 1056 | { |
54a8ad92 | 1057 | struct ref *matched_src, *matched_dst; |
cdf690e5 | 1058 | int copy_src; |
8558fd9e | 1059 | |
54a8ad92 | 1060 | const char *dst_value = rs->dst; |
f8aae120 | 1061 | char *dst_guess; |
6b62816c | 1062 | |
a83619d6 | 1063 | if (rs->pattern || rs->matching) |
9a7bbd1d | 1064 | return 0; |
8558fd9e | 1065 | |
54a8ad92 JH |
1066 | matched_src = matched_dst = NULL; |
1067 | switch (count_refspec_match(rs->src, src, &matched_src)) { | |
1068 | case 1: | |
cdf690e5 | 1069 | copy_src = 1; |
54a8ad92 JH |
1070 | break; |
1071 | case 0: | |
1072 | /* The source could be in the get_sha1() format | |
1073 | * not a reference name. :refs/other is a | |
1074 | * way to delete 'other' ref at the remote end. | |
1075 | */ | |
1076 | matched_src = try_explicit_object_name(rs->src); | |
7dfee372 | 1077 | if (!matched_src) |
9a7bbd1d | 1078 | return error("src refspec %s does not match any.", rs->src); |
cdf690e5 | 1079 | copy_src = 0; |
54a8ad92 JH |
1080 | break; |
1081 | default: | |
9a7bbd1d | 1082 | return error("src refspec %s matches more than one.", rs->src); |
54a8ad92 | 1083 | } |
3c8b7df1 | 1084 | |
4491e62a | 1085 | if (!dst_value) { |
9f0ea7e8 DB |
1086 | unsigned char sha1[20]; |
1087 | int flag; | |
1088 | ||
8cad4744 | 1089 | dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag); |
9f0ea7e8 DB |
1090 | if (!dst_value || |
1091 | ((flag & REF_ISSYMREF) && | |
1092 | prefixcmp(dst_value, "refs/heads/"))) | |
1093 | die("%s cannot be resolved to branch.", | |
1094 | matched_src->name); | |
4491e62a | 1095 | } |
3c8b7df1 | 1096 | |
54a8ad92 JH |
1097 | switch (count_refspec_match(dst_value, dst, &matched_dst)) { |
1098 | case 1: | |
1099 | break; | |
1100 | case 0: | |
163f0ee5 | 1101 | if (!memcmp(dst_value, "refs/", 5)) |
1d735267 | 1102 | matched_dst = make_linked_ref(dst_value, dst_tail); |
5742c82b JK |
1103 | else if (is_null_sha1(matched_src->new_sha1)) |
1104 | error("unable to delete '%s': remote ref does not exist", | |
1105 | dst_value); | |
eeefa7c9 | 1106 | else if ((dst_guess = guess_ref(dst_value, matched_src))) |
f8aae120 | 1107 | matched_dst = make_linked_ref(dst_guess, dst_tail); |
3c8b7df1 | 1108 | else |
f8aae120 JK |
1109 | error("unable to push to unqualified destination: %s\n" |
1110 | "The destination refspec neither matches an " | |
1111 | "existing ref on the remote nor\n" | |
1112 | "begins with refs/, and we are unable to " | |
1113 | "guess a prefix based on the source ref.", | |
1114 | dst_value); | |
54a8ad92 JH |
1115 | break; |
1116 | default: | |
3c8b7df1 | 1117 | matched_dst = NULL; |
54a8ad92 JH |
1118 | error("dst refspec %s matches more than one.", |
1119 | dst_value); | |
1120 | break; | |
1121 | } | |
9a7bbd1d JK |
1122 | if (!matched_dst) |
1123 | return -1; | |
1124 | if (matched_dst->peer_ref) | |
1125 | return error("dst ref %s receives from more than one src.", | |
54a8ad92 | 1126 | matched_dst->name); |
54a8ad92 | 1127 | else { |
cdf690e5 | 1128 | matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src; |
54a8ad92 | 1129 | matched_dst->force = rs->force; |
6b62816c | 1130 | } |
9a7bbd1d | 1131 | return 0; |
54a8ad92 JH |
1132 | } |
1133 | ||
1134 | static int match_explicit_refs(struct ref *src, struct ref *dst, | |
1135 | struct ref ***dst_tail, struct refspec *rs, | |
1136 | int rs_nr) | |
1137 | { | |
1138 | int i, errs; | |
1139 | for (i = errs = 0; i < rs_nr; i++) | |
9a7bbd1d JK |
1140 | errs += match_explicit(src, dst, dst_tail, &rs[i]); |
1141 | return errs; | |
6b62816c DB |
1142 | } |
1143 | ||
db70a04c | 1144 | static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref, |
6ddba5e2 | 1145 | int send_mirror, int direction, const struct refspec **ret_pat) |
8558fd9e | 1146 | { |
db70a04c FC |
1147 | const struct refspec *pat; |
1148 | char *name; | |
8558fd9e | 1149 | int i; |
a83619d6 | 1150 | int matching_refs = -1; |
8558fd9e | 1151 | for (i = 0; i < rs_nr; i++) { |
a83619d6 PB |
1152 | if (rs[i].matching && |
1153 | (matching_refs == -1 || rs[i].force)) { | |
1154 | matching_refs = i; | |
1155 | continue; | |
1156 | } | |
1157 | ||
db70a04c FC |
1158 | if (rs[i].pattern) { |
1159 | const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src; | |
6ddba5e2 FC |
1160 | int match; |
1161 | if (direction == FROM_SRC) | |
1162 | match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name); | |
1163 | else | |
1164 | match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name); | |
1165 | if (match) { | |
db70a04c FC |
1166 | matching_refs = i; |
1167 | break; | |
1168 | } | |
1169 | } | |
8558fd9e | 1170 | } |
db70a04c | 1171 | if (matching_refs == -1) |
a83619d6 | 1172 | return NULL; |
db70a04c FC |
1173 | |
1174 | pat = rs + matching_refs; | |
1175 | if (pat->matching) { | |
1176 | /* | |
1177 | * "matching refs"; traditionally we pushed everything | |
1178 | * including refs outside refs/heads/ hierarchy, but | |
1179 | * that does not make much sense these days. | |
1180 | */ | |
1181 | if (!send_mirror && prefixcmp(ref->name, "refs/heads/")) | |
1182 | return NULL; | |
1183 | name = xstrdup(ref->name); | |
1184 | } | |
1185 | if (ret_pat) | |
1186 | *ret_pat = pat; | |
1187 | return name; | |
8558fd9e DB |
1188 | } |
1189 | ||
6d2bf96e CB |
1190 | static struct ref **tail_ref(struct ref **head) |
1191 | { | |
1192 | struct ref **tail = head; | |
1193 | while (*tail) | |
1194 | tail = &((*tail)->next); | |
1195 | return tail; | |
1196 | } | |
1197 | ||
54a8ad92 | 1198 | /* |
29753cdd JH |
1199 | * Given the set of refs the local repository has, the set of refs the |
1200 | * remote repository has, and the refspec used for push, determine | |
1201 | * what remote refs we will update and with what value by setting | |
1202 | * peer_ref (which object is being pushed) and force (if the push is | |
1203 | * forced) in elements of "dst". The function may add new elements to | |
1204 | * dst (e.g. pushing to a new branch, done in match_explicit_refs). | |
54a8ad92 | 1205 | */ |
29753cdd JH |
1206 | int match_push_refs(struct ref *src, struct ref **dst, |
1207 | int nr_refspec, const char **refspec, int flags) | |
6b62816c | 1208 | { |
a83619d6 | 1209 | struct refspec *rs; |
28b9d6e5 AW |
1210 | int send_all = flags & MATCH_REFS_ALL; |
1211 | int send_mirror = flags & MATCH_REFS_MIRROR; | |
6ddba5e2 | 1212 | int send_prune = flags & MATCH_REFS_PRUNE; |
5f48cb95 | 1213 | int errs; |
2af202be | 1214 | static const char *default_refspec[] = { ":", NULL }; |
b1d8b1f3 | 1215 | struct ref *ref, **dst_tail = tail_ref(dst); |
6b62816c | 1216 | |
a83619d6 PB |
1217 | if (!nr_refspec) { |
1218 | nr_refspec = 1; | |
1219 | refspec = default_refspec; | |
1220 | } | |
1221 | rs = parse_push_refspec(nr_refspec, (const char **) refspec); | |
6d2bf96e | 1222 | errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec); |
6b62816c DB |
1223 | |
1224 | /* pick the remainder */ | |
b1d8b1f3 | 1225 | for (ref = src; ref; ref = ref->next) { |
6b62816c | 1226 | struct ref *dst_peer; |
6e66bf3c AR |
1227 | const struct refspec *pat = NULL; |
1228 | char *dst_name; | |
db70a04c | 1229 | |
b1d8b1f3 | 1230 | if (ref->peer_ref) |
6b62816c | 1231 | continue; |
a83619d6 | 1232 | |
6ddba5e2 | 1233 | dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat); |
db70a04c | 1234 | if (!dst_name) |
a83619d6 PB |
1235 | continue; |
1236 | ||
6d2bf96e | 1237 | dst_peer = find_ref_by_name(*dst, dst_name); |
a83619d6 PB |
1238 | if (dst_peer) { |
1239 | if (dst_peer->peer_ref) | |
1240 | /* We're already sending something to this ref. */ | |
1241 | goto free_name; | |
a83619d6 PB |
1242 | } else { |
1243 | if (pat->matching && !(send_all || send_mirror)) | |
1244 | /* | |
1245 | * Remote doesn't have it, and we have no | |
1246 | * explicit pattern, and we don't have | |
1247 | * --all nor --mirror. | |
1248 | */ | |
1249 | goto free_name; | |
28b9d6e5 | 1250 | |
6b62816c | 1251 | /* Create a new one and link it */ |
6d2bf96e | 1252 | dst_peer = make_linked_ref(dst_name, &dst_tail); |
b1d8b1f3 | 1253 | hashcpy(dst_peer->new_sha1, ref->new_sha1); |
6b62816c | 1254 | } |
b1d8b1f3 | 1255 | dst_peer->peer_ref = copy_ref(ref); |
a83619d6 | 1256 | dst_peer->force = pat->force; |
6e66bf3c AR |
1257 | free_name: |
1258 | free(dst_name); | |
6b62816c | 1259 | } |
6ddba5e2 FC |
1260 | if (send_prune) { |
1261 | /* check for missing refs on the remote */ | |
1262 | for (ref = *dst; ref; ref = ref->next) { | |
1263 | char *src_name; | |
1264 | ||
1265 | if (ref->peer_ref) | |
1266 | /* We're already sending something to this ref. */ | |
1267 | continue; | |
1268 | ||
1269 | src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL); | |
1270 | if (src_name) { | |
1271 | if (!find_ref_by_name(src, src_name)) | |
1272 | ref->peer_ref = alloc_delete_ref(); | |
1273 | free(src_name); | |
1274 | } | |
1275 | } | |
1276 | } | |
5f48cb95 JS |
1277 | if (errs) |
1278 | return -1; | |
6b62816c DB |
1279 | return 0; |
1280 | } | |
cf818348 | 1281 | |
20e8b465 TRC |
1282 | void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, |
1283 | int force_update) | |
1284 | { | |
1285 | struct ref *ref; | |
1286 | ||
1287 | for (ref = remote_refs; ref; ref = ref->next) { | |
8c5f6f71 CR |
1288 | int force_ref_update = ref->force || force_update; |
1289 | ||
20e8b465 TRC |
1290 | if (ref->peer_ref) |
1291 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); | |
1292 | else if (!send_mirror) | |
1293 | continue; | |
1294 | ||
1295 | ref->deletion = is_null_sha1(ref->new_sha1); | |
1296 | if (!ref->deletion && | |
1297 | !hashcmp(ref->old_sha1, ref->new_sha1)) { | |
1298 | ref->status = REF_STATUS_UPTODATE; | |
1299 | continue; | |
1300 | } | |
1301 | ||
a272b289 | 1302 | /* |
256b9d70 JH |
1303 | * Decide whether an individual refspec A:B can be |
1304 | * pushed. The push will succeed if any of the | |
1305 | * following are true: | |
20e8b465 | 1306 | * |
a272b289 | 1307 | * (1) the remote reference B does not exist |
20e8b465 | 1308 | * |
a272b289 CR |
1309 | * (2) the remote reference B is being removed (i.e., |
1310 | * pushing :B where no source is specified) | |
20e8b465 | 1311 | * |
256b9d70 JH |
1312 | * (3) the destination is not under refs/tags/, and |
1313 | * if the old and new value is a commit, the new | |
1314 | * is a descendant of the old. | |
20e8b465 | 1315 | * |
a272b289 CR |
1316 | * (4) it is forced using the +A:B notation, or by |
1317 | * passing the --force argument | |
20e8b465 TRC |
1318 | */ |
1319 | ||
5ece083f | 1320 | if (!ref->deletion && !is_null_sha1(ref->old_sha1)) { |
0f4d498d JH |
1321 | int why = 0; /* why would this push require --force? */ |
1322 | ||
1323 | if (!prefixcmp(ref->name, "refs/tags/")) | |
1324 | why = REF_STATUS_REJECT_ALREADY_EXISTS; | |
75e5c0dc JH |
1325 | else if (!has_sha1_file(ref->old_sha1)) |
1326 | why = REF_STATUS_REJECT_FETCH_FIRST; | |
1327 | else if (!lookup_commit_reference_gently(ref->old_sha1, 1) || | |
1328 | !lookup_commit_reference_gently(ref->new_sha1, 1)) | |
1329 | why = REF_STATUS_REJECT_NEEDS_FORCE; | |
1330 | else if (!ref_newer(ref->new_sha1, ref->old_sha1)) | |
0f4d498d JH |
1331 | why = REF_STATUS_REJECT_NONFASTFORWARD; |
1332 | ||
1333 | if (!force_ref_update) | |
1334 | ref->status = why; | |
1335 | else if (why) | |
5ece083f | 1336 | ref->forced_update = 1; |
20e8b465 TRC |
1337 | } |
1338 | } | |
1339 | } | |
1340 | ||
cf818348 DB |
1341 | struct branch *branch_get(const char *name) |
1342 | { | |
1343 | struct branch *ret; | |
1344 | ||
1345 | read_config(); | |
1346 | if (!name || !*name || !strcmp(name, "HEAD")) | |
1347 | ret = current_branch; | |
1348 | else | |
1349 | ret = make_branch(name, 0); | |
1350 | if (ret && ret->remote_name) { | |
1351 | ret->remote = remote_get(ret->remote_name); | |
1352 | if (ret->merge_nr) { | |
1353 | int i; | |
1354 | ret->merge = xcalloc(sizeof(*ret->merge), | |
1355 | ret->merge_nr); | |
1356 | for (i = 0; i < ret->merge_nr; i++) { | |
1357 | ret->merge[i] = xcalloc(1, sizeof(**ret->merge)); | |
1358 | ret->merge[i]->src = xstrdup(ret->merge_name[i]); | |
5e6e2b48 MG |
1359 | if (remote_find_tracking(ret->remote, ret->merge[i]) |
1360 | && !strcmp(ret->remote_name, ".")) | |
1361 | ret->merge[i]->dst = xstrdup(ret->merge_name[i]); | |
cf818348 DB |
1362 | } |
1363 | } | |
1364 | } | |
1365 | return ret; | |
1366 | } | |
1367 | ||
1368 | int branch_has_merge_config(struct branch *branch) | |
1369 | { | |
1370 | return branch && !!branch->merge; | |
1371 | } | |
1372 | ||
85682c19 SP |
1373 | int branch_merge_matches(struct branch *branch, |
1374 | int i, | |
1375 | const char *refname) | |
cf818348 | 1376 | { |
85682c19 | 1377 | if (!branch || i < 0 || i >= branch->merge_nr) |
cf818348 | 1378 | return 0; |
605b4978 | 1379 | return refname_match(branch->merge[i]->src, refname, ref_fetch_rules); |
cf818348 | 1380 | } |
d71ab174 | 1381 | |
f8fb971e JH |
1382 | static int ignore_symref_update(const char *refname) |
1383 | { | |
1384 | unsigned char sha1[20]; | |
1385 | int flag; | |
1386 | ||
1387 | if (!resolve_ref_unsafe(refname, sha1, 0, &flag)) | |
1388 | return 0; /* non-existing refs are OK */ | |
1389 | return (flag & REF_ISSYMREF); | |
1390 | } | |
1391 | ||
4577370e | 1392 | static struct ref *get_expanded_map(const struct ref *remote_refs, |
d71ab174 DB |
1393 | const struct refspec *refspec) |
1394 | { | |
4577370e | 1395 | const struct ref *ref; |
d71ab174 DB |
1396 | struct ref *ret = NULL; |
1397 | struct ref **tail = &ret; | |
1398 | ||
e928213f | 1399 | char *expn_name; |
d71ab174 DB |
1400 | |
1401 | for (ref = remote_refs; ref; ref = ref->next) { | |
1402 | if (strchr(ref->name, '^')) | |
1403 | continue; /* a dereference item */ | |
e928213f | 1404 | if (match_name_with_pattern(refspec->src, ref->name, |
f8fb971e JH |
1405 | refspec->dst, &expn_name) && |
1406 | !ignore_symref_update(expn_name)) { | |
d71ab174 | 1407 | struct ref *cpy = copy_ref(ref); |
d71ab174 | 1408 | |
e928213f DB |
1409 | cpy->peer_ref = alloc_ref(expn_name); |
1410 | free(expn_name); | |
d71ab174 DB |
1411 | if (refspec->force) |
1412 | cpy->peer_ref->force = 1; | |
1413 | *tail = cpy; | |
1414 | tail = &cpy->next; | |
1415 | } | |
1416 | } | |
1417 | ||
1418 | return ret; | |
1419 | } | |
1420 | ||
4577370e | 1421 | static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name) |
d71ab174 | 1422 | { |
4577370e | 1423 | const struct ref *ref; |
d71ab174 | 1424 | for (ref = refs; ref; ref = ref->next) { |
605b4978 | 1425 | if (refname_match(name, ref->name, ref_fetch_rules)) |
d71ab174 DB |
1426 | return ref; |
1427 | } | |
1428 | return NULL; | |
1429 | } | |
1430 | ||
4577370e | 1431 | struct ref *get_remote_ref(const struct ref *remote_refs, const char *name) |
d71ab174 | 1432 | { |
4577370e | 1433 | const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name); |
d71ab174 DB |
1434 | |
1435 | if (!ref) | |
9ad7c5ae | 1436 | return NULL; |
d71ab174 DB |
1437 | |
1438 | return copy_ref(ref); | |
1439 | } | |
1440 | ||
1441 | static struct ref *get_local_ref(const char *name) | |
1442 | { | |
3eb96997 | 1443 | if (!name || name[0] == '\0') |
d71ab174 DB |
1444 | return NULL; |
1445 | ||
59c69c0c RS |
1446 | if (!prefixcmp(name, "refs/")) |
1447 | return alloc_ref(name); | |
d71ab174 DB |
1448 | |
1449 | if (!prefixcmp(name, "heads/") || | |
1450 | !prefixcmp(name, "tags/") || | |
8009768e RS |
1451 | !prefixcmp(name, "remotes/")) |
1452 | return alloc_ref_with_prefix("refs/", 5, name); | |
d71ab174 | 1453 | |
8009768e | 1454 | return alloc_ref_with_prefix("refs/heads/", 11, name); |
d71ab174 DB |
1455 | } |
1456 | ||
4577370e | 1457 | int get_fetch_map(const struct ref *remote_refs, |
d71ab174 | 1458 | const struct refspec *refspec, |
9ad7c5ae JH |
1459 | struct ref ***tail, |
1460 | int missing_ok) | |
d71ab174 | 1461 | { |
ef00d150 | 1462 | struct ref *ref_map, **rmp; |
d71ab174 DB |
1463 | |
1464 | if (refspec->pattern) { | |
1465 | ref_map = get_expanded_map(remote_refs, refspec); | |
1466 | } else { | |
9ad7c5ae JH |
1467 | const char *name = refspec->src[0] ? refspec->src : "HEAD"; |
1468 | ||
6e7b66ee JH |
1469 | if (refspec->exact_sha1) { |
1470 | ref_map = alloc_ref(name); | |
1471 | get_sha1_hex(name, ref_map->old_sha1); | |
1472 | } else { | |
1473 | ref_map = get_remote_ref(remote_refs, name); | |
1474 | } | |
9ad7c5ae JH |
1475 | if (!missing_ok && !ref_map) |
1476 | die("Couldn't find remote ref %s", name); | |
1477 | if (ref_map) { | |
1478 | ref_map->peer_ref = get_local_ref(refspec->dst); | |
1479 | if (ref_map->peer_ref && refspec->force) | |
1480 | ref_map->peer_ref->force = 1; | |
1481 | } | |
d71ab174 DB |
1482 | } |
1483 | ||
ef00d150 DB |
1484 | for (rmp = &ref_map; *rmp; ) { |
1485 | if ((*rmp)->peer_ref) { | |
5c08c1f2 JH |
1486 | if (prefixcmp((*rmp)->peer_ref->name, "refs/") || |
1487 | check_refname_format((*rmp)->peer_ref->name, 0)) { | |
ef00d150 DB |
1488 | struct ref *ignore = *rmp; |
1489 | error("* Ignoring funny ref '%s' locally", | |
1490 | (*rmp)->peer_ref->name); | |
1491 | *rmp = (*rmp)->next; | |
1492 | free(ignore->peer_ref); | |
1493 | free(ignore); | |
1494 | continue; | |
1495 | } | |
1496 | } | |
1497 | rmp = &((*rmp)->next); | |
d71ab174 DB |
1498 | } |
1499 | ||
8f70a765 AR |
1500 | if (ref_map) |
1501 | tail_link_ref(ref_map, tail); | |
d71ab174 DB |
1502 | |
1503 | return 0; | |
1504 | } | |
be885d96 DB |
1505 | |
1506 | int resolve_remote_symref(struct ref *ref, struct ref *list) | |
1507 | { | |
1508 | if (!ref->symref) | |
1509 | return 0; | |
1510 | for (; list; list = list->next) | |
1511 | if (!strcmp(ref->symref, list->name)) { | |
1512 | hashcpy(ref->old_sha1, list->old_sha1); | |
1513 | return 0; | |
1514 | } | |
1515 | return 1; | |
1516 | } | |
6d21bf96 | 1517 | |
ec8452d5 JS |
1518 | static void unmark_and_free(struct commit_list *list, unsigned int mark) |
1519 | { | |
1520 | while (list) { | |
1521 | struct commit_list *temp = list; | |
1522 | temp->item->object.flags &= ~mark; | |
1523 | list = temp->next; | |
1524 | free(temp); | |
1525 | } | |
1526 | } | |
1527 | ||
1528 | int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1) | |
1529 | { | |
1530 | struct object *o; | |
1531 | struct commit *old, *new; | |
1532 | struct commit_list *list, *used; | |
1533 | int found = 0; | |
1534 | ||
75e5c0dc JH |
1535 | /* |
1536 | * Both new and old must be commit-ish and new is descendant of | |
ec8452d5 JS |
1537 | * old. Otherwise we require --force. |
1538 | */ | |
1539 | o = deref_tag(parse_object(old_sha1), NULL, 0); | |
1540 | if (!o || o->type != OBJ_COMMIT) | |
1541 | return 0; | |
1542 | old = (struct commit *) o; | |
1543 | ||
1544 | o = deref_tag(parse_object(new_sha1), NULL, 0); | |
1545 | if (!o || o->type != OBJ_COMMIT) | |
1546 | return 0; | |
1547 | new = (struct commit *) o; | |
1548 | ||
1549 | if (parse_commit(new) < 0) | |
1550 | return 0; | |
1551 | ||
1552 | used = list = NULL; | |
1553 | commit_list_insert(new, &list); | |
1554 | while (list) { | |
1555 | new = pop_most_recent_commit(&list, TMP_MARK); | |
1556 | commit_list_insert(new, &used); | |
1557 | if (new == old) { | |
1558 | found = 1; | |
1559 | break; | |
1560 | } | |
1561 | } | |
1562 | unmark_and_free(list, TMP_MARK); | |
1563 | unmark_and_free(used, TMP_MARK); | |
1564 | return found; | |
1565 | } | |
1566 | ||
6d21bf96 JH |
1567 | /* |
1568 | * Return true if there is anything to report, otherwise false. | |
1569 | */ | |
1570 | int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs) | |
1571 | { | |
1572 | unsigned char sha1[20]; | |
1573 | struct commit *ours, *theirs; | |
1574 | char symmetric[84]; | |
1575 | struct rev_info revs; | |
1576 | const char *rev_argv[10], *base; | |
1577 | int rev_argc; | |
1578 | ||
1579 | /* | |
1580 | * Nothing to report unless we are marked to build on top of | |
1581 | * somebody else. | |
1582 | */ | |
1583 | if (!branch || | |
1584 | !branch->merge || !branch->merge[0] || !branch->merge[0]->dst) | |
1585 | return 0; | |
1586 | ||
1587 | /* | |
1588 | * If what we used to build on no longer exists, there is | |
1589 | * nothing to report. | |
1590 | */ | |
1591 | base = branch->merge[0]->dst; | |
c6893323 | 1592 | if (read_ref(base, sha1)) |
6d21bf96 | 1593 | return 0; |
57ffc5f8 | 1594 | theirs = lookup_commit_reference(sha1); |
6d21bf96 JH |
1595 | if (!theirs) |
1596 | return 0; | |
1597 | ||
c6893323 | 1598 | if (read_ref(branch->refname, sha1)) |
6d21bf96 | 1599 | return 0; |
57ffc5f8 | 1600 | ours = lookup_commit_reference(sha1); |
6d21bf96 JH |
1601 | if (!ours) |
1602 | return 0; | |
1603 | ||
1604 | /* are we the same? */ | |
1605 | if (theirs == ours) | |
1606 | return 0; | |
1607 | ||
8fbf879e | 1608 | /* Run "rev-list --left-right ours...theirs" internally... */ |
6d21bf96 JH |
1609 | rev_argc = 0; |
1610 | rev_argv[rev_argc++] = NULL; | |
1611 | rev_argv[rev_argc++] = "--left-right"; | |
1612 | rev_argv[rev_argc++] = symmetric; | |
1613 | rev_argv[rev_argc++] = "--"; | |
1614 | rev_argv[rev_argc] = NULL; | |
1615 | ||
1616 | strcpy(symmetric, sha1_to_hex(ours->object.sha1)); | |
1617 | strcpy(symmetric + 40, "..."); | |
1618 | strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1)); | |
1619 | ||
1620 | init_revisions(&revs, NULL); | |
1621 | setup_revisions(rev_argc, rev_argv, &revs, NULL); | |
1622 | prepare_revision_walk(&revs); | |
1623 | ||
1624 | /* ... and count the commits on each side. */ | |
1625 | *num_ours = 0; | |
1626 | *num_theirs = 0; | |
1627 | while (1) { | |
1628 | struct commit *c = get_revision(&revs); | |
1629 | if (!c) | |
1630 | break; | |
1631 | if (c->object.flags & SYMMETRIC_LEFT) | |
1632 | (*num_ours)++; | |
1633 | else | |
1634 | (*num_theirs)++; | |
1635 | } | |
c0234b2e JH |
1636 | |
1637 | /* clear object flags smudged by the above traversal */ | |
1638 | clear_commit_marks(ours, ALL_REV_FLAGS); | |
1639 | clear_commit_marks(theirs, ALL_REV_FLAGS); | |
6d21bf96 JH |
1640 | return 1; |
1641 | } | |
1642 | ||
1643 | /* | |
1644 | * Return true when there is anything to report, otherwise false. | |
1645 | */ | |
1646 | int format_tracking_info(struct branch *branch, struct strbuf *sb) | |
1647 | { | |
1648 | int num_ours, num_theirs; | |
4de53ce0 | 1649 | const char *base; |
6d21bf96 JH |
1650 | |
1651 | if (!stat_tracking_info(branch, &num_ours, &num_theirs)) | |
1652 | return 0; | |
1653 | ||
1654 | base = branch->merge[0]->dst; | |
45972ffb | 1655 | base = shorten_unambiguous_ref(base, 0); |
c190ced6 | 1656 | if (!num_theirs) { |
8a5b7494 JX |
1657 | strbuf_addf(sb, |
1658 | Q_("Your branch is ahead of '%s' by %d commit.\n", | |
1659 | "Your branch is ahead of '%s' by %d commits.\n", | |
1660 | num_ours), | |
1661 | base, num_ours); | |
491e3075 JK |
1662 | if (advice_status_hints) |
1663 | strbuf_addf(sb, | |
1664 | _(" (use \"git push\" to publish your local commits)\n")); | |
c190ced6 | 1665 | } else if (!num_ours) { |
8a5b7494 JX |
1666 | strbuf_addf(sb, |
1667 | Q_("Your branch is behind '%s' by %d commit, " | |
1668 | "and can be fast-forwarded.\n", | |
1669 | "Your branch is behind '%s' by %d commits, " | |
1670 | "and can be fast-forwarded.\n", | |
1671 | num_theirs), | |
1672 | base, num_theirs); | |
491e3075 JK |
1673 | if (advice_status_hints) |
1674 | strbuf_addf(sb, | |
1675 | _(" (use \"git pull\" to update your local branch)\n")); | |
c190ced6 | 1676 | } else { |
8a5b7494 JX |
1677 | strbuf_addf(sb, |
1678 | Q_("Your branch and '%s' have diverged,\n" | |
1679 | "and have %d and %d different commit each, " | |
1680 | "respectively.\n", | |
1681 | "Your branch and '%s' have diverged,\n" | |
1682 | "and have %d and %d different commits each, " | |
1683 | "respectively.\n", | |
1684 | num_theirs), | |
1685 | base, num_ours, num_theirs); | |
491e3075 JK |
1686 | if (advice_status_hints) |
1687 | strbuf_addf(sb, | |
1688 | _(" (use \"git pull\" to merge the remote branch into yours)\n")); | |
c190ced6 | 1689 | } |
6d21bf96 JH |
1690 | return 1; |
1691 | } | |
454e2025 JS |
1692 | |
1693 | static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) | |
1694 | { | |
1695 | struct ref ***local_tail = cb_data; | |
1696 | struct ref *ref; | |
1697 | int len; | |
1698 | ||
1699 | /* we already know it starts with refs/ to get here */ | |
8d9c5010 | 1700 | if (check_refname_format(refname + 5, 0)) |
454e2025 JS |
1701 | return 0; |
1702 | ||
1703 | len = strlen(refname) + 1; | |
1704 | ref = xcalloc(1, sizeof(*ref) + len); | |
1705 | hashcpy(ref->new_sha1, sha1); | |
1706 | memcpy(ref->name, refname, len); | |
1707 | **local_tail = ref; | |
1708 | *local_tail = &ref->next; | |
1709 | return 0; | |
1710 | } | |
1711 | ||
1712 | struct ref *get_local_heads(void) | |
1713 | { | |
55f0566f | 1714 | struct ref *local_refs = NULL, **local_tail = &local_refs; |
454e2025 JS |
1715 | for_each_ref(one_local_ref, &local_tail); |
1716 | return local_refs; | |
1717 | } | |
8ef51733 | 1718 | |
4229f1fa JS |
1719 | struct ref *guess_remote_head(const struct ref *head, |
1720 | const struct ref *refs, | |
1721 | int all) | |
8ef51733 | 1722 | { |
8ef51733 | 1723 | const struct ref *r; |
4229f1fa JS |
1724 | struct ref *list = NULL; |
1725 | struct ref **tail = &list; | |
8ef51733 | 1726 | |
6cb4e6cc | 1727 | if (!head) |
8ef51733 JS |
1728 | return NULL; |
1729 | ||
fbb074c2 JK |
1730 | /* |
1731 | * Some transports support directly peeking at | |
1732 | * where HEAD points; if that is the case, then | |
1733 | * we don't have to guess. | |
1734 | */ | |
1735 | if (head->symref) | |
1736 | return copy_ref(find_ref_by_name(refs, head->symref)); | |
1737 | ||
8ef51733 | 1738 | /* If refs/heads/master could be right, it is. */ |
4229f1fa JS |
1739 | if (!all) { |
1740 | r = find_ref_by_name(refs, "refs/heads/master"); | |
1741 | if (r && !hashcmp(r->old_sha1, head->old_sha1)) | |
1742 | return copy_ref(r); | |
1743 | } | |
8ef51733 JS |
1744 | |
1745 | /* Look for another ref that points there */ | |
4229f1fa | 1746 | for (r = refs; r; r = r->next) { |
61adfd30 JK |
1747 | if (r != head && |
1748 | !prefixcmp(r->name, "refs/heads/") && | |
1749 | !hashcmp(r->old_sha1, head->old_sha1)) { | |
4229f1fa JS |
1750 | *tail = copy_ref(r); |
1751 | tail = &((*tail)->next); | |
1752 | if (!all) | |
1753 | break; | |
1754 | } | |
1755 | } | |
8ef51733 | 1756 | |
4229f1fa | 1757 | return list; |
8ef51733 | 1758 | } |
f2ef6075 JS |
1759 | |
1760 | struct stale_heads_info { | |
f2ef6075 JS |
1761 | struct string_list *ref_names; |
1762 | struct ref **stale_refs_tail; | |
ed43de6e CMN |
1763 | struct refspec *refs; |
1764 | int ref_count; | |
f2ef6075 JS |
1765 | }; |
1766 | ||
1767 | static int get_stale_heads_cb(const char *refname, | |
1768 | const unsigned char *sha1, int flags, void *cb_data) | |
1769 | { | |
1770 | struct stale_heads_info *info = cb_data; | |
ed43de6e CMN |
1771 | struct refspec query; |
1772 | memset(&query, 0, sizeof(struct refspec)); | |
1773 | query.dst = (char *)refname; | |
1774 | ||
1775 | if (query_refspecs(info->refs, info->ref_count, &query)) | |
1776 | return 0; /* No matches */ | |
1777 | ||
1778 | /* | |
1779 | * If we did find a suitable refspec and it's not a symref and | |
1780 | * it's not in the list of refs that currently exist in that | |
1781 | * remote we consider it to be stale. | |
1782 | */ | |
1783 | if (!((flags & REF_ISSYMREF) || | |
1784 | string_list_has_string(info->ref_names, query.src))) { | |
1785 | struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); | |
1786 | hashcpy(ref->new_sha1, sha1); | |
f2ef6075 | 1787 | } |
ed43de6e CMN |
1788 | |
1789 | free(query.src); | |
f2ef6075 JS |
1790 | return 0; |
1791 | } | |
1792 | ||
ed43de6e | 1793 | struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map) |
f2ef6075 JS |
1794 | { |
1795 | struct ref *ref, *stale_refs = NULL; | |
183113a5 | 1796 | struct string_list ref_names = STRING_LIST_INIT_NODUP; |
f2ef6075 | 1797 | struct stale_heads_info info; |
f2ef6075 JS |
1798 | info.ref_names = &ref_names; |
1799 | info.stale_refs_tail = &stale_refs; | |
ed43de6e CMN |
1800 | info.refs = refs; |
1801 | info.ref_count = ref_count; | |
f2ef6075 | 1802 | for (ref = fetch_map; ref; ref = ref->next) |
1d2f80fa | 1803 | string_list_append(&ref_names, ref->name); |
f2ef6075 JS |
1804 | sort_string_list(&ref_names); |
1805 | for_each_ref(get_stale_heads_cb, &info); | |
1806 | string_list_clear(&ref_names, 0); | |
1807 | return stale_refs; | |
1808 | } |