repository: distinguish sequencer cherry-pick and revertcmn/repository-state-sequencer

These are not quite like their plain counterparts and require special handling.

4 files changed, 35 insertions, 3 deletions

diff --git a/include/git2/repository.h b/include/git2/repository.h
index cf268ef85..85b7e6861 100644
--- a/include/git2/repository.h
+++ b/include/git2/repository.h
@@ -675,7 +675,9 @@ typedef enum {
 	GIT_REPOSITORY_STATE_NONE,
 	GIT_REPOSITORY_STATE_MERGE,
 	GIT_REPOSITORY_STATE_REVERT,
+	GIT_REPOSITORY_STATE_REVERT_SEQUENCE,
 	GIT_REPOSITORY_STATE_CHERRYPICK,
+	GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE,
 	GIT_REPOSITORY_STATE_BISECT,
 	GIT_REPOSITORY_STATE_REBASE,
 	GIT_REPOSITORY_STATE_REBASE_INTERACTIVE,
diff --git a/src/refs.h b/src/refs.h
index f78ea06b0..fda9532de 100644
--- a/src/refs.h
+++ b/src/refs.h
@@ -44,6 +44,11 @@
 #define GIT_REBASE_APPLY_APPLYING_FILE GIT_REBASE_APPLY_DIR "applying"
 #define GIT_REFS_HEADS_MASTER_FILE GIT_REFS_HEADS_DIR "master"
 
+#define GIT_SEQUENCER_DIR "sequencer/"
+#define GIT_SEQUENCER_HEAD_FILE GIT_SEQUENCER_DIR "head"
+#define GIT_SEQUENCER_OPTIONS_FILE GIT_SEQUENCER_DIR "options"
+#define GIT_SEQUENCER_TODO_FILE GIT_SEQUENCER_DIR "todo"
+
 #define GIT_STASH_FILE "stash"
 #define GIT_REFS_STASH_FILE GIT_REFS_DIR GIT_STASH_FILE
 
diff --git a/src/repository.c b/src/repository.c
index c61d0e4f0..6234cd595 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -2222,11 +2222,17 @@ int git_repository_state(git_repository *repo)
 		state = GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE;
 	else if (git_path_contains_file(&repo_path, GIT_MERGE_HEAD_FILE))
 		state = GIT_REPOSITORY_STATE_MERGE;
-	else if(git_path_contains_file(&repo_path, GIT_REVERT_HEAD_FILE))
+	else if (git_path_contains_file(&repo_path, GIT_REVERT_HEAD_FILE)) {
 		state = GIT_REPOSITORY_STATE_REVERT;
-	else if(git_path_contains_file(&repo_path, GIT_CHERRYPICK_HEAD_FILE))
+		if (git_path_contains_file(&repo_path, GIT_SEQUENCER_TODO_FILE)) {
+			state = GIT_REPOSITORY_STATE_REVERT_SEQUENCE;
+		}
+	} else if (git_path_contains_file(&repo_path, GIT_CHERRYPICK_HEAD_FILE)) {
 		state = GIT_REPOSITORY_STATE_CHERRYPICK;
-	else if(git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE))
+		if (git_path_contains_file(&repo_path, GIT_SEQUENCER_TODO_FILE)) {
+			state = GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE;
+		}
+	} else if (git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE))
 		state = GIT_REPOSITORY_STATE_BISECT;
 
 	git_buf_free(&repo_path);
@@ -2271,6 +2277,7 @@ static const char *state_files[] = {
 	GIT_BISECT_LOG_FILE,
 	GIT_REBASE_MERGE_DIR,
 	GIT_REBASE_APPLY_DIR,
+	GIT_SEQUENCER_DIR,
 };
 
 int git_repository_state_cleanup(git_repository *repo)
diff --git a/tests/repo/state.c b/tests/repo/state.c
index bf2633c17..7f20eebe8 100644
--- a/tests/repo/state.c
+++ b/tests/repo/state.c
@@ -57,6 +57,15 @@ void test_repo_state__revert(void)
 	assert_repo_state(GIT_REPOSITORY_STATE_NONE);
 }
 
+void test_repo_state__revert_sequence(void)
+{
+	setup_simple_state(GIT_REVERT_HEAD_FILE);
+	setup_simple_state(GIT_SEQUENCER_TODO_FILE);
+	assert_repo_state(GIT_REPOSITORY_STATE_REVERT_SEQUENCE);
+	cl_git_pass(git_repository_state_cleanup(_repo));
+	assert_repo_state(GIT_REPOSITORY_STATE_NONE);
+}
+
 void test_repo_state__cherry_pick(void)
 {
 	setup_simple_state(GIT_CHERRYPICK_HEAD_FILE);
@@ -65,6 +74,15 @@ void test_repo_state__cherry_pick(void)
 	assert_repo_state(GIT_REPOSITORY_STATE_NONE);
 }
 
+void test_repo_state__cherrypick_sequence(void)
+{
+	setup_simple_state(GIT_CHERRYPICK_HEAD_FILE);
+	setup_simple_state(GIT_SEQUENCER_TODO_FILE);
+	assert_repo_state(GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE);
+	cl_git_pass(git_repository_state_cleanup(_repo));
+	assert_repo_state(GIT_REPOSITORY_STATE_NONE);
+}
+
 void test_repo_state__bisect(void)
 {
 	setup_simple_state(GIT_BISECT_LOG_FILE);