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