Blame src/reset.c

Packit ae9e2a
/*
Packit ae9e2a
 * Copyright (C) the libgit2 contributors. All rights reserved.
Packit ae9e2a
 *
Packit ae9e2a
 * This file is part of libgit2, distributed under the GNU GPL v2 with
Packit ae9e2a
 * a Linking Exception. For full terms see the included COPYING file.
Packit ae9e2a
 */
Packit ae9e2a
Packit ae9e2a
#include "common.h"
Packit ae9e2a
#include "commit.h"
Packit ae9e2a
#include "tag.h"
Packit ae9e2a
#include "merge.h"
Packit ae9e2a
#include "diff.h"
Packit ae9e2a
#include "annotated_commit.h"
Packit ae9e2a
#include "git2/reset.h"
Packit ae9e2a
#include "git2/checkout.h"
Packit ae9e2a
#include "git2/merge.h"
Packit ae9e2a
#include "git2/refs.h"
Packit ae9e2a
Packit ae9e2a
#define ERROR_MSG "Cannot perform reset"
Packit ae9e2a
Packit ae9e2a
int git_reset_default(
Packit ae9e2a
	git_repository *repo,
Packit ae9e2a
	git_object *target,
Packit ae9e2a
	git_strarray* pathspecs)
Packit ae9e2a
{
Packit ae9e2a
	git_object *commit = NULL;
Packit ae9e2a
	git_tree *tree = NULL;
Packit ae9e2a
	git_diff *diff = NULL;
Packit ae9e2a
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
Packit ae9e2a
	size_t i, max_i;
Packit ae9e2a
	git_index_entry entry;
Packit ae9e2a
	int error;
Packit ae9e2a
	git_index *index = NULL;
Packit ae9e2a
Packit ae9e2a
	assert(pathspecs != NULL && pathspecs->count > 0);
Packit ae9e2a
Packit ae9e2a
	memset(&entry, 0, sizeof(git_index_entry));
Packit ae9e2a
Packit ae9e2a
	if ((error = git_repository_index(&index, repo)) < 0)
Packit ae9e2a
		goto cleanup;
Packit ae9e2a
Packit ae9e2a
	if (target) {
Packit ae9e2a
		if (git_object_owner(target) != repo) {
Packit ae9e2a
			giterr_set(GITERR_OBJECT,
Packit ae9e2a
				"%s_default - The given target does not belong to this repository.", ERROR_MSG);
Packit ae9e2a
			return -1;
Packit ae9e2a
		}
Packit ae9e2a
Packit ae9e2a
		if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 ||
Packit ae9e2a
			(error = git_commit_tree(&tree, (git_commit *)commit)) < 0)
Packit ae9e2a
			goto cleanup;
Packit ae9e2a
	}
Packit ae9e2a
Packit ae9e2a
	opts.pathspec = *pathspecs;
Packit ae9e2a
	opts.flags = GIT_DIFF_REVERSE;
Packit ae9e2a
Packit ae9e2a
	if ((error = git_diff_tree_to_index(
Packit ae9e2a
		&diff, repo, tree, index, &opts)) < 0)
Packit ae9e2a
			goto cleanup;
Packit ae9e2a
Packit ae9e2a
	for (i = 0, max_i = git_diff_num_deltas(diff); i < max_i; ++i) {
Packit ae9e2a
		const git_diff_delta *delta = git_diff_get_delta(diff, i);
Packit ae9e2a
Packit ae9e2a
		assert(delta->status == GIT_DELTA_ADDED ||
Packit ae9e2a
			delta->status == GIT_DELTA_MODIFIED ||
Packit ae9e2a
			delta->status == GIT_DELTA_CONFLICTED ||
Packit ae9e2a
			delta->status == GIT_DELTA_DELETED);
Packit ae9e2a
Packit ae9e2a
		error = git_index_conflict_remove(index, delta->old_file.path);
Packit ae9e2a
		if (error < 0) {
Packit ae9e2a
			if (delta->status == GIT_DELTA_ADDED && error == GIT_ENOTFOUND)
Packit ae9e2a
				giterr_clear();
Packit ae9e2a
			else
Packit ae9e2a
				goto cleanup;
Packit ae9e2a
		}
Packit ae9e2a
Packit ae9e2a
		if (delta->status == GIT_DELTA_DELETED) {
Packit ae9e2a
			if ((error = git_index_remove(index, delta->old_file.path, 0)) < 0)
Packit ae9e2a
				goto cleanup;
Packit ae9e2a
		} else {
Packit ae9e2a
			entry.mode = delta->new_file.mode;
Packit ae9e2a
			git_oid_cpy(&entry.id, &delta->new_file.id);
Packit ae9e2a
			entry.path = (char *)delta->new_file.path;
Packit ae9e2a
Packit ae9e2a
			if ((error = git_index_add(index, &entry)) < 0)
Packit ae9e2a
				goto cleanup;
Packit ae9e2a
		}
Packit ae9e2a
	}
Packit ae9e2a
Packit ae9e2a
	error = git_index_write(index);
Packit ae9e2a
Packit ae9e2a
cleanup:
Packit ae9e2a
	git_object_free(commit);
Packit ae9e2a
	git_tree_free(tree);
Packit ae9e2a
	git_index_free(index);
Packit ae9e2a
	git_diff_free(diff);
Packit ae9e2a
Packit ae9e2a
	return error;
Packit ae9e2a
}
Packit ae9e2a
Packit ae9e2a
static int reset(
Packit ae9e2a
	git_repository *repo,
Packit ae9e2a
	git_object *target,
Packit ae9e2a
	const char *to,
Packit ae9e2a
	git_reset_t reset_type,
Packit ae9e2a
	const git_checkout_options *checkout_opts)
Packit ae9e2a
{
Packit ae9e2a
	git_object *commit = NULL;
Packit ae9e2a
	git_index *index = NULL;
Packit ae9e2a
	git_tree *tree = NULL;
Packit ae9e2a
	int error = 0;
Packit ae9e2a
	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
Packit ae9e2a
	git_buf log_message = GIT_BUF_INIT;
Packit ae9e2a
Packit ae9e2a
	assert(repo && target);
Packit ae9e2a
Packit ae9e2a
	if (checkout_opts)
Packit ae9e2a
		opts = *checkout_opts;
Packit ae9e2a
Packit ae9e2a
	if (git_object_owner(target) != repo) {
Packit ae9e2a
		giterr_set(GITERR_OBJECT,
Packit ae9e2a
			"%s - The given target does not belong to this repository.", ERROR_MSG);
Packit ae9e2a
		return -1;
Packit ae9e2a
	}
Packit ae9e2a
Packit ae9e2a
	if (reset_type != GIT_RESET_SOFT &&
Packit ae9e2a
		(error = git_repository__ensure_not_bare(repo,
Packit ae9e2a
			reset_type == GIT_RESET_MIXED ? "reset mixed" : "reset hard")) < 0)
Packit ae9e2a
		return error;
Packit ae9e2a
Packit ae9e2a
	if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 ||
Packit ae9e2a
		(error = git_repository_index(&index, repo)) < 0 ||
Packit ae9e2a
		(error = git_commit_tree(&tree, (git_commit *)commit)) < 0)
Packit ae9e2a
		goto cleanup;
Packit ae9e2a
Packit ae9e2a
	if (reset_type == GIT_RESET_SOFT &&
Packit ae9e2a
		(git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE ||
Packit ae9e2a
		 git_index_has_conflicts(index)))
Packit ae9e2a
	{
Packit ae9e2a
		giterr_set(GITERR_OBJECT, "%s (soft) in the middle of a merge", ERROR_MSG);
Packit ae9e2a
		error = GIT_EUNMERGED;
Packit ae9e2a
		goto cleanup;
Packit ae9e2a
	}
Packit ae9e2a
Packit ae9e2a
	if ((error = git_buf_printf(&log_message, "reset: moving to %s", to)) < 0)
Packit ae9e2a
		return error;
Packit ae9e2a
Packit ae9e2a
	if (reset_type == GIT_RESET_HARD) {
Packit ae9e2a
		/* overwrite working directory with the new tree */
Packit ae9e2a
		opts.checkout_strategy = GIT_CHECKOUT_FORCE;
Packit ae9e2a
Packit ae9e2a
		if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0)
Packit ae9e2a
			goto cleanup;
Packit ae9e2a
	}
Packit ae9e2a
Packit ae9e2a
	/* move HEAD to the new target */
Packit ae9e2a
	if ((error = git_reference__update_terminal(repo, GIT_HEAD_FILE,
Packit ae9e2a
		git_object_id(commit), NULL, git_buf_cstr(&log_message))) < 0)
Packit ae9e2a
		goto cleanup;
Packit ae9e2a
Packit ae9e2a
	if (reset_type > GIT_RESET_SOFT) {
Packit ae9e2a
		/* reset index to the target content */
Packit ae9e2a
Packit ae9e2a
		if ((error = git_index_read_tree(index, tree)) < 0 ||
Packit ae9e2a
			(error = git_index_write(index)) < 0)
Packit ae9e2a
			goto cleanup;
Packit ae9e2a
Packit ae9e2a
		if ((error = git_repository_state_cleanup(repo)) < 0) {
Packit ae9e2a
			giterr_set(GITERR_INDEX, "%s - failed to clean up merge data", ERROR_MSG);
Packit ae9e2a
			goto cleanup;
Packit ae9e2a
		}
Packit ae9e2a
	}
Packit ae9e2a
Packit ae9e2a
cleanup:
Packit ae9e2a
	git_object_free(commit);
Packit ae9e2a
	git_index_free(index);
Packit ae9e2a
	git_tree_free(tree);
Packit ae9e2a
	git_buf_free(&log_message);
Packit ae9e2a
Packit ae9e2a
	return error;
Packit ae9e2a
}
Packit ae9e2a
Packit ae9e2a
int git_reset(
Packit ae9e2a
	git_repository *repo,
Packit ae9e2a
	git_object *target,
Packit ae9e2a
	git_reset_t reset_type,
Packit ae9e2a
	const git_checkout_options *checkout_opts)
Packit ae9e2a
{
Packit ae9e2a
	return reset(repo, target, git_oid_tostr_s(git_object_id(target)), reset_type, checkout_opts);
Packit ae9e2a
}
Packit ae9e2a
Packit ae9e2a
int git_reset_from_annotated(
Packit ae9e2a
	git_repository *repo,
Packit ae9e2a
	git_annotated_commit *commit,
Packit ae9e2a
	git_reset_t reset_type,
Packit ae9e2a
	const git_checkout_options *checkout_opts)
Packit ae9e2a
{
Packit ae9e2a
	return reset(repo, (git_object *) commit->commit, commit->description, reset_type, checkout_opts);
Packit ae9e2a
}