builtin-branch.c 10.6 KB
Newer Older
L
Lars Hjemli 已提交
1 2 3 4 5 6 7
/*
 * Builtin "git branch"
 *
 * Copyright (c) 2006 Kristian Hgsberg <krh@redhat.com>
 * Based on git-branch.sh by Junio C Hamano.
 */

A
Andy Parkins 已提交
8
#include "color.h"
L
Lars Hjemli 已提交
9 10 11 12 13 14
#include "cache.h"
#include "refs.h"
#include "commit.h"
#include "builtin.h"

static const char builtin_branch_usage[] =
15
  "git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [-r | -a] [-v [--abbrev=<length>]]";
L
Lars Hjemli 已提交
16 17 18 19 20


static const char *head;
static unsigned char head_sha1[20];

A
Andy Parkins 已提交
21 22 23 24 25
static int branch_use_color;
static char branch_colors[][COLOR_MAXLEN] = {
	"\033[m",	/* reset */
	"",		/* PLAIN (normal) */
	"\033[31m",	/* REMOTE (red) */
26 27
	"",		/* LOCAL (normal) */
	"\033[32m",	/* CURRENT (green) */
A
Andy Parkins 已提交
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
};
enum color_branch {
	COLOR_BRANCH_RESET = 0,
	COLOR_BRANCH_PLAIN = 1,
	COLOR_BRANCH_REMOTE = 2,
	COLOR_BRANCH_LOCAL = 3,
	COLOR_BRANCH_CURRENT = 4,
};

static int parse_branch_color_slot(const char *var, int ofs)
{
	if (!strcasecmp(var+ofs, "plain"))
		return COLOR_BRANCH_PLAIN;
	if (!strcasecmp(var+ofs, "reset"))
		return COLOR_BRANCH_RESET;
	if (!strcasecmp(var+ofs, "remote"))
		return COLOR_BRANCH_REMOTE;
	if (!strcasecmp(var+ofs, "local"))
		return COLOR_BRANCH_LOCAL;
	if (!strcasecmp(var+ofs, "current"))
		return COLOR_BRANCH_CURRENT;
	die("bad config variable '%s'", var);
}

int git_branch_config(const char *var, const char *value)
{
	if (!strcmp(var, "color.branch")) {
		branch_use_color = git_config_colorbool(var, value);
		return 0;
	}
	if (!strncmp(var, "color.branch.", 13)) {
		int slot = parse_branch_color_slot(var, 13);
		color_parse(value, var, branch_colors[slot]);
		return 0;
	}
	return git_default_config(var, value);
}

const char *branch_get_color(enum color_branch ix)
{
	if (branch_use_color)
		return branch_colors[ix];
	return "";
}

L
Lars Hjemli 已提交
73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
static int in_merge_bases(const unsigned char *sha1,
			  struct commit *rev1,
			  struct commit *rev2)
{
	struct commit_list *bases, *b;
	int ret = 0;

	bases = get_merge_bases(rev1, rev2, 1);
	for (b = bases; b; b = b->next) {
		if (!hashcmp(sha1, b->item->object.sha1)) {
			ret = 1;
			break;
		}
	}

	free_commit_list(bases);
	return ret;
}

static void delete_branches(int argc, const char **argv, int force)
{
94
	struct commit *rev, *head_rev = head_rev;
L
Lars Hjemli 已提交
95 96 97 98
	unsigned char sha1[20];
	char *name;
	int i;

99 100 101 102 103
	if (!force) {
		head_rev = lookup_commit_reference(head_sha1);
		if (!head_rev)
			die("Couldn't look up commit object for HEAD");
	}
L
Lars Hjemli 已提交
104 105 106 107 108 109 110 111 112
	for (i = 0; i < argc; i++) {
		if (!strcmp(head, argv[i]))
			die("Cannot delete the branch you are currently on.");

		name = xstrdup(mkpath("refs/heads/%s", argv[i]));
		if (!resolve_ref(name, sha1, 1, NULL))
			die("Branch '%s' not found.", argv[i]);

		rev = lookup_commit_reference(sha1);
113 114
		if (!rev)
			die("Couldn't look up commit object for '%s'", name);
L
Lars Hjemli 已提交
115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138

		/* This checks whether the merge bases of branch and
		 * HEAD contains branch -- which means that the HEAD
		 * contains everything in both.
		 */

		if (!force &&
		    !in_merge_bases(sha1, rev, head_rev)) {
			fprintf(stderr,
				"The branch '%s' is not a strict subset of your current HEAD.\n"
				"If you are sure you want to delete it, run 'git branch -D %s'.\n",
				argv[i], argv[i]);
			exit(1);
		}

		if (delete_ref(name, sha1))
			printf("Error deleting branch '%s'\n", argv[i]);
		else
			printf("Deleted branch %s.\n", argv[i]);

		free(name);
	}
}

139 140 141 142
#define REF_UNKNOWN_TYPE    0x00
#define REF_LOCAL_BRANCH    0x01
#define REF_REMOTE_BRANCH   0x02
#define REF_TAG             0x04
L
Lars Hjemli 已提交
143

144 145 146
struct ref_item {
	char *name;
	unsigned int kind;
147
	unsigned char sha1[20];
148 149 150
};

struct ref_list {
151
	int index, alloc, maxwidth;
152 153 154 155 156
	struct ref_item *list;
	int kinds;
};

static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
L
Lars Hjemli 已提交
157
{
158 159 160
	struct ref_list *ref_list = (struct ref_list*)(cb_data);
	struct ref_item *newitem;
	int kind = REF_UNKNOWN_TYPE;
161
	int len;
162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183

	/* Detect kind */
	if (!strncmp(refname, "refs/heads/", 11)) {
		kind = REF_LOCAL_BRANCH;
		refname += 11;
	} else if (!strncmp(refname, "refs/remotes/", 13)) {
		kind = REF_REMOTE_BRANCH;
		refname += 13;
	} else if (!strncmp(refname, "refs/tags/", 10)) {
		kind = REF_TAG;
		refname += 10;
	}

	/* Don't add types the caller doesn't want */
	if ((kind & ref_list->kinds) == 0)
		return 0;

	/* Resize buffer */
	if (ref_list->index >= ref_list->alloc) {
		ref_list->alloc = alloc_nr(ref_list->alloc);
		ref_list->list = xrealloc(ref_list->list,
				ref_list->alloc * sizeof(struct ref_item));
L
Lars Hjemli 已提交
184 185
	}

186 187 188 189
	/* Record the new item */
	newitem = &(ref_list->list[ref_list->index++]);
	newitem->name = xstrdup(refname);
	newitem->kind = kind;
190 191 192 193
	hashcpy(newitem->sha1, sha1);
	len = strlen(newitem->name);
	if (len > ref_list->maxwidth)
		ref_list->maxwidth = len;
L
Lars Hjemli 已提交
194 195 196 197

	return 0;
}

198 199 200 201 202 203 204 205 206
static void free_ref_list(struct ref_list *ref_list)
{
	int i;

	for (i = 0; i < ref_list->index; i++)
		free(ref_list->list[i].name);
	free(ref_list->list);
}

L
Lars Hjemli 已提交
207 208
static int ref_cmp(const void *r1, const void *r2)
{
209 210 211 212 213 214
	struct ref_item *c1 = (struct ref_item *)(r1);
	struct ref_item *c2 = (struct ref_item *)(r2);

	if (c1->kind != c2->kind)
		return c1->kind - c2->kind;
	return strcmp(c1->name, c2->name);
L
Lars Hjemli 已提交
215 216
}

217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234
static void print_ref_info(const unsigned char *sha1, int abbrev)
{
	struct commit *commit;
	char subject[256];


	commit = lookup_commit(sha1);
	if (commit && !parse_commit(commit))
		pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
				    subject, sizeof(subject), 0,
				    NULL, NULL, 0);
	else
		strcpy(subject, " **** invalid ref ****");

	printf(" %s %s\n", find_unique_abbrev(sha1, abbrev), subject);
}

static void print_ref_list(int kinds, int verbose, int abbrev)
L
Lars Hjemli 已提交
235 236
{
	int i;
237
	char c;
238
	struct ref_list ref_list;
A
Andy Parkins 已提交
239
	int color;
L
Lars Hjemli 已提交
240

241 242 243
	memset(&ref_list, 0, sizeof(ref_list));
	ref_list.kinds = kinds;
	for_each_ref(append_ref, &ref_list);
L
Lars Hjemli 已提交
244

245
	qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
L
Lars Hjemli 已提交
246

247
	for (i = 0; i < ref_list.index; i++) {
A
Andy Parkins 已提交
248 249 250 251 252 253 254 255 256 257 258 259
		switch( ref_list.list[i].kind ) {
			case REF_LOCAL_BRANCH:
				color = COLOR_BRANCH_LOCAL;
				break;
			case REF_REMOTE_BRANCH:
				color = COLOR_BRANCH_REMOTE;
				break;
			default:
				color = COLOR_BRANCH_PLAIN;
				break;
		}

260
		c = ' ';
261
		if (ref_list.list[i].kind == REF_LOCAL_BRANCH &&
A
Andy Parkins 已提交
262
				!strcmp(ref_list.list[i].name, head)) {
263
			c = '*';
A
Andy Parkins 已提交
264 265
			color = COLOR_BRANCH_CURRENT;
		}
266

267
		if (verbose) {
A
Andy Parkins 已提交
268 269 270 271 272
			printf("%c %s%-*s%s", c,
					branch_get_color(color),
					ref_list.maxwidth,
					ref_list.list[i].name,
					branch_get_color(COLOR_BRANCH_RESET));
273 274 275
			print_ref_info(ref_list.list[i].sha1, abbrev);
		}
		else
A
Andy Parkins 已提交
276 277 278 279
			printf("%c %s%s%s\n", c,
					branch_get_color(color),
					ref_list.list[i].name,
					branch_get_color(COLOR_BRANCH_RESET));
L
Lars Hjemli 已提交
280
	}
281 282

	free_ref_list(&ref_list);
L
Lars Hjemli 已提交
283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321
}

static void create_branch(const char *name, const char *start,
			  int force, int reflog)
{
	struct ref_lock *lock;
	struct commit *commit;
	unsigned char sha1[20];
	char ref[PATH_MAX], msg[PATH_MAX + 20];

	snprintf(ref, sizeof ref, "refs/heads/%s", name);
	if (check_ref_format(ref))
		die("'%s' is not a valid branch name.", name);

	if (resolve_ref(ref, sha1, 1, NULL)) {
		if (!force)
			die("A branch named '%s' already exists.", name);
		else if (!strcmp(head, name))
			die("Cannot force update the current branch.");
	}

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

	lock = lock_any_ref_for_update(ref, NULL);
	if (!lock)
		die("Failed to lock ref for update: %s.", strerror(errno));

	if (reflog) {
		log_all_ref_updates = 1;
		snprintf(msg, sizeof msg, "branch: Created from %s", start);
	}

	if (write_ref_sha1(lock, sha1, msg) < 0)
		die("Failed to write ref: %s.", strerror(errno));
}

322 323
static void rename_branch(const char *oldname, const char *newname, int force)
{
324
	char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100];
325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341
	unsigned char sha1[20];

	if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref))
		die("Old branchname too long");

	if (check_ref_format(oldref))
		die("Invalid branch name: %s", oldref);

	if (snprintf(newref, sizeof(newref), "refs/heads/%s", newname) > sizeof(newref))
		die("New branchname too long");

	if (check_ref_format(newref))
		die("Invalid branch name: %s", newref);

	if (resolve_ref(newref, sha1, 1, NULL) && !force)
		die("A branch named '%s' already exists.", newname);

342 343 344 345
	snprintf(logmsg, sizeof(logmsg), "Branch: renamed %s to %s",
		 oldref, newref);

	if (rename_ref(oldref, newref, logmsg))
346 347 348 349 350 351
		die("Branch rename failed");

	if (!strcmp(oldname, head) && create_symref("HEAD", newref))
		die("Branch renamed to %s, but HEAD is not updated!", newname);
}

L
Lars Hjemli 已提交
352 353
int cmd_branch(int argc, const char **argv, const char *prefix)
{
354
	int delete = 0, force_delete = 0, force_create = 0;
355
	int rename = 0, force_rename = 0;
356
	int verbose = 0, abbrev = DEFAULT_ABBREV;
L
Lars Hjemli 已提交
357
	int reflog = 0;
358
	int kinds = REF_LOCAL_BRANCH;
L
Lars Hjemli 已提交
359 360
	int i;

361
	setup_ident();
A
Andy Parkins 已提交
362
	git_config(git_branch_config);
L
Lars Hjemli 已提交
363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385

	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];

		if (arg[0] != '-')
			break;
		if (!strcmp(arg, "--")) {
			i++;
			break;
		}
		if (!strcmp(arg, "-d")) {
			delete = 1;
			continue;
		}
		if (!strcmp(arg, "-D")) {
			delete = 1;
			force_delete = 1;
			continue;
		}
		if (!strcmp(arg, "-f")) {
			force_create = 1;
			continue;
		}
386 387 388 389 390 391 392 393 394
		if (!strcmp(arg, "-m")) {
			rename = 1;
			continue;
		}
		if (!strcmp(arg, "-M")) {
			rename = 1;
			force_rename = 1;
			continue;
		}
L
Lars Hjemli 已提交
395
		if (!strcmp(arg, "-r")) {
396 397 398 399 400
			kinds = REF_REMOTE_BRANCH;
			continue;
		}
		if (!strcmp(arg, "-a")) {
			kinds = REF_REMOTE_BRANCH | REF_LOCAL_BRANCH;
L
Lars Hjemli 已提交
401 402 403 404 405 406
			continue;
		}
		if (!strcmp(arg, "-l")) {
			reflog = 1;
			continue;
		}
407 408 409 410 411 412 413 414
		if (!strncmp(arg, "--abbrev=", 9)) {
			abbrev = atoi(arg+9);
			continue;
		}
		if (!strcmp(arg, "-v")) {
			verbose = 1;
			continue;
		}
A
Andy Parkins 已提交
415 416 417 418 419 420 421 422
		if (!strcmp(arg, "--color")) {
			branch_use_color = 1;
			continue;
		}
		if (!strcmp(arg, "--no-color")) {
			branch_use_color = 0;
			continue;
		}
L
Lars Hjemli 已提交
423 424 425
		usage(builtin_branch_usage);
	}

426 427 428 429
	if ((delete && rename) || (delete && force_create) ||
	    (rename && force_create))
		usage(builtin_branch_usage);

L
Lars Hjemli 已提交
430 431 432 433 434 435 436 437 438 439
	head = xstrdup(resolve_ref("HEAD", head_sha1, 0, NULL));
	if (!head)
		die("Failed to resolve HEAD as a valid ref.");
	if (strncmp(head, "refs/heads/", 11))
		die("HEAD not found below refs/heads!");
	head += 11;

	if (delete)
		delete_branches(argc - i, argv + i, force_delete);
	else if (i == argc)
440
		print_ref_list(kinds, verbose, abbrev);
441 442 443 444
	else if (rename && (i == argc - 1))
		rename_branch(head, argv[i], force_rename);
	else if (rename && (i == argc - 2))
		rename_branch(argv[i], argv[i + 1], force_rename);
L
Lars Hjemli 已提交
445 446 447 448 449 450 451 452 453
	else if (i == argc - 1)
		create_branch(argv[i], head, force_create, reflog);
	else if (i == argc - 2)
		create_branch(argv[i], argv[i + 1], force_create, reflog);
	else
		usage(builtin_branch_usage);

	return 0;
}