remote.c 32.4 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
#include "dir.h"
8

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

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

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

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

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

	longest = NULL;
	longest_i = -1;
58 59 60 61
	for (i = 0; i < rewrite_nr; i++) {
		if (!rewrite[i])
			continue;
		for (j = 0; j < rewrite[i]->instead_of_nr; j++) {
62 63 64 65 66
			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;
67 68 69
			}
		}
	}
70 71 72
	if (!longest)
		return url;

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

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

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

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

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

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

D
Daniel Barkalow 已提交
112 113 114 115 116
	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];
117 118
	}

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

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

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

D
Daniel Barkalow 已提交
142 143 144 145 146
	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];
147 148
	}

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

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

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

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

	ALLOC_GROW(rewrite, rewrite_nr + 1, rewrite_alloc);
	ret = xcalloc(1, sizeof(struct rewrite));
	rewrite[rewrite_nr++] = ret;
180
	if (len) {
181
		ret->base = xstrndup(base, len);
182 183 184
		ret->baselen = len;
	}
	else {
185
		ret->base = xstrdup(base);
186 187
		ret->baselen = strlen(base);
	}
188 189 190 191 192 193
	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);
194 195 196
	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++;
197 198
}

199 200 201 202 203 204
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
205
	remote->origin = REMOTE_REMOTES;
206 207 208 209 210 211 212 213 214 215
	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;
216 217 218
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
219 220 221 222 223 224 225 226 227 228 229 230 231 232
		} else
			continue;

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

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

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

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
249
	char *frag;
250
	struct strbuf branch = STRBUF_INIT;
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265
	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;
266
	remote->origin = REMOTE_BRANCHES;
267 268 269 270 271 272 273 274 275 276
	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);
277 278 279 280 281 282 283 284 285 286 287 288

	/*
	 * 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.
	 */
289 290 291
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
292 293 294 295 296
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
	if (!slash) {
		strbuf_addf(&branch, ":refs/heads/%s", remote->name);
297
	} else {
298 299
		strbuf_reset(&branch);
		strbuf_addstr(&branch, "HEAD:");
300
	}
301
	add_url_alias(remote, p);
302
	add_fetch_refspec(remote, strbuf_detach(&branch, 0));
303 304 305 306 307 308 309 310 311 312 313
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
	strbuf_init(&branch, 0);
	strbuf_addstr(&branch, "HEAD");
	if (frag)
		strbuf_addf(&branch, ":refs/heads/%s", frag);
	else
		strbuf_addstr(&branch, ":refs/heads/master");
	add_push_refspec(remote, strbuf_detach(&branch, 0));
314
	remote->fetch_tags = 1; /* always auto-follow */
315 316
}

317
static int handle_config(const char *key, const char *value, void *cb)
318 319 320 321
{
	const char *name;
	const char *subkey;
	struct remote *remote;
322 323 324 325 326 327
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
328
		branch = make_branch(name, subkey - name);
329
		if (!strcmp(subkey, ".remote")) {
330 331
			if (!value)
				return config_error_nonbool(key);
332 333 334
			branch->remote_name = xstrdup(value);
			if (branch == current_branch)
				default_remote_name = branch->remote_name;
335 336 337
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
338
			add_merge(branch, xstrdup(value));
339
		}
340
		return 0;
341
	}
342 343
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
344
		name = key + 4;
345 346 347 348 349 350 351 352 353 354
		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));
		}
	}
355 356 357
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
358 359 360 361 362
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
363 364 365 366
	subkey = strrchr(name, '.');
	if (!subkey)
		return error("Config with no key for remote %s", name);
	remote = make_remote(name, subkey - name);
367
	remote->origin = REMOTE_CONFIG;
368 369 370 371 372 373 374 375 376 377
	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);
378
	} else if (!strcmp(subkey, ".push")) {
379 380 381 382
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
383
	} else if (!strcmp(subkey, ".fetch")) {
384 385 386 387
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
388
	} else if (!strcmp(subkey, ".receivepack")) {
389 390 391
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
392
		if (!remote->receivepack)
393
			remote->receivepack = v;
394 395
		else
			error("more than one receivepack given, using the first");
396
	} else if (!strcmp(subkey, ".uploadpack")) {
397 398 399
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
400
		if (!remote->uploadpack)
401
			remote->uploadpack = v;
402 403
		else
			error("more than one uploadpack given, using the first");
404 405 406
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
S
Sam Vilain 已提交
407
	} else if (!strcmp(subkey, ".proxy")) {
408 409 410
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
	}
411 412 413
	return 0;
}

414 415 416 417 418 419 420 421 422 423 424 425
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]);
		}
	}
}

426 427 428 429 430 431 432 433 434 435 436 437
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/")) {
438 439
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
440
	}
441
	git_config(handle_config, NULL);
442
	alias_all_urls();
443 444
}

445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466
/*
 * 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;
}

467 468 469 470 471 472
/*
 * 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.
 */
473
static void free_refspecs(struct refspec *refspec, int nr_refspec)
474 475 476 477 478 479 480 481 482 483 484 485 486
{
	int i;

	if (!refspec)
		return;

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

487
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
488 489
{
	int i;
D
Daniel Barkalow 已提交
490
	int st;
491
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
492

493
	for (i = 0; i < nr_refspec; i++) {
494
		size_t llen;
495 496 497
		int is_glob;
		const char *lhs, *rhs;

498
		llen = is_glob = 0;
499 500 501

		lhs = refspec[i];
		if (*lhs == '+') {
502
			rs[i].force = 1;
503
			lhs++;
504
		}
505 506

		rhs = strrchr(lhs, ':');
507 508 509 510 511 512 513 514 515 516

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

517
		if (rhs) {
518
			size_t rlen = strlen(++rhs);
519
			is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));
520
			rs[i].dst = xstrndup(rhs, rlen - is_glob);
521
		}
D
Daniel Barkalow 已提交
522

523
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
524 525 526 527
		if (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)) {
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
528
			llen--;
529 530
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
531
		}
532

533 534 535 536 537 538 539 540 541 542 543 544
		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 {
545
				st = verify_refname(rs[i].src, is_glob);
546 547 548 549 550
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
			/*
			 * RHS
551
			 * - missing is ok, and is same as empty.
552 553 554 555 556 557 558 559
			 * - 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 {
560
				st = verify_refname(rs[i].dst, is_glob);
561 562 563 564 565 566 567 568 569 570 571 572 573 574
				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) {
575
				st = verify_refname(rs[i].src, is_glob);
576 577 578 579 580 581 582 583 584 585 586 587 588
				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) {
589
				st = verify_refname(rs[i].src, is_glob);
590 591 592 593 594
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
595
				st = verify_refname(rs[i].dst, is_glob);
596 597 598
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
D
Daniel Barkalow 已提交
599
		}
600 601
	}
	return rs;
602 603

 invalid:
604
	if (verify) {
605 606 607 608 609 610
		/*
		 * 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);
611 612
		return NULL;
	}
613 614 615
	die("Invalid refspec '%s'", refspec[i]);
}

616 617 618 619 620 621
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);
622
	free_refspecs(refspec, 1);
623 624 625
	return !!refspec;
}

626 627
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
628
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
629 630
}

631
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
632
{
633
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
634 635
}

636 637
static int valid_remote_nick(const char *name)
{
638
	if (!name[0] || is_dot_or_dotdot(name))
639 640 641 642
		return 0;
	return !strchr(name, '/'); /* no slash */
}

643 644 645 646 647 648 649 650
struct remote *remote_get(const char *name)
{
	struct remote *ret;

	read_config();
	if (!name)
		name = default_remote_name;
	ret = make_remote(name, 0);
651
	if (valid_remote_nick(name)) {
652
		if (!ret->url)
653
			read_remotes_file(ret);
654
		if (!ret->url)
655 656
			read_branches_file(ret);
	}
657
	if (!ret->url)
658
		add_url_alias(ret, name);
659
	if (!ret->url)
660
		return NULL;
661 662
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
663 664
	return ret;
}
665

666 667 668 669
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
670
	for (i = 0; i < remotes_nr && !result; i++) {
671 672 673 674
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
675 676
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
677
		if (!r->push)
678 679
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
680 681 682 683 684
		result = fn(r, priv);
	}
	return result;
}

685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711
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;
			}
		}
	}
}

712
int remote_has_url(struct remote *remote, const char *url)
713 714
{
	int i;
715 716
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
717 718 719 720 721
			return 1;
	}
	return 0;
}

722 723
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
724
{
725 726 727 728 729 730 731 732 733 734
	size_t klen = strlen(key);
	int ret = !strncmp(key, name, klen);
	if (ret && value) {
		size_t vlen = strlen(value);
		*result = xmalloc(vlen +
				  strlen(name) -
				  klen + 1);
		strcpy(*result, value);
		strcpy(*result + vlen, name + klen);
	}
735 736 737
	return ret;
}

738 739
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
740 741
	int find_src = refspec->src == NULL;
	char *needle, **result;
742
	int i;
743 744

	if (find_src) {
745
		if (!refspec->dst)
746 747 748 749 750 751 752 753
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

754 755
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
756 757
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
758 759 760
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
761
			if (match_name_with_pattern(key, needle, value, result)) {
762 763 764
				refspec->force = fetch->force;
				return 0;
			}
765 766 767 768
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
769 770 771 772 773
		}
	}
	return -1;
}

R
René Scharfe 已提交
774 775 776 777 778 779 780 781 782 783
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
	struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

784
struct ref *alloc_ref(const char *name)
785
{
786
	return alloc_ref_with_prefix("", 0, name);
787 788
}

789
static struct ref *copy_ref(const struct ref *ref)
790 791 792 793 794 795 796
{
	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;
}

797 798 799 800 801 802 803 804 805 806 807 808
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;
}

809
static void free_ref(struct ref *ref)
810 811 812 813 814 815 816 817
{
	if (!ref)
		return;
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

818 819 820 821 822
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
823
		free(ref->peer_ref);
824
		free_ref(ref);
825 826 827 828
		ref = next;
	}
}

829 830 831 832 833 834 835 836 837 838 839 840 841 842
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);

843
		if (!refname_match(pattern, name, ref_rev_parse_rules))
844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882
			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;
	}
}

883
static void tail_link_ref(struct ref *ref, struct ref ***tail)
884 885
{
	**tail = ref;
886 887
	while (ref->next)
		ref = ref->next;
888 889 890 891 892 893 894 895 896
	*tail = &ref->next;
}

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

	if (!*name) {
897
		ref = alloc_ref("(delete)");
898 899 900 901 902
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
903
	ref = alloc_ref(name);
904 905 906 907
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

908
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
909
{
910
	struct ref *ret = alloc_ref(name);
911 912
	tail_link_ref(ret, tail);
	return ret;
913
}
914

915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934
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);
}

935 936
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
937
			  struct refspec *rs)
938
{
939
	struct ref *matched_src, *matched_dst;
940

941
	const char *dst_value = rs->dst;
942
	char *dst_guess;
943

944
	if (rs->pattern || rs->matching)
945
		return 0;
946

947 948 949 950 951 952 953 954 955 956
	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);
957
		if (!matched_src)
958
			return error("src refspec %s does not match any.", rs->src);
959 960
		break;
	default:
961
		return error("src refspec %s matches more than one.", rs->src);
962
	}
963

964
	if (!dst_value) {
965 966 967 968 969 970 971 972 973
		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);
974
	}
975

976 977 978 979
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
980
		if (!memcmp(dst_value, "refs/", 5))
981
			matched_dst = make_linked_ref(dst_value, dst_tail);
982 983
		else if((dst_guess = guess_ref(dst_value, matched_src)))
			matched_dst = make_linked_ref(dst_guess, dst_tail);
984
		else
985 986 987 988 989 990
			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);
991 992
		break;
	default:
993
		matched_dst = NULL;
994 995 996 997
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
998 999 1000 1001
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1002 1003 1004 1005
		      matched_dst->name);
	else {
		matched_dst->peer_ref = matched_src;
		matched_dst->force = rs->force;
1006
	}
1007
	return 0;
1008 1009 1010 1011 1012 1013 1014 1015
}

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++)
1016 1017
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1018 1019
}

1020 1021 1022
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1023 1024
{
	int i;
1025
	int matching_refs = -1;
1026
	for (i = 0; i < rs_nr; i++) {
1027 1028 1029 1030 1031 1032
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1033 1034
		if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
							     NULL, NULL))
1035
			return rs + i;
1036
	}
1037 1038 1039 1040
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1041 1042
}

1043 1044 1045 1046 1047
/*
 * 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.
 */
1048
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
A
Andy Whitcroft 已提交
1049
	       int nr_refspec, const char **refspec, int flags)
1050
{
1051
	struct refspec *rs;
A
Andy Whitcroft 已提交
1052 1053
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1054
	static const char *default_refspec[] = { ":", 0 };
1055

1056 1057 1058 1059 1060
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1061 1062
	if (match_explicit_refs(src, dst, dst_tail, rs, nr_refspec))
		return -1;
1063 1064 1065 1066

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1067 1068
		const struct refspec *pat = NULL;
		char *dst_name;
1069 1070
		if (src->peer_ref)
			continue;
1071 1072 1073 1074 1075 1076

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

		if (pat->matching) {
1077 1078 1079 1080 1081
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1082 1083 1084
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1085

1086
		} else {
1087
			const char *dst_side = pat->dst ? pat->dst : pat->src;
1088 1089 1090
			if (!match_name_with_pattern(pat->src, src->name,
						     dst_side, &dst_name))
				die("Didn't think it matches any more");
1091
		}
1092
		dst_peer = find_ref_by_name(dst, dst_name);
1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105
		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 已提交
1106

1107
			/* Create a new one and link it */
1108
			dst_peer = make_linked_ref(dst_name, dst_tail);
1109 1110 1111
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
		dst_peer->peer_ref = src;
1112
		dst_peer->force = pat->force;
1113 1114
	free_name:
		free(dst_name);
1115 1116 1117
	}
	return 0;
}
1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149

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;
}

1150 1151 1152
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1153
{
1154
	if (!branch || i < 0 || i >= branch->merge_nr)
1155
		return 0;
1156
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1157
}
1158

1159
static struct ref *get_expanded_map(const struct ref *remote_refs,
1160 1161
				    const struct refspec *refspec)
{
1162
	const struct ref *ref;
1163 1164 1165
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1166
	char *expn_name;
1167 1168 1169 1170

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1171 1172
		if (match_name_with_pattern(refspec->src, ref->name,
					    refspec->dst, &expn_name)) {
1173 1174
			struct ref *cpy = copy_ref(ref);

1175 1176
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1177 1178 1179 1180 1181 1182 1183 1184 1185 1186
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1187
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1188
{
1189
	const struct ref *ref;
1190
	for (ref = refs; ref; ref = ref->next) {
1191
		if (refname_match(name, ref->name, ref_fetch_rules))
1192 1193 1194 1195 1196
			return ref;
	}
	return NULL;
}

1197
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1198
{
1199
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1200 1201

	if (!ref)
1202
		return NULL;
1203 1204 1205 1206 1207 1208 1209 1210 1211

	return copy_ref(ref);
}

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

1212 1213
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1214 1215 1216

	if (!prefixcmp(name, "heads/") ||
	    !prefixcmp(name, "tags/") ||
R
René Scharfe 已提交
1217 1218
	    !prefixcmp(name, "remotes/"))
		return alloc_ref_with_prefix("refs/", 5, name);
1219

R
René Scharfe 已提交
1220
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1221 1222
}

1223
int get_fetch_map(const struct ref *remote_refs,
1224
		  const struct refspec *refspec,
1225 1226
		  struct ref ***tail,
		  int missing_ok)
1227
{
D
Daniel Barkalow 已提交
1228
	struct ref *ref_map, **rmp;
1229 1230 1231 1232

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1233 1234 1235 1236 1237 1238 1239 1240 1241 1242
		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;
		}
1243 1244
	}

D
Daniel Barkalow 已提交
1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258
	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);
1259 1260
	}

1261 1262
	if (ref_map)
		tail_link_ref(ref_map, tail);
1263 1264 1265

	return 0;
}
1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277

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;
}
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 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347

/*
 * 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)++;
	}
1348 1349 1350 1351

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1352 1353 1354 1355 1356 1357 1358 1359 1360
	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;
1361
	const char *base;
1362 1363 1364 1365 1366 1367 1368 1369 1370

	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)
1371
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1372
			    "by %d commit%s.\n",
1373
			    base, num_ours, (num_ours == 1) ? "" : "s");
1374
	else if (!num_ours)
1375 1376
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1377
			    "and can be fast-forwarded.\n",
1378
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1379
	else
1380 1381 1382 1383
		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);
1384 1385
	return 1;
}