Re: [PATCH] branch as a builtin (again)

["Kristian Høgsberg" <krh@bitplanet.net>]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Ok, once more without the spaces.  I have to state that it's against
my personal beliefs using pointers as boolean values, but I can go
with the flow here.  For extra bonus, I'm using xrealloc instead of
plain realloc now.

cheers,
Kristian

[-- Attachment #2: builtin-branch.c --]
[-- Type: application/octet-stream, Size: 5250 bytes --]

/*
 * Builtin "git branch"
 *
 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
 * Based on git-branch.sh by Junio C Hamano.
 */

#include "cache.h"
#include "refs.h"
#include "commit.h"
#include "builtin.h"

static const char builtin_branch_usage[] =
"git-branch [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]] | -r";


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

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)
{
	struct commit *rev, *head_rev;
	unsigned char sha1[20];
	const char *name, *reflog;
	int i;

	head_rev = lookup_commit_reference(head_sha1);
	for (i = 0; i < argc; i++) {
		if (!strcmp(head, argv[i]))
			die("Cannot delete the branch you are currently on.");

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

		rev = lookup_commit_reference(sha1);
		if (!rev || !head_rev)
			die("Couldn't look up commit objects.");

		/* 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);
		}

		unlink(name);

		/* Unlink reflog if it exists. */
		reflog = git_path("logs/refs/heads/%s", argv[i]);
		unlink(reflog);

		printf("Deleted branch %s.\n", argv[i]);
	}
}

static int ref_index, ref_alloc;
static char **ref_list;

static int append_ref(const char *refname, const unsigned char *sha1)
{
	if (ref_index >= ref_alloc) {
		ref_alloc = ref_alloc > 0 ? ref_alloc * 2 : 16;
		ref_list = xrealloc(ref_list, ref_alloc * sizeof(char *));
	}

	ref_list[ref_index++] = strdup(refname);

	return 0;
}

static int ref_cmp(const void *r1, const void *r2)
{
	return strcmp(*(char **)r1, *(char **)r2);
}

static void print_ref_list(int remote_only)
{
	int i;

	if (remote_only)
		for_each_remote_ref(append_ref);
	else
		for_each_branch_ref(append_ref);

	qsort(ref_list, ref_index, sizeof(char *), ref_cmp);

	for (i = 0; i < ref_index; i++) {
		if (!strcmp(ref_list[i], head))
			printf("* %s\n", ref_list[i]);
		else
			printf("  %s\n", ref_list[i]);
	}
}

static void create_reflog(struct ref_lock *lock)
{
	struct stat stbuf;
	int fd;

	if (!stat(lock->log_file, &stbuf) && S_ISREG(stbuf.st_mode))
		return;
	if (safe_create_leading_directories(lock->log_file) < 0)
		die("Unable to create directory for %s.", lock->log_file);
	fd = open(lock->log_file, O_CREAT | O_TRUNC | O_WRONLY, 0666);
	if (fd < 0)
		die("Unable to create ref log %s: %s.",
		    lock->log_file, strerror(errno));
	close(fd);
}

static void create_branch(const char *name, const char *start,
			  int force, int reflog)
{
	struct ref_lock *lock;
	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(git_path(ref), sha1, 1)) {
		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))
		die("Not a valid branch point: '%s'.", start);

	lock = lock_any_ref_for_update(ref, NULL, 0);
	if (!lock)
		die("Failed to lock ref for update: %s.", strerror(errno));
	if (reflog)
		create_reflog(lock);
	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));
}

int cmd_branch(int argc, const char **argv, const char *prefix)
{
	int delete = 0, force_delete = 0, force_create = 0, remote_only = 0;
	int reflog = 0;
	int i, prefix_length;
	const char *p;

	git_config(git_default_config);

	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;
		}
		if (!strcmp(arg, "-r")) {
			remote_only = 1;
			continue;
		}
		if (!strcmp(arg, "-l")) {
			reflog = 1;
			continue;
		}
		usage(builtin_branch_usage);
	}

	prefix_length = strlen(git_path("refs/heads/"));
	p = resolve_ref(git_path("HEAD"), head_sha1, 0);
	if (!p)
		die("Failed to resolve HEAD as a valid ref.");
	head = strdup(p + prefix_length);

	if (delete)
		delete_branches(argc - i, argv + i, force_delete);
	else if (i == argc)
		print_ref_list(remote_only);
	else if (argc - i == 1)
		create_branch(argv[i], head, force_create, reflog);
	else
		create_branch(argv[i], argv[i + 1], force_create, reflog);

	return 0;
}