WIP
[git/mjg.git] / remote.c
blob6d552d727e4e2b51387261142885b9a1b43ac34e
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"
12 enum map_direction { FROM_SRC, FROM_DST };
14 static struct refspec s_tag_refspec = {
18 "refs/tags/*",
19 "refs/tags/*"
22 const struct refspec *tag_refspec = &s_tag_refspec;
24 struct counted_string {
25 size_t len;
26 const char *s;
28 struct rewrite {
29 const char *base;
30 size_t baselen;
31 struct counted_string *instead_of;
32 int instead_of_nr;
33 int instead_of_alloc;
35 struct rewrites {
36 struct rewrite **rewrite;
37 int rewrite_alloc;
38 int rewrite_nr;
41 static struct remote **remotes;
42 static int remotes_alloc;
43 static int remotes_nr;
45 static struct branch **branches;
46 static int branches_alloc;
47 static int branches_nr;
49 static struct branch *current_branch;
50 static const char *default_remote_name;
51 static int explicit_default_remote_name;
53 static struct rewrites rewrites;
54 static struct rewrites rewrites_push;
56 #define BUF_SIZE (2048)
57 static char buffer[BUF_SIZE];
59 static int valid_remote(const struct remote *remote)
61 return (!!remote->url) || (!!remote->foreign_vcs);
64 static const char *alias_url(const char *url, struct rewrites *r)
66 int i, j;
67 char *ret;
68 struct counted_string *longest;
69 int longest_i;
71 longest = NULL;
72 longest_i = -1;
73 for (i = 0; i < r->rewrite_nr; i++) {
74 if (!r->rewrite[i])
75 continue;
76 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
77 if (!prefixcmp(url, r->rewrite[i]->instead_of[j].s) &&
78 (!longest ||
79 longest->len < r->rewrite[i]->instead_of[j].len)) {
80 longest = &(r->rewrite[i]->instead_of[j]);
81 longest_i = i;
85 if (!longest)
86 return url;
88 ret = xmalloc(r->rewrite[longest_i]->baselen +
89 (strlen(url) - longest->len) + 1);
90 strcpy(ret, r->rewrite[longest_i]->base);
91 strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
92 return ret;
95 static void add_push_refspec(struct remote *remote, const char *ref)
97 ALLOC_GROW(remote->push_refspec,
98 remote->push_refspec_nr + 1,
99 remote->push_refspec_alloc);
100 remote->push_refspec[remote->push_refspec_nr++] = ref;
103 static void add_fetch_refspec(struct remote *remote, const char *ref)
105 ALLOC_GROW(remote->fetch_refspec,
106 remote->fetch_refspec_nr + 1,
107 remote->fetch_refspec_alloc);
108 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
111 static void add_url(struct remote *remote, const char *url, const char *fromurl)
113 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
114 ALLOC_GROW(remote->fromurl, remote->url_nr + 1, remote->fromurl_alloc);
115 remote->url[remote->url_nr++] = url;
116 remote->fromurl[remote->url_nr] = fromurl;
117 printf("added url %s (from %s)\n", url, fromurl ? fromurl : "");
120 static void add_pushurl(struct remote *remote, const char *pushurl, const char *fromurl)
122 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
123 ALLOC_GROW(remote->frompushurl, remote->pushurl_nr + 1, remote->frompushurl_alloc);
124 remote->pushurl[remote->pushurl_nr++] = pushurl;
125 remote->frompushurl[remote->pushurl_nr] = fromurl;
126 printf("added pushurl %s (from %s)\n", pushurl, fromurl ? fromurl : "");
129 static void add_pushurl_alias(struct remote *remote, const char *url)
131 const char *pushurl = alias_url(url, &rewrites_push);
132 if (pushurl != url)
133 add_pushurl(remote, pushurl, url);
136 static void add_url_alias(struct remote *remote, const char *url)
138 add_url(remote, alias_url(url, &rewrites), url);
139 add_pushurl_alias(remote, url);
142 static struct remote *make_remote(const char *name, int len)
144 struct remote *ret;
145 int i;
147 for (i = 0; i < remotes_nr; i++) {
148 if (len ? (!strncmp(name, remotes[i]->name, len) &&
149 !remotes[i]->name[len]) :
150 !strcmp(name, remotes[i]->name))
151 return remotes[i];
154 ret = xcalloc(1, sizeof(struct remote));
155 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
156 remotes[remotes_nr++] = ret;
157 if (len)
158 ret->name = xstrndup(name, len);
159 else
160 ret->name = xstrdup(name);
161 return ret;
164 static void add_merge(struct branch *branch, const char *name)
166 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
167 branch->merge_alloc);
168 branch->merge_name[branch->merge_nr++] = name;
171 static struct branch *make_branch(const char *name, int len)
173 struct branch *ret;
174 int i;
175 char *refname;
177 for (i = 0; i < branches_nr; i++) {
178 if (len ? (!strncmp(name, branches[i]->name, len) &&
179 !branches[i]->name[len]) :
180 !strcmp(name, branches[i]->name))
181 return branches[i];
184 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
185 ret = xcalloc(1, sizeof(struct branch));
186 branches[branches_nr++] = ret;
187 if (len)
188 ret->name = xstrndup(name, len);
189 else
190 ret->name = xstrdup(name);
191 refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
192 strcpy(refname, "refs/heads/");
193 strcpy(refname + strlen("refs/heads/"), ret->name);
194 ret->refname = refname;
196 return ret;
199 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
201 struct rewrite *ret;
202 int i;
204 for (i = 0; i < r->rewrite_nr; i++) {
205 if (len
206 ? (len == r->rewrite[i]->baselen &&
207 !strncmp(base, r->rewrite[i]->base, len))
208 : !strcmp(base, r->rewrite[i]->base))
209 return r->rewrite[i];
212 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
213 ret = xcalloc(1, sizeof(struct rewrite));
214 r->rewrite[r->rewrite_nr++] = ret;
215 if (len) {
216 ret->base = xstrndup(base, len);
217 ret->baselen = len;
219 else {
220 ret->base = xstrdup(base);
221 ret->baselen = strlen(base);
223 return ret;
226 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
228 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
229 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
230 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
231 rewrite->instead_of_nr++;
234 static void read_remotes_file(struct remote *remote)
236 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
238 if (!f)
239 return;
240 remote->origin = REMOTE_REMOTES;
241 while (fgets(buffer, BUF_SIZE, f)) {
242 int value_list;
243 char *s, *p;
245 if (!prefixcmp(buffer, "URL:")) {
246 value_list = 0;
247 s = buffer + 4;
248 } else if (!prefixcmp(buffer, "Push:")) {
249 value_list = 1;
250 s = buffer + 5;
251 } else if (!prefixcmp(buffer, "Pull:")) {
252 value_list = 2;
253 s = buffer + 5;
254 } else
255 continue;
257 while (isspace(*s))
258 s++;
259 if (!*s)
260 continue;
262 p = s + strlen(s);
263 while (isspace(p[-1]))
264 *--p = 0;
266 switch (value_list) {
267 case 0:
268 add_url_alias(remote, xstrdup(s));
269 break;
270 case 1:
271 add_push_refspec(remote, xstrdup(s));
272 break;
273 case 2:
274 add_fetch_refspec(remote, xstrdup(s));
275 break;
278 fclose(f);
281 static void read_branches_file(struct remote *remote)
283 const char *slash = strchr(remote->name, '/');
284 char *frag;
285 struct strbuf branch = STRBUF_INIT;
286 int n = slash ? slash - remote->name : 1000;
287 FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
288 char *s, *p;
289 int len;
291 if (!f)
292 return;
293 s = fgets(buffer, BUF_SIZE, f);
294 fclose(f);
295 if (!s)
296 return;
297 while (isspace(*s))
298 s++;
299 if (!*s)
300 return;
301 remote->origin = REMOTE_BRANCHES;
302 p = s + strlen(s);
303 while (isspace(p[-1]))
304 *--p = 0;
305 len = p - s;
306 if (slash)
307 len += strlen(slash);
308 p = xmalloc(len + 1);
309 strcpy(p, s);
310 if (slash)
311 strcat(p, slash);
314 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
315 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
316 * the partial URL obtained from the branches file plus
317 * "/netdev-2.6" and does not store it in any tracking ref.
318 * #branch specifier in the file is ignored.
320 * Otherwise, the branches file would have URL and optionally
321 * #branch specified. The "master" (or specified) branch is
322 * fetched and stored in the local branch of the same name.
324 frag = strchr(p, '#');
325 if (frag) {
326 *(frag++) = '\0';
327 strbuf_addf(&branch, "refs/heads/%s", frag);
328 } else
329 strbuf_addstr(&branch, "refs/heads/master");
330 if (!slash) {
331 strbuf_addf(&branch, ":refs/heads/%s", remote->name);
332 } else {
333 strbuf_reset(&branch);
334 strbuf_addstr(&branch, "HEAD:");
336 add_url_alias(remote, p);
337 add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
339 * Cogito compatible push: push current HEAD to remote #branch
340 * (master if missing)
342 strbuf_init(&branch, 0);
343 strbuf_addstr(&branch, "HEAD");
344 if (frag)
345 strbuf_addf(&branch, ":refs/heads/%s", frag);
346 else
347 strbuf_addstr(&branch, ":refs/heads/master");
348 add_push_refspec(remote, strbuf_detach(&branch, NULL));
349 remote->fetch_tags = 1; /* always auto-follow */
352 static int handle_config(const char *key, const char *value, void *cb)
354 const char *name;
355 const char *subkey;
356 struct remote *remote;
357 struct branch *branch;
358 if (!prefixcmp(key, "branch.")) {
359 name = key + 7;
360 subkey = strrchr(name, '.');
361 if (!subkey)
362 return 0;
363 branch = make_branch(name, subkey - name);
364 if (!strcmp(subkey, ".remote")) {
365 if (!value)
366 return config_error_nonbool(key);
367 branch->remote_name = xstrdup(value);
368 if (branch == current_branch) {
369 default_remote_name = branch->remote_name;
370 explicit_default_remote_name = 1;
372 } else if (!strcmp(subkey, ".merge")) {
373 if (!value)
374 return config_error_nonbool(key);
375 add_merge(branch, xstrdup(value));
377 return 0;
379 if (!prefixcmp(key, "url.")) {
380 struct rewrite *rewrite;
381 name = key + 4;
382 subkey = strrchr(name, '.');
383 if (!subkey)
384 return 0;
385 if (!strcmp(subkey, ".insteadof")) {
386 rewrite = make_rewrite(&rewrites, name, subkey - name);
387 if (!value)
388 return config_error_nonbool(key);
389 add_instead_of(rewrite, xstrdup(value));
390 } else if (!strcmp(subkey, ".pushinsteadof")) {
391 rewrite = make_rewrite(&rewrites_push, name, subkey - name);
392 if (!value)
393 return config_error_nonbool(key);
394 add_instead_of(rewrite, xstrdup(value));
397 if (prefixcmp(key, "remote."))
398 return 0;
399 name = key + 7;
400 if (*name == '/') {
401 warning("Config remote shorthand cannot begin with '/': %s",
402 name);
403 return 0;
405 subkey = strrchr(name, '.');
406 if (!subkey)
407 return 0;
408 remote = make_remote(name, subkey - name);
409 remote->origin = REMOTE_CONFIG;
410 if (!strcmp(subkey, ".mirror"))
411 remote->mirror = git_config_bool(key, value);
412 else if (!strcmp(subkey, ".skipdefaultupdate"))
413 remote->skip_default_update = git_config_bool(key, value);
414 else if (!strcmp(subkey, ".skipfetchall"))
415 remote->skip_default_update = git_config_bool(key, value);
416 else if (!strcmp(subkey, ".url")) {
417 const char *v;
418 if (git_config_string(&v, key, value))
419 return -1;
420 add_url(remote, v, NULL);
421 } else if (!strcmp(subkey, ".pushurl")) {
422 const char *v;
423 if (git_config_string(&v, key, value))
424 return -1;
425 add_pushurl(remote, v, NULL);
426 } else if (!strcmp(subkey, ".push")) {
427 const char *v;
428 if (git_config_string(&v, key, value))
429 return -1;
430 add_push_refspec(remote, v);
431 } else if (!strcmp(subkey, ".fetch")) {
432 const char *v;
433 if (git_config_string(&v, key, value))
434 return -1;
435 add_fetch_refspec(remote, v);
436 } else if (!strcmp(subkey, ".receivepack")) {
437 const char *v;
438 if (git_config_string(&v, key, value))
439 return -1;
440 if (!remote->receivepack)
441 remote->receivepack = v;
442 else
443 error("more than one receivepack given, using the first");
444 } else if (!strcmp(subkey, ".uploadpack")) {
445 const char *v;
446 if (git_config_string(&v, key, value))
447 return -1;
448 if (!remote->uploadpack)
449 remote->uploadpack = v;
450 else
451 error("more than one uploadpack given, using the first");
452 } else if (!strcmp(subkey, ".tagopt")) {
453 if (!strcmp(value, "--no-tags"))
454 remote->fetch_tags = -1;
455 else if (!strcmp(value, "--tags"))
456 remote->fetch_tags = 2;
457 } else if (!strcmp(subkey, ".proxy")) {
458 return git_config_string((const char **)&remote->http_proxy,
459 key, value);
460 } else if (!strcmp(subkey, ".vcs")) {
461 return git_config_string(&remote->foreign_vcs, key, value);
463 return 0;
466 static void alias_all_urls(void)
468 int i, j;
469 for (i = 0; i < remotes_nr; i++) {
470 int add_pushurl_aliases;
471 if (!remotes[i])
472 continue;
473 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
474 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
476 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
477 for (j = 0; j < remotes[i]->url_nr; j++) {
478 if (add_pushurl_aliases)
479 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
480 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
485 static void read_config(void)
487 unsigned char sha1[20];
488 const char *head_ref;
489 int flag;
490 if (default_remote_name) /* did this already */
491 return;
492 default_remote_name = xstrdup("origin");
493 current_branch = NULL;
494 head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
495 if (head_ref && (flag & REF_ISSYMREF) &&
496 !prefixcmp(head_ref, "refs/heads/")) {
497 current_branch =
498 make_branch(head_ref + strlen("refs/heads/"), 0);
500 git_config(handle_config, NULL);
501 alias_all_urls();
505 * This function frees a refspec array.
506 * Warning: code paths should be checked to ensure that the src
507 * and dst pointers are always freeable pointers as well
508 * as the refspec pointer itself.
510 static void free_refspecs(struct refspec *refspec, int nr_refspec)
512 int i;
514 if (!refspec)
515 return;
517 for (i = 0; i < nr_refspec; i++) {
518 free(refspec[i].src);
519 free(refspec[i].dst);
521 free(refspec);
524 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
526 int i;
527 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
529 for (i = 0; i < nr_refspec; i++) {
530 size_t llen;
531 int is_glob;
532 const char *lhs, *rhs;
533 int flags;
535 is_glob = 0;
537 lhs = refspec[i];
538 if (*lhs == '+') {
539 rs[i].force = 1;
540 lhs++;
543 rhs = strrchr(lhs, ':');
546 * Before going on, special case ":" (or "+:") as a refspec
547 * for matching refs.
549 if (!fetch && rhs == lhs && rhs[1] == '\0') {
550 rs[i].matching = 1;
551 continue;
554 if (rhs) {
555 size_t rlen = strlen(++rhs);
556 is_glob = (1 <= rlen && strchr(rhs, '*'));
557 rs[i].dst = xstrndup(rhs, rlen);
560 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
561 if (1 <= llen && memchr(lhs, '*', llen)) {
562 if ((rhs && !is_glob) || (!rhs && fetch))
563 goto invalid;
564 is_glob = 1;
565 } else if (rhs && is_glob) {
566 goto invalid;
569 rs[i].pattern = is_glob;
570 rs[i].src = xstrndup(lhs, llen);
571 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
573 if (fetch) {
575 * LHS
576 * - empty is allowed; it means HEAD.
577 * - otherwise it must be a valid looking ref.
579 if (!*rs[i].src)
580 ; /* empty is ok */
581 else if (check_refname_format(rs[i].src, flags))
582 goto invalid;
584 * RHS
585 * - missing is ok, and is same as empty.
586 * - empty is ok; it means not to store.
587 * - otherwise it must be a valid looking ref.
589 if (!rs[i].dst)
590 ; /* ok */
591 else if (!*rs[i].dst)
592 ; /* ok */
593 else if (check_refname_format(rs[i].dst, flags))
594 goto invalid;
595 } else {
597 * LHS
598 * - empty is allowed; it means delete.
599 * - when wildcarded, it must be a valid looking ref.
600 * - otherwise, it must be an extended SHA-1, but
601 * there is no existing way to validate this.
603 if (!*rs[i].src)
604 ; /* empty is ok */
605 else if (is_glob) {
606 if (check_refname_format(rs[i].src, flags))
607 goto invalid;
609 else
610 ; /* anything goes, for now */
612 * RHS
613 * - missing is allowed, but LHS then must be a
614 * valid looking ref.
615 * - empty is not allowed.
616 * - otherwise it must be a valid looking ref.
618 if (!rs[i].dst) {
619 if (check_refname_format(rs[i].src, flags))
620 goto invalid;
621 } else if (!*rs[i].dst) {
622 goto invalid;
623 } else {
624 if (check_refname_format(rs[i].dst, flags))
625 goto invalid;
629 return rs;
631 invalid:
632 if (verify) {
634 * nr_refspec must be greater than zero and i must be valid
635 * since it is only possible to reach this point from within
636 * the for loop above.
638 free_refspecs(rs, i+1);
639 return NULL;
641 die("Invalid refspec '%s'", refspec[i]);
644 int valid_fetch_refspec(const char *fetch_refspec_str)
646 struct refspec *refspec;
648 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
649 free_refspecs(refspec, 1);
650 return !!refspec;
653 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
655 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
658 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
660 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
663 void free_refspec(int nr_refspec, struct refspec *refspec)
665 int i;
666 for (i = 0; i < nr_refspec; i++) {
667 free(refspec[i].src);
668 free(refspec[i].dst);
670 free(refspec);
673 static int valid_remote_nick(const char *name)
675 if (!name[0] || is_dot_or_dotdot(name))
676 return 0;
677 return !strchr(name, '/'); /* no slash */
680 struct remote *remote_get(const char *name)
682 struct remote *ret;
683 int name_given = 0;
685 read_config();
686 if (name)
687 name_given = 1;
688 else {
689 name = default_remote_name;
690 name_given = explicit_default_remote_name;
693 ret = make_remote(name, 0);
694 if (valid_remote_nick(name)) {
695 if (!valid_remote(ret))
696 read_remotes_file(ret);
697 if (!valid_remote(ret))
698 read_branches_file(ret);
700 if (name_given && !valid_remote(ret))
701 add_url_alias(ret, name);
702 if (!valid_remote(ret))
703 return NULL;
704 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
705 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
706 return ret;
709 int remote_is_configured(const char *name)
711 int i;
712 read_config();
714 for (i = 0; i < remotes_nr; i++)
715 if (!strcmp(name, remotes[i]->name))
716 return 1;
717 return 0;
720 int for_each_remote(each_remote_fn fn, void *priv)
722 int i, result = 0;
723 read_config();
724 for (i = 0; i < remotes_nr && !result; i++) {
725 struct remote *r = remotes[i];
726 if (!r)
727 continue;
728 if (!r->fetch)
729 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
730 r->fetch_refspec);
731 if (!r->push)
732 r->push = parse_push_refspec(r->push_refspec_nr,
733 r->push_refspec);
734 result = fn(r, priv);
736 return result;
739 void ref_remove_duplicates(struct ref *ref_map)
741 struct string_list refs = STRING_LIST_INIT_NODUP;
742 struct string_list_item *item = NULL;
743 struct ref *prev = NULL, *next = NULL;
744 for (; ref_map; prev = ref_map, ref_map = next) {
745 next = ref_map->next;
746 if (!ref_map->peer_ref)
747 continue;
749 item = string_list_lookup(&refs, ref_map->peer_ref->name);
750 if (item) {
751 if (strcmp(((struct ref *)item->util)->name,
752 ref_map->name))
753 die("%s tracks both %s and %s",
754 ref_map->peer_ref->name,
755 ((struct ref *)item->util)->name,
756 ref_map->name);
757 prev->next = ref_map->next;
758 free(ref_map->peer_ref);
759 free(ref_map);
760 ref_map = prev; /* skip this; we freed it */
761 continue;
764 item = string_list_insert(&refs, ref_map->peer_ref->name);
765 item->util = ref_map;
767 string_list_clear(&refs, 0);
770 int remote_has_url(struct remote *remote, const char *url)
772 int i;
773 for (i = 0; i < remote->url_nr; i++) {
774 if (!strcmp(remote->url[i], url))
775 return 1;
777 return 0;
780 static int match_name_with_pattern(const char *key, const char *name,
781 const char *value, char **result)
783 const char *kstar = strchr(key, '*');
784 size_t klen;
785 size_t ksuffixlen;
786 size_t namelen;
787 int ret;
788 if (!kstar)
789 die("Key '%s' of pattern had no '*'", key);
790 klen = kstar - key;
791 ksuffixlen = strlen(kstar + 1);
792 namelen = strlen(name);
793 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
794 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
795 if (ret && value) {
796 const char *vstar = strchr(value, '*');
797 size_t vlen;
798 size_t vsuffixlen;
799 if (!vstar)
800 die("Value '%s' of pattern has no '*'", value);
801 vlen = vstar - value;
802 vsuffixlen = strlen(vstar + 1);
803 *result = xmalloc(vlen + vsuffixlen +
804 strlen(name) -
805 klen - ksuffixlen + 1);
806 strncpy(*result, value, vlen);
807 strncpy(*result + vlen,
808 name + klen, namelen - klen - ksuffixlen);
809 strcpy(*result + vlen + namelen - klen - ksuffixlen,
810 vstar + 1);
812 return ret;
815 static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
817 int i;
818 int find_src = !query->src;
820 if (find_src && !query->dst)
821 return error("query_refspecs: need either src or dst");
823 for (i = 0; i < ref_count; i++) {
824 struct refspec *refspec = &refs[i];
825 const char *key = find_src ? refspec->dst : refspec->src;
826 const char *value = find_src ? refspec->src : refspec->dst;
827 const char *needle = find_src ? query->dst : query->src;
828 char **result = find_src ? &query->src : &query->dst;
830 if (!refspec->dst)
831 continue;
832 if (refspec->pattern) {
833 if (match_name_with_pattern(key, needle, value, result)) {
834 query->force = refspec->force;
835 return 0;
837 } else if (!strcmp(needle, key)) {
838 *result = xstrdup(value);
839 query->force = refspec->force;
840 return 0;
843 return -1;
846 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
847 const char *name)
849 struct refspec query;
851 memset(&query, 0, sizeof(struct refspec));
852 query.src = (char *)name;
854 if (query_refspecs(refspecs, nr_refspec, &query))
855 return NULL;
857 return query.dst;
860 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
862 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
865 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
866 const char *name)
868 size_t len = strlen(name);
869 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
870 memcpy(ref->name, prefix, prefixlen);
871 memcpy(ref->name + prefixlen, name, len);
872 return ref;
875 struct ref *alloc_ref(const char *name)
877 return alloc_ref_with_prefix("", 0, name);
880 struct ref *copy_ref(const struct ref *ref)
882 struct ref *cpy;
883 size_t len;
884 if (!ref)
885 return NULL;
886 len = strlen(ref->name);
887 cpy = xmalloc(sizeof(struct ref) + len + 1);
888 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
889 cpy->next = NULL;
890 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
891 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
892 cpy->peer_ref = copy_ref(ref->peer_ref);
893 return cpy;
896 struct ref *copy_ref_list(const struct ref *ref)
898 struct ref *ret = NULL;
899 struct ref **tail = &ret;
900 while (ref) {
901 *tail = copy_ref(ref);
902 ref = ref->next;
903 tail = &((*tail)->next);
905 return ret;
908 static void free_ref(struct ref *ref)
910 if (!ref)
911 return;
912 free_ref(ref->peer_ref);
913 free(ref->remote_status);
914 free(ref->symref);
915 free(ref);
918 void free_refs(struct ref *ref)
920 struct ref *next;
921 while (ref) {
922 next = ref->next;
923 free_ref(ref);
924 ref = next;
928 int ref_compare_name(const void *va, const void *vb)
930 const struct ref *a = va, *b = vb;
931 return strcmp(a->name, b->name);
934 static void *ref_list_get_next(const void *a)
936 return ((const struct ref *)a)->next;
939 static void ref_list_set_next(void *a, void *next)
941 ((struct ref *)a)->next = next;
944 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
946 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
949 static int count_refspec_match(const char *pattern,
950 struct ref *refs,
951 struct ref **matched_ref)
953 int patlen = strlen(pattern);
954 struct ref *matched_weak = NULL;
955 struct ref *matched = NULL;
956 int weak_match = 0;
957 int match = 0;
959 for (weak_match = match = 0; refs; refs = refs->next) {
960 char *name = refs->name;
961 int namelen = strlen(name);
963 if (!refname_match(pattern, name, ref_rev_parse_rules))
964 continue;
966 /* A match is "weak" if it is with refs outside
967 * heads or tags, and did not specify the pattern
968 * in full (e.g. "refs/remotes/origin/master") or at
969 * least from the toplevel (e.g. "remotes/origin/master");
970 * otherwise "git push $URL master" would result in
971 * ambiguity between remotes/origin/master and heads/master
972 * at the remote site.
974 if (namelen != patlen &&
975 patlen != namelen - 5 &&
976 prefixcmp(name, "refs/heads/") &&
977 prefixcmp(name, "refs/tags/")) {
978 /* We want to catch the case where only weak
979 * matches are found and there are multiple
980 * matches, and where more than one strong
981 * matches are found, as ambiguous. One
982 * strong match with zero or more weak matches
983 * are acceptable as a unique match.
985 matched_weak = refs;
986 weak_match++;
988 else {
989 matched = refs;
990 match++;
993 if (!matched) {
994 *matched_ref = matched_weak;
995 return weak_match;
997 else {
998 *matched_ref = matched;
999 return match;
1003 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1005 **tail = ref;
1006 while (ref->next)
1007 ref = ref->next;
1008 *tail = &ref->next;
1011 static struct ref *alloc_delete_ref(void)
1013 struct ref *ref = alloc_ref("(delete)");
1014 hashclr(ref->new_sha1);
1015 return ref;
1018 static struct ref *try_explicit_object_name(const char *name)
1020 unsigned char sha1[20];
1021 struct ref *ref;
1023 if (!*name)
1024 return alloc_delete_ref();
1025 if (get_sha1(name, sha1))
1026 return NULL;
1027 ref = alloc_ref(name);
1028 hashcpy(ref->new_sha1, sha1);
1029 return ref;
1032 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1034 struct ref *ret = alloc_ref(name);
1035 tail_link_ref(ret, tail);
1036 return ret;
1039 static char *guess_ref(const char *name, struct ref *peer)
1041 struct strbuf buf = STRBUF_INIT;
1042 unsigned char sha1[20];
1044 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1045 if (!r)
1046 return NULL;
1048 if (!prefixcmp(r, "refs/heads/"))
1049 strbuf_addstr(&buf, "refs/heads/");
1050 else if (!prefixcmp(r, "refs/tags/"))
1051 strbuf_addstr(&buf, "refs/tags/");
1052 else
1053 return NULL;
1055 strbuf_addstr(&buf, name);
1056 return strbuf_detach(&buf, NULL);
1059 static int match_explicit(struct ref *src, struct ref *dst,
1060 struct ref ***dst_tail,
1061 struct refspec *rs)
1063 struct ref *matched_src, *matched_dst;
1064 int copy_src;
1066 const char *dst_value = rs->dst;
1067 char *dst_guess;
1069 if (rs->pattern || rs->matching)
1070 return 0;
1072 matched_src = matched_dst = NULL;
1073 switch (count_refspec_match(rs->src, src, &matched_src)) {
1074 case 1:
1075 copy_src = 1;
1076 break;
1077 case 0:
1078 /* The source could be in the get_sha1() format
1079 * not a reference name. :refs/other is a
1080 * way to delete 'other' ref at the remote end.
1082 matched_src = try_explicit_object_name(rs->src);
1083 if (!matched_src)
1084 return error("src refspec %s does not match any.", rs->src);
1085 copy_src = 0;
1086 break;
1087 default:
1088 return error("src refspec %s matches more than one.", rs->src);
1091 if (!dst_value) {
1092 unsigned char sha1[20];
1093 int flag;
1095 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1096 if (!dst_value ||
1097 ((flag & REF_ISSYMREF) &&
1098 prefixcmp(dst_value, "refs/heads/")))
1099 die("%s cannot be resolved to branch.",
1100 matched_src->name);
1103 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1104 case 1:
1105 break;
1106 case 0:
1107 if (!memcmp(dst_value, "refs/", 5))
1108 matched_dst = make_linked_ref(dst_value, dst_tail);
1109 else if (is_null_sha1(matched_src->new_sha1))
1110 error("unable to delete '%s': remote ref does not exist",
1111 dst_value);
1112 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1113 matched_dst = make_linked_ref(dst_guess, dst_tail);
1114 else
1115 error("unable to push to unqualified destination: %s\n"
1116 "The destination refspec neither matches an "
1117 "existing ref on the remote nor\n"
1118 "begins with refs/, and we are unable to "
1119 "guess a prefix based on the source ref.",
1120 dst_value);
1121 break;
1122 default:
1123 matched_dst = NULL;
1124 error("dst refspec %s matches more than one.",
1125 dst_value);
1126 break;
1128 if (!matched_dst)
1129 return -1;
1130 if (matched_dst->peer_ref)
1131 return error("dst ref %s receives from more than one src.",
1132 matched_dst->name);
1133 else {
1134 matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1135 matched_dst->force = rs->force;
1137 return 0;
1140 static int match_explicit_refs(struct ref *src, struct ref *dst,
1141 struct ref ***dst_tail, struct refspec *rs,
1142 int rs_nr)
1144 int i, errs;
1145 for (i = errs = 0; i < rs_nr; i++)
1146 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1147 return errs;
1150 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1151 int send_mirror, int direction, const struct refspec **ret_pat)
1153 const struct refspec *pat;
1154 char *name;
1155 int i;
1156 int matching_refs = -1;
1157 for (i = 0; i < rs_nr; i++) {
1158 if (rs[i].matching &&
1159 (matching_refs == -1 || rs[i].force)) {
1160 matching_refs = i;
1161 continue;
1164 if (rs[i].pattern) {
1165 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1166 int match;
1167 if (direction == FROM_SRC)
1168 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1169 else
1170 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1171 if (match) {
1172 matching_refs = i;
1173 break;
1177 if (matching_refs == -1)
1178 return NULL;
1180 pat = rs + matching_refs;
1181 if (pat->matching) {
1183 * "matching refs"; traditionally we pushed everything
1184 * including refs outside refs/heads/ hierarchy, but
1185 * that does not make much sense these days.
1187 if (!send_mirror && prefixcmp(ref->name, "refs/heads/"))
1188 return NULL;
1189 name = xstrdup(ref->name);
1191 if (ret_pat)
1192 *ret_pat = pat;
1193 return name;
1196 static struct ref **tail_ref(struct ref **head)
1198 struct ref **tail = head;
1199 while (*tail)
1200 tail = &((*tail)->next);
1201 return tail;
1205 * Given the set of refs the local repository has, the set of refs the
1206 * remote repository has, and the refspec used for push, determine
1207 * what remote refs we will update and with what value by setting
1208 * peer_ref (which object is being pushed) and force (if the push is
1209 * forced) in elements of "dst". The function may add new elements to
1210 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1212 int match_push_refs(struct ref *src, struct ref **dst,
1213 int nr_refspec, const char **refspec, int flags)
1215 struct refspec *rs;
1216 int send_all = flags & MATCH_REFS_ALL;
1217 int send_mirror = flags & MATCH_REFS_MIRROR;
1218 int send_prune = flags & MATCH_REFS_PRUNE;
1219 int errs;
1220 static const char *default_refspec[] = { ":", NULL };
1221 struct ref *ref, **dst_tail = tail_ref(dst);
1223 if (!nr_refspec) {
1224 nr_refspec = 1;
1225 refspec = default_refspec;
1227 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1228 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1230 /* pick the remainder */
1231 for (ref = src; ref; ref = ref->next) {
1232 struct ref *dst_peer;
1233 const struct refspec *pat = NULL;
1234 char *dst_name;
1236 if (ref->peer_ref)
1237 continue;
1239 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1240 if (!dst_name)
1241 continue;
1243 dst_peer = find_ref_by_name(*dst, dst_name);
1244 if (dst_peer) {
1245 if (dst_peer->peer_ref)
1246 /* We're already sending something to this ref. */
1247 goto free_name;
1248 } else {
1249 if (pat->matching && !(send_all || send_mirror))
1251 * Remote doesn't have it, and we have no
1252 * explicit pattern, and we don't have
1253 * --all nor --mirror.
1255 goto free_name;
1257 /* Create a new one and link it */
1258 dst_peer = make_linked_ref(dst_name, &dst_tail);
1259 hashcpy(dst_peer->new_sha1, ref->new_sha1);
1261 dst_peer->peer_ref = copy_ref(ref);
1262 dst_peer->force = pat->force;
1263 free_name:
1264 free(dst_name);
1266 if (send_prune) {
1267 /* check for missing refs on the remote */
1268 for (ref = *dst; ref; ref = ref->next) {
1269 char *src_name;
1271 if (ref->peer_ref)
1272 /* We're already sending something to this ref. */
1273 continue;
1275 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1276 if (src_name) {
1277 if (!find_ref_by_name(src, src_name))
1278 ref->peer_ref = alloc_delete_ref();
1279 free(src_name);
1283 if (errs)
1284 return -1;
1285 return 0;
1288 static inline int is_forwardable(struct ref* ref)
1290 struct object *o;
1292 if (!prefixcmp(ref->name, "refs/tags/"))
1293 return 0;
1295 /* old object must be a commit */
1296 o = parse_object(ref->old_sha1);
1297 if (!o || o->type != OBJ_COMMIT)
1298 return 0;
1300 /* new object must be commit-ish */
1301 o = deref_tag(parse_object(ref->new_sha1), NULL, 0);
1302 if (!o || o->type != OBJ_COMMIT)
1303 return 0;
1305 return 1;
1308 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1309 int force_update)
1311 struct ref *ref;
1313 for (ref = remote_refs; ref; ref = ref->next) {
1314 int force_ref_update = ref->force || force_update;
1316 if (ref->peer_ref)
1317 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1318 else if (!send_mirror)
1319 continue;
1321 ref->deletion = is_null_sha1(ref->new_sha1);
1322 if (!ref->deletion &&
1323 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1324 ref->status = REF_STATUS_UPTODATE;
1325 continue;
1329 * The below logic determines whether an individual
1330 * refspec A:B can be pushed. The push will succeed
1331 * if any of the following are true:
1333 * (1) the remote reference B does not exist
1335 * (2) the remote reference B is being removed (i.e.,
1336 * pushing :B where no source is specified)
1338 * (3) the update meets all fast-forwarding criteria:
1340 * (a) the destination is not under refs/tags/
1341 * (b) the old is a commit
1342 * (c) the new is a descendant of the old
1344 * NOTE: We must actually have the old object in
1345 * order to overwrite it in the remote reference,
1346 * and the new object must be commit-ish. These are
1347 * implied by (b) and (c) respectively.
1349 * (4) it is forced using the +A:B notation, or by
1350 * passing the --force argument
1353 ref->not_forwardable = !is_forwardable(ref);
1355 ref->update =
1356 !ref->deletion &&
1357 !is_null_sha1(ref->old_sha1);
1359 if (ref->update) {
1360 ref->nonfastforward =
1361 !has_sha1_file(ref->old_sha1)
1362 || !ref_newer(ref->new_sha1, ref->old_sha1);
1364 if (ref->not_forwardable) {
1365 ref->requires_force = 1;
1366 if (!force_ref_update) {
1367 ref->status = REF_STATUS_REJECT_ALREADY_EXISTS;
1368 continue;
1370 } else if (ref->nonfastforward) {
1371 ref->requires_force = 1;
1372 if (!force_ref_update) {
1373 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
1374 continue;
1381 struct branch *branch_get(const char *name)
1383 struct branch *ret;
1385 read_config();
1386 if (!name || !*name || !strcmp(name, "HEAD"))
1387 ret = current_branch;
1388 else
1389 ret = make_branch(name, 0);
1390 if (ret && ret->remote_name) {
1391 ret->remote = remote_get(ret->remote_name);
1392 if (ret->merge_nr) {
1393 int i;
1394 ret->merge = xcalloc(sizeof(*ret->merge),
1395 ret->merge_nr);
1396 for (i = 0; i < ret->merge_nr; i++) {
1397 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1398 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1399 if (remote_find_tracking(ret->remote, ret->merge[i])
1400 && !strcmp(ret->remote_name, "."))
1401 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1405 return ret;
1408 int branch_has_merge_config(struct branch *branch)
1410 return branch && !!branch->merge;
1413 int branch_merge_matches(struct branch *branch,
1414 int i,
1415 const char *refname)
1417 if (!branch || i < 0 || i >= branch->merge_nr)
1418 return 0;
1419 return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1422 static int ignore_symref_update(const char *refname)
1424 unsigned char sha1[20];
1425 int flag;
1427 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1428 return 0; /* non-existing refs are OK */
1429 return (flag & REF_ISSYMREF);
1432 static struct ref *get_expanded_map(const struct ref *remote_refs,
1433 const struct refspec *refspec)
1435 const struct ref *ref;
1436 struct ref *ret = NULL;
1437 struct ref **tail = &ret;
1439 char *expn_name;
1441 for (ref = remote_refs; ref; ref = ref->next) {
1442 if (strchr(ref->name, '^'))
1443 continue; /* a dereference item */
1444 if (match_name_with_pattern(refspec->src, ref->name,
1445 refspec->dst, &expn_name) &&
1446 !ignore_symref_update(expn_name)) {
1447 struct ref *cpy = copy_ref(ref);
1449 cpy->peer_ref = alloc_ref(expn_name);
1450 free(expn_name);
1451 if (refspec->force)
1452 cpy->peer_ref->force = 1;
1453 *tail = cpy;
1454 tail = &cpy->next;
1458 return ret;
1461 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1463 const struct ref *ref;
1464 for (ref = refs; ref; ref = ref->next) {
1465 if (refname_match(name, ref->name, ref_fetch_rules))
1466 return ref;
1468 return NULL;
1471 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1473 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1475 if (!ref)
1476 return NULL;
1478 return copy_ref(ref);
1481 static struct ref *get_local_ref(const char *name)
1483 if (!name || name[0] == '\0')
1484 return NULL;
1486 if (!prefixcmp(name, "refs/"))
1487 return alloc_ref(name);
1489 if (!prefixcmp(name, "heads/") ||
1490 !prefixcmp(name, "tags/") ||
1491 !prefixcmp(name, "remotes/"))
1492 return alloc_ref_with_prefix("refs/", 5, name);
1494 return alloc_ref_with_prefix("refs/heads/", 11, name);
1497 int get_fetch_map(const struct ref *remote_refs,
1498 const struct refspec *refspec,
1499 struct ref ***tail,
1500 int missing_ok)
1502 struct ref *ref_map, **rmp;
1504 if (refspec->pattern) {
1505 ref_map = get_expanded_map(remote_refs, refspec);
1506 } else {
1507 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1509 ref_map = get_remote_ref(remote_refs, name);
1510 if (!missing_ok && !ref_map)
1511 die("Couldn't find remote ref %s", name);
1512 if (ref_map) {
1513 ref_map->peer_ref = get_local_ref(refspec->dst);
1514 if (ref_map->peer_ref && refspec->force)
1515 ref_map->peer_ref->force = 1;
1519 for (rmp = &ref_map; *rmp; ) {
1520 if ((*rmp)->peer_ref) {
1521 if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
1522 check_refname_format((*rmp)->peer_ref->name, 0)) {
1523 struct ref *ignore = *rmp;
1524 error("* Ignoring funny ref '%s' locally",
1525 (*rmp)->peer_ref->name);
1526 *rmp = (*rmp)->next;
1527 free(ignore->peer_ref);
1528 free(ignore);
1529 continue;
1532 rmp = &((*rmp)->next);
1535 if (ref_map)
1536 tail_link_ref(ref_map, tail);
1538 return 0;
1541 int resolve_remote_symref(struct ref *ref, struct ref *list)
1543 if (!ref->symref)
1544 return 0;
1545 for (; list; list = list->next)
1546 if (!strcmp(ref->symref, list->name)) {
1547 hashcpy(ref->old_sha1, list->old_sha1);
1548 return 0;
1550 return 1;
1553 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1555 while (list) {
1556 struct commit_list *temp = list;
1557 temp->item->object.flags &= ~mark;
1558 list = temp->next;
1559 free(temp);
1563 int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1565 struct object *o;
1566 struct commit *old, *new;
1567 struct commit_list *list, *used;
1568 int found = 0;
1570 /* Both new and old must be commit-ish and new is descendant of
1571 * old. Otherwise we require --force.
1573 o = deref_tag(parse_object(old_sha1), NULL, 0);
1574 if (!o || o->type != OBJ_COMMIT)
1575 return 0;
1576 old = (struct commit *) o;
1578 o = deref_tag(parse_object(new_sha1), NULL, 0);
1579 if (!o || o->type != OBJ_COMMIT)
1580 return 0;
1581 new = (struct commit *) o;
1583 if (parse_commit(new) < 0)
1584 return 0;
1586 used = list = NULL;
1587 commit_list_insert(new, &list);
1588 while (list) {
1589 new = pop_most_recent_commit(&list, TMP_MARK);
1590 commit_list_insert(new, &used);
1591 if (new == old) {
1592 found = 1;
1593 break;
1596 unmark_and_free(list, TMP_MARK);
1597 unmark_and_free(used, TMP_MARK);
1598 return found;
1602 * Return true if there is anything to report, otherwise false.
1604 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1606 unsigned char sha1[20];
1607 struct commit *ours, *theirs;
1608 char symmetric[84];
1609 struct rev_info revs;
1610 const char *rev_argv[10], *base;
1611 int rev_argc;
1614 * Nothing to report unless we are marked to build on top of
1615 * somebody else.
1617 if (!branch ||
1618 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1619 return 0;
1622 * If what we used to build on no longer exists, there is
1623 * nothing to report.
1625 base = branch->merge[0]->dst;
1626 if (read_ref(base, sha1))
1627 return 0;
1628 theirs = lookup_commit_reference(sha1);
1629 if (!theirs)
1630 return 0;
1632 if (read_ref(branch->refname, sha1))
1633 return 0;
1634 ours = lookup_commit_reference(sha1);
1635 if (!ours)
1636 return 0;
1638 /* are we the same? */
1639 if (theirs == ours)
1640 return 0;
1642 /* Run "rev-list --left-right ours...theirs" internally... */
1643 rev_argc = 0;
1644 rev_argv[rev_argc++] = NULL;
1645 rev_argv[rev_argc++] = "--left-right";
1646 rev_argv[rev_argc++] = symmetric;
1647 rev_argv[rev_argc++] = "--";
1648 rev_argv[rev_argc] = NULL;
1650 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1651 strcpy(symmetric + 40, "...");
1652 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1654 init_revisions(&revs, NULL);
1655 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1656 prepare_revision_walk(&revs);
1658 /* ... and count the commits on each side. */
1659 *num_ours = 0;
1660 *num_theirs = 0;
1661 while (1) {
1662 struct commit *c = get_revision(&revs);
1663 if (!c)
1664 break;
1665 if (c->object.flags & SYMMETRIC_LEFT)
1666 (*num_ours)++;
1667 else
1668 (*num_theirs)++;
1671 /* clear object flags smudged by the above traversal */
1672 clear_commit_marks(ours, ALL_REV_FLAGS);
1673 clear_commit_marks(theirs, ALL_REV_FLAGS);
1674 return 1;
1678 * Return true when there is anything to report, otherwise false.
1680 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1682 int num_ours, num_theirs;
1683 const char *base;
1685 if (!stat_tracking_info(branch, &num_ours, &num_theirs))
1686 return 0;
1688 base = branch->merge[0]->dst;
1689 base = shorten_unambiguous_ref(base, 0);
1690 if (!num_theirs) {
1691 strbuf_addf(sb,
1692 Q_("Your branch is ahead of '%s' by %d commit.\n",
1693 "Your branch is ahead of '%s' by %d commits.\n",
1694 num_ours),
1695 base, num_ours);
1696 if (advice_status_hints)
1697 strbuf_addf(sb,
1698 _(" (use \"git push\" to publish your local commits)\n"));
1699 } else if (!num_ours) {
1700 strbuf_addf(sb,
1701 Q_("Your branch is behind '%s' by %d commit, "
1702 "and can be fast-forwarded.\n",
1703 "Your branch is behind '%s' by %d commits, "
1704 "and can be fast-forwarded.\n",
1705 num_theirs),
1706 base, num_theirs);
1707 if (advice_status_hints)
1708 strbuf_addf(sb,
1709 _(" (use \"git pull\" to update your local branch)\n"));
1710 } else {
1711 strbuf_addf(sb,
1712 Q_("Your branch and '%s' have diverged,\n"
1713 "and have %d and %d different commit each, "
1714 "respectively.\n",
1715 "Your branch and '%s' have diverged,\n"
1716 "and have %d and %d different commits each, "
1717 "respectively.\n",
1718 num_theirs),
1719 base, num_ours, num_theirs);
1720 if (advice_status_hints)
1721 strbuf_addf(sb,
1722 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1724 return 1;
1727 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1729 struct ref ***local_tail = cb_data;
1730 struct ref *ref;
1731 int len;
1733 /* we already know it starts with refs/ to get here */
1734 if (check_refname_format(refname + 5, 0))
1735 return 0;
1737 len = strlen(refname) + 1;
1738 ref = xcalloc(1, sizeof(*ref) + len);
1739 hashcpy(ref->new_sha1, sha1);
1740 memcpy(ref->name, refname, len);
1741 **local_tail = ref;
1742 *local_tail = &ref->next;
1743 return 0;
1746 struct ref *get_local_heads(void)
1748 struct ref *local_refs = NULL, **local_tail = &local_refs;
1749 for_each_ref(one_local_ref, &local_tail);
1750 return local_refs;
1753 struct ref *guess_remote_head(const struct ref *head,
1754 const struct ref *refs,
1755 int all)
1757 const struct ref *r;
1758 struct ref *list = NULL;
1759 struct ref **tail = &list;
1761 if (!head)
1762 return NULL;
1765 * Some transports support directly peeking at
1766 * where HEAD points; if that is the case, then
1767 * we don't have to guess.
1769 if (head->symref)
1770 return copy_ref(find_ref_by_name(refs, head->symref));
1772 /* If refs/heads/master could be right, it is. */
1773 if (!all) {
1774 r = find_ref_by_name(refs, "refs/heads/master");
1775 if (r && !hashcmp(r->old_sha1, head->old_sha1))
1776 return copy_ref(r);
1779 /* Look for another ref that points there */
1780 for (r = refs; r; r = r->next) {
1781 if (r != head &&
1782 !prefixcmp(r->name, "refs/heads/") &&
1783 !hashcmp(r->old_sha1, head->old_sha1)) {
1784 *tail = copy_ref(r);
1785 tail = &((*tail)->next);
1786 if (!all)
1787 break;
1791 return list;
1794 struct stale_heads_info {
1795 struct string_list *ref_names;
1796 struct ref **stale_refs_tail;
1797 struct refspec *refs;
1798 int ref_count;
1801 static int get_stale_heads_cb(const char *refname,
1802 const unsigned char *sha1, int flags, void *cb_data)
1804 struct stale_heads_info *info = cb_data;
1805 struct refspec query;
1806 memset(&query, 0, sizeof(struct refspec));
1807 query.dst = (char *)refname;
1809 if (query_refspecs(info->refs, info->ref_count, &query))
1810 return 0; /* No matches */
1813 * If we did find a suitable refspec and it's not a symref and
1814 * it's not in the list of refs that currently exist in that
1815 * remote we consider it to be stale.
1817 if (!((flags & REF_ISSYMREF) ||
1818 string_list_has_string(info->ref_names, query.src))) {
1819 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
1820 hashcpy(ref->new_sha1, sha1);
1823 free(query.src);
1824 return 0;
1827 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1829 struct ref *ref, *stale_refs = NULL;
1830 struct string_list ref_names = STRING_LIST_INIT_NODUP;
1831 struct stale_heads_info info;
1832 info.ref_names = &ref_names;
1833 info.stale_refs_tail = &stale_refs;
1834 info.refs = refs;
1835 info.ref_count = ref_count;
1836 for (ref = fetch_map; ref; ref = ref->next)
1837 string_list_append(&ref_names, ref->name);
1838 sort_string_list(&ref_names);
1839 for_each_ref(get_stale_heads_cb, &info);
1840 string_list_clear(&ref_names, 0);
1841 return stale_refs;