commit: introduce _fromstate()

carlosmn · carlosmn · commit a0590091af08 · 2015-11-11T01:24:39.000+01:00
This variant of the commit creation function takes the reference to
update, the tree and the parents from the current branch, index and
merging state, allowing for simpler use of a common use-case.
diff --git a/include/git2/commit.h b/include/git2/commit.h
@@ -363,6 +363,27 @@ GIT_EXTERN(int) git_commit_amend(
 	const char *message,
 	const git_tree *tree);
 
+/**
+ * Create a new commit from the current state and update the current branch
+ *
+ * Creates a new commit, similarly to the other functions. This
+ * variant takes the current state of the repository instead of
+ * arguments.
+ *
+ * The current branch will be updated. The tree will be created from
+ * the repository's index. The parents will be taken from HEAD and
+ * MERGE_HEAD, if applicable.
+ *
+ * @see git_commit_create
+ */
+GIT_EXTERN(int) git_commit_create_fromstate(
+	git_oid *id,
+	git_repository *repo,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message);
+
 /** @} */
 GIT_END_DECL
 #endif
diff --git a/src/commit.c b/src/commit.c
@@ -9,6 +9,7 @@
 #include "git2/object.h"
 #include "git2/repository.h"
 #include "git2/signature.h"
+#include "git2/index.h"
 #include "git2/sys/commit.h"
 
 #include "common.h"
@@ -302,6 +303,79 @@ int git_commit_amend(
 	return error;
 }
 
+static int insert_commit(git_vector *v, git_repository *repo, git_oid *id)
+{
+	int error;
+	git_commit *commit;
+
+	if ((error = git_commit_lookup(&commit, repo, id)) < 0)
+		return error;
+
+	if ((error = git_vector_insert(v, commit)) < 0) {
+		git_commit_free(commit);
+		return error;
+	}
+
+	return 0;
+}
+
+int git_commit_create_fromstate(
+	git_oid *id,
+	git_repository *repo,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message)
+{
+	int error;
+	size_t i;
+	git_tree *tree = NULL;
+	git_index *index = NULL;
+	git_oid current_id, tree_id;
+	git_commit *commit;
+	git_vector commits = GIT_VECTOR_INIT;
+	git_repository_state_t state;
+
+	state = git_repository_state(repo);
+
+	if ((error = git_reference_name_to_id(&current_id, repo, GIT_HEAD_FILE)) < 0)
+		return error;
+
+	if ((error = insert_commit(&commits, repo, &current_id)) < 0)
+		goto cleanup;
+
+	/* TODO: how do we handle octopus merges? */
+	if (state == GIT_REPOSITORY_STATE_MERGE) {
+		if ((error = git_reference_name_to_id(&current_id, repo, GIT_MERGE_HEAD_FILE)) < 0)
+			goto cleanup;
+
+		if ((error = insert_commit(&commits, repo, &current_id)) < 0)
+			goto cleanup;
+	}
+
+	if ((error = git_repository_index(&index, repo)) < 0)
+		goto cleanup;
+
+	error = git_index_write_tree(&tree_id, index);
+	git_index_free(index);
+	if (error < 0)
+		goto cleanup;
+
+	if ((error = git_tree_lookup(&tree, repo, &tree_id)) < 0)
+		goto cleanup;
+
+	error = git_commit_create(id, repo, GIT_HEAD_FILE,
+				  author, committer, message_encoding, message,
+				  tree, commits.length, (const git_commit **) commits.contents);
+
+cleanup:
+	git_tree_free(tree);
+	git_vector_foreach(&commits, i, commit) {
+		git_commit_free(commit);
+	}
+	return 0;
+}
+
 int git_commit__parse(void *_commit, git_odb_object *odb_obj)
 {
 	git_commit *commit = _commit;
