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