rebase.c 33.2 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14
/*
 * Copyright (C) the libgit2 contributors. All rights reserved.
 *
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
 */

#include "common.h"
#include "buffer.h"
#include "repository.h"
#include "posix.h"
#include "filebuf.h"
#include "merge.h"
#include "array.h"
15
#include "config.h"
16
#include "annotated_commit.h"
17
#include "index.h"
18 19

#include <git2/types.h>
20
#include <git2/annotated_commit.h>
21 22 23 24
#include <git2/rebase.h>
#include <git2/commit.h>
#include <git2/reset.h>
#include <git2/revwalk.h>
25
#include <git2/notes.h>
26

27 28
#define REBASE_APPLY_DIR    "rebase-apply"
#define REBASE_MERGE_DIR    "rebase-merge"
29

30 31 32 33 34 35
#define HEAD_NAME_FILE      "head-name"
#define ORIG_HEAD_FILE      "orig-head"
#define HEAD_FILE           "head"
#define ONTO_FILE           "onto"
#define ONTO_NAME_FILE      "onto_name"
#define QUIET_FILE          "quiet"
36

37 38 39 40 41
#define MSGNUM_FILE         "msgnum"
#define END_FILE            "end"
#define CMT_FILE_FMT        "cmt.%" PRIuZ
#define CURRENT_FILE        "current"
#define REWRITTEN_FILE      "rewritten"
42

43
#define ORIG_DETACHED_HEAD  "detached HEAD"
44

45
#define NOTES_DEFAULT_REF   NULL
46

47 48
#define REBASE_DIR_MODE     0777
#define REBASE_FILE_MODE    0666
49 50 51 52 53

typedef enum {
	GIT_REBASE_TYPE_NONE = 0,
	GIT_REBASE_TYPE_APPLY = 1,
	GIT_REBASE_TYPE_MERGE = 2,
54
	GIT_REBASE_TYPE_INTERACTIVE = 3,
55 56
} git_rebase_type_t;

57 58 59
struct git_rebase {
	git_repository *repo;

60 61
	git_rebase_options options;

62 63 64
	git_rebase_type_t type;
	char *state_path;

65
	int head_detached : 1,
66
		inmemory : 1,
67 68
		quiet : 1,
		started : 1;
69

70 71 72 73
	git_array_t(git_rebase_operation) operations;
	size_t current;

	/* Used by in-memory rebase */
74
	git_index *index;
75 76 77
	git_commit *last_commit;

	/* Used by regular (not in-memory) merge-style rebase */
78
	git_oid orig_head_id;
79
	char *orig_head_name;
80

81
	git_oid onto_id;
82
	char *onto_name;
83
};
84 85 86

#define GIT_REBASE_STATE_INIT {0}

87 88 89 90 91 92 93 94
static int rebase_state_type(
	git_rebase_type_t *type_out,
	char **path_out,
	git_repository *repo)
{
	git_buf path = GIT_BUF_INIT;
	git_rebase_type_t type = GIT_REBASE_TYPE_NONE;

95
	if (git_buf_joinpath(&path, repo->gitdir, REBASE_APPLY_DIR) < 0)
96 97 98 99 100 101 102 103
		return -1;

	if (git_path_isdir(git_buf_cstr(&path))) {
		type = GIT_REBASE_TYPE_APPLY;
		goto done;
	}

	git_buf_clear(&path);
104
	if (git_buf_joinpath(&path, repo->gitdir, REBASE_MERGE_DIR) < 0)
105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
		return -1;

	if (git_path_isdir(git_buf_cstr(&path))) {
		type = GIT_REBASE_TYPE_MERGE;
		goto done;
	}

done:
	*type_out = type;

	if (type != GIT_REBASE_TYPE_NONE && path_out)
		*path_out = git_buf_detach(&path);

	git_buf_free(&path);

	return 0;
}

123 124 125 126
GIT_INLINE(int) rebase_readfile(
	git_buf *out,
	git_buf *state_path,
	const char *filename)
127
{
128 129
	size_t state_path_len = state_path->size;
	int error;
130

131 132 133 134
	git_buf_clear(out);

	if ((error = git_buf_joinpath(state_path, state_path->ptr, filename)) < 0 ||
		(error = git_futils_readbuffer(out, state_path->ptr)) < 0)
135 136
		goto done;

137
	git_buf_rtrim(out);
138

139 140 141 142
done:
	git_buf_truncate(state_path, state_path_len);
	return error;
}
143

144 145 146 147
GIT_INLINE(int) rebase_readint(
	size_t *out, git_buf *asc_out, git_buf *state_path, const char *filename)
{
	int32_t num;
148
	const char *eol;
149
	int error = 0;
150

151 152
	if ((error = rebase_readfile(asc_out, state_path, filename)) < 0)
		return error;
153

154
	if (git__strtol32(&num, asc_out->ptr, &eol, 10) < 0 || num < 0 || *eol) {
155
		giterr_set(GITERR_REBASE, "the file '%s' contains an invalid numeric value", filename);
156 157
		return -1;
	}
158

159
	*out = (size_t) num;
160

161 162
	return 0;
}
163

164 165 166 167
GIT_INLINE(int) rebase_readoid(
	git_oid *out, git_buf *str_out, git_buf *state_path, const char *filename)
{
	int error;
168

169 170
	if ((error = rebase_readfile(str_out, state_path, filename)) < 0)
		return error;
171

172
	if (str_out->size != GIT_OID_HEXSZ || git_oid_fromstr(out, str_out->ptr) < 0) {
173
		giterr_set(GITERR_REBASE, "the file '%s' contains an invalid object ID", filename);
174 175
		return -1;
	}
176

177 178
	return 0;
}
179

180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200
static git_rebase_operation *rebase_operation_alloc(
	git_rebase *rebase,
	git_rebase_operation_t type,
	git_oid *id,
	const char *exec)
{
	git_rebase_operation *operation;

	assert((type == GIT_REBASE_OPERATION_EXEC) == !id);
	assert((type == GIT_REBASE_OPERATION_EXEC) == !!exec);

	if ((operation = git_array_alloc(rebase->operations)) == NULL)
		return NULL;

	operation->type = type;
	git_oid_cpy((git_oid *)&operation->id, id);
	operation->exec = exec;

	return operation;
}

201 202 203
static int rebase_open_merge(git_rebase *rebase)
{
	git_buf state_path = GIT_BUF_INIT, buf = GIT_BUF_INIT, cmt = GIT_BUF_INIT;
204
	git_oid id;
205 206 207
	git_rebase_operation *operation;
	size_t i, msgnum = 0, end;
	int error;
208

209 210
	if ((error = git_buf_puts(&state_path, rebase->state_path)) < 0)
		goto done;
211

212 213 214 215
	/* Read 'msgnum' if it exists (otherwise, let msgnum = 0) */
	if ((error = rebase_readint(&msgnum, &buf, &state_path, MSGNUM_FILE)) < 0 &&
		error != GIT_ENOTFOUND)
		goto done;
216

217 218 219 220
	if (msgnum) {
		rebase->started = 1;
		rebase->current = msgnum - 1;
	}
221

222 223
	/* Read 'end' */
	if ((error = rebase_readint(&end, &buf, &state_path, END_FILE)) < 0)
224 225
		goto done;

226
	/* Read 'current' if it exists */
227
	if ((error = rebase_readoid(&id, &buf, &state_path, CURRENT_FILE)) < 0 &&
228 229 230 231 232 233
		error != GIT_ENOTFOUND)
		goto done;

	/* Read cmt.* */
	git_array_init_to_size(rebase->operations, end);
	GITERR_CHECK_ARRAY(rebase->operations);
234

235 236 237 238
	for (i = 0; i < end; i++) {
		git_buf_clear(&cmt);

		if ((error = git_buf_printf(&cmt, "cmt.%" PRIuZ, (i+1))) < 0 ||
239
			(error = rebase_readoid(&id, &buf, &state_path, cmt.ptr)) < 0)
240
			goto done;
241 242 243

		operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL);
		GITERR_CHECK_ALLOC(operation);
244
	}
245

246 247 248 249 250 251
	/* Read 'onto_name' */
	if ((error = rebase_readfile(&buf, &state_path, ONTO_NAME_FILE)) < 0)
		goto done;

	rebase->onto_name = git_buf_detach(&buf);

252
done:
253 254 255
	git_buf_free(&cmt);
	git_buf_free(&state_path);
	git_buf_free(&buf);
256 257 258 259

	return error;
}

260
static int rebase_alloc(git_rebase **out, const git_rebase_options *rebase_opts)
261 262
{
	git_rebase *rebase = git__calloc(1, sizeof(git_rebase));
263
	GITERR_CHECK_ALLOC(rebase);
264

265
	*out = NULL;
266 267 268 269 270 271 272

	if (rebase_opts)
		memcpy(&rebase->options, rebase_opts, sizeof(git_rebase_options));
	else
		git_rebase_init_options(&rebase->options, GIT_REBASE_OPTIONS_VERSION);

	if (rebase_opts && rebase_opts->rewrite_notes_ref) {
273 274
		rebase->options.rewrite_notes_ref = git__strdup(rebase_opts->rewrite_notes_ref);
		GITERR_CHECK_ALLOC(rebase->options.rewrite_notes_ref);
275 276
	}

277 278
	if ((rebase->options.checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0)
		rebase->options.checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
279

280 281 282
	*out = rebase;

	return 0;
283 284 285 286 287 288 289
}

static int rebase_check_versions(const git_rebase_options *given_opts)
{
	GITERR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options");

	if (given_opts)
290
		GITERR_CHECK_VERSION(&given_opts->checkout_options, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options");
291 292 293 294 295 296 297 298

	return 0;
}

int git_rebase_open(
	git_rebase **out,
	git_repository *repo,
	const git_rebase_options *given_opts)
299
{
300
	git_rebase *rebase;
301
	git_buf path = GIT_BUF_INIT, orig_head_name = GIT_BUF_INIT,
302
		orig_head_id = GIT_BUF_INIT, onto_id = GIT_BUF_INIT;
303 304
	int state_path_len, error;

305 306
	assert(repo);

307 308 309
	if ((error = rebase_check_versions(given_opts)) < 0)
		return error;

310 311
	if (rebase_alloc(&rebase, given_opts) < 0)
		return -1;
312

313 314 315
	rebase->repo = repo;

	if ((error = rebase_state_type(&rebase->type, &rebase->state_path, repo)) < 0)
316 317
		goto done;

318
	if (rebase->type == GIT_REBASE_TYPE_NONE) {
319
		giterr_set(GITERR_REBASE, "there is no rebase in progress");
Jacques Germishuys committed
320 321
		error = GIT_ENOTFOUND;
		goto done;
322 323
	}

324
	if ((error = git_buf_puts(&path, rebase->state_path)) < 0)
325 326 327 328 329 330 331 332 333 334 335
		goto done;

	state_path_len = git_buf_len(&path);

	if ((error = git_buf_joinpath(&path, path.ptr, HEAD_NAME_FILE)) < 0 ||
		(error = git_futils_readbuffer(&orig_head_name, path.ptr)) < 0)
		goto done;

	git_buf_rtrim(&orig_head_name);

	if (strcmp(ORIG_DETACHED_HEAD, orig_head_name.ptr) == 0)
336
		rebase->head_detached = 1;
337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355

	git_buf_truncate(&path, state_path_len);

	if ((error = git_buf_joinpath(&path, path.ptr, ORIG_HEAD_FILE)) < 0)
		goto done;

	if (!git_path_isfile(path.ptr)) {
		/* Previous versions of git.git used 'head' here; support that. */
		git_buf_truncate(&path, state_path_len);

		if ((error = git_buf_joinpath(&path, path.ptr, HEAD_FILE)) < 0)
			goto done;
	}

	if ((error = git_futils_readbuffer(&orig_head_id, path.ptr)) < 0)
		goto done;

	git_buf_rtrim(&orig_head_id);

356
	if ((error = git_oid_fromstr(&rebase->orig_head_id, orig_head_id.ptr)) < 0)
357 358
		goto done;

359 360 361 362 363 364 365 366
	git_buf_truncate(&path, state_path_len);

	if ((error = git_buf_joinpath(&path, path.ptr, ONTO_FILE)) < 0 ||
		(error = git_futils_readbuffer(&onto_id, path.ptr)) < 0)
		goto done;

	git_buf_rtrim(&onto_id);

367
	if ((error = git_oid_fromstr(&rebase->onto_id, onto_id.ptr)) < 0)
368 369
		goto done;

370 371
	if (!rebase->head_detached)
		rebase->orig_head_name = git_buf_detach(&orig_head_name);
372

373
	switch (rebase->type) {
374
	case GIT_REBASE_TYPE_INTERACTIVE:
375
		giterr_set(GITERR_REBASE, "interactive rebase is not supported");
376 377 378
		error = -1;
		break;
	case GIT_REBASE_TYPE_MERGE:
379
		error = rebase_open_merge(rebase);
380 381
		break;
	case GIT_REBASE_TYPE_APPLY:
382
		giterr_set(GITERR_REBASE, "patch application rebase is not supported");
383 384 385 386 387 388
		error = -1;
		break;
	default:
		abort();
	}

389
done:
390 391 392 393 394
	if (error == 0)
		*out = rebase;
	else
		git_rebase_free(rebase);

395 396 397 398 399 400 401
	git_buf_free(&path);
	git_buf_free(&orig_head_name);
	git_buf_free(&orig_head_id);
	git_buf_free(&onto_id);
	return error;
}

402
static int rebase_cleanup(git_rebase *rebase)
403
{
404 405 406
	if (!rebase || rebase->inmemory)
		return 0;

407 408
	return git_path_isdir(rebase->state_path) ?
		git_futils_rmdir_r(rebase->state_path, NULL, GIT_RMDIR_REMOVE_FILES) :
409 410 411
		0;
}

412
static int rebase_setupfile(git_rebase *rebase, const char *filename, int flags, const char *fmt, ...)
413 414 415 416 417 418 419 420 421 422
{
	git_buf path = GIT_BUF_INIT,
		contents = GIT_BUF_INIT;
	va_list ap;
	int error;

	va_start(ap, fmt);
	git_buf_vprintf(&contents, fmt, ap);
	va_end(ap);

423
	if ((error = git_buf_joinpath(&path, rebase->state_path, filename)) == 0)
424
		error = git_futils_writebuffer(&contents, path.ptr, flags, REBASE_FILE_MODE);
425 426 427 428 429 430 431

	git_buf_free(&path);
	git_buf_free(&contents);

	return error;
}

432
static const char *rebase_onto_name(const git_annotated_commit *onto)
433 434 435 436 437 438
{
	if (onto->ref_name && git__strncmp(onto->ref_name, "refs/heads/", 11) == 0)
		return onto->ref_name + 11;
	else if (onto->ref_name)
		return onto->ref_name;
	else
439
		return onto->id_str;
440 441
}

442
static int rebase_setupfiles_merge(git_rebase *rebase)
443 444 445
{
	git_buf commit_filename = GIT_BUF_INIT;
	char id_str[GIT_OID_HEXSZ];
446 447 448
	git_rebase_operation *operation;
	size_t i;
	int error = 0;
449

450 451
	if ((error = rebase_setupfile(rebase, END_FILE, 0, "%" PRIuZ "\n", git_array_size(rebase->operations))) < 0 ||
		(error = rebase_setupfile(rebase, ONTO_NAME_FILE, 0, "%s\n", rebase->onto_name)) < 0)
452 453
		goto done;

454 455
	for (i = 0; i < git_array_size(rebase->operations); i++) {
		operation = git_array_get(rebase->operations, i);
456 457

		git_buf_clear(&commit_filename);
458 459 460
		git_buf_printf(&commit_filename, CMT_FILE_FMT, i+1);

		git_oid_fmt(id_str, &operation->id);
461

462
		if ((error = rebase_setupfile(rebase, commit_filename.ptr, 0,
463 464 465 466 467 468 469 470 471
				"%.*s\n", GIT_OID_HEXSZ, id_str)) < 0)
			goto done;
	}

done:
	git_buf_free(&commit_filename);
	return error;
}

472
static int rebase_setupfiles(git_rebase *rebase)
473
{
474
	char onto[GIT_OID_HEXSZ], orig_head[GIT_OID_HEXSZ];
475
	const char *orig_head_name;
476

477 478
	git_oid_fmt(onto, &rebase->onto_id);
	git_oid_fmt(orig_head, &rebase->orig_head_id);
479

480
	if (p_mkdir(rebase->state_path, REBASE_DIR_MODE) < 0) {
481
		giterr_set(GITERR_OS, "failed to create rebase directory '%s'", rebase->state_path);
482
		return -1;
483 484
	}

485 486 487
	orig_head_name = rebase->head_detached ? ORIG_DETACHED_HEAD :
		rebase->orig_head_name;

488
	if (git_repository__set_orig_head(rebase->repo, &rebase->orig_head_id) < 0 ||
489 490 491 492
		rebase_setupfile(rebase, HEAD_NAME_FILE, 0, "%s\n", orig_head_name) < 0 ||
		rebase_setupfile(rebase, ONTO_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, onto) < 0 ||
		rebase_setupfile(rebase, ORIG_HEAD_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, orig_head) < 0 ||
		rebase_setupfile(rebase, QUIET_FILE, 0, rebase->quiet ? "t\n" : "\n") < 0)
493
		return -1;
494

495
	return rebase_setupfiles_merge(rebase);
496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513
}

int git_rebase_init_options(git_rebase_options *opts, unsigned int version)
{
	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
		opts, version, git_rebase_options, GIT_REBASE_OPTIONS_INIT);
	return 0;
}

static int rebase_ensure_not_in_progress(git_repository *repo)
{
	int error;
	git_rebase_type_t type;

	if ((error = rebase_state_type(&type, NULL, repo)) < 0)
		return error;

	if (type != GIT_REBASE_TYPE_NONE) {
514
		giterr_set(GITERR_REBASE, "there is an existing rebase in progress");
515 516 517 518 519 520
		return -1;
	}

	return 0;
}

521 522 523 524 525
static int rebase_ensure_not_dirty(
	git_repository *repo,
	bool check_index,
	bool check_workdir,
	int fail_with)
526 527 528 529
{
	git_tree *head = NULL;
	git_index *index = NULL;
	git_diff *diff = NULL;
530
	int error = 0;
531

532 533 534 535 536
	if (check_index) {
		if ((error = git_repository_head_tree(&head, repo)) < 0 ||
			(error = git_repository_index(&index, repo)) < 0 ||
			(error = git_diff_tree_to_index(&diff, repo, head, index, NULL)) < 0)
			goto done;
537

538
		if (git_diff_num_deltas(diff) > 0) {
539
			giterr_set(GITERR_REBASE, "uncommitted changes exist in index");
540 541 542
			error = fail_with;
			goto done;
		}
543

544 545 546
		git_diff_free(diff);
		diff = NULL;
	}
547

548
	if (check_workdir) {
549 550 551
		git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
		diff_opts.ignore_submodules = GIT_SUBMODULE_IGNORE_UNTRACKED;
		if ((error = git_diff_index_to_workdir(&diff, repo, index, &diff_opts)) < 0)
552
			goto done;
553

554
		if (git_diff_num_deltas(diff) > 0) {
555
			giterr_set(GITERR_REBASE, "unstaged changes exist in workdir");
556 557 558
			error = fail_with;
			goto done;
		}
559 560 561 562 563 564 565 566 567 568
	}

done:
	git_diff_free(diff);
	git_index_free(index);
	git_tree_free(head);

	return error;
}

569 570 571
static int rebase_init_operations(
	git_rebase *rebase,
	git_repository *repo,
572 573 574
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto)
575 576 577 578 579 580 581 582 583 584 585 586
{
	git_revwalk *revwalk = NULL;
	git_commit *commit;
	git_oid id;
	bool merge;
	git_rebase_operation *operation;
	int error;

	if (!upstream)
		upstream = onto;

	if ((error = git_revwalk_new(&revwalk, rebase->repo)) < 0 ||
587 588
		(error = git_revwalk_push(revwalk, git_annotated_commit_id(branch))) < 0 ||
		(error = git_revwalk_hide(revwalk, git_annotated_commit_id(upstream))) < 0)
589 590
		goto done;

591
	git_revwalk_sorting(revwalk, GIT_SORT_REVERSE);
592 593 594 595 596 597 598 599 600 601 602

	while ((error = git_revwalk_next(&id, revwalk)) == 0) {
		if ((error = git_commit_lookup(&commit, repo, &id)) < 0)
			goto done;

		merge = (git_commit_parentcount(commit) > 1);
		git_commit_free(commit);

		if (merge)
			continue;

603
		operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL);
604
		GITERR_CHECK_ALLOC(operation);
605 606 607 608 609 610 611 612 613 614 615 616
	}

	error = 0;

done:
	git_revwalk_free(revwalk);
	return error;
}

static int rebase_init_merge(
	git_rebase *rebase,
	git_repository *repo,
617 618 619
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto)
620
{
621
	git_reference *head_ref = NULL;
622 623
	git_commit *onto_commit = NULL;
	git_buf reflog = GIT_BUF_INIT;
624 625 626
	git_buf state_path = GIT_BUF_INIT;
	int error;

627 628
	GIT_UNUSED(upstream);

629
	if ((error = git_buf_joinpath(&state_path, repo->gitdir, REBASE_MERGE_DIR)) < 0)
630 631
		goto done;

632
	rebase->state_path = git_buf_detach(&state_path);
633 634
	GITERR_CHECK_ALLOC(rebase->state_path);

635
	if (branch->ref_name && strcmp(branch->ref_name, "HEAD")) {
636 637 638 639 640
		rebase->orig_head_name = git__strdup(branch->ref_name);
		GITERR_CHECK_ALLOC(rebase->orig_head_name);
	} else {
		rebase->head_detached = 1;
	}
641 642 643 644

	rebase->onto_name = git__strdup(rebase_onto_name(onto));
	GITERR_CHECK_ALLOC(rebase->onto_name);

645
	rebase->quiet = rebase->options.quiet;
646

647 648
	git_oid_cpy(&rebase->orig_head_id, git_annotated_commit_id(branch));
	git_oid_cpy(&rebase->onto_id, git_annotated_commit_id(onto));
649

650 651 652 653 654 655 656 657 658 659
	if ((error = rebase_setupfiles(rebase)) < 0 ||
		(error = git_buf_printf(&reflog,
			"rebase: checkout %s", rebase_onto_name(onto))) < 0 ||
		(error = git_commit_lookup(
			&onto_commit, repo, git_annotated_commit_id(onto))) < 0 ||
		(error = git_checkout_tree(repo,
			(git_object *)onto_commit, &rebase->options.checkout_options)) < 0 ||
		(error = git_reference_create(&head_ref, repo, GIT_HEAD_FILE,
			git_annotated_commit_id(onto), 1, reflog.ptr)) < 0)
		goto done;
660

661 662
done:
	git_reference_free(head_ref);
663 664 665
	git_commit_free(onto_commit);
	git_buf_free(&reflog);
	git_buf_free(&state_path);
666

667 668 669
	return error;
}

670 671 672 673 674 675 676 677 678 679 680 681 682 683
static int rebase_init_inmemory(
	git_rebase *rebase,
	git_repository *repo,
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto)
{
	GIT_UNUSED(branch);
	GIT_UNUSED(upstream);

	return git_commit_lookup(
		&rebase->last_commit, repo, git_annotated_commit_id(onto));
}

684 685
int git_rebase_init(
	git_rebase **out,
686
	git_repository *repo,
687 688 689
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto,
690
	const git_rebase_options *given_opts)
691
{
692
	git_rebase *rebase = NULL;
693
	git_annotated_commit *head_branch = NULL;
694
	git_reference *head_ref = NULL;
695
	bool inmemory = (given_opts && given_opts->inmemory);
696 697
	int error;

698
	assert(repo && (upstream || onto));
699

700 701 702 703 704
	*out = NULL;

	if (!onto)
		onto = upstream;

705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721
	if ((error = rebase_check_versions(given_opts)) < 0)
		goto done;

	if (!inmemory) {
		if ((error = git_repository__ensure_not_bare(repo, "rebase")) < 0 ||
			(error = rebase_ensure_not_in_progress(repo)) < 0 ||
			(error = rebase_ensure_not_dirty(repo, true, true, GIT_ERROR)) < 0)
			goto done;
	}

	if (!branch) {
		if ((error = git_repository_head(&head_ref, repo)) < 0 ||
			(error = git_annotated_commit_from_ref(&head_branch, repo, head_ref)) < 0)
			goto done;

		branch = head_branch;
	}
722

723 724
	if (rebase_alloc(&rebase, given_opts) < 0)
		return -1;
725

726 727 728 729 730
	rebase->repo = repo;
	rebase->inmemory = inmemory;
	rebase->type = GIT_REBASE_TYPE_MERGE;

	if ((error = rebase_init_operations(rebase, repo, branch, upstream, onto)) < 0)
731 732
		goto done;

733 734 735
	if (inmemory)
		error = rebase_init_inmemory(rebase, repo, branch, upstream, onto);
	else
736
		error = rebase_init_merge(rebase, repo, branch ,upstream, onto);
737 738 739

	if (error == 0)
		*out = rebase;
740 741

done:
742
	git_reference_free(head_ref);
743 744
	git_annotated_commit_free(head_branch);

745 746 747 748 749
	if (error < 0) {
		rebase_cleanup(rebase);
		git_rebase_free(rebase);
	}

750 751
	return error;
}
752

753
static void normalize_checkout_options_for_apply(
754
	git_checkout_options *checkout_opts,
755 756
	git_rebase *rebase,
	git_commit *current_commit)
757
{
758
	memcpy(checkout_opts, &rebase->options.checkout_options, sizeof(git_checkout_options));
759 760 761 762

	if (!checkout_opts->ancestor_label)
		checkout_opts->ancestor_label = "ancestor";

763
	if (rebase->type == GIT_REBASE_TYPE_MERGE) {
764
		if (!checkout_opts->our_label)
765
			checkout_opts->our_label = rebase->onto_name;
766

767 768
		if (!checkout_opts->their_label)
			checkout_opts->their_label = git_commit_summary(current_commit);
769 770 771 772 773
	} else {
		abort();
	}
}

774 775 776 777 778 779 780 781 782 783 784 785 786
GIT_INLINE(int) rebase_movenext(git_rebase *rebase)
{
	size_t next = rebase->started ? rebase->current + 1 : 0;

	if (next == git_array_size(rebase->operations))
		return GIT_ITEROVER;

	rebase->started = 1;
	rebase->current = next;

	return 0;
}

787
static int rebase_next_merge(
788
	git_rebase_operation **out,
789
	git_rebase *rebase)
790
{
791 792
	git_buf path = GIT_BUF_INIT;
	git_commit *current_commit = NULL, *parent_commit = NULL;
793 794
	git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL;
	git_index *index = NULL;
795
	git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
796
	git_rebase_operation *operation;
797
	git_checkout_options checkout_opts;
798
	char current_idstr[GIT_OID_HEXSZ];
799 800 801
	unsigned int parent_count;
	int error;

802
	*out = NULL;
803

804
	operation = git_array_get(rebase->operations, rebase->current);
805

806 807
	if ((error = git_commit_lookup(&current_commit, rebase->repo, &operation->id)) < 0 ||
		(error = git_commit_tree(&current_tree, current_commit)) < 0 ||
808
		(error = git_repository_head_tree(&head_tree, rebase->repo)) < 0)
809 810
		goto done;

811
	if ((parent_count = git_commit_parentcount(current_commit)) > 1) {
812
		giterr_set(GITERR_REBASE, "cannot rebase a merge commit");
813 814 815
		error = -1;
		goto done;
	} else if (parent_count) {
816
		if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 ||
817 818 819 820
			(error = git_commit_tree(&parent_tree, parent_commit)) < 0)
			goto done;
	}

821 822
	git_oid_fmt(current_idstr, &operation->id);

823
	normalize_checkout_options_for_apply(&checkout_opts, rebase, current_commit);
824

825
	if ((error = git_indexwriter_init_for_operation(&indexwriter, rebase->repo, &checkout_opts.checkout_strategy)) < 0 ||
826 827
		(error = rebase_setupfile(rebase, MSGNUM_FILE, 0, "%" PRIuZ "\n", rebase->current+1)) < 0 ||
		(error = rebase_setupfile(rebase, CURRENT_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, current_idstr)) < 0 ||
828
		(error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0 ||
829
		(error = git_merge__check_result(rebase->repo, index)) < 0 ||
830 831
		(error = git_checkout_index(rebase->repo, index, &checkout_opts)) < 0 ||
		(error = git_indexwriter_commit(&indexwriter)) < 0)
832 833
		goto done;

834
	*out = operation;
835

836
done:
837
	git_indexwriter_cleanup(&indexwriter);
838 839 840 841 842
	git_index_free(index);
	git_tree_free(current_tree);
	git_tree_free(head_tree);
	git_tree_free(parent_tree);
	git_commit_free(parent_commit);
843
	git_commit_free(current_commit);
844 845 846 847 848
	git_buf_free(&path);

	return error;
}

849 850 851 852 853 854 855 856
static int rebase_next_inmemory(
	git_rebase_operation **out,
	git_rebase *rebase)
{
	git_commit *current_commit = NULL, *parent_commit = NULL;
	git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL;
	git_rebase_operation *operation;
	git_index *index = NULL;
857
	unsigned int parent_count;
858 859 860 861 862 863 864
	int error;

	*out = NULL;

	operation = git_array_get(rebase->operations, rebase->current);

	if ((error = git_commit_lookup(&current_commit, rebase->repo, &operation->id)) < 0 ||
865 866 867 868
		(error = git_commit_tree(&current_tree, current_commit)) < 0)
		goto done;

	if ((parent_count = git_commit_parentcount(current_commit)) > 1) {
869
		giterr_set(GITERR_REBASE, "cannot rebase a merge commit");
870 871 872 873 874 875 876 877 878
		error = -1;
		goto done;
	} else if (parent_count) {
		if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 ||
			(error = git_commit_tree(&parent_tree, parent_commit)) < 0)
			goto done;
	}

	if ((error = git_commit_tree(&head_tree, rebase->last_commit)) < 0 ||
879
		(error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0)
880 881
		goto done;

882 883 884 885 886 887 888
	if (!rebase->index) {
		rebase->index = index;
		index = NULL;
	} else {
		if ((error = git_index_read_index(rebase->index, index)) < 0)
			goto done;
	}
889 890 891 892 893 894 895 896 897 898 899 900 901 902

	*out = operation;

done:
	git_commit_free(current_commit);
	git_commit_free(parent_commit);
	git_tree_free(current_tree);
	git_tree_free(head_tree);
	git_tree_free(parent_tree);
	git_index_free(index);

	return error;
}

903
int git_rebase_next(
904
	git_rebase_operation **out,
905
	git_rebase *rebase)
906 907 908
{
	int error;

909
	assert(out && rebase);
910

911 912 913 914 915 916
	if ((error = rebase_movenext(rebase)) < 0)
		return error;

	if (rebase->inmemory)
		error = rebase_next_inmemory(out, rebase);
	else if (rebase->type == GIT_REBASE_TYPE_MERGE)
917
		error = rebase_next_merge(out, rebase);
918
	else
919 920
		abort();

921 922 923
	return error;
}

924 925 926 927 928 929 930 931 932 933 934 935
int git_rebase_inmemory_index(
	git_index **out,
	git_rebase *rebase)
{
	assert(out && rebase && rebase->index);

	GIT_REFCOUNT_INC(rebase->index);
	*out = rebase->index;

	return 0;
}

936 937
static int rebase_commit__create(
	git_commit **out,
938
	git_rebase *rebase,
939 940
	git_index *index,
	git_commit *parent_commit,
941 942 943 944 945
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
946
	git_rebase_operation *operation;
947 948 949
	git_commit *current_commit = NULL, *commit = NULL;
	git_tree *parent_tree = NULL, *tree = NULL;
	git_oid tree_id, commit_id;
950 951
	int error;

952
	operation = git_array_get(rebase->operations, rebase->current);
953 954

	if (git_index_has_conflicts(index)) {
955
		giterr_set(GITERR_REBASE, "conflicts have not been resolved");
956
		error = GIT_EUNMERGED;
957 958 959
		goto done;
	}

960 961 962 963
	if ((error = git_commit_lookup(&current_commit, rebase->repo, &operation->id)) < 0 ||
		(error = git_commit_tree(&parent_tree, parent_commit)) < 0 ||
		(error = git_index_write_tree_to(&tree_id, index, rebase->repo)) < 0 ||
		(error = git_tree_lookup(&tree, rebase->repo, &tree_id)) < 0)
964 965
		goto done;

966 967
	if (git_oid_equal(&tree_id, git_tree_id(parent_tree))) {
		giterr_set(GITERR_REBASE, "this patch has already been applied");
968 969 970 971
		error = GIT_EAPPLIED;
		goto done;
	}

972
	if (!author)
973
		author = git_commit_author(current_commit);
974 975

	if (!message) {
976 977
		message_encoding = git_commit_message_encoding(current_commit);
		message = git_commit_message(current_commit);
978 979
	}

980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022
	if ((error = git_commit_create(&commit_id, rebase->repo, NULL, author,
		committer, message_encoding, message, tree, 1,
		(const git_commit **)&parent_commit)) < 0 ||
		(error = git_commit_lookup(&commit, rebase->repo, &commit_id)) < 0)
		goto done;

	*out = commit;

done:
	if (error < 0)
		git_commit_free(commit);

	git_commit_free(current_commit);
	git_tree_free(parent_tree);
	git_tree_free(tree);

	return error;
}

static int rebase_commit_merge(
	git_oid *commit_id,
	git_rebase *rebase,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
	git_rebase_operation *operation;
	git_reference *head = NULL;
	git_commit *head_commit = NULL, *commit = NULL;
	git_index *index = NULL;
	char old_idstr[GIT_OID_HEXSZ], new_idstr[GIT_OID_HEXSZ];
	int error;

	operation = git_array_get(rebase->operations, rebase->current);
	assert(operation);

	if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 ||
		(error = git_repository_head(&head, rebase->repo)) < 0 ||
		(error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)) < 0 ||
		(error = git_repository_index(&index, rebase->repo)) < 0 ||
		(error = rebase_commit__create(&commit, rebase, index, head_commit,
			author, committer, message_encoding, message)) < 0 ||
1023
		(error = git_reference__update_for_commit(
1024
			rebase->repo, NULL, "HEAD", git_commit_id(commit), "rebase")) < 0)
1025 1026
		goto done;

1027 1028 1029 1030 1031 1032
	git_oid_fmt(old_idstr, &operation->id);
	git_oid_fmt(new_idstr, git_commit_id(commit));

	if ((error = rebase_setupfile(rebase, REWRITTEN_FILE, O_CREAT|O_WRONLY|O_APPEND,
		"%.*s %.*s\n", GIT_OID_HEXSZ, old_idstr, GIT_OID_HEXSZ, new_idstr)) < 0)
		goto done;
1033

1034
	git_oid_cpy(commit_id, git_commit_id(commit));
1035 1036 1037

done:
	git_index_free(index);
1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054
	git_reference_free(head);
	git_commit_free(head_commit);
	git_commit_free(commit);
	return error;
}

static int rebase_commit_inmemory(
	git_oid *commit_id,
	git_rebase *rebase,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
	git_commit *commit = NULL;
	int error = 0;

1055
	assert(rebase->index);
1056
	assert(rebase->last_commit);
1057
	assert(rebase->current < rebase->operations.size);
1058

1059
	if ((error = rebase_commit__create(&commit, rebase, rebase->index,
1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070
		rebase->last_commit, author, committer, message_encoding, message)) < 0)
		goto done;

	git_commit_free(rebase->last_commit);
	rebase->last_commit = commit;

	git_oid_cpy(commit_id, git_commit_id(commit));

done:
	if (error < 0)
		git_commit_free(commit);
1071 1072 1073 1074 1075 1076

	return error;
}

int git_rebase_commit(
	git_oid *id,
1077
	git_rebase *rebase,
1078 1079 1080 1081 1082 1083 1084
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
	int error;

1085
	assert(rebase && committer);
1086

1087 1088 1089 1090
	if (rebase->inmemory)
		error = rebase_commit_inmemory(
			id, rebase, author, committer, message_encoding, message);
	else if (rebase->type == GIT_REBASE_TYPE_MERGE)
1091
		error = rebase_commit_merge(
1092
			id, rebase, author, committer, message_encoding, message);
1093
	else
1094 1095
		abort();

1096 1097 1098
	return error;
}

1099
int git_rebase_abort(git_rebase *rebase)
1100 1101 1102 1103 1104
{
	git_reference *orig_head_ref = NULL;
	git_commit *orig_head_commit = NULL;
	int error;

1105
	assert(rebase);
1106

1107 1108 1109
	if (rebase->inmemory)
		return 0;

1110 1111
	error = rebase->head_detached ?
		git_reference_create(&orig_head_ref, rebase->repo, GIT_HEAD_FILE,
1112
			 &rebase->orig_head_id, 1, "rebase: aborting") :
1113
		git_reference_symbolic_create(
1114
			&orig_head_ref, rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1,
1115
			"rebase: aborting");
1116 1117 1118 1119 1120

	if (error < 0)
		goto done;

	if ((error = git_commit_lookup(
1121 1122
			&orig_head_commit, rebase->repo, &rebase->orig_head_id)) < 0 ||
		(error = git_reset(rebase->repo, (git_object *)orig_head_commit,
1123
			GIT_RESET_HARD, &rebase->options.checkout_options)) < 0)
1124 1125
		goto done;

1126
	error = rebase_cleanup(rebase);
1127 1128 1129 1130 1131 1132 1133

done:
	git_commit_free(orig_head_commit);
	git_reference_free(orig_head_ref);

	return error;
}
1134

1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165
static int notes_ref_lookup(git_buf *out, git_rebase *rebase)
{
	git_config *config = NULL;
	int do_rewrite, error;

	if (rebase->options.rewrite_notes_ref) {
		git_buf_attach_notowned(out,
			rebase->options.rewrite_notes_ref,
			strlen(rebase->options.rewrite_notes_ref));
		return 0;
	}

	if ((error = git_repository_config(&config, rebase->repo)) < 0 ||
		(error = git_config_get_bool(&do_rewrite, config, "notes.rewrite.rebase")) < 0) {

		if (error != GIT_ENOTFOUND)
			goto done;

		giterr_clear();
		do_rewrite = 1;
	}

	error = do_rewrite ?
		git_config_get_string_buf(out, config, "notes.rewriteref") :
		GIT_ENOTFOUND;

done:
	git_config_free(config);
	return error;
}

1166
static int rebase_copy_note(
1167
	git_rebase *rebase,
1168
	const char *notes_ref,
1169 1170
	git_oid *from,
	git_oid *to,
1171
	const git_signature *committer)
1172
{
1173 1174
	git_note *note = NULL;
	git_oid note_id;
1175
	git_signature *who = NULL;
1176 1177
	int error;

1178
	if ((error = git_note_read(&note, rebase->repo, notes_ref, from)) < 0) {
1179 1180 1181 1182 1183 1184 1185 1186
		if (error == GIT_ENOTFOUND) {
			giterr_clear();
			error = 0;
		}

		goto done;
	}

1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198
	if (!committer) {
		if((error = git_signature_default(&who, rebase->repo)) < 0) {
			if (error != GIT_ENOTFOUND ||
				(error = git_signature_now(&who, "unknown", "unknown")) < 0)
				goto done;

			giterr_clear();
		}

		committer = who;
	}

1199
	error = git_note_create(&note_id, rebase->repo, notes_ref,
1200
		git_note_author(note), committer, to, git_note_message(note), 0);
1201 1202 1203

done:
	git_note_free(note);
1204
	git_signature_free(who);
1205 1206 1207 1208 1209

	return error;
}

static int rebase_copy_notes(
1210
	git_rebase *rebase,
1211
	const git_signature *committer)
1212
{
1213
	git_buf path = GIT_BUF_INIT, rewritten = GIT_BUF_INIT, notes_ref = GIT_BUF_INIT;
1214 1215 1216 1217 1218
	char *pair_list, *fromstr, *tostr, *end;
	git_oid from, to;
	unsigned int linenum = 1;
	int error = 0;

1219 1220 1221 1222 1223 1224
	if ((error = notes_ref_lookup(&notes_ref, rebase)) < 0) {
		if (error == GIT_ENOTFOUND) {
			giterr_clear();
			error = 0;
		}

1225
		goto done;
1226
	}
1227

1228
	if ((error = git_buf_joinpath(&path, rebase->state_path, REWRITTEN_FILE)) < 0 ||
1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254
		(error = git_futils_readbuffer(&rewritten, path.ptr)) < 0)
		goto done;

	pair_list = rewritten.ptr;

	while (*pair_list) {
		fromstr = pair_list;

		if ((end = strchr(fromstr, '\n')) == NULL)
			goto on_error;

		pair_list = end+1;
		*end = '\0';

		if ((end = strchr(fromstr, ' ')) == NULL)
			goto on_error;

		tostr = end+1;
		*end = '\0';

		if (strlen(fromstr) != GIT_OID_HEXSZ ||
			strlen(tostr) != GIT_OID_HEXSZ ||
			git_oid_fromstr(&from, fromstr) < 0 ||
			git_oid_fromstr(&to, tostr) < 0)
			goto on_error;

1255
		if ((error = rebase_copy_note(rebase, notes_ref.ptr, &from, &to, committer)) < 0)
1256 1257 1258 1259 1260 1261 1262 1263
			goto done;

		linenum++;
	}

	goto done;

on_error:
1264
	giterr_set(GITERR_REBASE, "invalid rewritten file at line %d", linenum);
1265 1266 1267 1268 1269
	error = -1;

done:
	git_buf_free(&rewritten);
	git_buf_free(&path);
1270
	git_buf_free(&notes_ref);
1271 1272 1273 1274

	return error;
}

1275
static int return_to_orig_head(git_rebase *rebase)
1276
{
1277 1278 1279 1280
	git_reference *terminal_ref = NULL, *branch_ref = NULL, *head_ref = NULL;
	git_commit *terminal_commit = NULL;
	git_buf branch_msg = GIT_BUF_INIT, head_msg = GIT_BUF_INIT;
	char onto[GIT_OID_HEXSZ];
1281
	int error = 0;
1282

1283
	git_oid_fmt(onto, &rebase->onto_id);
1284

1285 1286 1287 1288 1289 1290 1291
	if ((error = git_buf_printf(&branch_msg,
			"rebase finished: %s onto %.*s",
			rebase->orig_head_name, GIT_OID_HEXSZ, onto)) == 0 &&
		(error = git_buf_printf(&head_msg,
			"rebase finished: returning to %s",
			rebase->orig_head_name)) == 0 &&
		(error = git_repository_head(&terminal_ref, rebase->repo)) == 0 &&
1292
		(error = git_reference_peel((git_object **)&terminal_commit,
1293
			terminal_ref, GIT_OBJ_COMMIT)) == 0 &&
1294
		(error = git_reference_create_matching(&branch_ref,
1295 1296 1297 1298
			rebase->repo, rebase->orig_head_name,
			git_commit_id(terminal_commit), 1,
			&rebase->orig_head_id, branch_msg.ptr)) == 0)
		error = git_reference_symbolic_create(&head_ref,
1299
			rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1,
1300
			head_msg.ptr);
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311

	git_buf_free(&head_msg);
	git_buf_free(&branch_msg);
	git_commit_free(terminal_commit);
	git_reference_free(head_ref);
	git_reference_free(branch_ref);
	git_reference_free(terminal_ref);

	return error;
}

1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331
int git_rebase_finish(
	git_rebase *rebase,
	const git_signature *signature)
{
	int error = 0;

	assert(rebase);

	if (rebase->inmemory)
		return 0;

	if (!rebase->head_detached)
		error = return_to_orig_head(rebase);

	if (error == 0 && (error = rebase_copy_notes(rebase, signature)) == 0)
		error = rebase_cleanup(rebase);

	return error;
}

1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342
size_t git_rebase_operation_entrycount(git_rebase *rebase)
{
	assert(rebase);

	return git_array_size(rebase->operations);
}

size_t git_rebase_operation_current(git_rebase *rebase)
{
	assert(rebase);

1343
	return rebase->started ? rebase->current : GIT_REBASE_NO_OPERATION;
1344 1345 1346 1347 1348 1349 1350 1351 1352
}

git_rebase_operation *git_rebase_operation_byindex(git_rebase *rebase, size_t idx)
{
	assert(rebase);

	return git_array_get(rebase->operations, idx);
}

1353 1354 1355 1356 1357
void git_rebase_free(git_rebase *rebase)
{
	if (rebase == NULL)
		return;

1358
	git_index_free(rebase->index);
1359
	git_commit_free(rebase->last_commit);
1360
	git__free(rebase->onto_name);
1361 1362
	git__free(rebase->orig_head_name);
	git__free(rebase->state_path);
1363
	git_array_clear(rebase->operations);
1364
	git__free((char *)rebase->options.rewrite_notes_ref);
1365
	git__free(rebase);
1366
}