[thirdparty/git.git] / t / helper / test-fast-rebase.c

/*
 * "git fast-rebase" builtin command
 *
 * FAST: Forking Any Subprocesses (is) Taboo
 *
 * This is meant SOLELY as a demo of what is possible.  sequencer.c and
 * rebase.c should be refactored to use the ideas here, rather than attempting
 * to extend this file to replace those (unless Phillip or Dscho say that
 * refactoring is too hard and we need a clean slate, but I'm guessing that
 * refactoring is the better route).
 */

#define USE_THE_INDEX_VARIABLE
#include "test-tool.h"
#include "cache.h"
#include "cache-tree.h"
#include "commit.h"
#include "hex.h"
#include "lockfile.h"
#include "merge-ort.h"
#include "refs.h"
#include "revision.h"
#include "sequencer.h"
#include "strvec.h"
#include "tree.h"

static const char *short_commit_name(struct commit *commit)
{
	return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);
}

static struct commit *peel_committish(const char *name)
{
	struct object *obj;
	struct object_id oid;

	if (get_oid(name, &oid))
		return NULL;
	obj = parse_object(the_repository, &oid);
	return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
}

static char *get_author(const char *message)
{
	size_t len;
	const char *a;

	a = find_commit_header(message, "author", &len);
	if (a)
		return xmemdupz(a, len);

	return NULL;
}

static struct commit *create_commit(struct tree *tree,
				    struct commit *based_on,
				    struct commit *parent)
{
	struct object_id ret;
	struct object *obj;
	struct commit_list *parents = NULL;
	char *author;
	char *sign_commit = NULL;
	struct commit_extra_header *extra;
	struct strbuf msg = STRBUF_INIT;
	const char *out_enc = get_commit_output_encoding();
	const char *message = logmsg_reencode(based_on, NULL, out_enc);
	const char *orig_message = NULL;
	const char *exclude_gpgsig[] = { "gpgsig", NULL };

	commit_list_insert(parent, &parents);
	extra = read_commit_extra_headers(based_on, exclude_gpgsig);
	find_commit_subject(message, &orig_message);
	strbuf_addstr(&msg, orig_message);
	author = get_author(message);
	reset_ident_date();
	if (commit_tree_extended(msg.buf, msg.len, &tree->object.oid, parents,
				 &ret, author, NULL, sign_commit, extra)) {
		error(_("failed to write commit object"));
		return NULL;
	}
	free(author);
	strbuf_release(&msg);

	obj = parse_object(the_repository, &ret);
	return (struct commit *)obj;
}

int cmd__fast_rebase(int argc, const char **argv)
{
	struct commit *onto;
	struct commit *last_commit = NULL, *last_picked_commit = NULL;
	struct object_id head;
	struct lock_file lock = LOCK_INIT;
	struct strvec rev_walk_args = STRVEC_INIT;
	struct rev_info revs;
	struct commit *commit;
	struct merge_options merge_opt;
	struct tree *next_tree, *base_tree, *head_tree;
	struct merge_result result;
	struct strbuf reflog_msg = STRBUF_INIT;
	struct strbuf branch_name = STRBUF_INIT;
	int ret = 0;

	/*
	 * test-tool stuff doesn't set up the git directory by default; need to
	 * do that manually.
	 */
	setup_git_directory();

	if (argc == 2 && !strcmp(argv[1], "-h")) {
		printf("Sorry, I am not a psychiatrist; I can not give you the help you need.  Oh, you meant usage...\n");
		exit(129);
	}

	if (argc != 5 || strcmp(argv[1], "--onto"))
		die("usage: read the code, figure out how to use it, then do so");

	onto = peel_committish(argv[2]);
	strbuf_addf(&branch_name, "refs/heads/%s", argv[4]);

	/* Sanity check */
	if (get_oid("HEAD", &head))
		die(_("Cannot read HEAD"));
	assert(oideq(&onto->object.oid, &head));

	repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR);
	if (repo_read_index(the_repository) < 0)
		BUG("Could not read index");

	repo_init_revisions(the_repository, &revs, NULL);
	revs.verbose_header = 1;
	revs.max_parents = 1;
	revs.cherry_mark = 1;
	revs.limited = 1;
	revs.reverse = 1;
	revs.right_only = 1;
	revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
	revs.topo_order = 1;
	strvec_pushl(&rev_walk_args, "", argv[4], "--not", argv[3], NULL);

	if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
		ret = error(_("unhandled options"));
		goto cleanup;
	}

	strvec_clear(&rev_walk_args);

	if (prepare_revision_walk(&revs) < 0) {
		ret = error(_("error preparing revisions"));
		goto cleanup;
	}

	init_merge_options(&merge_opt, the_repository);
	memset(&result, 0, sizeof(result));
	merge_opt.show_rename_progress = 1;
	merge_opt.branch1 = "HEAD";
	head_tree = get_commit_tree(onto);
	result.tree = head_tree;
	last_commit = onto;
	while ((commit = get_revision(&revs))) {
		struct commit *base;

		fprintf(stderr, "Rebasing %s...\r",
			oid_to_hex(&commit->object.oid));
		assert(commit->parents && !commit->parents->next);
		base = commit->parents->item;

		next_tree = get_commit_tree(commit);
		base_tree = get_commit_tree(base);

		merge_opt.branch2 = short_commit_name(commit);
		merge_opt.ancestor = xstrfmt("parent of %s", merge_opt.branch2);

		merge_incore_nonrecursive(&merge_opt,
					  base_tree,
					  result.tree,
					  next_tree,
					  &result);

		free((char*)merge_opt.ancestor);
		merge_opt.ancestor = NULL;
		if (!result.clean)
			break;
		last_picked_commit = commit;
		last_commit = create_commit(result.tree, commit, last_commit);
	}

	merge_switch_to_result(&merge_opt, head_tree, &result, 1, !result.clean);

	if (result.clean < 0)
		exit(128);

	if (result.clean) {
		fprintf(stderr, "\nDone.\n");
		strbuf_addf(&reflog_msg, "finish rebase %s onto %s",
			    oid_to_hex(&last_picked_commit->object.oid),
			    oid_to_hex(&last_commit->object.oid));
		if (update_ref(reflog_msg.buf, branch_name.buf,
			       &last_commit->object.oid,
			       &last_picked_commit->object.oid,
			       REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
			error(_("could not update %s"), argv[4]);
			die("Failed to update %s", argv[4]);
		}
		if (create_symref("HEAD", branch_name.buf, reflog_msg.buf) < 0)
			die(_("unable to update HEAD"));

		prime_cache_tree(the_repository, the_repository->index,
				 result.tree);
	} else {
		fprintf(stderr, "\nAborting: Hit a conflict.\n");
		strbuf_addf(&reflog_msg, "rebase progress up to %s",
			    oid_to_hex(&last_picked_commit->object.oid));
		if (update_ref(reflog_msg.buf, "HEAD",
			       &last_commit->object.oid,
			       &head,
			       REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
			error(_("could not update %s"), argv[4]);
			die("Failed to update %s", argv[4]);
		}
	}
	if (write_locked_index(&the_index, &lock,
			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
		die(_("unable to write %s"), get_index_file());

	ret = (result.clean == 0);
cleanup:
	strbuf_release(&reflog_msg);
	strbuf_release(&branch_name);
	release_revisions(&revs);
	return ret;
}
Commit	Line	Data
fe1a21d5 EN	1	/*
	2	* "git fast-rebase" builtin command
	3	*
	4	* FAST: Forking Any Subprocesses (is) Taboo
	5	*
	6	* This is meant SOLELY as a demo of what is possible. sequencer.c and
	7	* rebase.c should be refactored to use the ideas here, rather than attempting
	8	* to extend this file to replace those (unless Phillip or Dscho say that
	9	* refactoring is too hard and we need a clean slate, but I'm guessing that
	10	* refactoring is the better route).
	11	*/
	12
bdafeae0	13	#define USE_THE_INDEX_VARIABLE
fe1a21d5	14	#include "test-tool.h"
a6dc3d36	15	#include "cache.h"
fe1a21d5 EN	16	#include "cache-tree.h"
fe1a21d5 EN	17	#include "commit.h"
41771fa4	18	#include "hex.h"
fe1a21d5 EN	19	#include "lockfile.h"
	20	#include "merge-ort.h"
	21	#include "refs.h"
	22	#include "revision.h"
	23	#include "sequencer.h"
	24	#include "strvec.h"
	25	#include "tree.h"
	26
	27	static const char short_commit_name(struct commit commit)
	28	{
	29	return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);
	30	}
	31
	32	static struct commit peel_committish(const char name)
	33	{
	34	struct object *obj;
	35	struct object_id oid;
	36
	37	if (get_oid(name, &oid))
	38	return NULL;
	39	obj = parse_object(the_repository, &oid);
	40	return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
	41	}
	42
	43	static char get_author(const char message)
	44	{
	45	size_t len;
	46	const char *a;
	47
	48	a = find_commit_header(message, "author", &len);
	49	if (a)
	50	return xmemdupz(a, len);
	51
	52	return NULL;
	53	}
	54
	55	static struct commit create_commit(struct tree tree,
	56	struct commit *based_on,
	57	struct commit *parent)
	58	{
	59	struct object_id ret;
	60	struct object *obj;
	61	struct commit_list *parents = NULL;
	62	char *author;
	63	char *sign_commit = NULL;
	64	struct commit_extra_header *extra;
	65	struct strbuf msg = STRBUF_INIT;
	66	const char *out_enc = get_commit_output_encoding();
	67	const char *message = logmsg_reencode(based_on, NULL, out_enc);
	68	const char *orig_message = NULL;
	69	const char *exclude_gpgsig[] = { "gpgsig", NULL };
	70
	71	commit_list_insert(parent, &parents);
	72	extra = read_commit_extra_headers(based_on, exclude_gpgsig);
	73	find_commit_subject(message, &orig_message);
	74	strbuf_addstr(&msg, orig_message);
	75	author = get_author(message);
	76	reset_ident_date();
	77	if (commit_tree_extended(msg.buf, msg.len, &tree->object.oid, parents,
	78	&ret, author, NULL, sign_commit, extra)) {
	79	error(_("failed to write commit object"));
	80	return NULL;
	81	}
	82	free(author);
83	strbuf_release(&msg);
84
85	obj = parse_object(the_repository, &ret);
86	return (struct commit *)obj;
87	}
88
89	int cmd__fast_rebase(int argc, const char **argv)
90	{
91	struct commit *onto;
92	struct commit last_commit = NULL, last_picked_commit = NULL;
93	struct object_id head;
94	struct lock_file lock = LOCK_INIT;
fe1a21d5 EN	95	struct strvec rev_walk_args = STRVEC_INIT;
	96	struct rev_info revs;
	97	struct commit *commit;
	98	struct merge_options merge_opt;
	99	struct tree next_tree, base_tree, *head_tree;
	100	struct merge_result result;
	101	struct strbuf reflog_msg = STRBUF_INIT;
	102	struct strbuf branch_name = STRBUF_INIT;
0139c58a	103	int ret = 0;
fe1a21d5 EN	104
	105	/*
	106	* test-tool stuff doesn't set up the git directory by default; need to
	107	* do that manually.
	108	*/
	109	setup_git_directory();
	110
	111	if (argc == 2 && !strcmp(argv[1], "-h")) {
	112	printf("Sorry, I am not a psychiatrist; I can not give you the help you need. Oh, you meant usage...\n");
	113	exit(129);
	114	}
	115
	116	if (argc != 5 \|\| strcmp(argv[1], "--onto"))
	117	die("usage: read the code, figure out how to use it, then do so");
	118
	119	onto = peel_committish(argv[2]);
	120	strbuf_addf(&branch_name, "refs/heads/%s", argv[4]);
	121
	122	/* Sanity check */
	123	if (get_oid("HEAD", &head))
	124	die(_("Cannot read HEAD"));
	125	assert(oideq(&onto->object.oid, &head));
	126
0ea414a1	127	repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR);
caba91c3 EN	128	if (repo_read_index(the_repository) < 0)
caba91c3 EN	129	BUG("Could not read index");
fe1a21d5 EN	130
	131	repo_init_revisions(the_repository, &revs, NULL);
	132	revs.verbose_header = 1;
	133	revs.max_parents = 1;
	134	revs.cherry_mark = 1;
	135	revs.limited = 1;
	136	revs.reverse = 1;
	137	revs.right_only = 1;
	138	revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
	139	revs.topo_order = 1;
	140	strvec_pushl(&rev_walk_args, "", argv[4], "--not", argv[3], NULL);
	141
0139c58a ÆAB	142	if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
	143	ret = error(_("unhandled options"));
	144	goto cleanup;
	145	}
fe1a21d5 EN	146
	147	strvec_clear(&rev_walk_args);
	148
0139c58a ÆAB	149	if (prepare_revision_walk(&revs) < 0) {
	150	ret = error(_("error preparing revisions"));
	151	goto cleanup;
	152	}
fe1a21d5 EN	153
	154	init_merge_options(&merge_opt, the_repository);
	155	memset(&result, 0, sizeof(result));
	156	merge_opt.show_rename_progress = 1;
	157	merge_opt.branch1 = "HEAD";
	158	head_tree = get_commit_tree(onto);
	159	result.tree = head_tree;
	160	last_commit = onto;
	161	while ((commit = get_revision(&revs))) {
	162	struct commit *base;
	163
	164	fprintf(stderr, "Rebasing %s...\r",
	165	oid_to_hex(&commit->object.oid));
	166	assert(commit->parents && !commit->parents->next);
	167	base = commit->parents->item;
	168
	169	next_tree = get_commit_tree(commit);
	170	base_tree = get_commit_tree(base);
	171
	172	merge_opt.branch2 = short_commit_name(commit);
	173	merge_opt.ancestor = xstrfmt("parent of %s", merge_opt.branch2);
	174
	175	merge_incore_nonrecursive(&merge_opt,
	176	base_tree,
	177	result.tree,
	178	next_tree,
	179	&result);
	180
	181	free((char*)merge_opt.ancestor);
	182	merge_opt.ancestor = NULL;
	183	if (!result.clean)
f9500261	184	break;
fe1a21d5 EN	185	last_picked_commit = commit;
	186	last_commit = create_commit(result.tree, commit, last_commit);
	187	}
fe1a21d5 EN	188
	189	merge_switch_to_result(&merge_opt, head_tree, &result, 1, !result.clean);
	190
	191	if (result.clean < 0)
	192	exit(128);
	193
f9500261 EN	194	if (result.clean) {
	195	fprintf(stderr, "\nDone.\n");
	196	strbuf_addf(&reflog_msg, "finish rebase %s onto %s",
	197	oid_to_hex(&last_picked_commit->object.oid),
	198	oid_to_hex(&last_commit->object.oid));
	199	if (update_ref(reflog_msg.buf, branch_name.buf,
	200	&last_commit->object.oid,
	201	&last_picked_commit->object.oid,
	202	REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
	203	error(_("could not update %s"), argv[4]);
	204	die("Failed to update %s", argv[4]);
	205	}
	206	if (create_symref("HEAD", branch_name.buf, reflog_msg.buf) < 0)
	207	die(_("unable to update HEAD"));
f9500261 EN	208
	209	prime_cache_tree(the_repository, the_repository->index,
	210	result.tree);
	211	} else {
	212	fprintf(stderr, "\nAborting: Hit a conflict.\n");
	213	strbuf_addf(&reflog_msg, "rebase progress up to %s",
	214	oid_to_hex(&last_picked_commit->object.oid));
	215	if (update_ref(reflog_msg.buf, "HEAD",
	216	&last_commit->object.oid,
	217	&head,
	218	REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
	219	error(_("could not update %s"), argv[4]);
	220	die("Failed to update %s", argv[4]);
	221	}
fe1a21d5	222	}
fe1a21d5 EN	223	if (write_locked_index(&the_index, &lock,
	224	COMMIT_LOCK \| SKIP_IF_UNCHANGED))
	225	die(_("unable to write %s"), get_index_file());
b925fcf1	226
0139c58a ÆAB	227	ret = (result.clean == 0);
0139c58a ÆAB	228	cleanup:
b925fcf1 ÆAB	229	strbuf_release(&reflog_msg);
b925fcf1 ÆAB	230	strbuf_release(&branch_name);
0139c58a ÆAB	231	release_revisions(&revs);
0139c58a ÆAB	232	return ret;
fe1a21d5	233	}