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