proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 12:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2259 from libgit2/vmg/state-cleanup

Browse Source 
Rewrite `state-cleanup`
This commit is contained in:
Vicent Marti 2014-04-09 12:45:49 +02:00
commit bcc622934a
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/repository.c
View File

@ -1955,24 +1955,32 @@ int git_repository_state(git_repository *repo)
return state; return state;
} }
int git_repository__cleanup_files(git_repository *repo, const char *files[], size_t files_len) int git_repository__cleanup_files(
git_repository *repo, const char *files[], size_t files_len)
{ {
git_buf path = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
size_t i; size_t i;
int error = 0; int error;
for (i = 0; i < files_len; ++i) { for (error = 0, i = 0; !error && i < files_len; ++i) {
git_buf_clear(&path); const char *path;
if ((error = git_buf_joinpath(&path, repo->path_repository, files[i])) < 0 || if (git_buf_joinpath(&buf, repo->path_repository, files[i]) < 0)
(git_path_isfile(git_buf_cstr(&path)) && return -1;
(error = p_unlink(git_buf_cstr(&path))) < 0))
goto done; path = git_buf_cstr(&buf);
if (git_path_isfile(path)) {
error = p_unlink(path);
} else if (git_path_isdir(path)) {
error = git_futils_rmdir_r(path, NULL,
GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS);
}
git_buf_clear(&buf);
} }
done: git_buf_free(&buf);
git_buf_free(&path);
return error; return error;
} }
@ -1982,6 +1990,9 @@ static const char *state_files[] = {
GIT_MERGE_MSG_FILE, GIT_MERGE_MSG_FILE,
GIT_REVERT_HEAD_FILE, GIT_REVERT_HEAD_FILE,
GIT_CHERRY_PICK_HEAD_FILE, GIT_CHERRY_PICK_HEAD_FILE,
GIT_BISECT_LOG_FILE,
GIT_REBASE_MERGE_DIR,
GIT_REBASE_APPLY_DIR,
}; };
int git_repository_state_cleanup(git_repository *repo) int git_repository_state_cleanup(git_repository *repo)

18
tests/repo/state.c
View File

@ -45,52 +45,70 @@ void test_repo_state__merge(void)
{ {
setup_simple_state(GIT_MERGE_HEAD_FILE); setup_simple_state(GIT_MERGE_HEAD_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_MERGE); assert_repo_state(GIT_REPOSITORY_STATE_MERGE);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__revert(void) void test_repo_state__revert(void)
{ {
setup_simple_state(GIT_REVERT_HEAD_FILE); setup_simple_state(GIT_REVERT_HEAD_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_REVERT); assert_repo_state(GIT_REPOSITORY_STATE_REVERT);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__cherry_pick(void) void test_repo_state__cherry_pick(void)
{ {
setup_simple_state(GIT_CHERRY_PICK_HEAD_FILE); setup_simple_state(GIT_CHERRY_PICK_HEAD_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_CHERRY_PICK); assert_repo_state(GIT_REPOSITORY_STATE_CHERRY_PICK);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__bisect(void) void test_repo_state__bisect(void)
{ {
setup_simple_state(GIT_BISECT_LOG_FILE); setup_simple_state(GIT_BISECT_LOG_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_BISECT); assert_repo_state(GIT_REPOSITORY_STATE_BISECT);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__rebase_interactive(void) void test_repo_state__rebase_interactive(void)
{ {
setup_simple_state(GIT_REBASE_MERGE_INTERACTIVE_FILE); setup_simple_state(GIT_REBASE_MERGE_INTERACTIVE_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_REBASE_INTERACTIVE); assert_repo_state(GIT_REPOSITORY_STATE_REBASE_INTERACTIVE);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__rebase_merge(void) void test_repo_state__rebase_merge(void)
{ {
setup_simple_state(GIT_REBASE_MERGE_DIR "whatever"); setup_simple_state(GIT_REBASE_MERGE_DIR "whatever");
assert_repo_state(GIT_REPOSITORY_STATE_REBASE_MERGE); assert_repo_state(GIT_REPOSITORY_STATE_REBASE_MERGE);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__rebase(void) void test_repo_state__rebase(void)
{ {
setup_simple_state(GIT_REBASE_APPLY_REBASING_FILE); setup_simple_state(GIT_REBASE_APPLY_REBASING_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_REBASE); assert_repo_state(GIT_REPOSITORY_STATE_REBASE);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__apply_mailbox(void) void test_repo_state__apply_mailbox(void)
{ {
setup_simple_state(GIT_REBASE_APPLY_APPLYING_FILE); setup_simple_state(GIT_REBASE_APPLY_APPLYING_FILE);
assert_repo_state(GIT_REPOSITORY_STATE_APPLY_MAILBOX); assert_repo_state(GIT_REPOSITORY_STATE_APPLY_MAILBOX);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }
void test_repo_state__apply_mailbox_or_rebase(void) void test_repo_state__apply_mailbox_or_rebase(void)
{ {
setup_simple_state(GIT_REBASE_APPLY_DIR "whatever"); setup_simple_state(GIT_REBASE_APPLY_DIR "whatever");
assert_repo_state(GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE); assert_repo_state(GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE);
cl_git_pass(git_repository_state_cleanup(_repo));
assert_repo_state(GIT_REPOSITORY_STATE_NONE);
} }