remote.c 32.1 KB
Newer Older
1 2 3
#include "cache.h"
#include "remote.h"
#include "refs.h"
4 5 6
#include "commit.h"
#include "diff.h"
#include "revision.h"
7

8 9 10
static struct refspec s_tag_refspec = {
	0,
	1,
J
Junio C Hamano 已提交
11
	0,
12 13 14 15 16 17
	"refs/tags/",
	"refs/tags/"
};

const struct refspec *tag_refspec = &s_tag_refspec;

18 19 20 21
struct counted_string {
	size_t len;
	const char *s;
};
22 23
struct rewrite {
	const char *base;
24 25
	size_t baselen;
	struct counted_string *instead_of;
26 27 28 29
	int instead_of_nr;
	int instead_of_alloc;
};

30
static struct remote **remotes;
D
Daniel Barkalow 已提交
31 32
static int remotes_alloc;
static int remotes_nr;
33

34
static struct branch **branches;
D
Daniel Barkalow 已提交
35 36
static int branches_alloc;
static int branches_nr;
37 38 39 40

static struct branch *current_branch;
static const char *default_remote_name;

41 42 43 44
static struct rewrite **rewrite;
static int rewrite_alloc;
static int rewrite_nr;

45 46 47
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

48 49 50
static const char *alias_url(const char *url)
{
	int i, j;
51 52 53 54 55 56
	char *ret;
	struct counted_string *longest;
	int longest_i;

	longest = NULL;
	longest_i = -1;
57 58 59 60
	for (i = 0; i < rewrite_nr; i++) {
		if (!rewrite[i])
			continue;
		for (j = 0; j < rewrite[i]->instead_of_nr; j++) {
61 62 63 64 65
			if (!prefixcmp(url, rewrite[i]->instead_of[j].s) &&
			    (!longest ||
			     longest->len < rewrite[i]->instead_of[j].len)) {
				longest = &(rewrite[i]->instead_of[j]);
				longest_i = i;
66 67 68
			}
		}
	}
69 70 71
	if (!longest)
		return url;

72
	ret = xmalloc(rewrite[longest_i]->baselen +
73 74 75 76
		     (strlen(url) - longest->len) + 1);
	strcpy(ret, rewrite[longest_i]->base);
	strcpy(ret + rewrite[longest_i]->baselen, url + longest->len);
	return ret;
77 78
}

79 80
static void add_push_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
81 82 83 84
	ALLOC_GROW(remote->push_refspec,
		   remote->push_refspec_nr + 1,
		   remote->push_refspec_alloc);
	remote->push_refspec[remote->push_refspec_nr++] = ref;
85 86
}

87 88
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
89 90 91 92
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
93 94
}

95
static void add_url(struct remote *remote, const char *url)
96
{
D
Daniel Barkalow 已提交
97 98
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
99 100
}

101 102 103 104 105
static void add_url_alias(struct remote *remote, const char *url)
{
	add_url(remote, alias_url(url));
}

106 107
static struct remote *make_remote(const char *name, int len)
{
D
Daniel Barkalow 已提交
108 109
	struct remote *ret;
	int i;
110

D
Daniel Barkalow 已提交
111 112 113 114 115
	for (i = 0; i < remotes_nr; i++) {
		if (len ? (!strncmp(name, remotes[i]->name, len) &&
			   !remotes[i]->name[len]) :
		    !strcmp(name, remotes[i]->name))
			return remotes[i];
116 117
	}

D
Daniel Barkalow 已提交
118 119 120
	ret = xcalloc(1, sizeof(struct remote));
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
121
	if (len)
D
Daniel Barkalow 已提交
122
		ret->name = xstrndup(name, len);
123
	else
D
Daniel Barkalow 已提交
124 125
		ret->name = xstrdup(name);
	return ret;
126 127
}

128 129
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
130 131 132
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
133 134 135 136
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
137 138
	struct branch *ret;
	int i;
139 140
	char *refname;

D
Daniel Barkalow 已提交
141 142 143 144 145
	for (i = 0; i < branches_nr; i++) {
		if (len ? (!strncmp(name, branches[i]->name, len) &&
			   !branches[i]->name[len]) :
		    !strcmp(name, branches[i]->name))
			return branches[i];
146 147
	}

D
Daniel Barkalow 已提交
148 149 150
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
151
	if (len)
D
Daniel Barkalow 已提交
152
		ret->name = xstrndup(name, len);
153
	else
D
Daniel Barkalow 已提交
154
		ret->name = xstrdup(name);
155
	refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
156
	strcpy(refname, "refs/heads/");
D
Daniel Barkalow 已提交
157 158
	strcpy(refname + strlen("refs/heads/"), ret->name);
	ret->refname = refname;
159

D
Daniel Barkalow 已提交
160
	return ret;
161 162
}

163 164 165 166 167 168
static struct rewrite *make_rewrite(const char *base, int len)
{
	struct rewrite *ret;
	int i;

	for (i = 0; i < rewrite_nr; i++) {
169 170 171 172
		if (len
		    ? (len == rewrite[i]->baselen &&
		       !strncmp(base, rewrite[i]->base, len))
		    : !strcmp(base, rewrite[i]->base))
173 174 175 176 177 178
			return rewrite[i];
	}

	ALLOC_GROW(rewrite, rewrite_nr + 1, rewrite_alloc);
	ret = xcalloc(1, sizeof(struct rewrite));
	rewrite[rewrite_nr++] = ret;
179
	if (len) {
180
		ret->base = xstrndup(base, len);
181 182 183
		ret->baselen = len;
	}
	else {
184
		ret->base = xstrdup(base);
185 186
		ret->baselen = strlen(base);
	}
187 188 189 190 191 192
	return ret;
}

static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
{
	ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
193 194 195
	rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
	rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
	rewrite->instead_of_nr++;
196 197
}

198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
	while (fgets(buffer, BUF_SIZE, f)) {
		int value_list;
		char *s, *p;

		if (!prefixcmp(buffer, "URL:")) {
			value_list = 0;
			s = buffer + 4;
		} else if (!prefixcmp(buffer, "Push:")) {
			value_list = 1;
			s = buffer + 5;
214 215 216
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
217 218 219 220 221 222 223 224 225 226 227 228 229 230
		} else
			continue;

		while (isspace(*s))
			s++;
		if (!*s)
			continue;

		p = s + strlen(s);
		while (isspace(p[-1]))
			*--p = 0;

		switch (value_list) {
		case 0:
231
			add_url_alias(remote, xstrdup(s));
232 233 234 235
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
236 237 238
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
239 240 241 242 243 244 245 246
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
247
	char *frag;
248
	struct strbuf branch = STRBUF_INIT;
249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273
	int n = slash ? slash - remote->name : 1000;
	FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
	char *s, *p;
	int len;

	if (!f)
		return;
	s = fgets(buffer, BUF_SIZE, f);
	fclose(f);
	if (!s)
		return;
	while (isspace(*s))
		s++;
	if (!*s)
		return;
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	if (slash)
		len += strlen(slash);
	p = xmalloc(len + 1);
	strcpy(p, s);
	if (slash)
		strcat(p, slash);
274 275 276 277 278 279 280 281 282 283 284 285

	/*
	 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
	 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
	 * the partial URL obtained from the branches file plus
	 * "/netdev-2.6" and does not store it in any tracking ref.
	 * #branch specifier in the file is ignored.
	 *
	 * Otherwise, the branches file would have URL and optionally
	 * #branch specified.  The "master" (or specified) branch is
	 * fetched and stored in the local branch of the same name.
	 */
286 287 288
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
289 290 291 292 293
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
	if (!slash) {
		strbuf_addf(&branch, ":refs/heads/%s", remote->name);
294
	} else {
295 296
		strbuf_reset(&branch);
		strbuf_addstr(&branch, "HEAD:");
297
	}
298
	add_url_alias(remote, p);
299
	add_fetch_refspec(remote, strbuf_detach(&branch, 0));
300
	remote->fetch_tags = 1; /* always auto-follow */
301 302
}

303
static int handle_config(const char *key, const char *value, void *cb)
304 305 306 307
{
	const char *name;
	const char *subkey;
	struct remote *remote;
308 309 310 311 312 313
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
314
		branch = make_branch(name, subkey - name);
315
		if (!strcmp(subkey, ".remote")) {
316 317
			if (!value)
				return config_error_nonbool(key);
318 319 320
			branch->remote_name = xstrdup(value);
			if (branch == current_branch)
				default_remote_name = branch->remote_name;
321 322 323
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
324
			add_merge(branch, xstrdup(value));
325
		}
326
		return 0;
327
	}
328 329
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
330
		name = key + 4;
331 332 333 334 335 336 337 338 339 340
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		rewrite = make_rewrite(name, subkey - name);
		if (!strcmp(subkey, ".insteadof")) {
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
341 342 343
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
344 345 346 347 348
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
349 350 351 352
	subkey = strrchr(name, '.');
	if (!subkey)
		return error("Config with no key for remote %s", name);
	remote = make_remote(name, subkey - name);
353 354 355 356 357 358 359 360 361 362
	if (!strcmp(subkey, ".mirror"))
		remote->mirror = git_config_bool(key, value);
	else if (!strcmp(subkey, ".skipdefaultupdate"))
		remote->skip_default_update = git_config_bool(key, value);

	else if (!strcmp(subkey, ".url")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
363
	} else if (!strcmp(subkey, ".push")) {
364 365 366 367
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
368
	} else if (!strcmp(subkey, ".fetch")) {
369 370 371 372
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
373
	} else if (!strcmp(subkey, ".receivepack")) {
374 375 376
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
377
		if (!remote->receivepack)
378
			remote->receivepack = v;
379 380
		else
			error("more than one receivepack given, using the first");
381
	} else if (!strcmp(subkey, ".uploadpack")) {
382 383 384
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
385
		if (!remote->uploadpack)
386
			remote->uploadpack = v;
387 388
		else
			error("more than one uploadpack given, using the first");
389 390 391
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
S
Sam Vilain 已提交
392
	} else if (!strcmp(subkey, ".proxy")) {
393 394 395
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
	}
396 397 398
	return 0;
}

399 400 401 402 403 404 405 406 407 408 409 410
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
		if (!remotes[i])
			continue;
		for (j = 0; j < remotes[i]->url_nr; j++) {
			remotes[i]->url[j] = alias_url(remotes[i]->url[j]);
		}
	}
}

411 412 413 414 415 416 417 418 419 420 421 422
static void read_config(void)
{
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
	if (default_remote_name) // did this already
		return;
	default_remote_name = xstrdup("origin");
	current_branch = NULL;
	head_ref = resolve_ref("HEAD", sha1, 0, &flag);
	if (head_ref && (flag & REF_ISSYMREF) &&
	    !prefixcmp(head_ref, "refs/heads/")) {
423 424
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
425
	}
426
	git_config(handle_config, NULL);
427
	alias_all_urls();
428 429
}

430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451
/*
 * We need to make sure the tracking branches are well formed, but a
 * wildcard refspec in "struct refspec" must have a trailing slash. We
 * temporarily drop the trailing '/' while calling check_ref_format(),
 * and put it back.  The caller knows that a CHECK_REF_FORMAT_ONELEVEL
 * error return is Ok for a wildcard refspec.
 */
static int verify_refname(char *name, int is_glob)
{
	int result, len = -1;

	if (is_glob) {
		len = strlen(name);
		assert(name[len - 1] == '/');
		name[len - 1] = '\0';
	}
	result = check_ref_format(name);
	if (is_glob)
		name[len - 1] = '/';
	return result;
}

452 453 454 455 456 457
/*
 * This function frees a refspec array.
 * Warning: code paths should be checked to ensure that the src
 *          and dst pointers are always freeable pointers as well
 *          as the refspec pointer itself.
 */
458
static void free_refspecs(struct refspec *refspec, int nr_refspec)
459 460 461 462 463 464 465 466 467 468 469 470 471
{
	int i;

	if (!refspec)
		return;

	for (i = 0; i < nr_refspec; i++) {
		free(refspec[i].src);
		free(refspec[i].dst);
	}
	free(refspec);
}

472
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
473 474
{
	int i;
D
Daniel Barkalow 已提交
475
	int st;
476
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
477

478
	for (i = 0; i < nr_refspec; i++) {
479
		size_t llen;
480 481 482
		int is_glob;
		const char *lhs, *rhs;

483
		llen = is_glob = 0;
484 485 486

		lhs = refspec[i];
		if (*lhs == '+') {
487
			rs[i].force = 1;
488
			lhs++;
489
		}
490 491

		rhs = strrchr(lhs, ':');
492 493 494 495 496 497 498 499 500 501

		/*
		 * Before going on, special case ":" (or "+:") as a refspec
		 * for matching refs.
		 */
		if (!fetch && rhs == lhs && rhs[1] == '\0') {
			rs[i].matching = 1;
			continue;
		}

502
		if (rhs) {
503
			size_t rlen = strlen(++rhs);
504
			is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));
505
			rs[i].dst = xstrndup(rhs, rlen - is_glob);
506
		}
D
Daniel Barkalow 已提交
507

508
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
509 510 511 512
		if (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)) {
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
513
			llen--;
514 515
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
516
		}
517

518 519 520 521 522 523 524 525 526 527 528 529
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);

		if (fetch) {
			/*
			 * LHS
			 * - empty is allowed; it means HEAD.
			 * - otherwise it must be a valid looking ref.
			 */
			if (!*rs[i].src)
				; /* empty is ok */
			else {
530
				st = verify_refname(rs[i].src, is_glob);
531 532 533 534 535
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
			/*
			 * RHS
536
			 * - missing is ok, and is same as empty.
537 538 539 540 541 542 543 544
			 * - empty is ok; it means not to store.
			 * - otherwise it must be a valid looking ref.
			 */
			if (!rs[i].dst) {
				; /* ok */
			} else if (!*rs[i].dst) {
				; /* ok */
			} else {
545
				st = verify_refname(rs[i].dst, is_glob);
546 547 548 549 550 551 552 553 554 555 556 557 558 559
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
		} else {
			/*
			 * LHS
			 * - empty is allowed; it means delete.
			 * - when wildcarded, it must be a valid looking ref.
			 * - otherwise, it must be an extended SHA-1, but
			 *   there is no existing way to validate this.
			 */
			if (!*rs[i].src)
				; /* empty is ok */
			else if (is_glob) {
560
				st = verify_refname(rs[i].src, is_glob);
561 562 563 564 565 566 567 568 569 570 571 572 573
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
			else
				; /* anything goes, for now */
			/*
			 * RHS
			 * - missing is allowed, but LHS then must be a
			 *   valid looking ref.
			 * - empty is not allowed.
			 * - otherwise it must be a valid looking ref.
			 */
			if (!rs[i].dst) {
574
				st = verify_refname(rs[i].src, is_glob);
575 576 577 578 579
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
580
				st = verify_refname(rs[i].dst, is_glob);
581 582 583
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
D
Daniel Barkalow 已提交
584
		}
585 586
	}
	return rs;
587 588

 invalid:
589
	if (verify) {
590 591 592 593 594 595
		/*
		 * nr_refspec must be greater than zero and i must be valid
		 * since it is only possible to reach this point from within
		 * the for loop above.
		 */
		free_refspecs(rs, i+1);
596 597
		return NULL;
	}
598 599 600
	die("Invalid refspec '%s'", refspec[i]);
}

601 602 603 604 605 606
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	const char *fetch_refspec[] = { fetch_refspec_str };
	struct refspec *refspec;

	refspec = parse_refspec_internal(1, fetch_refspec, 1, 1);
607
	free_refspecs(refspec, 1);
608 609 610
	return !!refspec;
}

611 612
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
613
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
614 615
}

616
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
617
{
618
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
619 620
}

621 622 623 624 625 626 627 628 629 630
static int valid_remote_nick(const char *name)
{
	if (!name[0] || /* not empty */
	    (name[0] == '.' && /* not "." */
	     (!name[1] || /* not ".." */
	      (name[1] == '.' && !name[2]))))
		return 0;
	return !strchr(name, '/'); /* no slash */
}

631 632 633 634 635 636 637 638
struct remote *remote_get(const char *name)
{
	struct remote *ret;

	read_config();
	if (!name)
		name = default_remote_name;
	ret = make_remote(name, 0);
639
	if (valid_remote_nick(name)) {
640
		if (!ret->url)
641
			read_remotes_file(ret);
642
		if (!ret->url)
643 644
			read_branches_file(ret);
	}
645
	if (!ret->url)
646
		add_url_alias(ret, name);
647
	if (!ret->url)
648
		return NULL;
649 650
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
651 652
	return ret;
}
653

654 655 656 657
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
658
	for (i = 0; i < remotes_nr && !result; i++) {
659 660 661 662
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
663 664
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
665
		if (!r->push)
666 667
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
668 669 670 671 672
		result = fn(r, priv);
	}
	return result;
}

673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699
void ref_remove_duplicates(struct ref *ref_map)
{
	struct ref **posn;
	struct ref *next;
	for (; ref_map; ref_map = ref_map->next) {
		if (!ref_map->peer_ref)
			continue;
		posn = &ref_map->next;
		while (*posn) {
			if ((*posn)->peer_ref &&
			    !strcmp((*posn)->peer_ref->name,
				    ref_map->peer_ref->name)) {
				if (strcmp((*posn)->name, ref_map->name))
					die("%s tracks both %s and %s",
					    ref_map->peer_ref->name,
					    (*posn)->name, ref_map->name);
				next = (*posn)->next;
				free((*posn)->peer_ref);
				free(*posn);
				*posn = next;
			} else {
				posn = &(*posn)->next;
			}
		}
	}
}

700
int remote_has_url(struct remote *remote, const char *url)
701 702
{
	int i;
703 704
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
705 706 707 708 709 710 711
			return 1;
	}
	return 0;
}

int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
712 713
	int find_src = refspec->src == NULL;
	char *needle, **result;
714
	int i;
715 716

	if (find_src) {
717
		if (!refspec->dst)
718 719 720 721 722 723 724 725
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

726 727
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
728 729
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
730 731 732
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
733
			if (!prefixcmp(needle, key)) {
734 735 736 737 738 739
				*result = xmalloc(strlen(value) +
						  strlen(needle) -
						  strlen(key) + 1);
				strcpy(*result, value);
				strcpy(*result + strlen(value),
				       needle + strlen(key));
740 741 742
				refspec->force = fetch->force;
				return 0;
			}
743 744 745 746
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
747 748 749 750 751
		}
	}
	return -1;
}

752 753
struct ref *alloc_ref(unsigned namelen)
{
754
	struct ref *ret = xcalloc(1, sizeof(struct ref) + namelen);
755 756 757
	return ret;
}

758 759 760 761 762 763 764
struct ref *alloc_ref_from_str(const char* str)
{
	struct ref *ret = alloc_ref(strlen(str) + 1);
	strcpy(ret->name, str);
	return ret;
}

765
static struct ref *copy_ref(const struct ref *ref)
766 767 768 769 770 771 772
{
	struct ref *ret = xmalloc(sizeof(struct ref) + strlen(ref->name) + 1);
	memcpy(ret, ref, sizeof(struct ref) + strlen(ref->name) + 1);
	ret->next = NULL;
	return ret;
}

773 774 775 776 777 778 779 780 781 782 783 784
struct ref *copy_ref_list(const struct ref *ref)
{
	struct ref *ret = NULL;
	struct ref **tail = &ret;
	while (ref) {
		*tail = copy_ref(ref);
		ref = ref->next;
		tail = &((*tail)->next);
	}
	return ret;
}

785
static void free_ref(struct ref *ref)
786 787 788 789 790 791 792 793
{
	if (!ref)
		return;
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

794 795 796 797 798
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
799
		free(ref->peer_ref);
800
		free_ref(ref);
801 802 803 804
		ref = next;
	}
}

805 806 807 808 809 810 811 812 813 814 815 816 817 818
static int count_refspec_match(const char *pattern,
			       struct ref *refs,
			       struct ref **matched_ref)
{
	int patlen = strlen(pattern);
	struct ref *matched_weak = NULL;
	struct ref *matched = NULL;
	int weak_match = 0;
	int match = 0;

	for (weak_match = match = 0; refs; refs = refs->next) {
		char *name = refs->name;
		int namelen = strlen(name);

819
		if (!refname_match(pattern, name, ref_rev_parse_rules))
820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858
			continue;

		/* A match is "weak" if it is with refs outside
		 * heads or tags, and did not specify the pattern
		 * in full (e.g. "refs/remotes/origin/master") or at
		 * least from the toplevel (e.g. "remotes/origin/master");
		 * otherwise "git push $URL master" would result in
		 * ambiguity between remotes/origin/master and heads/master
		 * at the remote site.
		 */
		if (namelen != patlen &&
		    patlen != namelen - 5 &&
		    prefixcmp(name, "refs/heads/") &&
		    prefixcmp(name, "refs/tags/")) {
			/* We want to catch the case where only weak
			 * matches are found and there are multiple
			 * matches, and where more than one strong
			 * matches are found, as ambiguous.  One
			 * strong match with zero or more weak matches
			 * are acceptable as a unique match.
			 */
			matched_weak = refs;
			weak_match++;
		}
		else {
			matched = refs;
			match++;
		}
	}
	if (!matched) {
		*matched_ref = matched_weak;
		return weak_match;
	}
	else {
		*matched_ref = matched;
		return match;
	}
}

859
static void tail_link_ref(struct ref *ref, struct ref ***tail)
860 861
{
	**tail = ref;
862 863
	while (ref->next)
		ref = ref->next;
864 865 866 867 868 869 870 871 872
	*tail = &ref->next;
}

static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

	if (!*name) {
873
		ref = alloc_ref(20);
874 875 876 877 878 879
		strcpy(ref->name, "(delete)");
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
880
	ref = alloc_ref_from_str(name);
881 882 883 884
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

885
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
886
{
887
	struct ref *ret = alloc_ref_from_str(name);
888 889
	tail_link_ref(ret, tail);
	return ret;
890
}
891

892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

	const char *r = resolve_ref(peer->name, sha1, 1, NULL);
	if (!r)
		return NULL;

	if (!prefixcmp(r, "refs/heads/"))
		strbuf_addstr(&buf, "refs/heads/");
	else if (!prefixcmp(r, "refs/tags/"))
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

	strbuf_addstr(&buf, name);
	return strbuf_detach(&buf, NULL);
}

912 913
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
914
			  struct refspec *rs)
915
{
916
	struct ref *matched_src, *matched_dst;
917

918
	const char *dst_value = rs->dst;
919
	char *dst_guess;
920

921
	if (rs->pattern || rs->matching)
922
		return 0;
923

924 925 926 927 928 929 930 931 932 933
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
		break;
	case 0:
		/* The source could be in the get_sha1() format
		 * not a reference name.  :refs/other is a
		 * way to delete 'other' ref at the remote end.
		 */
		matched_src = try_explicit_object_name(rs->src);
934
		if (!matched_src)
935
			return error("src refspec %s does not match any.", rs->src);
936 937
		break;
	default:
938
		return error("src refspec %s matches more than one.", rs->src);
939
	}
940

941
	if (!dst_value) {
942 943 944 945 946 947 948 949 950
		unsigned char sha1[20];
		int flag;

		dst_value = resolve_ref(matched_src->name, sha1, 1, &flag);
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
		     prefixcmp(dst_value, "refs/heads/")))
			die("%s cannot be resolved to branch.",
			    matched_src->name);
951
	}
952

953 954 955 956
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
957
		if (!memcmp(dst_value, "refs/", 5))
958
			matched_dst = make_linked_ref(dst_value, dst_tail);
959 960
		else if((dst_guess = guess_ref(dst_value, matched_src)))
			matched_dst = make_linked_ref(dst_guess, dst_tail);
961
		else
962 963 964 965 966 967
			error("unable to push to unqualified destination: %s\n"
			      "The destination refspec neither matches an "
			      "existing ref on the remote nor\n"
			      "begins with refs/, and we are unable to "
			      "guess a prefix based on the source ref.",
			      dst_value);
968 969
		break;
	default:
970
		matched_dst = NULL;
971 972 973 974
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
975 976 977 978
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
979 980 981 982
		      matched_dst->name);
	else {
		matched_dst->peer_ref = matched_src;
		matched_dst->force = rs->force;
983
	}
984
	return 0;
985 986 987 988 989 990 991 992
}

static int match_explicit_refs(struct ref *src, struct ref *dst,
			       struct ref ***dst_tail, struct refspec *rs,
			       int rs_nr)
{
	int i, errs;
	for (i = errs = 0; i < rs_nr; i++)
993 994
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
995 996
}

997 998 999
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1000 1001
{
	int i;
1002
	int matching_refs = -1;
1003
	for (i = 0; i < rs_nr; i++) {
1004 1005 1006 1007 1008 1009
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1010
		if (rs[i].pattern && !prefixcmp(src->name, rs[i].src))
1011
			return rs + i;
1012
	}
1013 1014 1015 1016
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1017 1018
}

1019 1020 1021 1022 1023
/*
 * Note. This is used only by "push"; refspec matching rules for
 * push and fetch are subtly different, so do not try to reuse it
 * without thinking.
 */
1024
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
A
Andy Whitcroft 已提交
1025
	       int nr_refspec, const char **refspec, int flags)
1026
{
1027
	struct refspec *rs;
A
Andy Whitcroft 已提交
1028 1029
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1030
	static const char *default_refspec[] = { ":", 0 };
1031

1032 1033 1034 1035 1036
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1037 1038
	if (match_explicit_refs(src, dst, dst_tail, rs, nr_refspec))
		return -1;
1039 1040 1041 1042

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1043 1044
		const struct refspec *pat = NULL;
		char *dst_name;
1045 1046
		if (src->peer_ref)
			continue;
1047 1048 1049 1050 1051 1052

		pat = check_pattern_match(rs, nr_refspec, src);
		if (!pat)
			continue;

		if (pat->matching) {
1053 1054 1055 1056 1057
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1058 1059 1060
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1061

1062
		} else {
1063 1064
			const char *dst_side = pat->dst ? pat->dst : pat->src;
			dst_name = xmalloc(strlen(dst_side) +
1065 1066
					   strlen(src->name) -
					   strlen(pat->src) + 2);
1067
			strcpy(dst_name, dst_side);
1068
			strcat(dst_name, src->name + strlen(pat->src));
1069
		}
1070
		dst_peer = find_ref_by_name(dst, dst_name);
1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083
		if (dst_peer) {
			if (dst_peer->peer_ref)
				/* We're already sending something to this ref. */
				goto free_name;

		} else {
			if (pat->matching && !(send_all || send_mirror))
				/*
				 * Remote doesn't have it, and we have no
				 * explicit pattern, and we don't have
				 * --all nor --mirror.
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1084

1085
			/* Create a new one and link it */
1086
			dst_peer = make_linked_ref(dst_name, dst_tail);
1087 1088 1089
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
		dst_peer->peer_ref = src;
1090
		dst_peer->force = pat->force;
1091 1092
	free_name:
		free(dst_name);
1093 1094 1095
	}
	return 0;
}
1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127

struct branch *branch_get(const char *name)
{
	struct branch *ret;

	read_config();
	if (!name || !*name || !strcmp(name, "HEAD"))
		ret = current_branch;
	else
		ret = make_branch(name, 0);
	if (ret && ret->remote_name) {
		ret->remote = remote_get(ret->remote_name);
		if (ret->merge_nr) {
			int i;
			ret->merge = xcalloc(sizeof(*ret->merge),
					     ret->merge_nr);
			for (i = 0; i < ret->merge_nr; i++) {
				ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
				ret->merge[i]->src = xstrdup(ret->merge_name[i]);
				remote_find_tracking(ret->remote,
						     ret->merge[i]);
			}
		}
	}
	return ret;
}

int branch_has_merge_config(struct branch *branch)
{
	return branch && !!branch->merge;
}

1128 1129 1130
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1131
{
1132
	if (!branch || i < 0 || i >= branch->merge_nr)
1133
		return 0;
1134
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1135
}
1136

1137
static struct ref *get_expanded_map(const struct ref *remote_refs,
1138 1139
				    const struct refspec *refspec)
{
1140
	const struct ref *ref;
1141 1142 1143 1144 1145 1146 1147 1148 1149 1150
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	int remote_prefix_len = strlen(refspec->src);
	int local_prefix_len = strlen(refspec->dst);

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
		if (!prefixcmp(ref->name, refspec->src)) {
1151
			const char *match;
1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
			struct ref *cpy = copy_ref(ref);
			match = ref->name + remote_prefix_len;

			cpy->peer_ref = alloc_ref(local_prefix_len +
						  strlen(match) + 1);
			sprintf(cpy->peer_ref->name, "%s%s",
				refspec->dst, match);
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1169
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1170
{
1171
	const struct ref *ref;
1172
	for (ref = refs; ref; ref = ref->next) {
1173
		if (refname_match(name, ref->name, ref_fetch_rules))
1174 1175 1176 1177 1178
			return ref;
	}
	return NULL;
}

1179
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1180
{
1181
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1182 1183

	if (!ref)
1184
		return NULL;
1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
	struct ref *ret;
	if (!name)
		return NULL;

	if (!prefixcmp(name, "refs/")) {
1196
		return alloc_ref_from_str(name);
1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211
	}

	if (!prefixcmp(name, "heads/") ||
	    !prefixcmp(name, "tags/") ||
	    !prefixcmp(name, "remotes/")) {
		ret = alloc_ref(strlen(name) + 6);
		sprintf(ret->name, "refs/%s", name);
		return ret;
	}

	ret = alloc_ref(strlen(name) + 12);
	sprintf(ret->name, "refs/heads/%s", name);
	return ret;
}

1212
int get_fetch_map(const struct ref *remote_refs,
1213
		  const struct refspec *refspec,
1214 1215
		  struct ref ***tail,
		  int missing_ok)
1216
{
D
Daniel Barkalow 已提交
1217
	struct ref *ref_map, **rmp;
1218 1219 1220 1221

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1222 1223 1224 1225 1226 1227 1228 1229 1230 1231
		const char *name = refspec->src[0] ? refspec->src : "HEAD";

		ref_map = get_remote_ref(remote_refs, name);
		if (!missing_ok && !ref_map)
			die("Couldn't find remote ref %s", name);
		if (ref_map) {
			ref_map->peer_ref = get_local_ref(refspec->dst);
			if (ref_map->peer_ref && refspec->force)
				ref_map->peer_ref->force = 1;
		}
1232 1233
	}

D
Daniel Barkalow 已提交
1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
			int st = check_ref_format((*rmp)->peer_ref->name + 5);
			if (st && st != CHECK_REF_FORMAT_ONELEVEL) {
				struct ref *ignore = *rmp;
				error("* Ignoring funny ref '%s' locally",
				      (*rmp)->peer_ref->name);
				*rmp = (*rmp)->next;
				free(ignore->peer_ref);
				free(ignore);
				continue;
			}
		}
		rmp = &((*rmp)->next);
1248 1249
	}

1250 1251
	if (ref_map)
		tail_link_ref(ref_map, tail);
1252 1253 1254

	return 0;
}
1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266

int resolve_remote_symref(struct ref *ref, struct ref *list)
{
	if (!ref->symref)
		return 0;
	for (; list; list = list->next)
		if (!strcmp(ref->symref, list->name)) {
			hashcpy(ref->old_sha1, list->old_sha1);
			return 0;
		}
	return 1;
}
1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336

/*
 * Return true if there is anything to report, otherwise false.
 */
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
{
	unsigned char sha1[20];
	struct commit *ours, *theirs;
	char symmetric[84];
	struct rev_info revs;
	const char *rev_argv[10], *base;
	int rev_argc;

	/*
	 * Nothing to report unless we are marked to build on top of
	 * somebody else.
	 */
	if (!branch ||
	    !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
		return 0;

	/*
	 * If what we used to build on no longer exists, there is
	 * nothing to report.
	 */
	base = branch->merge[0]->dst;
	if (!resolve_ref(base, sha1, 1, NULL))
		return 0;
	theirs = lookup_commit(sha1);
	if (!theirs)
		return 0;

	if (!resolve_ref(branch->refname, sha1, 1, NULL))
		return 0;
	ours = lookup_commit(sha1);
	if (!ours)
		return 0;

	/* are we the same? */
	if (theirs == ours)
		return 0;

	/* Run "rev-list --left-right ours...theirs" internally... */
	rev_argc = 0;
	rev_argv[rev_argc++] = NULL;
	rev_argv[rev_argc++] = "--left-right";
	rev_argv[rev_argc++] = symmetric;
	rev_argv[rev_argc++] = "--";
	rev_argv[rev_argc] = NULL;

	strcpy(symmetric, sha1_to_hex(ours->object.sha1));
	strcpy(symmetric + 40, "...");
	strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));

	init_revisions(&revs, NULL);
	setup_revisions(rev_argc, rev_argv, &revs, NULL);
	prepare_revision_walk(&revs);

	/* ... and count the commits on each side. */
	*num_ours = 0;
	*num_theirs = 0;
	while (1) {
		struct commit *c = get_revision(&revs);
		if (!c)
			break;
		if (c->object.flags & SYMMETRIC_LEFT)
			(*num_ours)++;
		else
			(*num_theirs)++;
	}
1337 1338 1339 1340

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1341 1342 1343 1344 1345 1346 1347 1348 1349
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
	int num_ours, num_theirs;
1350
	const char *base;
1351 1352 1353 1354 1355 1356 1357 1358 1359

	if (!stat_tracking_info(branch, &num_ours, &num_theirs))
		return 0;

	base = branch->merge[0]->dst;
	if (!prefixcmp(base, "refs/remotes/")) {
		base += strlen("refs/remotes/");
	}
	if (!num_theirs)
1360
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1361
			    "by %d commit%s.\n",
1362
			    base, num_ours, (num_ours == 1) ? "" : "s");
1363
	else if (!num_ours)
1364 1365
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1366
			    "and can be fast-forwarded.\n",
1367
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1368
	else
1369 1370 1371 1372
		strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
			    "and have %d and %d different commit(s) each, "
			    "respectively.\n",
			    base, num_ours, num_theirs);
1373 1374
	return 1;
}