remote.c 36.9 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
#include "tag.h"
9

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

const struct refspec *tag_refspec = &s_tag_refspec;

20 21 22 23
struct counted_string {
	size_t len;
	const char *s;
};
24 25
struct rewrite {
	const char *base;
26 27
	size_t baselen;
	struct counted_string *instead_of;
28 29 30
	int instead_of_nr;
	int instead_of_alloc;
};
31 32 33 34 35
struct rewrites {
	struct rewrite **rewrite;
	int rewrite_alloc;
	int rewrite_nr;
};
36

37
static struct remote **remotes;
D
Daniel Barkalow 已提交
38 39
static int remotes_alloc;
static int remotes_nr;
40

41
static struct branch **branches;
D
Daniel Barkalow 已提交
42 43
static int branches_alloc;
static int branches_nr;
44 45 46

static struct branch *current_branch;
static const char *default_remote_name;
47
static int explicit_default_remote_name;
48

49
static struct rewrites rewrites;
50

51 52 53
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

54
static const char *alias_url(const char *url, struct rewrites *r)
55 56
{
	int i, j;
57 58 59 60 61 62
	char *ret;
	struct counted_string *longest;
	int longest_i;

	longest = NULL;
	longest_i = -1;
63 64
	for (i = 0; i < r->rewrite_nr; i++) {
		if (!r->rewrite[i])
65
			continue;
66 67
		for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
			if (!prefixcmp(url, r->rewrite[i]->instead_of[j].s) &&
68
			    (!longest ||
69 70
			     longest->len < r->rewrite[i]->instead_of[j].len)) {
				longest = &(r->rewrite[i]->instead_of[j]);
71
				longest_i = i;
72 73 74
			}
		}
	}
75 76 77
	if (!longest)
		return url;

78
	ret = xmalloc(r->rewrite[longest_i]->baselen +
79
		     (strlen(url) - longest->len) + 1);
80 81
	strcpy(ret, r->rewrite[longest_i]->base);
	strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
82
	return ret;
83 84
}

85 86
static void add_push_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
87 88 89 90
	ALLOC_GROW(remote->push_refspec,
		   remote->push_refspec_nr + 1,
		   remote->push_refspec_alloc);
	remote->push_refspec[remote->push_refspec_nr++] = ref;
91 92
}

93 94
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
95 96 97 98
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
99 100
}

101
static void add_url(struct remote *remote, const char *url)
102
{
D
Daniel Barkalow 已提交
103 104
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
105 106
}

107 108
static void add_url_alias(struct remote *remote, const char *url)
{
109
	add_url(remote, alias_url(url, &rewrites));
110 111
}

112 113 114 115 116 117
static void add_pushurl(struct remote *remote, const char *pushurl)
{
	ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
	remote->pushurl[remote->pushurl_nr++] = pushurl;
}

118 119
static struct remote *make_remote(const char *name, int len)
{
D
Daniel Barkalow 已提交
120 121
	struct remote *ret;
	int i;
122

D
Daniel Barkalow 已提交
123 124 125 126 127
	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];
128 129
	}

D
Daniel Barkalow 已提交
130 131 132
	ret = xcalloc(1, sizeof(struct remote));
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
133
	if (len)
D
Daniel Barkalow 已提交
134
		ret->name = xstrndup(name, len);
135
	else
D
Daniel Barkalow 已提交
136 137
		ret->name = xstrdup(name);
	return ret;
138 139
}

140 141
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
142 143 144
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
145 146 147 148
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
149 150
	struct branch *ret;
	int i;
151 152
	char *refname;

D
Daniel Barkalow 已提交
153 154 155 156 157
	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];
158 159
	}

D
Daniel Barkalow 已提交
160 161 162
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
163
	if (len)
D
Daniel Barkalow 已提交
164
		ret->name = xstrndup(name, len);
165
	else
D
Daniel Barkalow 已提交
166
		ret->name = xstrdup(name);
167
	refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
168
	strcpy(refname, "refs/heads/");
D
Daniel Barkalow 已提交
169 170
	strcpy(refname + strlen("refs/heads/"), ret->name);
	ret->refname = refname;
171

D
Daniel Barkalow 已提交
172
	return ret;
173 174
}

175
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
176 177 178 179
{
	struct rewrite *ret;
	int i;

180
	for (i = 0; i < r->rewrite_nr; i++) {
181
		if (len
182 183 184 185
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
186 187
	}

188
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
189
	ret = xcalloc(1, sizeof(struct rewrite));
190
	r->rewrite[r->rewrite_nr++] = ret;
191
	if (len) {
192
		ret->base = xstrndup(base, len);
193 194 195
		ret->baselen = len;
	}
	else {
196
		ret->base = xstrdup(base);
197 198
		ret->baselen = strlen(base);
	}
199 200 201 202 203 204
	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);
205 206 207
	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++;
208 209
}

210 211 212 213 214 215
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
216
	remote->origin = REMOTE_REMOTES;
217 218 219 220 221 222 223 224 225 226
	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;
227 228 229
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
230 231 232 233 234 235 236 237 238 239 240 241 242 243
		} else
			continue;

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

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

		switch (value_list) {
		case 0:
244
			add_url_alias(remote, xstrdup(s));
245 246 247 248
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
249 250 251
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
252 253 254 255 256 257 258 259
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
260
	char *frag;
261
	struct strbuf branch = STRBUF_INIT;
262 263 264 265 266 267 268 269 270 271 272 273 274 275 276
	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;
277
	remote->origin = REMOTE_BRANCHES;
278 279 280 281 282 283 284 285 286 287
	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);
288 289 290 291 292 293 294 295 296 297 298 299

	/*
	 * 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.
	 */
300 301 302
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
303 304 305 306 307
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
	if (!slash) {
		strbuf_addf(&branch, ":refs/heads/%s", remote->name);
308
	} else {
309 310
		strbuf_reset(&branch);
		strbuf_addstr(&branch, "HEAD:");
311
	}
312
	add_url_alias(remote, p);
313
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
314 315 316 317 318 319 320 321 322 323
	/*
	 * 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");
324
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
325
	remote->fetch_tags = 1; /* always auto-follow */
326 327
}

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

432 433 434 435 436 437 438
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++) {
439
			remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
440
		}
441
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
442
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
443
		}
444 445 446
	}
}

447 448 449 450 451 452 453 454 455 456 457 458
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/")) {
459 460
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
461
	}
462
	git_config(handle_config, NULL);
463
	alias_all_urls();
464 465
}

466 467 468 469 470 471 472 473 474
/*
 * 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)
{
D
Daniel Barkalow 已提交
475
	int result;
476 477

	result = check_ref_format(name);
D
Daniel Barkalow 已提交
478 479
	if (is_glob && result == CHECK_REF_FORMAT_WILDCARD)
		result = CHECK_REF_FORMAT_OK;
480 481 482
	return result;
}

483 484 485 486 487 488
/*
 * 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.
 */
489
static void free_refspecs(struct refspec *refspec, int nr_refspec)
490 491 492 493 494 495 496 497 498 499 500 501 502
{
	int i;

	if (!refspec)
		return;

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

503
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
504 505
{
	int i;
D
Daniel Barkalow 已提交
506
	int st;
507
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
508

509
	for (i = 0; i < nr_refspec; i++) {
510
		size_t llen;
511 512 513
		int is_glob;
		const char *lhs, *rhs;

B
Benjamin Kramer 已提交
514
		is_glob = 0;
515 516 517

		lhs = refspec[i];
		if (*lhs == '+') {
518
			rs[i].force = 1;
519
			lhs++;
520
		}
521 522

		rhs = strrchr(lhs, ':');
523 524 525 526 527 528 529 530 531 532

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

533
		if (rhs) {
534
			size_t rlen = strlen(++rhs);
535
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
536
			rs[i].dst = xstrndup(rhs, rlen);
537
		}
D
Daniel Barkalow 已提交
538

539
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
540
		if (1 <= llen && memchr(lhs, '*', llen)) {
541 542 543 544 545
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
546
		}
547

548 549 550 551 552 553 554 555 556 557 558 559
		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 {
560
				st = verify_refname(rs[i].src, is_glob);
561 562 563 564 565
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
			/*
			 * RHS
566
			 * - missing is ok, and is same as empty.
567 568 569 570 571 572 573 574
			 * - 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 {
575
				st = verify_refname(rs[i].dst, is_glob);
576 577 578 579 580 581 582 583 584 585 586 587 588 589
				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) {
590
				st = verify_refname(rs[i].src, is_glob);
591 592 593 594 595 596 597 598 599 600 601 602 603
				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) {
604
				st = verify_refname(rs[i].src, is_glob);
605 606 607 608 609
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
610
				st = verify_refname(rs[i].dst, is_glob);
611 612 613
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
D
Daniel Barkalow 已提交
614
		}
615 616
	}
	return rs;
617 618

 invalid:
619
	if (verify) {
620 621 622 623 624 625
		/*
		 * 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);
626 627
		return NULL;
	}
628 629 630
	die("Invalid refspec '%s'", refspec[i]);
}

631 632 633 634 635 636
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);
637
	free_refspecs(refspec, 1);
638 639 640
	return !!refspec;
}

641 642
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
643
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
644 645
}

646
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
647
{
648
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
649 650
}

651 652
static int valid_remote_nick(const char *name)
{
653
	if (!name[0] || is_dot_or_dotdot(name))
654 655 656 657
		return 0;
	return !strchr(name, '/'); /* no slash */
}

658 659 660
struct remote *remote_get(const char *name)
{
	struct remote *ret;
661
	int name_given = 0;
662 663

	read_config();
664 665 666
	if (name)
		name_given = 1;
	else {
667
		name = default_remote_name;
668 669
		name_given = explicit_default_remote_name;
	}
670

671
	ret = make_remote(name, 0);
672
	if (valid_remote_nick(name)) {
673
		if (!ret->url)
674
			read_remotes_file(ret);
675
		if (!ret->url)
676 677
			read_branches_file(ret);
	}
678
	if (name_given && !ret->url)
679
		add_url_alias(ret, name);
680
	if (!ret->url)
681
		return NULL;
682 683
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
684 685
	return ret;
}
686

687 688 689 690 691 692 693 694 695 696 697
int remote_is_configured(const char *name)
{
	int i;
	read_config();

	for (i = 0; i < remotes_nr; i++)
		if (!strcmp(name, remotes[i]->name))
			return 1;
	return 0;
}

698 699 700 701
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
702
	for (i = 0; i < remotes_nr && !result; i++) {
703 704 705 706
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
707 708
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
709
		if (!r->push)
710 711
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
712 713 714 715 716
		result = fn(r, priv);
	}
	return result;
}

717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743
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;
			}
		}
	}
}

744
int remote_has_url(struct remote *remote, const char *url)
745 746
{
	int i;
747 748
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
749 750 751 752 753
			return 1;
	}
	return 0;
}

754 755
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
756
{
D
Daniel Barkalow 已提交
757 758
	const char *kstar = strchr(key, '*');
	size_t klen;
759 760
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
761 762 763 764
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
765 766 767 768
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
769
	if (ret && value) {
D
Daniel Barkalow 已提交
770 771
		const char *vstar = strchr(value, '*');
		size_t vlen;
772
		size_t vsuffixlen;
D
Daniel Barkalow 已提交
773 774 775
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
		vlen = vstar - value;
776 777
		vsuffixlen = strlen(vstar + 1);
		*result = xmalloc(vlen + vsuffixlen +
778
				  strlen(name) -
779 780 781 782 783 784
				  klen - ksuffixlen + 1);
		strncpy(*result, value, vlen);
		strncpy(*result + vlen,
			name + klen, namelen - klen - ksuffixlen);
		strcpy(*result + vlen + namelen - klen - ksuffixlen,
		       vstar + 1);
785
	}
786 787 788
	return ret;
}

789 790
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
791 792
	int find_src = refspec->src == NULL;
	char *needle, **result;
793
	int i;
794 795

	if (find_src) {
796
		if (!refspec->dst)
797 798 799 800 801 802 803 804
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

805 806
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
807 808
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
809 810 811
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
812
			if (match_name_with_pattern(key, needle, value, result)) {
813 814 815
				refspec->force = fetch->force;
				return 0;
			}
816 817 818 819
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
820 821 822 823 824
		}
	}
	return -1;
}

R
René Scharfe 已提交
825 826 827 828 829 830 831 832 833 834
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;
}

835
struct ref *alloc_ref(const char *name)
836
{
837
	return alloc_ref_with_prefix("", 0, name);
838 839
}

840
static struct ref *copy_ref(const struct ref *ref)
841
{
842 843 844 845 846 847 848 849 850 851 852 853
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
	len = strlen(ref->name);
	cpy = xmalloc(sizeof(struct ref) + len + 1);
	memcpy(cpy, ref, sizeof(struct ref) + len + 1);
	cpy->next = NULL;
	cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
	cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
854 855
}

856 857 858 859 860 861 862 863 864 865 866 867
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;
}

868
static void free_ref(struct ref *ref)
869 870 871
{
	if (!ref)
		return;
872
	free_ref(ref->peer_ref);
873 874 875 876 877
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

878 879 880 881 882
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
883
		free_ref(ref);
884 885 886 887
		ref = next;
	}
}

888 889 890 891 892 893 894 895 896 897 898 899 900 901
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);

902
		if (!refname_match(pattern, name, ref_rev_parse_rules))
903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941
			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;
	}
}

942
static void tail_link_ref(struct ref *ref, struct ref ***tail)
943 944
{
	**tail = ref;
945 946
	while (ref->next)
		ref = ref->next;
947 948 949 950 951 952 953 954 955
	*tail = &ref->next;
}

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

	if (!*name) {
956
		ref = alloc_ref("(delete)");
957 958 959 960 961
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
962
	ref = alloc_ref(name);
963 964 965 966
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

967
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
968
{
969
	struct ref *ret = alloc_ref(name);
970 971
	tail_link_ref(ret, tail);
	return ret;
972
}
973

974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993
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);
}

994 995
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
996
			  struct refspec *rs)
997
{
998
	struct ref *matched_src, *matched_dst;
999
	int copy_src;
1000

1001
	const char *dst_value = rs->dst;
1002
	char *dst_guess;
1003

1004
	if (rs->pattern || rs->matching)
1005
		return 0;
1006

1007 1008 1009
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
1010
		copy_src = 1;
1011 1012 1013 1014 1015 1016 1017
		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);
1018
		if (!matched_src)
1019
			return error("src refspec %s does not match any.", rs->src);
1020
		copy_src = 0;
1021 1022
		break;
	default:
1023
		return error("src refspec %s matches more than one.", rs->src);
1024
	}
1025

1026
	if (!dst_value) {
1027 1028 1029 1030 1031 1032 1033 1034 1035
		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);
1036
	}
1037

1038 1039 1040 1041
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1042
		if (!memcmp(dst_value, "refs/", 5))
1043
			matched_dst = make_linked_ref(dst_value, dst_tail);
1044
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1045
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1046
		else
1047 1048 1049 1050 1051 1052
			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);
1053 1054
		break;
	default:
1055
		matched_dst = NULL;
1056 1057 1058 1059
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1060 1061 1062 1063
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1064 1065
		      matched_dst->name);
	else {
1066
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1067
		matched_dst->force = rs->force;
1068
	}
1069
	return 0;
1070 1071 1072 1073 1074 1075 1076 1077
}

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++)
1078 1079
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1080 1081
}

1082 1083 1084
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1085 1086
{
	int i;
1087
	int matching_refs = -1;
1088
	for (i = 0; i < rs_nr; i++) {
1089 1090 1091 1092 1093 1094
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1095 1096
		if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
							     NULL, NULL))
1097
			return rs + i;
1098
	}
1099 1100 1101 1102
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1103 1104
}

1105 1106 1107 1108 1109 1110 1111 1112
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

1113 1114 1115 1116 1117
/*
 * 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.
 */
1118
int match_refs(struct ref *src, struct ref **dst,
A
Andy Whitcroft 已提交
1119
	       int nr_refspec, const char **refspec, int flags)
1120
{
1121
	struct refspec *rs;
A
Andy Whitcroft 已提交
1122 1123
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1124
	int errs;
1125
	static const char *default_refspec[] = { ":", NULL };
1126
	struct ref **dst_tail = tail_ref(dst);
1127

1128 1129 1130 1131 1132
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1133
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1134 1135 1136 1137

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1138 1139
		const struct refspec *pat = NULL;
		char *dst_name;
1140 1141
		if (src->peer_ref)
			continue;
1142 1143 1144 1145 1146 1147

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

		if (pat->matching) {
1148 1149 1150 1151 1152
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1153 1154 1155
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1156

1157
		} else {
1158
			const char *dst_side = pat->dst ? pat->dst : pat->src;
1159 1160 1161
			if (!match_name_with_pattern(pat->src, src->name,
						     dst_side, &dst_name))
				die("Didn't think it matches any more");
1162
		}
1163
		dst_peer = find_ref_by_name(*dst, dst_name);
1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176
		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 已提交
1177

1178
			/* Create a new one and link it */
1179
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1180 1181
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
1182
		dst_peer->peer_ref = copy_ref(src);
1183
		dst_peer->force = pat->force;
1184 1185
	free_name:
		free(dst_name);
1186
	}
1187 1188
	if (errs)
		return -1;
1189 1190
	return 0;
}
1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209

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]);
1210 1211 1212
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223
			}
		}
	}
	return ret;
}

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

1224 1225 1226
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1227
{
1228
	if (!branch || i < 0 || i >= branch->merge_nr)
1229
		return 0;
1230
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1231
}
1232

1233
static struct ref *get_expanded_map(const struct ref *remote_refs,
1234 1235
				    const struct refspec *refspec)
{
1236
	const struct ref *ref;
1237 1238 1239
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1240
	char *expn_name;
1241 1242 1243 1244

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

1249 1250
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1251 1252 1253 1254 1255 1256 1257 1258 1259 1260
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1261
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1262
{
1263
	const struct ref *ref;
1264
	for (ref = refs; ref; ref = ref->next) {
1265
		if (refname_match(name, ref->name, ref_fetch_rules))
1266 1267 1268 1269 1270
			return ref;
	}
	return NULL;
}

1271
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1272
{
1273
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1274 1275

	if (!ref)
1276
		return NULL;
1277 1278 1279 1280 1281 1282

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1283
	if (!name || name[0] == '\0')
1284 1285
		return NULL;

1286 1287
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1288 1289 1290

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

R
René Scharfe 已提交
1294
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1295 1296
}

1297
int get_fetch_map(const struct ref *remote_refs,
1298
		  const struct refspec *refspec,
1299 1300
		  struct ref ***tail,
		  int missing_ok)
1301
{
D
Daniel Barkalow 已提交
1302
	struct ref *ref_map, **rmp;
1303 1304 1305 1306

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1307 1308 1309 1310 1311 1312 1313 1314 1315 1316
		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;
		}
1317 1318
	}

D
Daniel Barkalow 已提交
1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332
	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);
1333 1334
	}

1335 1336
	if (ref_map)
		tail_link_ref(ref_map, tail);
1337 1338 1339

	return 0;
}
1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351

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

1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
		struct commit_list *temp = list;
		temp->item->object.flags &= ~mark;
		list = temp->next;
		free(temp);
	}
}

int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

	/* Both new and old must be commit-ish and new is descendant of
	 * old.  Otherwise we require --force.
	 */
	o = deref_tag(parse_object(old_sha1), NULL, 0);
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	old = (struct commit *) o;

	o = deref_tag(parse_object(new_sha1), NULL, 0);
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	new = (struct commit *) o;

	if (parse_commit(new) < 0)
		return 0;

	used = list = NULL;
	commit_list_insert(new, &list);
	while (list) {
		new = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new, &used);
		if (new == old) {
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427
/*
 * 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;
1428
	theirs = lookup_commit_reference(sha1);
1429 1430 1431 1432 1433
	if (!theirs)
		return 0;

	if (!resolve_ref(branch->refname, sha1, 1, NULL))
		return 0;
1434
	ours = lookup_commit_reference(sha1);
1435 1436 1437 1438 1439 1440 1441
	if (!ours)
		return 0;

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

1442
	/* Run "rev-list --left-right ours...theirs" internally... */
1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469
	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)++;
	}
1470 1471 1472 1473

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1474 1475 1476 1477 1478 1479 1480 1481 1482
	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;
1483
	const char *base;
1484 1485 1486 1487 1488

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

	base = branch->merge[0]->dst;
1489
	base = shorten_unambiguous_ref(base, 0);
1490
	if (!num_theirs)
1491
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1492
			    "by %d commit%s.\n",
1493
			    base, num_ours, (num_ours == 1) ? "" : "s");
1494
	else if (!num_ours)
1495 1496
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1497
			    "and can be fast-forwarded.\n",
1498
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1499
	else
1500 1501 1502 1503
		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);
1504 1505
	return 1;
}
1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527

static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;
	int len;

	/* we already know it starts with refs/ to get here */
	if (check_ref_format(refname + 5))
		return 0;

	len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
	hashcpy(ref->new_sha1, sha1);
	memcpy(ref->name, refname, len);
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
1528
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1529 1530 1531
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1532

1533 1534 1535
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1536 1537
{
	const struct ref *r;
1538 1539
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1540

1541
	if (!head)
J
Jay Soffian 已提交
1542 1543
		return NULL;

1544 1545 1546 1547 1548 1549 1550 1551
	/*
	 * Some transports support directly peeking at
	 * where HEAD points; if that is the case, then
	 * we don't have to guess.
	 */
	if (head->symref)
		return copy_ref(find_ref_by_name(refs, head->symref));

J
Jay Soffian 已提交
1552
	/* If refs/heads/master could be right, it is. */
1553 1554 1555 1556 1557
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
		if (r && !hashcmp(r->old_sha1, head->old_sha1))
			return copy_ref(r);
	}
J
Jay Soffian 已提交
1558 1559

	/* Look for another ref that points there */
1560 1561 1562 1563 1564 1565 1566 1567
	for (r = refs; r; r = r->next) {
		if (r != head && !hashcmp(r->old_sha1, head->old_sha1)) {
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1568

1569
	return list;
J
Jay Soffian 已提交
1570
}