[thirdparty/git.git] / branch.c

#include "cache.h"
#include "branch.h"
#include "refs.h"
#include "remote.h"
#include "commit.h"

struct tracking {
	struct refspec spec;
	char *src;
	const char *remote;
	int matches;
};

static int find_tracked_branch(struct remote *remote, void *priv)
{
	struct tracking *tracking = priv;

	if (!remote_find_tracking(remote, &tracking->spec)) {
		if (++tracking->matches == 1) {
			tracking->src = tracking->spec.src;
			tracking->remote = remote->name;
		} else {
			free(tracking->spec.src);
			if (tracking->src) {
				free(tracking->src);
				tracking->src = NULL;
			}
		}
		tracking->spec.src = NULL;
	}

	return 0;
}

static int should_setup_rebase(const char *origin)
{
	switch (autorebase) {
	case AUTOREBASE_NEVER:
		return 0;
	case AUTOREBASE_LOCAL:
		return origin == NULL;
	case AUTOREBASE_REMOTE:
		return origin != NULL;
	case AUTOREBASE_ALWAYS:
		return 1;
	}
	return 0;
}

void install_branch_config(int flag, const char *local, const char *origin, const char *remote)
{
	const char *shortname = remote + 11;
	int remote_is_branch = !prefixcmp(remote, "refs/heads/");
	struct strbuf key = STRBUF_INIT;
	int rebasing = should_setup_rebase(origin);

	if (remote_is_branch
	    && !strcmp(local, shortname)
	    && !origin) {
		warning("Not setting branch %s as its own upstream.",
			local);
		return;
	}

	strbuf_addf(&key, "branch.%s.remote", local);
	git_config_set(key.buf, origin ? origin : ".");

	strbuf_reset(&key);
	strbuf_addf(&key, "branch.%s.merge", local);
	git_config_set(key.buf, remote);

	if (rebasing) {
		strbuf_reset(&key);
		strbuf_addf(&key, "branch.%s.rebase", local);
		git_config_set(key.buf, "true");
	}

	if (flag & BRANCH_CONFIG_VERBOSE) {
		strbuf_reset(&key);

		strbuf_addstr(&key, origin ? "remote" : "local");

		/* Are we tracking a proper "branch"? */
		if (remote_is_branch) {
			strbuf_addf(&key, " branch %s", shortname);
			if (origin)
				strbuf_addf(&key, " from %s", origin);
		}
		else
			strbuf_addf(&key, " ref %s", remote);
		printf("Branch %s set up to track %s%s.\n",
		       local, key.buf,
		       rebasing ? " by rebasing" : "");
	}
	strbuf_release(&key);
}

/*
 * This is called when new_ref is branched off of orig_ref, and tries
 * to infer the settings for branch.<new_ref>.{remote,merge} from the
 * config.
 */
static int setup_tracking(const char *new_ref, const char *orig_ref,
                          enum branch_track track)
{
	struct tracking tracking;

	if (strlen(new_ref) > 1024 - 7 - 7 - 1)
		return error("Tracking not set up: name too long: %s",
				new_ref);

	memset(&tracking, 0, sizeof(tracking));
	tracking.spec.dst = (char *)orig_ref;
	if (for_each_remote(find_tracked_branch, &tracking))
		return 1;

	if (!tracking.matches)
		switch (track) {
		case BRANCH_TRACK_ALWAYS:
		case BRANCH_TRACK_EXPLICIT:
		case BRANCH_TRACK_OVERRIDE:
			break;
		default:
			return 1;
		}

	if (tracking.matches > 1)
		return error("Not tracking: ambiguous information for ref %s",
				orig_ref);

	install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote,
			      tracking.src ? tracking.src : orig_ref);

	free(tracking.src);
	return 0;
}

struct branch_desc_cb {
	const char *config_name;
	const char *value;
};

static int read_branch_desc_cb(const char *var, const char *value, void *cb)
{
	struct branch_desc_cb *desc = cb;
	if (strcmp(desc->config_name, var))
		return 0;
	free((char *)desc->value);
	return git_config_string(&desc->value, var, value);
}

int read_branch_desc(struct strbuf *buf, const char *branch_name)
{
	struct branch_desc_cb cb;
	struct strbuf name = STRBUF_INIT;
	strbuf_addf(&name, "branch.%s.description", branch_name);
	cb.config_name = name.buf;
	cb.value = NULL;
	if (git_config(read_branch_desc_cb, &cb) < 0) {
		strbuf_release(&name);
		return -1;
	}
	if (cb.value)
		strbuf_addstr(buf, cb.value);
	strbuf_release(&name);
	return 0;
}

int validate_new_branchname(const char *name, struct strbuf *ref,
			    int force, int attr_only)
{
	if (strbuf_check_branch_ref(ref, name))
		die("'%s' is not a valid branch name.", name);

	if (!ref_exists(ref->buf))
		return 0;
	else if (!force && !attr_only)
		die("A branch named '%s' already exists.", ref->buf + strlen("refs/heads/"));

	if (!attr_only) {
		const char *head;
		unsigned char sha1[20];

		head = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
		if (!is_bare_repository() && head && !strcmp(head, ref->buf))
			die("Cannot force update the current branch.");
	}
	return 1;
}

void create_branch(const char *head,
		   const char *name, const char *start_name,
		   int force, int reflog, int clobber_head,
		   enum branch_track track)
{
	struct ref_lock *lock = NULL;
	struct commit *commit;
	unsigned char sha1[20];
	char *real_ref, msg[PATH_MAX + 20];
	struct strbuf ref = STRBUF_INIT;
	int forcing = 0;
	int dont_change_ref = 0;
	int explicit_tracking = 0;

	if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
		explicit_tracking = 1;

	if (validate_new_branchname(name, &ref, force,
				    track == BRANCH_TRACK_OVERRIDE ||
				    clobber_head)) {
		if (!force)
			dont_change_ref = 1;
		else
			forcing = 1;
	}

	real_ref = NULL;
	if (get_sha1(start_name, sha1))
		die("Not a valid object name: '%s'.", start_name);

	switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
	case 0:
		/* Not branching from any existing branch */
		if (explicit_tracking)
			die("Cannot setup tracking information; starting point is not a branch.");
		break;
	case 1:
		/* Unique completion -- good, only if it is a real branch */
		if (prefixcmp(real_ref, "refs/heads/") &&
		    prefixcmp(real_ref, "refs/remotes/")) {
			if (explicit_tracking)
				die("Cannot setup tracking information; starting point is not a branch.");
			else
				real_ref = NULL;
		}
		break;
	default:
		die("Ambiguous object name: '%s'.", start_name);
		break;
	}

	if ((commit = lookup_commit_reference(sha1)) == NULL)
		die("Not a valid branch point: '%s'.", start_name);
	hashcpy(sha1, commit->object.sha1);

	if (!dont_change_ref) {
		lock = lock_any_ref_for_update(ref.buf, NULL, 0);
		if (!lock)
			die_errno("Failed to lock ref for update");
	}

	if (reflog)
		log_all_ref_updates = 1;

	if (forcing)
		snprintf(msg, sizeof msg, "branch: Reset to %s",
			 start_name);
	else if (!dont_change_ref)
		snprintf(msg, sizeof msg, "branch: Created from %s",
			 start_name);

	if (real_ref && track)
		setup_tracking(ref.buf+11, real_ref, track);

	if (!dont_change_ref)
		if (write_ref_sha1(lock, sha1, msg) < 0)
			die_errno("Failed to write ref");

	strbuf_release(&ref);
	free(real_ref);
}

void remove_branch_state(void)
{
	unlink(git_path("CHERRY_PICK_HEAD"));
	unlink(git_path("REVERT_HEAD"));
	unlink(git_path("MERGE_HEAD"));
	unlink(git_path("MERGE_RR"));
	unlink(git_path("MERGE_MSG"));
	unlink(git_path("MERGE_MODE"));
	unlink(git_path("SQUASH_MSG"));
}
Commit	Line	Data
e496c003 DB	1	#include "cache.h"
	2	#include "branch.h"
	3	#include "refs.h"
	4	#include "remote.h"
	5	#include "commit.h"
	6
	7	struct tracking {
	8	struct refspec spec;
	9	char *src;
	10	const char *remote;
	11	int matches;
	12	};
	13
	14	static int find_tracked_branch(struct remote remote, void priv)
	15	{
	16	struct tracking *tracking = priv;
	17
	18	if (!remote_find_tracking(remote, &tracking->spec)) {
	19	if (++tracking->matches == 1) {
	20	tracking->src = tracking->spec.src;
	21	tracking->remote = remote->name;
	22	} else {
	23	free(tracking->spec.src);
	24	if (tracking->src) {
	25	free(tracking->src);
	26	tracking->src = NULL;
	27	}
	28	}
	29	tracking->spec.src = NULL;
	30	}
	31
	32	return 0;
	33	}
	34
a9f2c136	35	static int should_setup_rebase(const char *origin)
c998ae9b DS	36	{
	37	switch (autorebase) {
	38	case AUTOREBASE_NEVER:
	39	return 0;
	40	case AUTOREBASE_LOCAL:
a9f2c136	41	return origin == NULL;
c998ae9b	42	case AUTOREBASE_REMOTE:
a9f2c136	43	return origin != NULL;
c998ae9b DS	44	case AUTOREBASE_ALWAYS:
	45	return 1;
	46	}
	47	return 0;
	48	}
	49
a9f2c136 JH	50	void install_branch_config(int flag, const char local, const char origin, const char *remote)
a9f2c136 JH	51	{
85e2233f MM	52	const char *shortname = remote + 11;
85e2233f MM	53	int remote_is_branch = !prefixcmp(remote, "refs/heads/");
a9f2c136 JH	54	struct strbuf key = STRBUF_INIT;
	55	int rebasing = should_setup_rebase(origin);
	56
85e2233f MM	57	if (remote_is_branch
	58	&& !strcmp(local, shortname)
	59	&& !origin) {
	60	warning("Not setting branch %s as its own upstream.",
	61	local);
	62	return;
	63	}
	64
a9f2c136 JH	65	strbuf_addf(&key, "branch.%s.remote", local);
	66	git_config_set(key.buf, origin ? origin : ".");
	67
	68	strbuf_reset(&key);
	69	strbuf_addf(&key, "branch.%s.merge", local);
	70	git_config_set(key.buf, remote);
	71
	72	if (rebasing) {
	73	strbuf_reset(&key);
	74	strbuf_addf(&key, "branch.%s.rebase", local);
	75	git_config_set(key.buf, "true");
	76	}
	77
72f60083 JH	78	if (flag & BRANCH_CONFIG_VERBOSE) {
	79	strbuf_reset(&key);
	80
	81	strbuf_addstr(&key, origin ? "remote" : "local");
	82
	83	/* Are we tracking a proper "branch"? */
85e2233f MM	84	if (remote_is_branch) {
85e2233f MM	85	strbuf_addf(&key, " branch %s", shortname);
72f60083 JH	86	if (origin)
	87	strbuf_addf(&key, " from %s", origin);
	88	}
	89	else
	90	strbuf_addf(&key, " ref %s", remote);
	91	printf("Branch %s set up to track %s%s.\n",
	92	local, key.buf,
	93	rebasing ? " by rebasing" : "");
	94	}
a9f2c136 JH	95	strbuf_release(&key);
	96	}
	97
e496c003 DB	98	/*
	99	* This is called when new_ref is branched off of orig_ref, and tries
	100	* to infer the settings for branch.<new_ref>.{remote,merge} from the
	101	* config.
	102	*/
9ed36cfa JS	103	static int setup_tracking(const char new_ref, const char orig_ref,
9ed36cfa JS	104	enum branch_track track)
e496c003	105	{
e496c003 DB	106	struct tracking tracking;
	107
	108	if (strlen(new_ref) > 1024 - 7 - 7 - 1)
	109	return error("Tracking not set up: name too long: %s",
	110	new_ref);
	111
	112	memset(&tracking, 0, sizeof(tracking));
	113	tracking.spec.dst = (char *)orig_ref;
9ed36cfa	114	if (for_each_remote(find_tracked_branch, &tracking))
e496c003 DB	115	return 1;
e496c003 DB	116
9ed36cfa JS	117	if (!tracking.matches)
	118	switch (track) {
	119	case BRANCH_TRACK_ALWAYS:
	120	case BRANCH_TRACK_EXPLICIT:
4fc50066	121	case BRANCH_TRACK_OVERRIDE:
9ed36cfa JS	122	break;
	123	default:
	124	return 1;
	125	}
	126
e496c003 DB	127	if (tracking.matches > 1)
	128	return error("Not tracking: ambiguous information for ref %s",
	129	orig_ref);
	130
a9f2c136 JH	131	install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote,
a9f2c136 JH	132	tracking.src ? tracking.src : orig_ref);
e496c003	133
a9f2c136	134	free(tracking.src);
e496c003 DB	135	return 0;
	136	}
	137
6f9a3321 JH	138	struct branch_desc_cb {
	139	const char *config_name;
	140	const char *value;
	141	};
	142
	143	static int read_branch_desc_cb(const char var, const char value, void *cb)
	144	{
	145	struct branch_desc_cb *desc = cb;
	146	if (strcmp(desc->config_name, var))
	147	return 0;
	148	free((char *)desc->value);
	149	return git_config_string(&desc->value, var, value);
	150	}
	151
	152	int read_branch_desc(struct strbuf buf, const char branch_name)
	153	{
	154	struct branch_desc_cb cb;
	155	struct strbuf name = STRBUF_INIT;
	156	strbuf_addf(&name, "branch.%s.description", branch_name);
	157	cb.config_name = name.buf;
	158	cb.value = NULL;
	159	if (git_config(read_branch_desc_cb, &cb) < 0) {
	160	strbuf_release(&name);
	161	return -1;
	162	}
	163	if (cb.value)
	164	strbuf_addstr(buf, cb.value);
	165	strbuf_release(&name);
	166	return 0;
	167	}
	168
fa799376 JH	169	int validate_new_branchname(const char name, struct strbuf ref,
fa799376 JH	170	int force, int attr_only)
55c4a673	171	{
55c4a673 CI	172	if (strbuf_check_branch_ref(ref, name))
	173	die("'%s' is not a valid branch name.", name);
	174
	175	if (!ref_exists(ref->buf))
	176	return 0;
fa799376	177	else if (!force && !attr_only)
587a9ee7	178	die("A branch named '%s' already exists.", ref->buf + strlen("refs/heads/"));
55c4a673	179
fa799376 JH	180	if (!attr_only) {
	181	const char *head;
	182	unsigned char sha1[20];
55c4a673	183
8cad4744	184	head = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
fa799376 JH	185	if (!is_bare_repository() && head && !strcmp(head, ref->buf))
	186	die("Cannot force update the current branch.");
	187	}
55c4a673 CI	188	return 1;
	189	}
	190
e496c003 DB	191	void create_branch(const char *head,
e496c003 DB	192	const char name, const char start_name,
39bd6f72 JN	193	int force, int reflog, int clobber_head,
39bd6f72 JN	194	enum branch_track track)
e496c003	195	{
4fc50066	196	struct ref_lock *lock = NULL;
e496c003 DB	197	struct commit *commit;
e496c003 DB	198	unsigned char sha1[20];
8415d5c7 JH	199	char *real_ref, msg[PATH_MAX + 20];
8415d5c7 JH	200	struct strbuf ref = STRBUF_INIT;
e496c003	201	int forcing = 0;
4fc50066 IL	202	int dont_change_ref = 0;
	203	int explicit_tracking = 0;
	204
	205	if (track == BRANCH_TRACK_EXPLICIT \|\| track == BRANCH_TRACK_OVERRIDE)
	206	explicit_tracking = 1;
e496c003	207
fa799376	208	if (validate_new_branchname(name, &ref, force,
39bd6f72 JN	209	track == BRANCH_TRACK_OVERRIDE \|\|
39bd6f72 JN	210	clobber_head)) {
55c4a673	211	if (!force)
4fc50066	212	dont_change_ref = 1;
55c4a673 CI	213	else
55c4a673 CI	214	forcing = 1;
e496c003 DB	215	}
	216
	217	real_ref = NULL;
	218	if (get_sha1(start_name, sha1))
	219	die("Not a valid object name: '%s'.", start_name);
	220
	221	switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
	222	case 0:
	223	/* Not branching from any existing branch */
4fc50066	224	if (explicit_tracking)
9ed36cfa	225	die("Cannot setup tracking information; starting point is not a branch.");
e496c003 DB	226	break;
e496c003 DB	227	case 1:
21b5b1e8 JH	228	/* Unique completion -- good, only if it is a real branch */
	229	if (prefixcmp(real_ref, "refs/heads/") &&
	230	prefixcmp(real_ref, "refs/remotes/")) {
	231	if (explicit_tracking)
	232	die("Cannot setup tracking information; starting point is not a branch.");
	233	else
	234	real_ref = NULL;
	235	}
e496c003 DB	236	break;
	237	default:
	238	die("Ambiguous object name: '%s'.", start_name);
	239	break;
	240	}
	241
	242	if ((commit = lookup_commit_reference(sha1)) == NULL)
	243	die("Not a valid branch point: '%s'.", start_name);
	244	hashcpy(sha1, commit->object.sha1);
	245
4fc50066 IL	246	if (!dont_change_ref) {
	247	lock = lock_any_ref_for_update(ref.buf, NULL, 0);
	248	if (!lock)
	249	die_errno("Failed to lock ref for update");
	250	}
e496c003 DB	251
	252	if (reflog)
	253	log_all_ref_updates = 1;
	254
	255	if (forcing)
da288e25	256	snprintf(msg, sizeof msg, "branch: Reset to %s",
e496c003	257	start_name);
4fc50066	258	else if (!dont_change_ref)
e496c003 DB	259	snprintf(msg, sizeof msg, "branch: Created from %s",
	260	start_name);
	261
e496c003	262	if (real_ref && track)
e9d4f740	263	setup_tracking(ref.buf+11, real_ref, track);
e496c003	264
4fc50066 IL	265	if (!dont_change_ref)
	266	if (write_ref_sha1(lock, sha1, msg) < 0)
	267	die_errno("Failed to write ref");
e496c003	268
8415d5c7	269	strbuf_release(&ref);
9ed36cfa	270	free(real_ref);
e496c003	271	}
c369e7b8 DB	272
	273	void remove_branch_state(void)
	274	{
d7e5c0cb	275	unlink(git_path("CHERRY_PICK_HEAD"));
82433cdf	276	unlink(git_path("REVERT_HEAD"));
c369e7b8	277	unlink(git_path("MERGE_HEAD"));
0af0ac7e	278	unlink(git_path("MERGE_RR"));
c369e7b8	279	unlink(git_path("MERGE_MSG"));
cf10f9fd	280	unlink(git_path("MERGE_MODE"));
c369e7b8 DB	281	unlink(git_path("SQUASH_MSG"));
c369e7b8 DB	282	}