| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "remote.h" |
| 3 | #include "refs.h" |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 4 | #include "commit.h" |
| 5 | #include "diff.h" |
| 6 | #include "revision.h" |
| Alexander Potashev | 8ca12c0 | 2009-01-10 12:07:50 | [diff] [blame] | 7 | #include "dir.h" |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 8 | #include "tag.h" |
| Julian Phillips | 73cf082 | 2009-10-25 21:28:11 | [diff] [blame] | 9 | #include "string-list.h" |
| Jeff King | ed81c76 | 2012-05-21 22:19:28 | [diff] [blame] | 10 | #include "mergesort.h" |
| Jeff King | 0b282cc | 2015-09-24 21:07:58 | [diff] [blame] | 11 | #include "argv-array.h" |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 12 | |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 13 | enum map_direction { FROM_SRC, FROM_DST }; |
| 14 | |
| Daniel Barkalow | e0aaa29 | 2008-04-17 23:32:35 | [diff] [blame] | 15 | static struct refspec s_tag_refspec = { |
| 16 | 0, |
| 17 | 1, |
| Junio C Hamano | b84c343 | 2008-05-25 20:38:44 | [diff] [blame] | 18 | 0, |
| Junio C Hamano | 6e7b66e | 2013-01-29 22:02:15 | [diff] [blame] | 19 | 0, |
| Daniel Barkalow | 08fbdb3 | 2009-03-07 06:11:36 | [diff] [blame] | 20 | "refs/tags/*", |
| 21 | "refs/tags/*" |
| Daniel Barkalow | e0aaa29 | 2008-04-17 23:32:35 | [diff] [blame] | 22 | }; |
| 23 | |
| 24 | const struct refspec *tag_refspec = &s_tag_refspec; |
| 25 | |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 26 | struct counted_string { |
| 27 | size_t len; |
| 28 | const char *s; |
| 29 | }; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 30 | struct rewrite { |
| 31 | const char *base; |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 32 | size_t baselen; |
| 33 | struct counted_string *instead_of; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 34 | int instead_of_nr; |
| 35 | int instead_of_alloc; |
| 36 | }; |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 37 | struct rewrites { |
| 38 | struct rewrite **rewrite; |
| 39 | int rewrite_alloc; |
| 40 | int rewrite_nr; |
| 41 | }; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 42 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 43 | static struct remote **remotes; |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 44 | static int remotes_alloc; |
| 45 | static int remotes_nr; |
| Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 | [diff] [blame] | 46 | static struct hashmap remotes_hash; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 47 | |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 48 | static struct branch **branches; |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 49 | static int branches_alloc; |
| 50 | static int branches_nr; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 51 | |
| 52 | static struct branch *current_branch; |
| Ramkumar Ramachandra | f24f715 | 2013-04-02 07:40:32 | [diff] [blame] | 53 | static const char *pushremote_name; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 54 | |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 55 | static struct rewrites rewrites; |
| Josh Triplett | 1c2eafb | 2009-09-07 08:56:33 | [diff] [blame] | 56 | static struct rewrites rewrites_push; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 57 | |
| Daniel Barkalow | 0a4da29 | 2009-11-18 01:42:23 | [diff] [blame] | 58 | static int valid_remote(const struct remote *remote) |
| 59 | { |
| Daniel Barkalow | c578f51 | 2009-11-18 01:42:25 | [diff] [blame] | 60 | return (!!remote->url) || (!!remote->foreign_vcs); |
| Daniel Barkalow | 0a4da29 | 2009-11-18 01:42:23 | [diff] [blame] | 61 | } |
| 62 | |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 63 | static const char *alias_url(const char *url, struct rewrites *r) |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 64 | { |
| 65 | int i, j; |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 66 | struct counted_string *longest; |
| 67 | int longest_i; |
| 68 | |
| 69 | longest = NULL; |
| 70 | longest_i = -1; |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 71 | for (i = 0; i < r->rewrite_nr; i++) { |
| 72 | if (!r->rewrite[i]) |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 73 | continue; |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 74 | for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) { |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 75 | if (starts_with(url, r->rewrite[i]->instead_of[j].s) && |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 76 | (!longest || |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 77 | longest->len < r->rewrite[i]->instead_of[j].len)) { |
| 78 | longest = &(r->rewrite[i]->instead_of[j]); |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 79 | longest_i = i; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 80 | } |
| 81 | } |
| 82 | } |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 83 | if (!longest) |
| 84 | return url; |
| 85 | |
| Jeff King | 75faa45 | 2015-09-24 21:07:03 | [diff] [blame] | 86 | return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len); |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 87 | } |
| 88 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 89 | static void add_push_refspec(struct remote *remote, const char *ref) |
| 90 | { |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 91 | ALLOC_GROW(remote->push_refspec, |
| 92 | remote->push_refspec_nr + 1, |
| 93 | remote->push_refspec_alloc); |
| 94 | remote->push_refspec[remote->push_refspec_nr++] = ref; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 95 | } |
| 96 | |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 97 | static void add_fetch_refspec(struct remote *remote, const char *ref) |
| 98 | { |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 99 | ALLOC_GROW(remote->fetch_refspec, |
| 100 | remote->fetch_refspec_nr + 1, |
| 101 | remote->fetch_refspec_alloc); |
| 102 | remote->fetch_refspec[remote->fetch_refspec_nr++] = ref; |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 103 | } |
| 104 | |
| Shawn O. Pearce | 28b91f8 | 2007-09-19 04:49:27 | [diff] [blame] | 105 | static void add_url(struct remote *remote, const char *url) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 106 | { |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 107 | ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc); |
| 108 | remote->url[remote->url_nr++] = url; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 109 | } |
| 110 | |
| Michael J Gruber | 2034623 | 2009-06-09 16:01:34 | [diff] [blame] | 111 | static void add_pushurl(struct remote *remote, const char *pushurl) |
| 112 | { |
| 113 | ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc); |
| 114 | remote->pushurl[remote->pushurl_nr++] = pushurl; |
| 115 | } |
| 116 | |
| Josh Triplett | 1c2eafb | 2009-09-07 08:56:33 | [diff] [blame] | 117 | static void add_pushurl_alias(struct remote *remote, const char *url) |
| 118 | { |
| 119 | const char *pushurl = alias_url(url, &rewrites_push); |
| 120 | if (pushurl != url) |
| 121 | add_pushurl(remote, pushurl); |
| 122 | } |
| 123 | |
| 124 | static void add_url_alias(struct remote *remote, const char *url) |
| 125 | { |
| 126 | add_url(remote, alias_url(url, &rewrites)); |
| 127 | add_pushurl_alias(remote, url); |
| 128 | } |
| 129 | |
| Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 | [diff] [blame] | 130 | struct remotes_hash_key { |
| 131 | const char *str; |
| 132 | int len; |
| 133 | }; |
| 134 | |
| 135 | static int remotes_hash_cmp(const struct remote *a, const struct remote *b, const struct remotes_hash_key *key) |
| 136 | { |
| 137 | if (key) |
| 138 | return strncmp(a->name, key->str, key->len) || a->name[key->len]; |
| 139 | else |
| 140 | return strcmp(a->name, b->name); |
| 141 | } |
| 142 | |
| 143 | static inline void init_remotes_hash(void) |
| 144 | { |
| 145 | if (!remotes_hash.cmpfn) |
| 146 | hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, 0); |
| 147 | } |
| 148 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 149 | static struct remote *make_remote(const char *name, int len) |
| 150 | { |
| Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 | [diff] [blame] | 151 | struct remote *ret, *replaced; |
| 152 | struct remotes_hash_key lookup; |
| 153 | struct hashmap_entry lookup_entry; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 154 | |
| Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 | [diff] [blame] | 155 | if (!len) |
| 156 | len = strlen(name); |
| 157 | |
| 158 | init_remotes_hash(); |
| 159 | lookup.str = name; |
| 160 | lookup.len = len; |
| 161 | hashmap_entry_init(&lookup_entry, memhash(name, len)); |
| 162 | |
| 163 | if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL) |
| 164 | return ret; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 165 | |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 166 | ret = xcalloc(1, sizeof(struct remote)); |
| Michael Schubert | 737c5a9 | 2013-07-13 09:36:24 | [diff] [blame] | 167 | ret->prune = -1; /* unspecified */ |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 168 | ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc); |
| 169 | remotes[remotes_nr++] = ret; |
| Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 | [diff] [blame] | 170 | ret->name = xstrndup(name, len); |
| 171 | |
| 172 | hashmap_entry_init(ret, lookup_entry.hash); |
| 173 | replaced = hashmap_put(&remotes_hash, ret); |
| 174 | assert(replaced == NULL); /* no previous entry overwritten */ |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 175 | return ret; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 176 | } |
| 177 | |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 178 | static void add_merge(struct branch *branch, const char *name) |
| 179 | { |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 180 | ALLOC_GROW(branch->merge_name, branch->merge_nr + 1, |
| 181 | branch->merge_alloc); |
| 182 | branch->merge_name[branch->merge_nr++] = name; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 183 | } |
| 184 | |
| 185 | static struct branch *make_branch(const char *name, int len) |
| 186 | { |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 187 | struct branch *ret; |
| 188 | int i; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 189 | |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 190 | for (i = 0; i < branches_nr; i++) { |
| 191 | if (len ? (!strncmp(name, branches[i]->name, len) && |
| 192 | !branches[i]->name[len]) : |
| 193 | !strcmp(name, branches[i]->name)) |
| 194 | return branches[i]; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 195 | } |
| 196 | |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 197 | ALLOC_GROW(branches, branches_nr + 1, branches_alloc); |
| 198 | ret = xcalloc(1, sizeof(struct branch)); |
| 199 | branches[branches_nr++] = ret; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 200 | if (len) |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 201 | ret->name = xstrndup(name, len); |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 202 | else |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 203 | ret->name = xstrdup(name); |
| Jeff King | fa3f60b | 2014-06-18 20:02:13 | [diff] [blame] | 204 | ret->refname = xstrfmt("refs/heads/%s", ret->name); |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 205 | |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 206 | return ret; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 207 | } |
| 208 | |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 209 | static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len) |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 210 | { |
| 211 | struct rewrite *ret; |
| 212 | int i; |
| 213 | |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 214 | for (i = 0; i < r->rewrite_nr; i++) { |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 215 | if (len |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 216 | ? (len == r->rewrite[i]->baselen && |
| 217 | !strncmp(base, r->rewrite[i]->base, len)) |
| 218 | : !strcmp(base, r->rewrite[i]->base)) |
| 219 | return r->rewrite[i]; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 220 | } |
| 221 | |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 222 | ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc); |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 223 | ret = xcalloc(1, sizeof(struct rewrite)); |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 224 | r->rewrite[r->rewrite_nr++] = ret; |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 225 | if (len) { |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 226 | ret->base = xstrndup(base, len); |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 227 | ret->baselen = len; |
| 228 | } |
| 229 | else { |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 230 | ret->base = xstrdup(base); |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 231 | ret->baselen = strlen(base); |
| 232 | } |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 233 | return ret; |
| 234 | } |
| 235 | |
| 236 | static void add_instead_of(struct rewrite *rewrite, const char *instead_of) |
| 237 | { |
| 238 | ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc); |
| Junio C Hamano | 844112c | 2008-02-25 06:25:04 | [diff] [blame] | 239 | rewrite->instead_of[rewrite->instead_of_nr].s = instead_of; |
| 240 | rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of); |
| 241 | rewrite->instead_of_nr++; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 242 | } |
| 243 | |
| Jeff King | 0e265a9 | 2015-09-24 21:07:20 | [diff] [blame] | 244 | static const char *skip_spaces(const char *s) |
| 245 | { |
| 246 | while (isspace(*s)) |
| 247 | s++; |
| 248 | return s; |
| 249 | } |
| 250 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 251 | static void read_remotes_file(struct remote *remote) |
| 252 | { |
| Jeff King | 0e265a9 | 2015-09-24 21:07:20 | [diff] [blame] | 253 | struct strbuf buf = STRBUF_INIT; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 254 | FILE *f = fopen(git_path("remotes/%s", remote->name), "r"); |
| 255 | |
| 256 | if (!f) |
| 257 | return; |
| Miklos Vajna | 89cf4c7 | 2008-11-10 20:43:00 | [diff] [blame] | 258 | remote->origin = REMOTE_REMOTES; |
| Junio C Hamano | 18814d0 | 2015-10-28 20:27:33 | [diff] [blame] | 259 | while (strbuf_getline(&buf, f) != EOF) { |
| Jeff King | 0e265a9 | 2015-09-24 21:07:20 | [diff] [blame] | 260 | const char *v; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 261 | |
| Jeff King | 0e265a9 | 2015-09-24 21:07:20 | [diff] [blame] | 262 | strbuf_rtrim(&buf); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 263 | |
| Jeff King | 0e265a9 | 2015-09-24 21:07:20 | [diff] [blame] | 264 | if (skip_prefix(buf.buf, "URL:", &v)) |
| 265 | add_url_alias(remote, xstrdup(skip_spaces(v))); |
| 266 | else if (skip_prefix(buf.buf, "Push:", &v)) |
| 267 | add_push_refspec(remote, xstrdup(skip_spaces(v))); |
| 268 | else if (skip_prefix(buf.buf, "Pull:", &v)) |
| 269 | add_fetch_refspec(remote, xstrdup(skip_spaces(v))); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 270 | } |
| Jeff King | 0e265a9 | 2015-09-24 21:07:20 | [diff] [blame] | 271 | strbuf_release(&buf); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 272 | fclose(f); |
| 273 | } |
| 274 | |
| 275 | static void read_branches_file(struct remote *remote) |
| 276 | { |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 277 | char *frag; |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 278 | struct strbuf buf = STRBUF_INIT; |
| 279 | FILE *f = fopen(git_path("branches/%s", remote->name), "r"); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 280 | |
| 281 | if (!f) |
| 282 | return; |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 283 | |
| Junio C Hamano | 8f309ae | 2016-01-13 23:31:17 | [diff] [blame] | 284 | strbuf_getline_lf(&buf, f); |
| Johannes Sixt | 0fb1990 | 2015-10-23 06:02:51 | [diff] [blame] | 285 | fclose(f); |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 286 | strbuf_trim(&buf); |
| 287 | if (!buf.len) { |
| 288 | strbuf_release(&buf); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 289 | return; |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 290 | } |
| 291 | |
| Miklos Vajna | 89cf4c7 | 2008-11-10 20:43:00 | [diff] [blame] | 292 | remote->origin = REMOTE_BRANCHES; |
| Daniel Barkalow | 472fa4c | 2008-03-25 23:35:28 | [diff] [blame] | 293 | |
| 294 | /* |
| Ramkumar Ramachandra | 55cfde2 | 2013-06-22 07:58:12 | [diff] [blame] | 295 | * The branches file would have URL and optionally |
| Daniel Barkalow | 472fa4c | 2008-03-25 23:35:28 | [diff] [blame] | 296 | * #branch specified. The "master" (or specified) branch is |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 297 | * fetched and stored in the local branch matching the |
| 298 | * remote name. |
| Daniel Barkalow | 472fa4c | 2008-03-25 23:35:28 | [diff] [blame] | 299 | */ |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 300 | frag = strchr(buf.buf, '#'); |
| 301 | if (frag) |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 302 | *(frag++) = '\0'; |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 303 | else |
| 304 | frag = "master"; |
| Ramkumar Ramachandra | 55cfde2 | 2013-06-22 07:58:12 | [diff] [blame] | 305 | |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 306 | add_url_alias(remote, strbuf_detach(&buf, NULL)); |
| 307 | add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s", |
| 308 | frag, remote->name)); |
| 309 | |
| Martin Koegler | 18afe10 | 2008-11-10 21:47:11 | [diff] [blame] | 310 | /* |
| 311 | * Cogito compatible push: push current HEAD to remote #branch |
| 312 | * (master if missing) |
| 313 | */ |
| Jeff King | f28e3ab | 2015-09-24 21:07:18 | [diff] [blame] | 314 | add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag)); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 315 | remote->fetch_tags = 1; /* always auto-follow */ |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 316 | } |
| 317 | |
| Johannes Schindelin | ef90d6d | 2008-05-14 17:46:53 | [diff] [blame] | 318 | static int handle_config(const char *key, const char *value, void *cb) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 319 | { |
| 320 | const char *name; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 321 | int namelen; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 322 | const char *subkey; |
| 323 | struct remote *remote; |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 324 | struct branch *branch; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 325 | if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) { |
| 326 | if (!name) |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 327 | return 0; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 328 | branch = make_branch(name, namelen); |
| 329 | if (!strcmp(subkey, "remote")) { |
| Jeff King | e41bf35 | 2015-05-01 22:44:41 | [diff] [blame] | 330 | return git_config_string(&branch->remote_name, key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 331 | } else if (!strcmp(subkey, "pushremote")) { |
| Jeff King | da66b27 | 2015-05-21 04:45:20 | [diff] [blame] | 332 | return git_config_string(&branch->pushremote_name, key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 333 | } else if (!strcmp(subkey, "merge")) { |
| Junio C Hamano | d2370cc | 2008-02-11 19:00:10 | [diff] [blame] | 334 | if (!value) |
| 335 | return config_error_nonbool(key); |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 336 | add_merge(branch, xstrdup(value)); |
| Junio C Hamano | d2370cc | 2008-02-11 19:00:10 | [diff] [blame] | 337 | } |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 338 | return 0; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 339 | } |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 340 | if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) { |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 341 | struct rewrite *rewrite; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 342 | if (!name) |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 343 | return 0; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 344 | if (!strcmp(subkey, "insteadof")) { |
| 345 | rewrite = make_rewrite(&rewrites, name, namelen); |
| Josh Triplett | 1c2eafb | 2009-09-07 08:56:33 | [diff] [blame] | 346 | if (!value) |
| 347 | return config_error_nonbool(key); |
| 348 | add_instead_of(rewrite, xstrdup(value)); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 349 | } else if (!strcmp(subkey, "pushinsteadof")) { |
| 350 | rewrite = make_rewrite(&rewrites_push, name, namelen); |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 351 | if (!value) |
| 352 | return config_error_nonbool(key); |
| 353 | add_instead_of(rewrite, xstrdup(value)); |
| 354 | } |
| 355 | } |
| Ramkumar Ramachandra | 224c217 | 2013-04-02 07:40:33 | [diff] [blame] | 356 | |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 357 | if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 358 | return 0; |
| Ramkumar Ramachandra | 224c217 | 2013-04-02 07:40:33 | [diff] [blame] | 359 | |
| 360 | /* Handle remote.* variables */ |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 361 | if (!name && !strcmp(subkey, "pushdefault")) |
| Ramkumar Ramachandra | 224c217 | 2013-04-02 07:40:33 | [diff] [blame] | 362 | return git_config_string(&pushremote_name, key, value); |
| 363 | |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 364 | if (!name) |
| 365 | return 0; |
| Ramkumar Ramachandra | 224c217 | 2013-04-02 07:40:33 | [diff] [blame] | 366 | /* Handle remote.<name>.* variables */ |
| Brandon Casey | c82efaf | 2008-10-14 20:30:21 | [diff] [blame] | 367 | if (*name == '/') { |
| 368 | warning("Config remote shorthand cannot begin with '/': %s", |
| 369 | name); |
| 370 | return 0; |
| 371 | } |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 372 | remote = make_remote(name, namelen); |
| Miklos Vajna | 89cf4c7 | 2008-11-10 20:43:00 | [diff] [blame] | 373 | remote->origin = REMOTE_CONFIG; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 374 | if (!strcmp(subkey, "mirror")) |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 375 | remote->mirror = git_config_bool(key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 376 | else if (!strcmp(subkey, "skipdefaultupdate")) |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 377 | remote->skip_default_update = git_config_bool(key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 378 | else if (!strcmp(subkey, "skipfetchall")) |
| Björn Gustavsson | 7cc91a2 | 2009-11-09 20:11:06 | [diff] [blame] | 379 | remote->skip_default_update = git_config_bool(key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 380 | else if (!strcmp(subkey, "prune")) |
| Michael Schubert | 737c5a9 | 2013-07-13 09:36:24 | [diff] [blame] | 381 | remote->prune = git_config_bool(key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 382 | else if (!strcmp(subkey, "url")) { |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 383 | const char *v; |
| 384 | if (git_config_string(&v, key, value)) |
| 385 | return -1; |
| 386 | add_url(remote, v); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 387 | } else if (!strcmp(subkey, "pushurl")) { |
| Michael J Gruber | 2034623 | 2009-06-09 16:01:34 | [diff] [blame] | 388 | const char *v; |
| 389 | if (git_config_string(&v, key, value)) |
| 390 | return -1; |
| 391 | add_pushurl(remote, v); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 392 | } else if (!strcmp(subkey, "push")) { |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 393 | const char *v; |
| 394 | if (git_config_string(&v, key, value)) |
| 395 | return -1; |
| 396 | add_push_refspec(remote, v); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 397 | } else if (!strcmp(subkey, "fetch")) { |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 398 | const char *v; |
| 399 | if (git_config_string(&v, key, value)) |
| 400 | return -1; |
| 401 | add_fetch_refspec(remote, v); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 402 | } else if (!strcmp(subkey, "receivepack")) { |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 403 | const char *v; |
| 404 | if (git_config_string(&v, key, value)) |
| 405 | return -1; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 406 | if (!remote->receivepack) |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 407 | remote->receivepack = v; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 408 | else |
| 409 | error("more than one receivepack given, using the first"); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 410 | } else if (!strcmp(subkey, "uploadpack")) { |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 411 | const char *v; |
| 412 | if (git_config_string(&v, key, value)) |
| 413 | return -1; |
| Daniel Barkalow | 0012ba2 | 2007-09-11 03:02:51 | [diff] [blame] | 414 | if (!remote->uploadpack) |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 415 | remote->uploadpack = v; |
| Daniel Barkalow | 0012ba2 | 2007-09-11 03:02:51 | [diff] [blame] | 416 | else |
| 417 | error("more than one uploadpack given, using the first"); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 418 | } else if (!strcmp(subkey, "tagopt")) { |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 419 | if (!strcmp(value, "--no-tags")) |
| 420 | remote->fetch_tags = -1; |
| Samuel Tardieu | 944163a | 2010-04-19 23:31:25 | [diff] [blame] | 421 | else if (!strcmp(value, "--tags")) |
| 422 | remote->fetch_tags = 2; |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 423 | } else if (!strcmp(subkey, "proxy")) { |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 424 | return git_config_string((const char **)&remote->http_proxy, |
| 425 | key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 426 | } else if (!strcmp(subkey, "proxyauthmethod")) { |
| Knut Franke | ef97639 | 2016-01-26 13:02:47 | [diff] [blame] | 427 | return git_config_string((const char **)&remote->http_proxy_authmethod, |
| 428 | key, value); |
| Thomas Gummerer | bc60f8a | 2016-02-16 09:47:49 | [diff] [blame] | 429 | } else if (!strcmp(subkey, "vcs")) { |
| Daniel Barkalow | c578f51 | 2009-11-18 01:42:25 | [diff] [blame] | 430 | return git_config_string(&remote->foreign_vcs, key, value); |
| Paolo Bonzini | 84bb2df | 2008-04-17 11:17:20 | [diff] [blame] | 431 | } |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 432 | return 0; |
| 433 | } |
| 434 | |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 435 | static void alias_all_urls(void) |
| 436 | { |
| 437 | int i, j; |
| 438 | for (i = 0; i < remotes_nr; i++) { |
| Josh Triplett | 1c2eafb | 2009-09-07 08:56:33 | [diff] [blame] | 439 | int add_pushurl_aliases; |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 440 | if (!remotes[i]) |
| 441 | continue; |
| Michael J Gruber | 2034623 | 2009-06-09 16:01:34 | [diff] [blame] | 442 | for (j = 0; j < remotes[i]->pushurl_nr; j++) { |
| Josh Triplett | d071d94 | 2009-09-07 08:56:00 | [diff] [blame] | 443 | remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites); |
| Michael J Gruber | 2034623 | 2009-06-09 16:01:34 | [diff] [blame] | 444 | } |
| Josh Triplett | 1c2eafb | 2009-09-07 08:56:33 | [diff] [blame] | 445 | add_pushurl_aliases = remotes[i]->pushurl_nr == 0; |
| 446 | for (j = 0; j < remotes[i]->url_nr; j++) { |
| 447 | if (add_pushurl_aliases) |
| 448 | add_pushurl_alias(remotes[i], remotes[i]->url[j]); |
| 449 | remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites); |
| 450 | } |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 451 | } |
| 452 | } |
| 453 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 454 | static void read_config(void) |
| 455 | { |
| Jeff King | e41bf35 | 2015-05-01 22:44:41 | [diff] [blame] | 456 | static int loaded; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 457 | struct object_id oid; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 458 | int flag; |
| Jeff King | e41bf35 | 2015-05-01 22:44:41 | [diff] [blame] | 459 | |
| 460 | if (loaded) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 461 | return; |
| Jeff King | e41bf35 | 2015-05-01 22:44:41 | [diff] [blame] | 462 | loaded = 1; |
| 463 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 464 | current_branch = NULL; |
| Jeff King | f2f12d1 | 2016-03-05 22:11:57 | [diff] [blame] | 465 | if (startup_info->have_repository) { |
| 466 | const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag); |
| 467 | if (head_ref && (flag & REF_ISSYMREF) && |
| 468 | skip_prefix(head_ref, "refs/heads/", &head_ref)) { |
| 469 | current_branch = make_branch(head_ref, 0); |
| 470 | } |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 471 | } |
| Johannes Schindelin | ef90d6d | 2008-05-14 17:46:53 | [diff] [blame] | 472 | git_config(handle_config, NULL); |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 473 | alias_all_urls(); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 474 | } |
| 475 | |
| Junio C Hamano | 47c6ef1 | 2008-07-27 06:15:51 | [diff] [blame] | 476 | /* |
| Brandon Casey | 2cb1f36 | 2008-08-22 00:16:30 | [diff] [blame] | 477 | * This function frees a refspec array. |
| 478 | * Warning: code paths should be checked to ensure that the src |
| 479 | * and dst pointers are always freeable pointers as well |
| 480 | * as the refspec pointer itself. |
| 481 | */ |
| Nanako Shiraishi | 697d7f5 | 2008-09-25 09:41:00 | [diff] [blame] | 482 | static void free_refspecs(struct refspec *refspec, int nr_refspec) |
| Brandon Casey | 2cb1f36 | 2008-08-22 00:16:30 | [diff] [blame] | 483 | { |
| 484 | int i; |
| 485 | |
| 486 | if (!refspec) |
| 487 | return; |
| 488 | |
| 489 | for (i = 0; i < nr_refspec; i++) { |
| 490 | free(refspec[i].src); |
| 491 | free(refspec[i].dst); |
| 492 | } |
| 493 | free(refspec); |
| 494 | } |
| 495 | |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 496 | static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify) |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 497 | { |
| 498 | int i; |
| Brian Gesiak | da7a478 | 2014-05-26 15:33:55 | [diff] [blame] | 499 | struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs)); |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 500 | |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 501 | for (i = 0; i < nr_refspec; i++) { |
| Junio C Hamano | 47c6ef1 | 2008-07-27 06:15:51 | [diff] [blame] | 502 | size_t llen; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 503 | int is_glob; |
| 504 | const char *lhs, *rhs; |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 505 | int flags; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 506 | |
| Benjamin Kramer | 8e76bf3 | 2009-03-13 12:51:33 | [diff] [blame] | 507 | is_glob = 0; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 508 | |
| 509 | lhs = refspec[i]; |
| 510 | if (*lhs == '+') { |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 511 | rs[i].force = 1; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 512 | lhs++; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 513 | } |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 514 | |
| 515 | rhs = strrchr(lhs, ':'); |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 516 | |
| 517 | /* |
| 518 | * Before going on, special case ":" (or "+:") as a refspec |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 519 | * for pushing matching refs. |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 520 | */ |
| 521 | if (!fetch && rhs == lhs && rhs[1] == '\0') { |
| 522 | rs[i].matching = 1; |
| 523 | continue; |
| 524 | } |
| 525 | |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 526 | if (rhs) { |
| Junio C Hamano | 47c6ef1 | 2008-07-27 06:15:51 | [diff] [blame] | 527 | size_t rlen = strlen(++rhs); |
| Daniel Barkalow | abd2bde | 2009-03-07 06:11:39 | [diff] [blame] | 528 | is_glob = (1 <= rlen && strchr(rhs, '*')); |
| Daniel Barkalow | 08fbdb3 | 2009-03-07 06:11:36 | [diff] [blame] | 529 | rs[i].dst = xstrndup(rhs, rlen); |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 530 | } |
| 531 | |
| 532 | llen = (rhs ? (rhs - lhs - 1) : strlen(lhs)); |
| Daniel Barkalow | abd2bde | 2009-03-07 06:11:39 | [diff] [blame] | 533 | if (1 <= llen && memchr(lhs, '*', llen)) { |
| Junio C Hamano | 7d19da4 | 2008-03-26 04:15:52 | [diff] [blame] | 534 | if ((rhs && !is_glob) || (!rhs && fetch)) |
| 535 | goto invalid; |
| 536 | is_glob = 1; |
| Junio C Hamano | 7d19da4 | 2008-03-26 04:15:52 | [diff] [blame] | 537 | } else if (rhs && is_glob) { |
| 538 | goto invalid; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 539 | } |
| Junio C Hamano | 7d19da4 | 2008-03-26 04:15:52 | [diff] [blame] | 540 | |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 541 | rs[i].pattern = is_glob; |
| 542 | rs[i].src = xstrndup(lhs, llen); |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 543 | flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0); |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 544 | |
| 545 | if (fetch) { |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 546 | struct object_id unused; |
| Junio C Hamano | 6e7b66e | 2013-01-29 22:02:15 | [diff] [blame] | 547 | |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 548 | /* LHS */ |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 549 | if (!*rs[i].src) |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 550 | ; /* empty is ok; it means "HEAD" */ |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 551 | else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused)) |
| Junio C Hamano | 6e7b66e | 2013-01-29 22:02:15 | [diff] [blame] | 552 | rs[i].exact_sha1 = 1; /* ok */ |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 553 | else if (!check_refname_format(rs[i].src, flags)) |
| 554 | ; /* valid looking ref is ok */ |
| 555 | else |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 556 | goto invalid; |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 557 | /* RHS */ |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 558 | if (!rs[i].dst) |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 559 | ; /* missing is ok; it is the same as empty */ |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 560 | else if (!*rs[i].dst) |
| Junio C Hamano | def2499 | 2013-01-29 20:58:50 | [diff] [blame] | 561 | ; /* empty is ok; it means "do not store" */ |
| 562 | else if (!check_refname_format(rs[i].dst, flags)) |
| 563 | ; /* valid looking ref is ok */ |
| 564 | else |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 565 | goto invalid; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 566 | } else { |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 567 | /* |
| 568 | * LHS |
| 569 | * - empty is allowed; it means delete. |
| 570 | * - when wildcarded, it must be a valid looking ref. |
| 571 | * - otherwise, it must be an extended SHA-1, but |
| 572 | * there is no existing way to validate this. |
| 573 | */ |
| 574 | if (!*rs[i].src) |
| 575 | ; /* empty is ok */ |
| 576 | else if (is_glob) { |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 577 | if (check_refname_format(rs[i].src, flags)) |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 578 | goto invalid; |
| 579 | } |
| 580 | else |
| 581 | ; /* anything goes, for now */ |
| 582 | /* |
| 583 | * RHS |
| 584 | * - missing is allowed, but LHS then must be a |
| 585 | * valid looking ref. |
| 586 | * - empty is not allowed. |
| 587 | * - otherwise it must be a valid looking ref. |
| 588 | */ |
| 589 | if (!rs[i].dst) { |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 590 | if (check_refname_format(rs[i].src, flags)) |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 591 | goto invalid; |
| 592 | } else if (!*rs[i].dst) { |
| 593 | goto invalid; |
| 594 | } else { |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 595 | if (check_refname_format(rs[i].dst, flags)) |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 596 | goto invalid; |
| 597 | } |
| Daniel Barkalow | ef00d15 | 2008-03-18 02:05:23 | [diff] [blame] | 598 | } |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 599 | } |
| 600 | return rs; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 601 | |
| 602 | invalid: |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 603 | if (verify) { |
| Brandon Casey | 2cb1f36 | 2008-08-22 00:16:30 | [diff] [blame] | 604 | /* |
| 605 | * nr_refspec must be greater than zero and i must be valid |
| 606 | * since it is only possible to reach this point from within |
| 607 | * the for loop above. |
| 608 | */ |
| 609 | free_refspecs(rs, i+1); |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 610 | return NULL; |
| 611 | } |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 612 | die("Invalid refspec '%s'", refspec[i]); |
| 613 | } |
| 614 | |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 615 | int valid_fetch_refspec(const char *fetch_refspec_str) |
| 616 | { |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 617 | struct refspec *refspec; |
| 618 | |
| Gary V. Vaughan | 66dbfd5 | 2010-05-14 09:31:33 | [diff] [blame] | 619 | refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1); |
| Brandon Casey | 2cb1f36 | 2008-08-22 00:16:30 | [diff] [blame] | 620 | free_refspecs(refspec, 1); |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 621 | return !!refspec; |
| 622 | } |
| 623 | |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 624 | struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec) |
| 625 | { |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 626 | return parse_refspec_internal(nr_refspec, refspec, 1, 0); |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 627 | } |
| 628 | |
| Nanako Shiraishi | 697d7f5 | 2008-09-25 09:41:00 | [diff] [blame] | 629 | static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec) |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 630 | { |
| Jonas Fonseca | 24b6177 | 2008-04-13 09:56:54 | [diff] [blame] | 631 | return parse_refspec_internal(nr_refspec, refspec, 0, 0); |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 632 | } |
| 633 | |
| Daniel Barkalow | 72ff894 | 2009-11-18 01:42:28 | [diff] [blame] | 634 | void free_refspec(int nr_refspec, struct refspec *refspec) |
| 635 | { |
| 636 | int i; |
| 637 | for (i = 0; i < nr_refspec; i++) { |
| 638 | free(refspec[i].src); |
| 639 | free(refspec[i].dst); |
| 640 | } |
| 641 | free(refspec); |
| 642 | } |
| 643 | |
| Daniel Barkalow | df93e33 | 2008-02-15 19:14:18 | [diff] [blame] | 644 | static int valid_remote_nick(const char *name) |
| 645 | { |
| Alexander Potashev | 8ca12c0 | 2009-01-10 12:07:50 | [diff] [blame] | 646 | if (!name[0] || is_dot_or_dotdot(name)) |
| Daniel Barkalow | df93e33 | 2008-02-15 19:14:18 | [diff] [blame] | 647 | return 0; |
| 648 | return !strchr(name, '/'); /* no slash */ |
| 649 | } |
| 650 | |
| Jeff King | f052154 | 2015-05-21 04:45:16 | [diff] [blame] | 651 | const char *remote_for_branch(struct branch *branch, int *explicit) |
| 652 | { |
| 653 | if (branch && branch->remote_name) { |
| 654 | if (explicit) |
| 655 | *explicit = 1; |
| 656 | return branch->remote_name; |
| 657 | } |
| 658 | if (explicit) |
| 659 | *explicit = 0; |
| 660 | return "origin"; |
| 661 | } |
| 662 | |
| Jeff King | da66b27 | 2015-05-21 04:45:20 | [diff] [blame] | 663 | const char *pushremote_for_branch(struct branch *branch, int *explicit) |
| 664 | { |
| 665 | if (branch && branch->pushremote_name) { |
| 666 | if (explicit) |
| 667 | *explicit = 1; |
| 668 | return branch->pushremote_name; |
| 669 | } |
| 670 | if (pushremote_name) { |
| 671 | if (explicit) |
| 672 | *explicit = 1; |
| 673 | return pushremote_name; |
| 674 | } |
| 675 | return remote_for_branch(branch, explicit); |
| 676 | } |
| 677 | |
| 678 | static struct remote *remote_get_1(const char *name, |
| 679 | const char *(*get_default)(struct branch *, int *)) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 680 | { |
| 681 | struct remote *ret; |
| Daniel Barkalow | fa685bd | 2009-03-11 05:47:20 | [diff] [blame] | 682 | int name_given = 0; |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 683 | |
| Jeff King | 8770e6f | 2015-05-21 04:45:23 | [diff] [blame] | 684 | read_config(); |
| 685 | |
| Daniel Barkalow | fa685bd | 2009-03-11 05:47:20 | [diff] [blame] | 686 | if (name) |
| 687 | name_given = 1; |
| Jeff King | da66b27 | 2015-05-21 04:45:20 | [diff] [blame] | 688 | else |
| 689 | name = get_default(current_branch, &name_given); |
| Junio C Hamano | 9326d49 | 2009-03-16 07:35:09 | [diff] [blame] | 690 | |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 691 | ret = make_remote(name, 0); |
| Daniel Barkalow | df93e33 | 2008-02-15 19:14:18 | [diff] [blame] | 692 | if (valid_remote_nick(name)) { |
| Daniel Barkalow | 0a4da29 | 2009-11-18 01:42:23 | [diff] [blame] | 693 | if (!valid_remote(ret)) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 694 | read_remotes_file(ret); |
| Daniel Barkalow | 0a4da29 | 2009-11-18 01:42:23 | [diff] [blame] | 695 | if (!valid_remote(ret)) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 696 | read_branches_file(ret); |
| 697 | } |
| Daniel Barkalow | 0a4da29 | 2009-11-18 01:42:23 | [diff] [blame] | 698 | if (name_given && !valid_remote(ret)) |
| Daniel Barkalow | 55029ae | 2008-02-20 18:43:53 | [diff] [blame] | 699 | add_url_alias(ret, name); |
| Daniel Barkalow | 0a4da29 | 2009-11-18 01:42:23 | [diff] [blame] | 700 | if (!valid_remote(ret)) |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 701 | return NULL; |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 702 | ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec); |
| 703 | ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec); |
| Daniel Barkalow | 5751f49 | 2007-05-12 15:45:53 | [diff] [blame] | 704 | return ret; |
| 705 | } |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 706 | |
| Ramkumar Ramachandra | f24f715 | 2013-04-02 07:40:32 | [diff] [blame] | 707 | struct remote *remote_get(const char *name) |
| 708 | { |
| Jeff King | da66b27 | 2015-05-21 04:45:20 | [diff] [blame] | 709 | return remote_get_1(name, remote_for_branch); |
| Ramkumar Ramachandra | f24f715 | 2013-04-02 07:40:32 | [diff] [blame] | 710 | } |
| 711 | |
| 712 | struct remote *pushremote_get(const char *name) |
| 713 | { |
| Jeff King | da66b27 | 2015-05-21 04:45:20 | [diff] [blame] | 714 | return remote_get_1(name, pushremote_for_branch); |
| Ramkumar Ramachandra | f24f715 | 2013-04-02 07:40:32 | [diff] [blame] | 715 | } |
| 716 | |
| Thomas Gummerer | 674468b | 2016-02-16 09:47:50 | [diff] [blame] | 717 | int remote_is_configured(struct remote *remote) |
| Finn Arne Gangstad | 9a23ba3 | 2009-04-06 13:41:01 | [diff] [blame] | 718 | { |
| Thomas Gummerer | 674468b | 2016-02-16 09:47:50 | [diff] [blame] | 719 | return remote && remote->origin; |
| Finn Arne Gangstad | 9a23ba3 | 2009-04-06 13:41:01 | [diff] [blame] | 720 | } |
| 721 | |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 722 | int for_each_remote(each_remote_fn fn, void *priv) |
| 723 | { |
| 724 | int i, result = 0; |
| 725 | read_config(); |
| Daniel Barkalow | 2d31347 | 2008-02-19 04:41:41 | [diff] [blame] | 726 | for (i = 0; i < remotes_nr && !result; i++) { |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 727 | struct remote *r = remotes[i]; |
| 728 | if (!r) |
| 729 | continue; |
| 730 | if (!r->fetch) |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 731 | r->fetch = parse_fetch_refspec(r->fetch_refspec_nr, |
| 732 | r->fetch_refspec); |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 733 | if (!r->push) |
| Junio C Hamano | 46220ca | 2008-03-21 06:34:37 | [diff] [blame] | 734 | r->push = parse_push_refspec(r->push_refspec_nr, |
| 735 | r->push_refspec); |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 736 | result = fn(r, priv); |
| 737 | } |
| 738 | return result; |
| 739 | } |
| 740 | |
| Michael Haggerty | df02ebd | 2013-10-30 05:33:10 | [diff] [blame] | 741 | static void handle_duplicate(struct ref *ref1, struct ref *ref2) |
| 742 | { |
| Michael Haggerty | f096e6e | 2013-10-30 05:33:12 | [diff] [blame] | 743 | if (strcmp(ref1->name, ref2->name)) { |
| 744 | if (ref1->fetch_head_status != FETCH_HEAD_IGNORE && |
| 745 | ref2->fetch_head_status != FETCH_HEAD_IGNORE) { |
| 746 | die(_("Cannot fetch both %s and %s to %s"), |
| 747 | ref1->name, ref2->name, ref2->peer_ref->name); |
| 748 | } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE && |
| 749 | ref2->fetch_head_status == FETCH_HEAD_IGNORE) { |
| 750 | warning(_("%s usually tracks %s, not %s"), |
| 751 | ref2->peer_ref->name, ref2->name, ref1->name); |
| 752 | } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE && |
| 753 | ref2->fetch_head_status == FETCH_HEAD_IGNORE) { |
| 754 | die(_("%s tracks both %s and %s"), |
| 755 | ref2->peer_ref->name, ref1->name, ref2->name); |
| 756 | } else { |
| 757 | /* |
| 758 | * This last possibility doesn't occur because |
| 759 | * FETCH_HEAD_IGNORE entries always appear at |
| 760 | * the end of the list. |
| 761 | */ |
| 762 | die(_("Internal error")); |
| 763 | } |
| 764 | } |
| Michael Haggerty | df02ebd | 2013-10-30 05:33:10 | [diff] [blame] | 765 | free(ref2->peer_ref); |
| 766 | free(ref2); |
| 767 | } |
| 768 | |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 769 | struct ref *ref_remove_duplicates(struct ref *ref_map) |
| Daniel Barkalow | 2467a4f | 2007-10-08 04:25:07 | [diff] [blame] | 770 | { |
| Thiago Farina | 183113a | 2010-07-04 19:46:19 | [diff] [blame] | 771 | struct string_list refs = STRING_LIST_INIT_NODUP; |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 772 | struct ref *retval = NULL; |
| 773 | struct ref **p = &retval; |
| Julian Phillips | 73cf082 | 2009-10-25 21:28:11 | [diff] [blame] | 774 | |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 775 | while (ref_map) { |
| 776 | struct ref *ref = ref_map; |
| Julian Phillips | 73cf082 | 2009-10-25 21:28:11 | [diff] [blame] | 777 | |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 778 | ref_map = ref_map->next; |
| 779 | ref->next = NULL; |
| 780 | |
| 781 | if (!ref->peer_ref) { |
| 782 | *p = ref; |
| 783 | p = &ref->next; |
| Michael Haggerty | 09ea1f8 | 2013-10-30 05:33:07 | [diff] [blame] | 784 | } else { |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 785 | struct string_list_item *item = |
| 786 | string_list_insert(&refs, ref->peer_ref->name); |
| 787 | |
| 788 | if (item->util) { |
| 789 | /* Entry already existed */ |
| Michael Haggerty | df02ebd | 2013-10-30 05:33:10 | [diff] [blame] | 790 | handle_duplicate((struct ref *)item->util, ref); |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 791 | } else { |
| 792 | *p = ref; |
| 793 | p = &ref->next; |
| 794 | item->util = ref; |
| 795 | } |
| Daniel Barkalow | 2467a4f | 2007-10-08 04:25:07 | [diff] [blame] | 796 | } |
| Daniel Barkalow | 2467a4f | 2007-10-08 04:25:07 | [diff] [blame] | 797 | } |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 798 | |
| Julian Phillips | 73cf082 | 2009-10-25 21:28:11 | [diff] [blame] | 799 | string_list_clear(&refs, 0); |
| Michael Haggerty | b9afe66 | 2013-10-30 05:33:09 | [diff] [blame] | 800 | return retval; |
| Daniel Barkalow | 2467a4f | 2007-10-08 04:25:07 | [diff] [blame] | 801 | } |
| 802 | |
| Shawn O. Pearce | 28b91f8 | 2007-09-19 04:49:27 | [diff] [blame] | 803 | int remote_has_url(struct remote *remote, const char *url) |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 804 | { |
| 805 | int i; |
| Shawn O. Pearce | 28b91f8 | 2007-09-19 04:49:27 | [diff] [blame] | 806 | for (i = 0; i < remote->url_nr; i++) { |
| 807 | if (!strcmp(remote->url[i], url)) |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 808 | return 1; |
| 809 | } |
| 810 | return 0; |
| 811 | } |
| 812 | |
| Daniel Barkalow | e928213 | 2009-03-07 06:11:34 | [diff] [blame] | 813 | static int match_name_with_pattern(const char *key, const char *name, |
| 814 | const char *value, char **result) |
| Daniel Barkalow | a3c8423 | 2009-03-07 06:11:29 | [diff] [blame] | 815 | { |
| Daniel Barkalow | 08fbdb3 | 2009-03-07 06:11:36 | [diff] [blame] | 816 | const char *kstar = strchr(key, '*'); |
| 817 | size_t klen; |
| Daniel Barkalow | abd2bde | 2009-03-07 06:11:39 | [diff] [blame] | 818 | size_t ksuffixlen; |
| 819 | size_t namelen; |
| Daniel Barkalow | 08fbdb3 | 2009-03-07 06:11:36 | [diff] [blame] | 820 | int ret; |
| 821 | if (!kstar) |
| 822 | die("Key '%s' of pattern had no '*'", key); |
| 823 | klen = kstar - key; |
| Daniel Barkalow | abd2bde | 2009-03-07 06:11:39 | [diff] [blame] | 824 | ksuffixlen = strlen(kstar + 1); |
| 825 | namelen = strlen(name); |
| 826 | ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen && |
| 827 | !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen); |
| Daniel Barkalow | e928213 | 2009-03-07 06:11:34 | [diff] [blame] | 828 | if (ret && value) { |
| René Scharfe | 07bfa57 | 2014-09-21 08:23:37 | [diff] [blame] | 829 | struct strbuf sb = STRBUF_INIT; |
| Daniel Barkalow | 08fbdb3 | 2009-03-07 06:11:36 | [diff] [blame] | 830 | const char *vstar = strchr(value, '*'); |
| Daniel Barkalow | 08fbdb3 | 2009-03-07 06:11:36 | [diff] [blame] | 831 | if (!vstar) |
| 832 | die("Value '%s' of pattern has no '*'", value); |
| René Scharfe | 07bfa57 | 2014-09-21 08:23:37 | [diff] [blame] | 833 | strbuf_add(&sb, value, vstar - value); |
| 834 | strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen); |
| 835 | strbuf_addstr(&sb, vstar + 1); |
| 836 | *result = strbuf_detach(&sb, NULL); |
| Daniel Barkalow | e928213 | 2009-03-07 06:11:34 | [diff] [blame] | 837 | } |
| Daniel Barkalow | a3c8423 | 2009-03-07 06:11:29 | [diff] [blame] | 838 | return ret; |
| 839 | } |
| 840 | |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 841 | static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results) |
| 842 | { |
| 843 | int i; |
| 844 | int find_src = !query->src; |
| 845 | |
| 846 | if (find_src && !query->dst) |
| 847 | error("query_refspecs_multiple: need either src or dst"); |
| 848 | |
| 849 | for (i = 0; i < ref_count; i++) { |
| 850 | struct refspec *refspec = &refs[i]; |
| 851 | const char *key = find_src ? refspec->dst : refspec->src; |
| 852 | const char *value = find_src ? refspec->src : refspec->dst; |
| 853 | const char *needle = find_src ? query->dst : query->src; |
| 854 | char **result = find_src ? &query->src : &query->dst; |
| 855 | |
| 856 | if (!refspec->dst) |
| 857 | continue; |
| 858 | if (refspec->pattern) { |
| 859 | if (match_name_with_pattern(key, needle, value, result)) |
| 860 | string_list_append_nodup(results, *result); |
| 861 | } else if (!strcmp(needle, key)) { |
| 862 | string_list_append(results, value); |
| 863 | } |
| 864 | } |
| 865 | } |
| 866 | |
| Junio C Hamano | ca02465 | 2013-12-03 23:41:15 | [diff] [blame] | 867 | int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query) |
| Daniel Barkalow | 72ff894 | 2009-11-18 01:42:28 | [diff] [blame] | 868 | { |
| 869 | int i; |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 870 | int find_src = !query->src; |
| Michael Haggerty | 049bff8 | 2013-10-30 05:33:01 | [diff] [blame] | 871 | const char *needle = find_src ? query->dst : query->src; |
| 872 | char **result = find_src ? &query->src : &query->dst; |
| Daniel Barkalow | 72ff894 | 2009-11-18 01:42:28 | [diff] [blame] | 873 | |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 874 | if (find_src && !query->dst) |
| 875 | return error("query_refspecs: need either src or dst"); |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 876 | |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 877 | for (i = 0; i < ref_count; i++) { |
| 878 | struct refspec *refspec = &refs[i]; |
| 879 | const char *key = find_src ? refspec->dst : refspec->src; |
| 880 | const char *value = find_src ? refspec->src : refspec->dst; |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 881 | |
| Shawn O. Pearce | 009c5bc | 2007-09-25 04:13:14 | [diff] [blame] | 882 | if (!refspec->dst) |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 883 | continue; |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 884 | if (refspec->pattern) { |
| Daniel Barkalow | e928213 | 2009-03-07 06:11:34 | [diff] [blame] | 885 | if (match_name_with_pattern(key, needle, value, result)) { |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 886 | query->force = refspec->force; |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 887 | return 0; |
| 888 | } |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 889 | } else if (!strcmp(needle, key)) { |
| 890 | *result = xstrdup(value); |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 891 | query->force = refspec->force; |
| Johannes Schindelin | b42f692 | 2007-07-10 17:48:40 | [diff] [blame] | 892 | return 0; |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 893 | } |
| 894 | } |
| Daniel Barkalow | 5d46c9d | 2007-05-12 15:46:03 | [diff] [blame] | 895 | return -1; |
| 896 | } |
| 897 | |
| Carlos Martín Nieto | c500352 | 2011-10-15 05:04:24 | [diff] [blame] | 898 | char *apply_refspecs(struct refspec *refspecs, int nr_refspec, |
| 899 | const char *name) |
| 900 | { |
| 901 | struct refspec query; |
| 902 | |
| 903 | memset(&query, 0, sizeof(struct refspec)); |
| 904 | query.src = (char *)name; |
| 905 | |
| 906 | if (query_refspecs(refspecs, nr_refspec, &query)) |
| 907 | return NULL; |
| 908 | |
| 909 | return query.dst; |
| 910 | } |
| 911 | |
| 912 | int remote_find_tracking(struct remote *remote, struct refspec *refspec) |
| 913 | { |
| 914 | return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec); |
| 915 | } |
| 916 | |
| René Scharfe | 8009768 | 2008-10-18 08:37:40 | [diff] [blame] | 917 | static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen, |
| 918 | const char *name) |
| 919 | { |
| 920 | size_t len = strlen(name); |
| Jeff King | 50a6c8e | 2016-02-22 22:44:35 | [diff] [blame] | 921 | struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1)); |
| René Scharfe | 8009768 | 2008-10-18 08:37:40 | [diff] [blame] | 922 | memcpy(ref->name, prefix, prefixlen); |
| 923 | memcpy(ref->name + prefixlen, name, len); |
| 924 | return ref; |
| 925 | } |
| 926 | |
| René Scharfe | 59c69c0 | 2008-10-18 08:44:18 | [diff] [blame] | 927 | struct ref *alloc_ref(const char *name) |
| Daniel Barkalow | dfd255d | 2007-07-10 04:47:23 | [diff] [blame] | 928 | { |
| René Scharfe | 59c69c0 | 2008-10-18 08:44:18 | [diff] [blame] | 929 | return alloc_ref_with_prefix("", 0, name); |
| Krzysztof Kowalczyk | 737922a | 2008-05-10 23:26:58 | [diff] [blame] | 930 | } |
| 931 | |
| Jeff King | 59a5775 | 2011-06-07 23:03:03 | [diff] [blame] | 932 | struct ref *copy_ref(const struct ref *ref) |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 933 | { |
| Jay Soffian | 7b3db09 | 2009-02-27 19:10:04 | [diff] [blame] | 934 | struct ref *cpy; |
| 935 | size_t len; |
| 936 | if (!ref) |
| 937 | return NULL; |
| Jeff King | 50a6c8e | 2016-02-22 22:44:35 | [diff] [blame] | 938 | len = st_add3(sizeof(struct ref), strlen(ref->name), 1); |
| 939 | cpy = xmalloc(len); |
| 940 | memcpy(cpy, ref, len); |
| Jay Soffian | 7b3db09 | 2009-02-27 19:10:04 | [diff] [blame] | 941 | cpy->next = NULL; |
| Jeff King | 8c53f07 | 2015-01-13 01:59:09 | [diff] [blame] | 942 | cpy->symref = xstrdup_or_null(ref->symref); |
| 943 | cpy->remote_status = xstrdup_or_null(ref->remote_status); |
| Jay Soffian | 7b3db09 | 2009-02-27 19:10:04 | [diff] [blame] | 944 | cpy->peer_ref = copy_ref(ref->peer_ref); |
| 945 | return cpy; |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 946 | } |
| 947 | |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 948 | struct ref *copy_ref_list(const struct ref *ref) |
| 949 | { |
| 950 | struct ref *ret = NULL; |
| 951 | struct ref **tail = &ret; |
| 952 | while (ref) { |
| 953 | *tail = copy_ref(ref); |
| 954 | ref = ref->next; |
| 955 | tail = &((*tail)->next); |
| 956 | } |
| 957 | return ret; |
| 958 | } |
| 959 | |
| Nanako Shiraishi | 697d7f5 | 2008-09-25 09:41:00 | [diff] [blame] | 960 | static void free_ref(struct ref *ref) |
| Daniel Barkalow | be885d9 | 2008-04-26 19:53:12 | [diff] [blame] | 961 | { |
| 962 | if (!ref) |
| 963 | return; |
| Jay Soffian | 7b3db09 | 2009-02-27 19:10:04 | [diff] [blame] | 964 | free_ref(ref->peer_ref); |
| Daniel Barkalow | be885d9 | 2008-04-26 19:53:12 | [diff] [blame] | 965 | free(ref->remote_status); |
| 966 | free(ref->symref); |
| 967 | free(ref); |
| 968 | } |
| 969 | |
| Daniel Barkalow | dfd255d | 2007-07-10 04:47:23 | [diff] [blame] | 970 | void free_refs(struct ref *ref) |
| 971 | { |
| 972 | struct ref *next; |
| 973 | while (ref) { |
| 974 | next = ref->next; |
| Daniel Barkalow | be885d9 | 2008-04-26 19:53:12 | [diff] [blame] | 975 | free_ref(ref); |
| Daniel Barkalow | dfd255d | 2007-07-10 04:47:23 | [diff] [blame] | 976 | ref = next; |
| 977 | } |
| 978 | } |
| 979 | |
| Jeff King | ed81c76 | 2012-05-21 22:19:28 | [diff] [blame] | 980 | int ref_compare_name(const void *va, const void *vb) |
| 981 | { |
| 982 | const struct ref *a = va, *b = vb; |
| 983 | return strcmp(a->name, b->name); |
| 984 | } |
| 985 | |
| 986 | static void *ref_list_get_next(const void *a) |
| 987 | { |
| 988 | return ((const struct ref *)a)->next; |
| 989 | } |
| 990 | |
| 991 | static void ref_list_set_next(void *a, void *next) |
| 992 | { |
| 993 | ((struct ref *)a)->next = next; |
| 994 | } |
| 995 | |
| 996 | void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *)) |
| 997 | { |
| 998 | *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp); |
| 999 | } |
| 1000 | |
| Junio C Hamano | ca02465 | 2013-12-03 23:41:15 | [diff] [blame] | 1001 | int count_refspec_match(const char *pattern, |
| 1002 | struct ref *refs, |
| 1003 | struct ref **matched_ref) |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1004 | { |
| 1005 | int patlen = strlen(pattern); |
| 1006 | struct ref *matched_weak = NULL; |
| 1007 | struct ref *matched = NULL; |
| 1008 | int weak_match = 0; |
| 1009 | int match = 0; |
| 1010 | |
| 1011 | for (weak_match = match = 0; refs; refs = refs->next) { |
| 1012 | char *name = refs->name; |
| 1013 | int namelen = strlen(name); |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1014 | |
| Michael Haggerty | 54457fe | 2014-01-14 03:16:07 | [diff] [blame] | 1015 | if (!refname_match(pattern, name)) |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1016 | continue; |
| 1017 | |
| 1018 | /* A match is "weak" if it is with refs outside |
| 1019 | * heads or tags, and did not specify the pattern |
| 1020 | * in full (e.g. "refs/remotes/origin/master") or at |
| 1021 | * least from the toplevel (e.g. "remotes/origin/master"); |
| 1022 | * otherwise "git push $URL master" would result in |
| 1023 | * ambiguity between remotes/origin/master and heads/master |
| 1024 | * at the remote site. |
| 1025 | */ |
| 1026 | if (namelen != patlen && |
| 1027 | patlen != namelen - 5 && |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1028 | !starts_with(name, "refs/heads/") && |
| 1029 | !starts_with(name, "refs/tags/")) { |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1030 | /* We want to catch the case where only weak |
| 1031 | * matches are found and there are multiple |
| 1032 | * matches, and where more than one strong |
| 1033 | * matches are found, as ambiguous. One |
| 1034 | * strong match with zero or more weak matches |
| 1035 | * are acceptable as a unique match. |
| 1036 | */ |
| 1037 | matched_weak = refs; |
| 1038 | weak_match++; |
| 1039 | } |
| 1040 | else { |
| 1041 | matched = refs; |
| 1042 | match++; |
| 1043 | } |
| 1044 | } |
| 1045 | if (!matched) { |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1046 | if (matched_ref) |
| 1047 | *matched_ref = matched_weak; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1048 | return weak_match; |
| 1049 | } |
| 1050 | else { |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1051 | if (matched_ref) |
| 1052 | *matched_ref = matched; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1053 | return match; |
| 1054 | } |
| 1055 | } |
| 1056 | |
| Daniel Barkalow | 1d73526 | 2007-07-10 04:47:26 | [diff] [blame] | 1057 | static void tail_link_ref(struct ref *ref, struct ref ***tail) |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1058 | { |
| 1059 | **tail = ref; |
| Daniel Barkalow | 1d73526 | 2007-07-10 04:47:26 | [diff] [blame] | 1060 | while (ref->next) |
| 1061 | ref = ref->next; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1062 | *tail = &ref->next; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1063 | } |
| 1064 | |
| Felipe Contreras | 6765524 | 2012-02-22 22:43:40 | [diff] [blame] | 1065 | static struct ref *alloc_delete_ref(void) |
| 1066 | { |
| 1067 | struct ref *ref = alloc_ref("(delete)"); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1068 | oidclr(&ref->new_oid); |
| Felipe Contreras | 6765524 | 2012-02-22 22:43:40 | [diff] [blame] | 1069 | return ref; |
| 1070 | } |
| 1071 | |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1072 | static int try_explicit_object_name(const char *name, |
| 1073 | struct ref **match) |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1074 | { |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1075 | struct object_id oid; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1076 | |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1077 | if (!*name) { |
| 1078 | if (match) |
| 1079 | *match = alloc_delete_ref(); |
| 1080 | return 0; |
| 1081 | } |
| 1082 | |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1083 | if (get_sha1(name, oid.hash)) |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1084 | return -1; |
| 1085 | |
| 1086 | if (match) { |
| 1087 | *match = alloc_ref(name); |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1088 | oidcpy(&(*match)->new_oid, &oid); |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1089 | } |
| 1090 | return 0; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1091 | } |
| 1092 | |
| Daniel Barkalow | 1d73526 | 2007-07-10 04:47:26 | [diff] [blame] | 1093 | static struct ref *make_linked_ref(const char *name, struct ref ***tail) |
| Junio C Hamano | 163f0ee | 2007-06-09 07:07:34 | [diff] [blame] | 1094 | { |
| René Scharfe | 59c69c0 | 2008-10-18 08:44:18 | [diff] [blame] | 1095 | struct ref *ret = alloc_ref(name); |
| Daniel Barkalow | 1d73526 | 2007-07-10 04:47:26 | [diff] [blame] | 1096 | tail_link_ref(ret, tail); |
| 1097 | return ret; |
| Junio C Hamano | 163f0ee | 2007-06-09 07:07:34 | [diff] [blame] | 1098 | } |
| 1099 | |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1100 | static char *guess_ref(const char *name, struct ref *peer) |
| 1101 | { |
| 1102 | struct strbuf buf = STRBUF_INIT; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1103 | struct object_id oid; |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1104 | |
| Ronnie Sahlberg | 7695d11 | 2014-07-15 19:59:36 | [diff] [blame] | 1105 | const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING, |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1106 | oid.hash, NULL); |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1107 | if (!r) |
| 1108 | return NULL; |
| 1109 | |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1110 | if (starts_with(r, "refs/heads/")) |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1111 | strbuf_addstr(&buf, "refs/heads/"); |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1112 | else if (starts_with(r, "refs/tags/")) |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1113 | strbuf_addstr(&buf, "refs/tags/"); |
| 1114 | else |
| 1115 | return NULL; |
| 1116 | |
| 1117 | strbuf_addstr(&buf, name); |
| 1118 | return strbuf_detach(&buf, NULL); |
| 1119 | } |
| 1120 | |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1121 | static int match_explicit_lhs(struct ref *src, |
| 1122 | struct refspec *rs, |
| 1123 | struct ref **match, |
| 1124 | int *allocated_match) |
| 1125 | { |
| 1126 | switch (count_refspec_match(rs->src, src, match)) { |
| 1127 | case 1: |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1128 | if (allocated_match) |
| 1129 | *allocated_match = 0; |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1130 | return 0; |
| 1131 | case 0: |
| 1132 | /* The source could be in the get_sha1() format |
| 1133 | * not a reference name. :refs/other is a |
| 1134 | * way to delete 'other' ref at the remote end. |
| 1135 | */ |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1136 | if (try_explicit_object_name(rs->src, match) < 0) |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1137 | return error("src refspec %s does not match any.", rs->src); |
| Jeff King | 471fd3f | 2014-03-05 19:03:43 | [diff] [blame] | 1138 | if (allocated_match) |
| 1139 | *allocated_match = 1; |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1140 | return 0; |
| 1141 | default: |
| 1142 | return error("src refspec %s matches more than one.", rs->src); |
| 1143 | } |
| 1144 | } |
| 1145 | |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1146 | static int match_explicit(struct ref *src, struct ref *dst, |
| 1147 | struct ref ***dst_tail, |
| Jeff King | 9a7bbd1 | 2008-06-16 16:15:02 | [diff] [blame] | 1148 | struct refspec *rs) |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1149 | { |
| 1150 | struct ref *matched_src, *matched_dst; |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1151 | int allocated_src; |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1152 | |
| 1153 | const char *dst_value = rs->dst; |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1154 | char *dst_guess; |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1155 | |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1156 | if (rs->pattern || rs->matching) |
| Jeff King | 9a7bbd1 | 2008-06-16 16:15:02 | [diff] [blame] | 1157 | return 0; |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1158 | |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1159 | matched_src = matched_dst = NULL; |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1160 | if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0) |
| 1161 | return -1; |
| Junio C Hamano | 3c8b7df | 2007-06-09 07:14:04 | [diff] [blame] | 1162 | |
| Shawn O. Pearce | 4491e62 | 2007-09-25 04:13:25 | [diff] [blame] | 1163 | if (!dst_value) { |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1164 | struct object_id oid; |
| Daniel Barkalow | 9f0ea7e | 2008-02-20 17:54:05 | [diff] [blame] | 1165 | int flag; |
| 1166 | |
| Ronnie Sahlberg | 7695d11 | 2014-07-15 19:59:36 | [diff] [blame] | 1167 | dst_value = resolve_ref_unsafe(matched_src->name, |
| 1168 | RESOLVE_REF_READING, |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1169 | oid.hash, &flag); |
| Daniel Barkalow | 9f0ea7e | 2008-02-20 17:54:05 | [diff] [blame] | 1170 | if (!dst_value || |
| 1171 | ((flag & REF_ISSYMREF) && |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1172 | !starts_with(dst_value, "refs/heads/"))) |
| Daniel Barkalow | 9f0ea7e | 2008-02-20 17:54:05 | [diff] [blame] | 1173 | die("%s cannot be resolved to branch.", |
| 1174 | matched_src->name); |
| Shawn O. Pearce | 4491e62 | 2007-09-25 04:13:25 | [diff] [blame] | 1175 | } |
| Junio C Hamano | 3c8b7df | 2007-06-09 07:14:04 | [diff] [blame] | 1176 | |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1177 | switch (count_refspec_match(dst_value, dst, &matched_dst)) { |
| 1178 | case 1: |
| 1179 | break; |
| 1180 | case 0: |
| René Scharfe | 50e19a8 | 2014-06-06 17:24:48 | [diff] [blame] | 1181 | if (starts_with(dst_value, "refs/")) |
| Daniel Barkalow | 1d73526 | 2007-07-10 04:47:26 | [diff] [blame] | 1182 | matched_dst = make_linked_ref(dst_value, dst_tail); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1183 | else if (is_null_oid(&matched_src->new_oid)) |
| Jeff King | 5742c82 | 2012-07-03 18:04:39 | [diff] [blame] | 1184 | error("unable to delete '%s': remote ref does not exist", |
| 1185 | dst_value); |
| Brian Gianforcaro | eeefa7c | 2009-09-01 05:35:10 | [diff] [blame] | 1186 | else if ((dst_guess = guess_ref(dst_value, matched_src))) |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1187 | matched_dst = make_linked_ref(dst_guess, dst_tail); |
| Junio C Hamano | 3c8b7df | 2007-06-09 07:14:04 | [diff] [blame] | 1188 | else |
| Jeff King | f8aae12 | 2008-04-23 09:16:06 | [diff] [blame] | 1189 | error("unable to push to unqualified destination: %s\n" |
| 1190 | "The destination refspec neither matches an " |
| 1191 | "existing ref on the remote nor\n" |
| 1192 | "begins with refs/, and we are unable to " |
| 1193 | "guess a prefix based on the source ref.", |
| 1194 | dst_value); |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1195 | break; |
| 1196 | default: |
| Junio C Hamano | 3c8b7df | 2007-06-09 07:14:04 | [diff] [blame] | 1197 | matched_dst = NULL; |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1198 | error("dst refspec %s matches more than one.", |
| 1199 | dst_value); |
| 1200 | break; |
| 1201 | } |
| Jeff King | 9a7bbd1 | 2008-06-16 16:15:02 | [diff] [blame] | 1202 | if (!matched_dst) |
| 1203 | return -1; |
| 1204 | if (matched_dst->peer_ref) |
| 1205 | return error("dst ref %s receives from more than one src.", |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1206 | matched_dst->name); |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1207 | else { |
| Jeff King | f7ade3d | 2014-03-05 19:03:21 | [diff] [blame] | 1208 | matched_dst->peer_ref = allocated_src ? |
| 1209 | matched_src : |
| 1210 | copy_ref(matched_src); |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1211 | matched_dst->force = rs->force; |
| 1212 | } |
| Jeff King | 9a7bbd1 | 2008-06-16 16:15:02 | [diff] [blame] | 1213 | return 0; |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1214 | } |
| 1215 | |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1216 | static int match_explicit_refs(struct ref *src, struct ref *dst, |
| 1217 | struct ref ***dst_tail, struct refspec *rs, |
| 1218 | int rs_nr) |
| 1219 | { |
| 1220 | int i, errs; |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1221 | for (i = errs = 0; i < rs_nr; i++) |
| Jeff King | 9a7bbd1 | 2008-06-16 16:15:02 | [diff] [blame] | 1222 | errs += match_explicit(src, dst, dst_tail, &rs[i]); |
| 1223 | return errs; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1224 | } |
| 1225 | |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1226 | static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref, |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1227 | int send_mirror, int direction, const struct refspec **ret_pat) |
| Daniel Barkalow | 8558fd9 | 2007-05-25 05:20:56 | [diff] [blame] | 1228 | { |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1229 | const struct refspec *pat; |
| 1230 | char *name; |
| Daniel Barkalow | 8558fd9 | 2007-05-25 05:20:56 | [diff] [blame] | 1231 | int i; |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1232 | int matching_refs = -1; |
| Daniel Barkalow | 8558fd9 | 2007-05-25 05:20:56 | [diff] [blame] | 1233 | for (i = 0; i < rs_nr; i++) { |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1234 | if (rs[i].matching && |
| 1235 | (matching_refs == -1 || rs[i].force)) { |
| 1236 | matching_refs = i; |
| 1237 | continue; |
| 1238 | } |
| 1239 | |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1240 | if (rs[i].pattern) { |
| 1241 | const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src; |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1242 | int match; |
| 1243 | if (direction == FROM_SRC) |
| 1244 | match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name); |
| 1245 | else |
| 1246 | match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name); |
| 1247 | if (match) { |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1248 | matching_refs = i; |
| 1249 | break; |
| 1250 | } |
| 1251 | } |
| Daniel Barkalow | 8558fd9 | 2007-05-25 05:20:56 | [diff] [blame] | 1252 | } |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1253 | if (matching_refs == -1) |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1254 | return NULL; |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1255 | |
| 1256 | pat = rs + matching_refs; |
| 1257 | if (pat->matching) { |
| 1258 | /* |
| 1259 | * "matching refs"; traditionally we pushed everything |
| 1260 | * including refs outside refs/heads/ hierarchy, but |
| 1261 | * that does not make much sense these days. |
| 1262 | */ |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1263 | if (!send_mirror && !starts_with(ref->name, "refs/heads/")) |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1264 | return NULL; |
| 1265 | name = xstrdup(ref->name); |
| 1266 | } |
| 1267 | if (ret_pat) |
| 1268 | *ret_pat = pat; |
| 1269 | return name; |
| Daniel Barkalow | 8558fd9 | 2007-05-25 05:20:56 | [diff] [blame] | 1270 | } |
| 1271 | |
| Clemens Buchacher | 6d2bf96 | 2009-05-31 14:26:48 | [diff] [blame] | 1272 | static struct ref **tail_ref(struct ref **head) |
| 1273 | { |
| 1274 | struct ref **tail = head; |
| 1275 | while (*tail) |
| 1276 | tail = &((*tail)->next); |
| 1277 | return tail; |
| 1278 | } |
| 1279 | |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1280 | struct tips { |
| 1281 | struct commit **tip; |
| 1282 | int nr, alloc; |
| 1283 | }; |
| 1284 | |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1285 | static void add_to_tips(struct tips *tips, const struct object_id *oid) |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1286 | { |
| 1287 | struct commit *commit; |
| 1288 | |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1289 | if (is_null_oid(oid)) |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1290 | return; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1291 | commit = lookup_commit_reference_gently(oid->hash, 1); |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1292 | if (!commit || (commit->object.flags & TMP_MARK)) |
| 1293 | return; |
| 1294 | commit->object.flags |= TMP_MARK; |
| 1295 | ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc); |
| 1296 | tips->tip[tips->nr++] = commit; |
| 1297 | } |
| 1298 | |
| 1299 | static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail) |
| 1300 | { |
| 1301 | struct string_list dst_tag = STRING_LIST_INIT_NODUP; |
| 1302 | struct string_list src_tag = STRING_LIST_INIT_NODUP; |
| 1303 | struct string_list_item *item; |
| 1304 | struct ref *ref; |
| 1305 | struct tips sent_tips; |
| 1306 | |
| 1307 | /* |
| 1308 | * Collect everything we know they would have at the end of |
| 1309 | * this push, and collect all tags they have. |
| 1310 | */ |
| 1311 | memset(&sent_tips, 0, sizeof(sent_tips)); |
| 1312 | for (ref = *dst; ref; ref = ref->next) { |
| 1313 | if (ref->peer_ref && |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1314 | !is_null_oid(&ref->peer_ref->new_oid)) |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1315 | add_to_tips(&sent_tips, &ref->peer_ref->new_oid); |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1316 | else |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1317 | add_to_tips(&sent_tips, &ref->old_oid); |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1318 | if (starts_with(ref->name, "refs/tags/")) |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1319 | string_list_append(&dst_tag, ref->name); |
| 1320 | } |
| 1321 | clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK); |
| 1322 | |
| Michael Haggerty | 3383e19 | 2014-11-25 08:02:35 | [diff] [blame] | 1323 | string_list_sort(&dst_tag); |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1324 | |
| 1325 | /* Collect tags they do not have. */ |
| 1326 | for (ref = src; ref; ref = ref->next) { |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1327 | if (!starts_with(ref->name, "refs/tags/")) |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1328 | continue; /* not a tag */ |
| 1329 | if (string_list_has_string(&dst_tag, ref->name)) |
| 1330 | continue; /* they already have it */ |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1331 | if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG) |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1332 | continue; /* be conservative */ |
| 1333 | item = string_list_append(&src_tag, ref->name); |
| 1334 | item->util = ref; |
| 1335 | } |
| 1336 | string_list_clear(&dst_tag, 0); |
| 1337 | |
| 1338 | /* |
| 1339 | * At this point, src_tag lists tags that are missing from |
| 1340 | * dst, and sent_tips lists the tips we are pushing or those |
| 1341 | * that we know they already have. An element in the src_tag |
| 1342 | * that is an ancestor of any of the sent_tips needs to be |
| 1343 | * sent to the other side. |
| 1344 | */ |
| 1345 | if (sent_tips.nr) { |
| 1346 | for_each_string_list_item(item, &src_tag) { |
| 1347 | struct ref *ref = item->util; |
| 1348 | struct ref *dst_ref; |
| 1349 | struct commit *commit; |
| 1350 | |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1351 | if (is_null_oid(&ref->new_oid)) |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1352 | continue; |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1353 | commit = lookup_commit_reference_gently(ref->new_oid.hash, 1); |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1354 | if (!commit) |
| 1355 | /* not pushing a commit, which is not an error */ |
| 1356 | continue; |
| 1357 | |
| 1358 | /* |
| 1359 | * Is this tag, which they do not have, reachable from |
| 1360 | * any of the commits we are sending? |
| 1361 | */ |
| 1362 | if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip)) |
| 1363 | continue; |
| 1364 | |
| 1365 | /* Add it in */ |
| 1366 | dst_ref = make_linked_ref(ref->name, dst_tail); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1367 | oidcpy(&dst_ref->new_oid, &ref->new_oid); |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1368 | dst_ref->peer_ref = copy_ref(ref); |
| 1369 | } |
| 1370 | } |
| 1371 | string_list_clear(&src_tag, 0); |
| 1372 | free(sent_tips.tip); |
| 1373 | } |
| 1374 | |
| Junio C Hamano | 47a5918 | 2013-07-08 20:56:53 | [diff] [blame] | 1375 | struct ref *find_ref_by_name(const struct ref *list, const char *name) |
| 1376 | { |
| 1377 | for ( ; list; list = list->next) |
| 1378 | if (!strcmp(list->name, name)) |
| 1379 | return (struct ref *)list; |
| 1380 | return NULL; |
| 1381 | } |
| 1382 | |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1383 | static void prepare_ref_index(struct string_list *ref_index, struct ref *ref) |
| 1384 | { |
| 1385 | for ( ; ref; ref = ref->next) |
| 1386 | string_list_append_nodup(ref_index, ref->name)->util = ref; |
| 1387 | |
| Michael Haggerty | 3383e19 | 2014-11-25 08:02:35 | [diff] [blame] | 1388 | string_list_sort(ref_index); |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1389 | } |
| 1390 | |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1391 | /* |
| Jeff King | ba928c1 | 2014-03-05 19:04:54 | [diff] [blame] | 1392 | * Given only the set of local refs, sanity-check the set of push |
| 1393 | * refspecs. We can't catch all errors that match_push_refs would, |
| 1394 | * but we can catch some errors early before even talking to the |
| 1395 | * remote side. |
| 1396 | */ |
| 1397 | int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names) |
| 1398 | { |
| 1399 | struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names); |
| 1400 | int ret = 0; |
| 1401 | int i; |
| 1402 | |
| 1403 | for (i = 0; i < nr_refspec; i++) { |
| 1404 | struct refspec *rs = refspec + i; |
| 1405 | |
| 1406 | if (rs->pattern || rs->matching) |
| 1407 | continue; |
| 1408 | |
| 1409 | ret |= match_explicit_lhs(src, rs, NULL, NULL); |
| 1410 | } |
| 1411 | |
| 1412 | free_refspec(nr_refspec, refspec); |
| 1413 | return ret; |
| 1414 | } |
| 1415 | |
| 1416 | /* |
| Junio C Hamano | 29753cd | 2011-09-09 18:54:58 | [diff] [blame] | 1417 | * Given the set of refs the local repository has, the set of refs the |
| 1418 | * remote repository has, and the refspec used for push, determine |
| 1419 | * what remote refs we will update and with what value by setting |
| 1420 | * peer_ref (which object is being pushed) and force (if the push is |
| 1421 | * forced) in elements of "dst". The function may add new elements to |
| 1422 | * dst (e.g. pushing to a new branch, done in match_explicit_refs). |
| Junio C Hamano | 54a8ad9 | 2007-06-09 06:22:58 | [diff] [blame] | 1423 | */ |
| Junio C Hamano | 29753cd | 2011-09-09 18:54:58 | [diff] [blame] | 1424 | int match_push_refs(struct ref *src, struct ref **dst, |
| 1425 | int nr_refspec, const char **refspec, int flags) |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1426 | { |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1427 | struct refspec *rs; |
| Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 | [diff] [blame] | 1428 | int send_all = flags & MATCH_REFS_ALL; |
| 1429 | int send_mirror = flags & MATCH_REFS_MIRROR; |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1430 | int send_prune = flags & MATCH_REFS_PRUNE; |
| Jay Soffian | 5f48cb9 | 2009-02-25 08:32:17 | [diff] [blame] | 1431 | int errs; |
| Linus Torvalds | 2af202b | 2009-06-18 17:28:43 | [diff] [blame] | 1432 | static const char *default_refspec[] = { ":", NULL }; |
| Felipe Contreras | b1d8b1f | 2012-02-22 22:43:38 | [diff] [blame] | 1433 | struct ref *ref, **dst_tail = tail_ref(dst); |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1434 | struct string_list dst_ref_index = STRING_LIST_INIT_NODUP; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1435 | |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1436 | if (!nr_refspec) { |
| 1437 | nr_refspec = 1; |
| 1438 | refspec = default_refspec; |
| 1439 | } |
| 1440 | rs = parse_push_refspec(nr_refspec, (const char **) refspec); |
| Clemens Buchacher | 6d2bf96 | 2009-05-31 14:26:48 | [diff] [blame] | 1441 | errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec); |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1442 | |
| 1443 | /* pick the remainder */ |
| Felipe Contreras | b1d8b1f | 2012-02-22 22:43:38 | [diff] [blame] | 1444 | for (ref = src; ref; ref = ref->next) { |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1445 | struct string_list_item *dst_item; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1446 | struct ref *dst_peer; |
| Alex Riesen | 6e66bf3 | 2007-06-07 23:43:05 | [diff] [blame] | 1447 | const struct refspec *pat = NULL; |
| 1448 | char *dst_name; |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1449 | |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1450 | dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat); |
| Felipe Contreras | db70a04 | 2012-02-22 22:43:39 | [diff] [blame] | 1451 | if (!dst_name) |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1452 | continue; |
| 1453 | |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1454 | if (!dst_ref_index.nr) |
| 1455 | prepare_ref_index(&dst_ref_index, *dst); |
| 1456 | |
| 1457 | dst_item = string_list_lookup(&dst_ref_index, dst_name); |
| 1458 | dst_peer = dst_item ? dst_item->util : NULL; |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1459 | if (dst_peer) { |
| 1460 | if (dst_peer->peer_ref) |
| 1461 | /* We're already sending something to this ref. */ |
| 1462 | goto free_name; |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1463 | } else { |
| 1464 | if (pat->matching && !(send_all || send_mirror)) |
| 1465 | /* |
| 1466 | * Remote doesn't have it, and we have no |
| 1467 | * explicit pattern, and we don't have |
| Justin Lebar | 0168990 | 2014-03-31 22:11:46 | [diff] [blame] | 1468 | * --all or --mirror. |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1469 | */ |
| 1470 | goto free_name; |
| 1471 | |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1472 | /* Create a new one and link it */ |
| Clemens Buchacher | 6d2bf96 | 2009-05-31 14:26:48 | [diff] [blame] | 1473 | dst_peer = make_linked_ref(dst_name, &dst_tail); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1474 | oidcpy(&dst_peer->new_oid, &ref->new_oid); |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1475 | string_list_insert(&dst_ref_index, |
| 1476 | dst_peer->name)->util = dst_peer; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1477 | } |
| Felipe Contreras | b1d8b1f | 2012-02-22 22:43:38 | [diff] [blame] | 1478 | dst_peer->peer_ref = copy_ref(ref); |
| Paolo Bonzini | a83619d | 2008-04-28 15:32:12 | [diff] [blame] | 1479 | dst_peer->force = pat->force; |
| Alex Riesen | 6e66bf3 | 2007-06-07 23:43:05 | [diff] [blame] | 1480 | free_name: |
| 1481 | free(dst_name); |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1482 | } |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1483 | |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1484 | string_list_clear(&dst_ref_index, 0); |
| 1485 | |
| Junio C Hamano | c2aba15 | 2013-03-04 20:09:50 | [diff] [blame] | 1486 | if (flags & MATCH_REFS_FOLLOW_TAGS) |
| 1487 | add_missing_tags(src, dst, &dst_tail); |
| 1488 | |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1489 | if (send_prune) { |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1490 | struct string_list src_ref_index = STRING_LIST_INIT_NODUP; |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1491 | /* check for missing refs on the remote */ |
| 1492 | for (ref = *dst; ref; ref = ref->next) { |
| 1493 | char *src_name; |
| 1494 | |
| 1495 | if (ref->peer_ref) |
| 1496 | /* We're already sending something to this ref. */ |
| 1497 | continue; |
| 1498 | |
| 1499 | src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL); |
| 1500 | if (src_name) { |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1501 | if (!src_ref_index.nr) |
| 1502 | prepare_ref_index(&src_ref_index, src); |
| 1503 | if (!string_list_has_string(&src_ref_index, |
| 1504 | src_name)) |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1505 | ref->peer_ref = alloc_delete_ref(); |
| 1506 | free(src_name); |
| 1507 | } |
| 1508 | } |
| Brandon Casey | f1bd15a | 2013-07-08 08:58:39 | [diff] [blame] | 1509 | string_list_clear(&src_ref_index, 0); |
| Felipe Contreras | 6ddba5e | 2012-02-22 22:43:41 | [diff] [blame] | 1510 | } |
| Jay Soffian | 5f48cb9 | 2009-02-25 08:32:17 | [diff] [blame] | 1511 | if (errs) |
| 1512 | return -1; |
| Daniel Barkalow | 6b62816 | 2007-05-12 15:45:59 | [diff] [blame] | 1513 | return 0; |
| 1514 | } |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 1515 | |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1516 | void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1517 | int force_update) |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1518 | { |
| 1519 | struct ref *ref; |
| 1520 | |
| 1521 | for (ref = remote_refs; ref; ref = ref->next) { |
| Chris Rorvick | 8c5f6f7 | 2012-11-30 01:41:36 | [diff] [blame] | 1522 | int force_ref_update = ref->force || force_update; |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1523 | int reject_reason = 0; |
| Chris Rorvick | 8c5f6f7 | 2012-11-30 01:41:36 | [diff] [blame] | 1524 | |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1525 | if (ref->peer_ref) |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1526 | oidcpy(&ref->new_oid, &ref->peer_ref->new_oid); |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1527 | else if (!send_mirror) |
| 1528 | continue; |
| 1529 | |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1530 | ref->deletion = is_null_oid(&ref->new_oid); |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1531 | if (!ref->deletion && |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1532 | !oidcmp(&ref->old_oid, &ref->new_oid)) { |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1533 | ref->status = REF_STATUS_UPTODATE; |
| 1534 | continue; |
| 1535 | } |
| 1536 | |
| Chris Rorvick | a272b28 | 2012-11-30 01:41:40 | [diff] [blame] | 1537 | /* |
| Andrew Wheeler | b2e93f8 | 2016-01-29 23:18:42 | [diff] [blame] | 1538 | * If the remote ref has moved and is now different |
| 1539 | * from what we expect, reject any push. |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1540 | * |
| 1541 | * It also is an error if the user told us to check |
| 1542 | * with the remote-tracking branch to find the value |
| 1543 | * to expect, but we did not have such a tracking |
| 1544 | * branch. |
| 1545 | */ |
| 1546 | if (ref->expect_old_sha1) { |
| John Keeping | 64ac39a | 2016-07-26 20:44:45 | [diff] [blame] | 1547 | if (oidcmp(&ref->old_oid, &ref->old_oid_expect)) |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1548 | reject_reason = REF_STATUS_REJECT_STALE; |
| Andrew Wheeler | b2e93f8 | 2016-01-29 23:18:42 | [diff] [blame] | 1549 | else |
| 1550 | /* If the ref isn't stale then force the update. */ |
| 1551 | force_ref_update = 1; |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1552 | } |
| 1553 | |
| 1554 | /* |
| Andrew Wheeler | b2e93f8 | 2016-01-29 23:18:42 | [diff] [blame] | 1555 | * If the update isn't already rejected then check |
| 1556 | * the usual "must fast-forward" rules. |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1557 | * |
| Junio C Hamano | 256b9d7 | 2013-01-16 21:02:27 | [diff] [blame] | 1558 | * Decide whether an individual refspec A:B can be |
| 1559 | * pushed. The push will succeed if any of the |
| 1560 | * following are true: |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1561 | * |
| Chris Rorvick | a272b28 | 2012-11-30 01:41:40 | [diff] [blame] | 1562 | * (1) the remote reference B does not exist |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1563 | * |
| Chris Rorvick | a272b28 | 2012-11-30 01:41:40 | [diff] [blame] | 1564 | * (2) the remote reference B is being removed (i.e., |
| 1565 | * pushing :B where no source is specified) |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1566 | * |
| Junio C Hamano | 256b9d7 | 2013-01-16 21:02:27 | [diff] [blame] | 1567 | * (3) the destination is not under refs/tags/, and |
| 1568 | * if the old and new value is a commit, the new |
| 1569 | * is a descendant of the old. |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1570 | * |
| Chris Rorvick | a272b28 | 2012-11-30 01:41:40 | [diff] [blame] | 1571 | * (4) it is forced using the +A:B notation, or by |
| 1572 | * passing the --force argument |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1573 | */ |
| 1574 | |
| Andrew Wheeler | b2e93f8 | 2016-01-29 23:18:42 | [diff] [blame] | 1575 | if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) { |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1576 | if (starts_with(ref->name, "refs/tags/")) |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1577 | reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS; |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1578 | else if (!has_object_file(&ref->old_oid)) |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1579 | reject_reason = REF_STATUS_REJECT_FETCH_FIRST; |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1580 | else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) || |
| 1581 | !lookup_commit_reference_gently(ref->new_oid.hash, 1)) |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1582 | reject_reason = REF_STATUS_REJECT_NEEDS_FORCE; |
| brian m. carlson | 6f3d57b | 2015-11-10 02:22:25 | [diff] [blame] | 1583 | else if (!ref_newer(&ref->new_oid, &ref->old_oid)) |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1584 | reject_reason = REF_STATUS_REJECT_NONFASTFORWARD; |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1585 | } |
| Junio C Hamano | 631b5ef | 2013-07-08 21:42:40 | [diff] [blame] | 1586 | |
| 1587 | /* |
| 1588 | * "--force" will defeat any rejection implemented |
| 1589 | * by the rules above. |
| 1590 | */ |
| 1591 | if (!force_ref_update) |
| 1592 | ref->status = reject_reason; |
| 1593 | else if (reject_reason) |
| 1594 | ref->forced_update = 1; |
| Tay Ray Chuan | 20e8b46 | 2010-01-08 02:12:42 | [diff] [blame] | 1595 | } |
| 1596 | } |
| 1597 | |
| Junio C Hamano | 05e7368 | 2014-10-14 21:42:04 | [diff] [blame] | 1598 | static void set_merge(struct branch *ret) |
| 1599 | { |
| Jeff King | 9e3751d | 2015-05-21 04:45:13 | [diff] [blame] | 1600 | struct remote *remote; |
| Junio C Hamano | 05e7368 | 2014-10-14 21:42:04 | [diff] [blame] | 1601 | char *ref; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1602 | struct object_id oid; |
| Junio C Hamano | 05e7368 | 2014-10-14 21:42:04 | [diff] [blame] | 1603 | int i; |
| 1604 | |
| Jeff King | ee2499f | 2015-05-21 04:45:09 | [diff] [blame] | 1605 | if (!ret) |
| 1606 | return; /* no branch */ |
| 1607 | if (ret->merge) |
| 1608 | return; /* already run */ |
| 1609 | if (!ret->remote_name || !ret->merge_nr) { |
| 1610 | /* |
| 1611 | * no merge config; let's make sure we don't confuse callers |
| 1612 | * with a non-zero merge_nr but a NULL merge |
| 1613 | */ |
| 1614 | ret->merge_nr = 0; |
| 1615 | return; |
| 1616 | } |
| 1617 | |
| Jeff King | 9e3751d | 2015-05-21 04:45:13 | [diff] [blame] | 1618 | remote = remote_get(ret->remote_name); |
| 1619 | |
| Junio C Hamano | 05e7368 | 2014-10-14 21:42:04 | [diff] [blame] | 1620 | ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge)); |
| 1621 | for (i = 0; i < ret->merge_nr; i++) { |
| 1622 | ret->merge[i] = xcalloc(1, sizeof(**ret->merge)); |
| 1623 | ret->merge[i]->src = xstrdup(ret->merge_name[i]); |
| Jeff King | 9e3751d | 2015-05-21 04:45:13 | [diff] [blame] | 1624 | if (!remote_find_tracking(remote, ret->merge[i]) || |
| Junio C Hamano | 05e7368 | 2014-10-14 21:42:04 | [diff] [blame] | 1625 | strcmp(ret->remote_name, ".")) |
| 1626 | continue; |
| 1627 | if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]), |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1628 | oid.hash, &ref) == 1) |
| Junio C Hamano | 05e7368 | 2014-10-14 21:42:04 | [diff] [blame] | 1629 | ret->merge[i]->dst = ref; |
| 1630 | else |
| 1631 | ret->merge[i]->dst = xstrdup(ret->merge_name[i]); |
| 1632 | } |
| 1633 | } |
| 1634 | |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 1635 | struct branch *branch_get(const char *name) |
| 1636 | { |
| 1637 | struct branch *ret; |
| 1638 | |
| 1639 | read_config(); |
| 1640 | if (!name || !*name || !strcmp(name, "HEAD")) |
| 1641 | ret = current_branch; |
| 1642 | else |
| 1643 | ret = make_branch(name, 0); |
| Jeff King | ee2499f | 2015-05-21 04:45:09 | [diff] [blame] | 1644 | set_merge(ret); |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 1645 | return ret; |
| 1646 | } |
| 1647 | |
| 1648 | int branch_has_merge_config(struct branch *branch) |
| 1649 | { |
| 1650 | return branch && !!branch->merge; |
| 1651 | } |
| 1652 | |
| Shawn O. Pearce | 85682c1 | 2007-09-18 08:54:53 | [diff] [blame] | 1653 | int branch_merge_matches(struct branch *branch, |
| 1654 | int i, |
| 1655 | const char *refname) |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 1656 | { |
| Shawn O. Pearce | 85682c1 | 2007-09-18 08:54:53 | [diff] [blame] | 1657 | if (!branch || i < 0 || i >= branch->merge_nr) |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 1658 | return 0; |
| Michael Haggerty | 54457fe | 2014-01-14 03:16:07 | [diff] [blame] | 1659 | return refname_match(branch->merge[i]->src, refname); |
| Daniel Barkalow | cf81834 | 2007-09-11 03:02:56 | [diff] [blame] | 1660 | } |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1661 | |
| Jeff King | 060e776 | 2016-04-25 21:15:23 | [diff] [blame] | 1662 | __attribute__((format (printf,2,3))) |
| Jeff King | 3a429d0 | 2015-05-21 04:45:32 | [diff] [blame] | 1663 | static const char *error_buf(struct strbuf *err, const char *fmt, ...) |
| Jeff King | a9f9f8c | 2015-05-21 04:45:28 | [diff] [blame] | 1664 | { |
| Jeff King | 3a429d0 | 2015-05-21 04:45:32 | [diff] [blame] | 1665 | if (err) { |
| 1666 | va_list ap; |
| 1667 | va_start(ap, fmt); |
| 1668 | strbuf_vaddf(err, fmt, ap); |
| 1669 | va_end(ap); |
| 1670 | } |
| 1671 | return NULL; |
| 1672 | } |
| 1673 | |
| 1674 | const char *branch_get_upstream(struct branch *branch, struct strbuf *err) |
| 1675 | { |
| 1676 | if (!branch) |
| 1677 | return error_buf(err, _("HEAD does not point to a branch")); |
| Jeff King | 1ca41a1 | 2015-05-22 00:46:43 | [diff] [blame] | 1678 | |
| 1679 | if (!branch->merge || !branch->merge[0]) { |
| 1680 | /* |
| 1681 | * no merge config; is it because the user didn't define any, |
| 1682 | * or because it is not a real branch, and get_branch |
| 1683 | * auto-vivified it? |
| 1684 | */ |
| Jeff King | 3a429d0 | 2015-05-21 04:45:32 | [diff] [blame] | 1685 | if (!ref_exists(branch->refname)) |
| 1686 | return error_buf(err, _("no such branch: '%s'"), |
| 1687 | branch->name); |
| Jeff King | 1ca41a1 | 2015-05-22 00:46:43 | [diff] [blame] | 1688 | return error_buf(err, |
| 1689 | _("no upstream configured for branch '%s'"), |
| 1690 | branch->name); |
| 1691 | } |
| 1692 | |
| 1693 | if (!branch->merge[0]->dst) |
| Jeff King | 3a429d0 | 2015-05-21 04:45:32 | [diff] [blame] | 1694 | return error_buf(err, |
| 1695 | _("upstream branch '%s' not stored as a remote-tracking branch"), |
| 1696 | branch->merge[0]->src); |
| Jeff King | 3a429d0 | 2015-05-21 04:45:32 | [diff] [blame] | 1697 | |
| Jeff King | a9f9f8c | 2015-05-21 04:45:28 | [diff] [blame] | 1698 | return branch->merge[0]->dst; |
| 1699 | } |
| 1700 | |
| Jeff King | e291c75 | 2015-05-21 04:45:36 | [diff] [blame] | 1701 | static const char *tracking_for_push_dest(struct remote *remote, |
| 1702 | const char *refname, |
| 1703 | struct strbuf *err) |
| 1704 | { |
| 1705 | char *ret; |
| 1706 | |
| 1707 | ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname); |
| 1708 | if (!ret) |
| 1709 | return error_buf(err, |
| 1710 | _("push destination '%s' on remote '%s' has no local tracking branch"), |
| 1711 | refname, remote->name); |
| 1712 | return ret; |
| 1713 | } |
| 1714 | |
| 1715 | static const char *branch_get_push_1(struct branch *branch, struct strbuf *err) |
| 1716 | { |
| 1717 | struct remote *remote; |
| 1718 | |
| 1719 | if (!branch) |
| 1720 | return error_buf(err, _("HEAD does not point to a branch")); |
| 1721 | |
| 1722 | remote = remote_get(pushremote_for_branch(branch, NULL)); |
| 1723 | if (!remote) |
| 1724 | return error_buf(err, |
| 1725 | _("branch '%s' has no remote for pushing"), |
| 1726 | branch->name); |
| 1727 | |
| 1728 | if (remote->push_refspec_nr) { |
| 1729 | char *dst; |
| 1730 | const char *ret; |
| 1731 | |
| 1732 | dst = apply_refspecs(remote->push, remote->push_refspec_nr, |
| 1733 | branch->refname); |
| 1734 | if (!dst) |
| 1735 | return error_buf(err, |
| 1736 | _("push refspecs for '%s' do not include '%s'"), |
| 1737 | remote->name, branch->name); |
| 1738 | |
| 1739 | ret = tracking_for_push_dest(remote, dst, err); |
| 1740 | free(dst); |
| 1741 | return ret; |
| 1742 | } |
| 1743 | |
| 1744 | if (remote->mirror) |
| 1745 | return tracking_for_push_dest(remote, branch->refname, err); |
| 1746 | |
| 1747 | switch (push_default) { |
| 1748 | case PUSH_DEFAULT_NOTHING: |
| 1749 | return error_buf(err, _("push has no destination (push.default is 'nothing')")); |
| 1750 | |
| 1751 | case PUSH_DEFAULT_MATCHING: |
| 1752 | case PUSH_DEFAULT_CURRENT: |
| 1753 | return tracking_for_push_dest(remote, branch->refname, err); |
| 1754 | |
| 1755 | case PUSH_DEFAULT_UPSTREAM: |
| 1756 | return branch_get_upstream(branch, err); |
| 1757 | |
| 1758 | case PUSH_DEFAULT_UNSPECIFIED: |
| 1759 | case PUSH_DEFAULT_SIMPLE: |
| 1760 | { |
| 1761 | const char *up, *cur; |
| 1762 | |
| 1763 | up = branch_get_upstream(branch, err); |
| 1764 | if (!up) |
| 1765 | return NULL; |
| 1766 | cur = tracking_for_push_dest(remote, branch->refname, err); |
| 1767 | if (!cur) |
| 1768 | return NULL; |
| 1769 | if (strcmp(cur, up)) |
| 1770 | return error_buf(err, |
| 1771 | _("cannot resolve 'simple' push to a single destination")); |
| 1772 | return cur; |
| 1773 | } |
| 1774 | } |
| 1775 | |
| 1776 | die("BUG: unhandled push situation"); |
| 1777 | } |
| 1778 | |
| 1779 | const char *branch_get_push(struct branch *branch, struct strbuf *err) |
| 1780 | { |
| 1781 | if (!branch->push_tracking_ref) |
| 1782 | branch->push_tracking_ref = branch_get_push_1(branch, err); |
| 1783 | return branch->push_tracking_ref; |
| 1784 | } |
| 1785 | |
| Junio C Hamano | f8fb971 | 2012-12-11 21:00:52 | [diff] [blame] | 1786 | static int ignore_symref_update(const char *refname) |
| 1787 | { |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1788 | struct object_id oid; |
| Junio C Hamano | f8fb971 | 2012-12-11 21:00:52 | [diff] [blame] | 1789 | int flag; |
| 1790 | |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1791 | if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag)) |
| Junio C Hamano | f8fb971 | 2012-12-11 21:00:52 | [diff] [blame] | 1792 | return 0; /* non-existing refs are OK */ |
| 1793 | return (flag & REF_ISSYMREF); |
| 1794 | } |
| 1795 | |
| Michael Haggerty | f166db2 | 2013-10-30 05:32:56 | [diff] [blame] | 1796 | /* |
| 1797 | * Create and return a list of (struct ref) consisting of copies of |
| 1798 | * each remote_ref that matches refspec. refspec must be a pattern. |
| 1799 | * Fill in the copies' peer_ref to describe the local tracking refs to |
| 1800 | * which they map. Omit any references that would map to an existing |
| 1801 | * local symbolic ref. |
| 1802 | */ |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1803 | static struct ref *get_expanded_map(const struct ref *remote_refs, |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1804 | const struct refspec *refspec) |
| 1805 | { |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1806 | const struct ref *ref; |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1807 | struct ref *ret = NULL; |
| 1808 | struct ref **tail = &ret; |
| 1809 | |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1810 | for (ref = remote_refs; ref; ref = ref->next) { |
| Michael Haggerty | e31a17f | 2013-10-30 05:32:57 | [diff] [blame] | 1811 | char *expn_name = NULL; |
| 1812 | |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1813 | if (strchr(ref->name, '^')) |
| 1814 | continue; /* a dereference item */ |
| Daniel Barkalow | e928213 | 2009-03-07 06:11:34 | [diff] [blame] | 1815 | if (match_name_with_pattern(refspec->src, ref->name, |
| Junio C Hamano | f8fb971 | 2012-12-11 21:00:52 | [diff] [blame] | 1816 | refspec->dst, &expn_name) && |
| 1817 | !ignore_symref_update(expn_name)) { |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1818 | struct ref *cpy = copy_ref(ref); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1819 | |
| Daniel Barkalow | e928213 | 2009-03-07 06:11:34 | [diff] [blame] | 1820 | cpy->peer_ref = alloc_ref(expn_name); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1821 | if (refspec->force) |
| 1822 | cpy->peer_ref->force = 1; |
| 1823 | *tail = cpy; |
| 1824 | tail = &cpy->next; |
| 1825 | } |
| Michael Haggerty | e31a17f | 2013-10-30 05:32:57 | [diff] [blame] | 1826 | free(expn_name); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1827 | } |
| 1828 | |
| 1829 | return ret; |
| 1830 | } |
| 1831 | |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1832 | static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name) |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1833 | { |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1834 | const struct ref *ref; |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1835 | for (ref = refs; ref; ref = ref->next) { |
| Michael Haggerty | 54457fe | 2014-01-14 03:16:07 | [diff] [blame] | 1836 | if (refname_match(name, ref->name)) |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1837 | return ref; |
| 1838 | } |
| 1839 | return NULL; |
| 1840 | } |
| 1841 | |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1842 | struct ref *get_remote_ref(const struct ref *remote_refs, const char *name) |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1843 | { |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1844 | const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1845 | |
| 1846 | if (!ref) |
| Junio C Hamano | 9ad7c5a | 2007-10-27 06:09:48 | [diff] [blame] | 1847 | return NULL; |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1848 | |
| 1849 | return copy_ref(ref); |
| 1850 | } |
| 1851 | |
| 1852 | static struct ref *get_local_ref(const char *name) |
| 1853 | { |
| Clemens Buchacher | 3eb9699 | 2009-06-17 13:38:36 | [diff] [blame] | 1854 | if (!name || name[0] == '\0') |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1855 | return NULL; |
| 1856 | |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1857 | if (starts_with(name, "refs/")) |
| René Scharfe | 59c69c0 | 2008-10-18 08:44:18 | [diff] [blame] | 1858 | return alloc_ref(name); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1859 | |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1860 | if (starts_with(name, "heads/") || |
| 1861 | starts_with(name, "tags/") || |
| 1862 | starts_with(name, "remotes/")) |
| René Scharfe | 8009768 | 2008-10-18 08:37:40 | [diff] [blame] | 1863 | return alloc_ref_with_prefix("refs/", 5, name); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1864 | |
| René Scharfe | 8009768 | 2008-10-18 08:37:40 | [diff] [blame] | 1865 | return alloc_ref_with_prefix("refs/heads/", 11, name); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1866 | } |
| 1867 | |
| Daniel Barkalow | 4577370 | 2007-10-30 01:05:40 | [diff] [blame] | 1868 | int get_fetch_map(const struct ref *remote_refs, |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1869 | const struct refspec *refspec, |
| Junio C Hamano | 9ad7c5a | 2007-10-27 06:09:48 | [diff] [blame] | 1870 | struct ref ***tail, |
| 1871 | int missing_ok) |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1872 | { |
| Daniel Barkalow | ef00d15 | 2008-03-18 02:05:23 | [diff] [blame] | 1873 | struct ref *ref_map, **rmp; |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1874 | |
| 1875 | if (refspec->pattern) { |
| 1876 | ref_map = get_expanded_map(remote_refs, refspec); |
| 1877 | } else { |
| Junio C Hamano | 9ad7c5a | 2007-10-27 06:09:48 | [diff] [blame] | 1878 | const char *name = refspec->src[0] ? refspec->src : "HEAD"; |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1879 | |
| Junio C Hamano | 6e7b66e | 2013-01-29 22:02:15 | [diff] [blame] | 1880 | if (refspec->exact_sha1) { |
| 1881 | ref_map = alloc_ref(name); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1882 | get_oid_hex(name, &ref_map->old_oid); |
| Junio C Hamano | 6e7b66e | 2013-01-29 22:02:15 | [diff] [blame] | 1883 | } else { |
| 1884 | ref_map = get_remote_ref(remote_refs, name); |
| 1885 | } |
| Junio C Hamano | 9ad7c5a | 2007-10-27 06:09:48 | [diff] [blame] | 1886 | if (!missing_ok && !ref_map) |
| 1887 | die("Couldn't find remote ref %s", name); |
| 1888 | if (ref_map) { |
| 1889 | ref_map->peer_ref = get_local_ref(refspec->dst); |
| 1890 | if (ref_map->peer_ref && refspec->force) |
| 1891 | ref_map->peer_ref->force = 1; |
| 1892 | } |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1893 | } |
| 1894 | |
| Daniel Barkalow | ef00d15 | 2008-03-18 02:05:23 | [diff] [blame] | 1895 | for (rmp = &ref_map; *rmp; ) { |
| 1896 | if ((*rmp)->peer_ref) { |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 1897 | if (!starts_with((*rmp)->peer_ref->name, "refs/") || |
| Junio C Hamano | 5c08c1f | 2012-05-04 22:35:18 | [diff] [blame] | 1898 | check_refname_format((*rmp)->peer_ref->name, 0)) { |
| Daniel Barkalow | ef00d15 | 2008-03-18 02:05:23 | [diff] [blame] | 1899 | struct ref *ignore = *rmp; |
| 1900 | error("* Ignoring funny ref '%s' locally", |
| 1901 | (*rmp)->peer_ref->name); |
| 1902 | *rmp = (*rmp)->next; |
| 1903 | free(ignore->peer_ref); |
| 1904 | free(ignore); |
| 1905 | continue; |
| 1906 | } |
| 1907 | } |
| 1908 | rmp = &((*rmp)->next); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1909 | } |
| 1910 | |
| Alex Riesen | 8f70a76 | 2007-10-12 20:40:04 | [diff] [blame] | 1911 | if (ref_map) |
| 1912 | tail_link_ref(ref_map, tail); |
| Daniel Barkalow | d71ab17 | 2007-09-11 03:03:08 | [diff] [blame] | 1913 | |
| 1914 | return 0; |
| 1915 | } |
| Daniel Barkalow | be885d9 | 2008-04-26 19:53:12 | [diff] [blame] | 1916 | |
| 1917 | int resolve_remote_symref(struct ref *ref, struct ref *list) |
| 1918 | { |
| 1919 | if (!ref->symref) |
| 1920 | return 0; |
| 1921 | for (; list; list = list->next) |
| 1922 | if (!strcmp(ref->symref, list->name)) { |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 1923 | oidcpy(&ref->old_oid, &list->old_oid); |
| Daniel Barkalow | be885d9 | 2008-04-26 19:53:12 | [diff] [blame] | 1924 | return 0; |
| 1925 | } |
| 1926 | return 1; |
| 1927 | } |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1928 | |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 1929 | static void unmark_and_free(struct commit_list *list, unsigned int mark) |
| 1930 | { |
| 1931 | while (list) { |
| René Scharfe | e510ab8 | 2015-10-24 16:21:31 | [diff] [blame] | 1932 | struct commit *commit = pop_commit(&list); |
| 1933 | commit->object.flags &= ~mark; |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 1934 | } |
| 1935 | } |
| 1936 | |
| brian m. carlson | 6f3d57b | 2015-11-10 02:22:25 | [diff] [blame] | 1937 | int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 1938 | { |
| 1939 | struct object *o; |
| 1940 | struct commit *old, *new; |
| 1941 | struct commit_list *list, *used; |
| 1942 | int found = 0; |
| 1943 | |
| Junio C Hamano | 75e5c0d | 2013-01-23 21:55:30 | [diff] [blame] | 1944 | /* |
| 1945 | * Both new and old must be commit-ish and new is descendant of |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 1946 | * old. Otherwise we require --force. |
| 1947 | */ |
| brian m. carlson | 6f3d57b | 2015-11-10 02:22:25 | [diff] [blame] | 1948 | o = deref_tag(parse_object(old_oid->hash), NULL, 0); |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 1949 | if (!o || o->type != OBJ_COMMIT) |
| 1950 | return 0; |
| 1951 | old = (struct commit *) o; |
| 1952 | |
| brian m. carlson | 6f3d57b | 2015-11-10 02:22:25 | [diff] [blame] | 1953 | o = deref_tag(parse_object(new_oid->hash), NULL, 0); |
| Jay Soffian | ec8452d | 2009-02-25 08:32:12 | [diff] [blame] | 1954 | if (!o || o->type != OBJ_COMMIT) |
| 1955 | return 0; |
| 1956 | new = (struct commit *) o; |
| 1957 | |
| 1958 | if (parse_commit(new) < 0) |
| 1959 | return 0; |
| 1960 | |
| 1961 | used = list = NULL; |
| 1962 | commit_list_insert(new, &list); |
| 1963 | while (list) { |
| 1964 | new = pop_most_recent_commit(&list, TMP_MARK); |
| 1965 | commit_list_insert(new, &used); |
| 1966 | if (new == old) { |
| 1967 | found = 1; |
| 1968 | break; |
| 1969 | } |
| 1970 | } |
| 1971 | unmark_and_free(list, TMP_MARK); |
| 1972 | unmark_and_free(used, TMP_MARK); |
| 1973 | return found; |
| 1974 | } |
| 1975 | |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1976 | /* |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 1977 | * Compare a branch with its upstream, and save their differences (number |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 1978 | * of commits) in *num_ours and *num_theirs. The name of the upstream branch |
| 1979 | * (or NULL if no upstream is defined) is returned via *upstream_name, if it |
| 1980 | * is not itself NULL. |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 1981 | * |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 1982 | * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no |
| 1983 | * upstream defined, or ref does not exist), 0 otherwise. |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1984 | */ |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 1985 | int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, |
| 1986 | const char **upstream_name) |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1987 | { |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 1988 | struct object_id oid; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1989 | struct commit *ours, *theirs; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1990 | struct rev_info revs; |
| Jeff King | 0b282cc | 2015-09-24 21:07:58 | [diff] [blame] | 1991 | const char *base; |
| 1992 | struct argv_array argv = ARGV_ARRAY_INIT; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 1993 | |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 1994 | /* Cannot stat unless we are marked to build on top of somebody else. */ |
| Jeff King | 3a429d0 | 2015-05-21 04:45:32 | [diff] [blame] | 1995 | base = branch_get_upstream(branch, NULL); |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 1996 | if (upstream_name) |
| 1997 | *upstream_name = base; |
| Jeff King | a9f9f8c | 2015-05-21 04:45:28 | [diff] [blame] | 1998 | if (!base) |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 1999 | return -1; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2000 | |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2001 | /* Cannot stat if what we used to build on no longer exists */ |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2002 | if (read_ref(base, oid.hash)) |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2003 | return -1; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2004 | theirs = lookup_commit_reference(oid.hash); |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2005 | if (!theirs) |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2006 | return -1; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2007 | |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2008 | if (read_ref(branch->refname, oid.hash)) |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2009 | return -1; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2010 | ours = lookup_commit_reference(oid.hash); |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2011 | if (!ours) |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2012 | return -1; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2013 | |
| 2014 | /* are we the same? */ |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2015 | if (theirs == ours) { |
| 2016 | *num_theirs = *num_ours = 0; |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 2017 | return 0; |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2018 | } |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2019 | |
| Junio C Hamano | 8fbf879 | 2009-04-21 23:32:18 | [diff] [blame] | 2020 | /* Run "rev-list --left-right ours...theirs" internally... */ |
| Jeff King | 0b282cc | 2015-09-24 21:07:58 | [diff] [blame] | 2021 | argv_array_push(&argv, ""); /* ignored */ |
| 2022 | argv_array_push(&argv, "--left-right"); |
| 2023 | argv_array_pushf(&argv, "%s...%s", |
| brian m. carlson | f2fd076 | 2015-11-10 02:22:28 | [diff] [blame] | 2024 | oid_to_hex(&ours->object.oid), |
| 2025 | oid_to_hex(&theirs->object.oid)); |
| Jeff King | 0b282cc | 2015-09-24 21:07:58 | [diff] [blame] | 2026 | argv_array_push(&argv, "--"); |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2027 | |
| 2028 | init_revisions(&revs, NULL); |
| Jeff King | 0b282cc | 2015-09-24 21:07:58 | [diff] [blame] | 2029 | setup_revisions(argv.argc, argv.argv, &revs, NULL); |
| Stefan Beller | 81c3ce3 | 2014-08-10 21:33:26 | [diff] [blame] | 2030 | if (prepare_revision_walk(&revs)) |
| 2031 | die("revision walk setup failed"); |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2032 | |
| 2033 | /* ... and count the commits on each side. */ |
| 2034 | *num_ours = 0; |
| 2035 | *num_theirs = 0; |
| 2036 | while (1) { |
| 2037 | struct commit *c = get_revision(&revs); |
| 2038 | if (!c) |
| 2039 | break; |
| 2040 | if (c->object.flags & SYMMETRIC_LEFT) |
| 2041 | (*num_ours)++; |
| 2042 | else |
| 2043 | (*num_theirs)++; |
| 2044 | } |
| Junio C Hamano | c0234b2 | 2008-07-03 19:09:48 | [diff] [blame] | 2045 | |
| 2046 | /* clear object flags smudged by the above traversal */ |
| 2047 | clear_commit_marks(ours, ALL_REV_FLAGS); |
| 2048 | clear_commit_marks(theirs, ALL_REV_FLAGS); |
| Jeff King | 0b282cc | 2015-09-24 21:07:58 | [diff] [blame] | 2049 | |
| 2050 | argv_array_clear(&argv); |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 2051 | return 0; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2052 | } |
| 2053 | |
| 2054 | /* |
| 2055 | * Return true when there is anything to report, otherwise false. |
| 2056 | */ |
| 2057 | int format_tracking_info(struct branch *branch, struct strbuf *sb) |
| 2058 | { |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2059 | int ours, theirs; |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 2060 | const char *full_base; |
| Stefan Beller | 2f50bab | 2014-08-10 19:43:33 | [diff] [blame] | 2061 | char *base; |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2062 | int upstream_is_gone = 0; |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2063 | |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 2064 | if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) { |
| 2065 | if (!full_base) |
| 2066 | return 0; |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2067 | upstream_is_gone = 1; |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2068 | } |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2069 | |
| Jeff King | 979cb24 | 2015-05-22 00:49:11 | [diff] [blame] | 2070 | base = shorten_unambiguous_ref(full_base, 0); |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2071 | if (upstream_is_gone) { |
| 2072 | strbuf_addf(sb, |
| 2073 | _("Your branch is based on '%s', but the upstream is gone.\n"), |
| 2074 | base); |
| 2075 | if (advice_status_hints) |
| 2076 | strbuf_addf(sb, |
| 2077 | _(" (use \"git branch --unset-upstream\" to fixup)\n")); |
| Jiang Xin | f223459 | 2013-08-26 07:02:49 | [diff] [blame] | 2078 | } else if (!ours && !theirs) { |
| 2079 | strbuf_addf(sb, |
| 2080 | _("Your branch is up-to-date with '%s'.\n"), |
| 2081 | base); |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2082 | } else if (!theirs) { |
| Jiang Xin | 8a5b749 | 2012-02-02 02:02:23 | [diff] [blame] | 2083 | strbuf_addf(sb, |
| 2084 | Q_("Your branch is ahead of '%s' by %d commit.\n", |
| 2085 | "Your branch is ahead of '%s' by %d commits.\n", |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2086 | ours), |
| 2087 | base, ours); |
| Jeff King | 491e307 | 2012-12-03 06:16:57 | [diff] [blame] | 2088 | if (advice_status_hints) |
| 2089 | strbuf_addf(sb, |
| 2090 | _(" (use \"git push\" to publish your local commits)\n")); |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2091 | } else if (!ours) { |
| Jiang Xin | 8a5b749 | 2012-02-02 02:02:23 | [diff] [blame] | 2092 | strbuf_addf(sb, |
| 2093 | Q_("Your branch is behind '%s' by %d commit, " |
| 2094 | "and can be fast-forwarded.\n", |
| 2095 | "Your branch is behind '%s' by %d commits, " |
| 2096 | "and can be fast-forwarded.\n", |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2097 | theirs), |
| 2098 | base, theirs); |
| Jeff King | 491e307 | 2012-12-03 06:16:57 | [diff] [blame] | 2099 | if (advice_status_hints) |
| 2100 | strbuf_addf(sb, |
| 2101 | _(" (use \"git pull\" to update your local branch)\n")); |
| Matthieu Moy | c190ced | 2012-11-15 10:45:00 | [diff] [blame] | 2102 | } else { |
| Jiang Xin | 8a5b749 | 2012-02-02 02:02:23 | [diff] [blame] | 2103 | strbuf_addf(sb, |
| 2104 | Q_("Your branch and '%s' have diverged,\n" |
| 2105 | "and have %d and %d different commit each, " |
| 2106 | "respectively.\n", |
| 2107 | "Your branch and '%s' have diverged,\n" |
| 2108 | "and have %d and %d different commits each, " |
| 2109 | "respectively.\n", |
| Nguyễn Thái Ngọc Duy | f54bea4 | 2016-05-03 00:12:30 | [diff] [blame] | 2110 | ours + theirs), |
| Jiang Xin | f2e0873 | 2013-08-26 07:02:48 | [diff] [blame] | 2111 | base, ours, theirs); |
| Jeff King | 491e307 | 2012-12-03 06:16:57 | [diff] [blame] | 2112 | if (advice_status_hints) |
| 2113 | strbuf_addf(sb, |
| 2114 | _(" (use \"git pull\" to merge the remote branch into yours)\n")); |
| Matthieu Moy | c190ced | 2012-11-15 10:45:00 | [diff] [blame] | 2115 | } |
| Stefan Beller | 2f50bab | 2014-08-10 19:43:33 | [diff] [blame] | 2116 | free(base); |
| Junio C Hamano | 6d21bf9 | 2008-07-02 07:51:18 | [diff] [blame] | 2117 | return 1; |
| 2118 | } |
| Jay Soffian | 454e202 | 2009-02-25 08:32:11 | [diff] [blame] | 2119 | |
| Michael Haggerty | 455ade6 | 2015-05-25 18:39:01 | [diff] [blame] | 2120 | static int one_local_ref(const char *refname, const struct object_id *oid, |
| 2121 | int flag, void *cb_data) |
| Jay Soffian | 454e202 | 2009-02-25 08:32:11 | [diff] [blame] | 2122 | { |
| 2123 | struct ref ***local_tail = cb_data; |
| 2124 | struct ref *ref; |
| Jay Soffian | 454e202 | 2009-02-25 08:32:11 | [diff] [blame] | 2125 | |
| 2126 | /* we already know it starts with refs/ to get here */ |
| Michael Haggerty | 8d9c501 | 2011-09-15 21:10:25 | [diff] [blame] | 2127 | if (check_refname_format(refname + 5, 0)) |
| Jay Soffian | 454e202 | 2009-02-25 08:32:11 | [diff] [blame] | 2128 | return 0; |
| 2129 | |
| Jeff King | 96ffc06 | 2016-02-22 22:44:32 | [diff] [blame] | 2130 | ref = alloc_ref(refname); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 2131 | oidcpy(&ref->new_oid, oid); |
| Jay Soffian | 454e202 | 2009-02-25 08:32:11 | [diff] [blame] | 2132 | **local_tail = ref; |
| 2133 | *local_tail = &ref->next; |
| 2134 | return 0; |
| 2135 | } |
| 2136 | |
| 2137 | struct ref *get_local_heads(void) |
| 2138 | { |
| Nguyễn Thái Ngọc Duy | 55f0566 | 2009-04-16 22:16:23 | [diff] [blame] | 2139 | struct ref *local_refs = NULL, **local_tail = &local_refs; |
| Michael Haggerty | 2b2a5be | 2015-05-25 18:38:28 | [diff] [blame] | 2140 | |
| Jay Soffian | 454e202 | 2009-02-25 08:32:11 | [diff] [blame] | 2141 | for_each_ref(one_local_ref, &local_tail); |
| 2142 | return local_refs; |
| 2143 | } |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2144 | |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2145 | struct ref *guess_remote_head(const struct ref *head, |
| 2146 | const struct ref *refs, |
| 2147 | int all) |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2148 | { |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2149 | const struct ref *r; |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2150 | struct ref *list = NULL; |
| 2151 | struct ref **tail = &list; |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2152 | |
| Jay Soffian | 6cb4e6c | 2009-02-25 08:32:14 | [diff] [blame] | 2153 | if (!head) |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2154 | return NULL; |
| 2155 | |
| Jeff King | fbb074c | 2009-02-27 19:10:06 | [diff] [blame] | 2156 | /* |
| 2157 | * Some transports support directly peeking at |
| 2158 | * where HEAD points; if that is the case, then |
| 2159 | * we don't have to guess. |
| 2160 | */ |
| 2161 | if (head->symref) |
| 2162 | return copy_ref(find_ref_by_name(refs, head->symref)); |
| 2163 | |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2164 | /* If refs/heads/master could be right, it is. */ |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2165 | if (!all) { |
| 2166 | r = find_ref_by_name(refs, "refs/heads/master"); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 2167 | if (r && !oidcmp(&r->old_oid, &head->old_oid)) |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2168 | return copy_ref(r); |
| 2169 | } |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2170 | |
| 2171 | /* Look for another ref that points there */ |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2172 | for (r = refs; r; r = r->next) { |
| Jeff King | 61adfd3 | 2011-06-03 05:11:13 | [diff] [blame] | 2173 | if (r != head && |
| Christian Couder | 5955654 | 2013-11-30 20:55:40 | [diff] [blame] | 2174 | starts_with(r->name, "refs/heads/") && |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 2175 | !oidcmp(&r->old_oid, &head->old_oid)) { |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2176 | *tail = copy_ref(r); |
| 2177 | tail = &((*tail)->next); |
| 2178 | if (!all) |
| 2179 | break; |
| 2180 | } |
| 2181 | } |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2182 | |
| Jay Soffian | 4229f1f | 2009-02-27 19:10:05 | [diff] [blame] | 2183 | return list; |
| Jay Soffian | 8ef5173 | 2009-02-25 08:32:13 | [diff] [blame] | 2184 | } |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2185 | |
| 2186 | struct stale_heads_info { |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2187 | struct string_list *ref_names; |
| 2188 | struct ref **stale_refs_tail; |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2189 | struct refspec *refs; |
| 2190 | int ref_count; |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2191 | }; |
| 2192 | |
| Michael Haggerty | 455ade6 | 2015-05-25 18:39:01 | [diff] [blame] | 2193 | static int get_stale_heads_cb(const char *refname, const struct object_id *oid, |
| 2194 | int flags, void *cb_data) |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2195 | { |
| 2196 | struct stale_heads_info *info = cb_data; |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 2197 | struct string_list matches = STRING_LIST_INIT_DUP; |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2198 | struct refspec query; |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 2199 | int i, stale = 1; |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2200 | memset(&query, 0, sizeof(struct refspec)); |
| 2201 | query.dst = (char *)refname; |
| 2202 | |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 2203 | query_refspecs_multiple(info->refs, info->ref_count, &query, &matches); |
| 2204 | if (matches.nr == 0) |
| 2205 | goto clean_exit; /* No matches */ |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2206 | |
| 2207 | /* |
| 2208 | * If we did find a suitable refspec and it's not a symref and |
| 2209 | * it's not in the list of refs that currently exist in that |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 2210 | * remote, we consider it to be stale. In order to deal with |
| 2211 | * overlapping refspecs, we need to go over all of the |
| 2212 | * matching refs. |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2213 | */ |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 2214 | if (flags & REF_ISSYMREF) |
| 2215 | goto clean_exit; |
| 2216 | |
| 2217 | for (i = 0; stale && i < matches.nr; i++) |
| 2218 | if (string_list_has_string(info->ref_names, matches.items[i].string)) |
| 2219 | stale = 0; |
| 2220 | |
| 2221 | if (stale) { |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2222 | struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 2223 | oidcpy(&ref->new_oid, oid); |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2224 | } |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2225 | |
| Carlos Martín Nieto | e6f6371 | 2014-02-27 09:00:10 | [diff] [blame] | 2226 | clean_exit: |
| 2227 | string_list_clear(&matches, 0); |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2228 | return 0; |
| 2229 | } |
| 2230 | |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2231 | struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map) |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2232 | { |
| 2233 | struct ref *ref, *stale_refs = NULL; |
| Thiago Farina | 183113a | 2010-07-04 19:46:19 | [diff] [blame] | 2234 | struct string_list ref_names = STRING_LIST_INIT_NODUP; |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2235 | struct stale_heads_info info; |
| Michael Haggerty | 2b2a5be | 2015-05-25 18:38:28 | [diff] [blame] | 2236 | |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2237 | info.ref_names = &ref_names; |
| 2238 | info.stale_refs_tail = &stale_refs; |
| Carlos Martín Nieto | ed43de6 | 2011-10-15 05:04:25 | [diff] [blame] | 2239 | info.refs = refs; |
| 2240 | info.ref_count = ref_count; |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2241 | for (ref = fetch_map; ref; ref = ref->next) |
| Julian Phillips | 1d2f80f | 2010-06-25 23:41:38 | [diff] [blame] | 2242 | string_list_append(&ref_names, ref->name); |
| Michael Haggerty | 3383e19 | 2014-11-25 08:02:35 | [diff] [blame] | 2243 | string_list_sort(&ref_names); |
| Jay Soffian | f2ef607 | 2009-11-10 05:03:31 | [diff] [blame] | 2244 | for_each_ref(get_stale_heads_cb, &info); |
| 2245 | string_list_clear(&ref_names, 0); |
| 2246 | return stale_refs; |
| 2247 | } |
| Junio C Hamano | 28f5d17 | 2013-07-08 22:34:36 | [diff] [blame] | 2248 | |
| 2249 | /* |
| 2250 | * Compare-and-swap |
| 2251 | */ |
| Junio C Hamano | a355b11 | 2015-01-14 22:58:44 | [diff] [blame] | 2252 | static void clear_cas_option(struct push_cas_option *cas) |
| Junio C Hamano | 28f5d17 | 2013-07-08 22:34:36 | [diff] [blame] | 2253 | { |
| 2254 | int i; |
| 2255 | |
| 2256 | for (i = 0; i < cas->nr; i++) |
| 2257 | free(cas->entry[i].refname); |
| 2258 | free(cas->entry); |
| 2259 | memset(cas, 0, sizeof(*cas)); |
| 2260 | } |
| 2261 | |
| 2262 | static struct push_cas *add_cas_entry(struct push_cas_option *cas, |
| 2263 | const char *refname, |
| 2264 | size_t refnamelen) |
| 2265 | { |
| 2266 | struct push_cas *entry; |
| 2267 | ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc); |
| 2268 | entry = &cas->entry[cas->nr++]; |
| 2269 | memset(entry, 0, sizeof(*entry)); |
| 2270 | entry->refname = xmemdupz(refname, refnamelen); |
| 2271 | return entry; |
| 2272 | } |
| 2273 | |
| 2274 | int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset) |
| 2275 | { |
| 2276 | const char *colon; |
| 2277 | struct push_cas *entry; |
| 2278 | |
| 2279 | if (unset) { |
| 2280 | /* "--no-<option>" */ |
| 2281 | clear_cas_option(cas); |
| 2282 | return 0; |
| 2283 | } |
| 2284 | |
| 2285 | if (!arg) { |
| 2286 | /* just "--<option>" */ |
| 2287 | cas->use_tracking_for_rest = 1; |
| 2288 | return 0; |
| 2289 | } |
| 2290 | |
| 2291 | /* "--<option>=refname" or "--<option>=refname:value" */ |
| 2292 | colon = strchrnul(arg, ':'); |
| 2293 | entry = add_cas_entry(cas, arg, colon - arg); |
| 2294 | if (!*colon) |
| 2295 | entry->use_tracking = 1; |
| John Keeping | eee98e7 | 2016-07-26 20:44:44 | [diff] [blame] | 2296 | else if (!colon[1]) |
| 2297 | hashclr(entry->expect); |
| Junio C Hamano | 28f5d17 | 2013-07-08 22:34:36 | [diff] [blame] | 2298 | else if (get_sha1(colon + 1, entry->expect)) |
| 2299 | return error("cannot parse expected object name '%s'", colon + 1); |
| 2300 | return 0; |
| 2301 | } |
| 2302 | |
| 2303 | int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset) |
| 2304 | { |
| 2305 | return parse_push_cas_option(opt->value, arg, unset); |
| 2306 | } |
| Junio C Hamano | 91048a9 | 2013-07-09 18:01:06 | [diff] [blame] | 2307 | |
| 2308 | int is_empty_cas(const struct push_cas_option *cas) |
| 2309 | { |
| 2310 | return !cas->use_tracking_for_rest && !cas->nr; |
| 2311 | } |
| 2312 | |
| 2313 | /* |
| 2314 | * Look at remote.fetch refspec and see if we have a remote |
| 2315 | * tracking branch for the refname there. Fill its current |
| 2316 | * value in sha1[]. |
| 2317 | * If we cannot do so, return negative to signal an error. |
| 2318 | */ |
| 2319 | static int remote_tracking(struct remote *remote, const char *refname, |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2320 | struct object_id *oid) |
| Junio C Hamano | 91048a9 | 2013-07-09 18:01:06 | [diff] [blame] | 2321 | { |
| 2322 | char *dst; |
| 2323 | |
| 2324 | dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname); |
| 2325 | if (!dst) |
| 2326 | return -1; /* no tracking ref for refname at remote */ |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2327 | if (read_ref(dst, oid->hash)) |
| Junio C Hamano | 91048a9 | 2013-07-09 18:01:06 | [diff] [blame] | 2328 | return -1; /* we know what the tracking ref is but we cannot read it */ |
| 2329 | return 0; |
| 2330 | } |
| 2331 | |
| 2332 | static void apply_cas(struct push_cas_option *cas, |
| 2333 | struct remote *remote, |
| 2334 | struct ref *ref) |
| 2335 | { |
| 2336 | int i; |
| 2337 | |
| 2338 | /* Find an explicit --<option>=<name>[:<value>] entry */ |
| 2339 | for (i = 0; i < cas->nr; i++) { |
| 2340 | struct push_cas *entry = &cas->entry[i]; |
| Michael Haggerty | 54457fe | 2014-01-14 03:16:07 | [diff] [blame] | 2341 | if (!refname_match(entry->refname, ref->name)) |
| Junio C Hamano | 91048a9 | 2013-07-09 18:01:06 | [diff] [blame] | 2342 | continue; |
| 2343 | ref->expect_old_sha1 = 1; |
| 2344 | if (!entry->use_tracking) |
| brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 | [diff] [blame] | 2345 | hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect); |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2346 | else if (remote_tracking(remote, ref->name, &ref->old_oid_expect)) |
| John Keeping | 64ac39a | 2016-07-26 20:44:45 | [diff] [blame] | 2347 | oidclr(&ref->old_oid_expect); |
| Junio C Hamano | 91048a9 | 2013-07-09 18:01:06 | [diff] [blame] | 2348 | return; |
| 2349 | } |
| 2350 | |
| 2351 | /* Are we using "--<option>" to cover all? */ |
| 2352 | if (!cas->use_tracking_for_rest) |
| 2353 | return; |
| 2354 | |
| 2355 | ref->expect_old_sha1 = 1; |
| brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 | [diff] [blame] | 2356 | if (remote_tracking(remote, ref->name, &ref->old_oid_expect)) |
| John Keeping | 64ac39a | 2016-07-26 20:44:45 | [diff] [blame] | 2357 | oidclr(&ref->old_oid_expect); |
| Junio C Hamano | 91048a9 | 2013-07-09 18:01:06 | [diff] [blame] | 2358 | } |
| 2359 | |
| 2360 | void apply_push_cas(struct push_cas_option *cas, |
| 2361 | struct remote *remote, |
| 2362 | struct ref *remote_refs) |
| 2363 | { |
| 2364 | struct ref *ref; |
| 2365 | for (ref = remote_refs; ref; ref = ref->next) |
| 2366 | apply_cas(cas, remote, ref); |
| 2367 | } |