mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-03 23:24:51 +00:00
2b672d5b64
This adds an additional pathspec API that will match a pathspec against a diff object. This is convenient if you want to handle renames (so you need the whole diff and can't use the pathspec constraint built into the diff API) but still want to tell if the diff had any files that matched the pathspec. When the pathspec is matched against a diff, instead of keeping a list of filenames that matched, instead the API keeps the list of git_diff_deltas that matched and they can be retrieved via a new API git_pathspec_match_list_diff_entry. There are a couple of other minor API extensions here that were mostly for the sake of convenience and to reduce dependencies on knowing the internal data structure between files inside the library.
93 lines
3.0 KiB
C
93 lines
3.0 KiB
C
#include "clar_libgit2.h"
|
|
#include "diff_helpers.h"
|
|
|
|
static git_repository *g_repo = NULL;
|
|
|
|
void test_diff_pathspec__initialize(void)
|
|
{
|
|
g_repo = cl_git_sandbox_init("status");
|
|
}
|
|
|
|
void test_diff_pathspec__cleanup(void)
|
|
{
|
|
cl_git_sandbox_cleanup();
|
|
}
|
|
|
|
void test_diff_pathspec__0(void)
|
|
{
|
|
const char *a_commit = "26a125ee"; /* the current HEAD */
|
|
const char *b_commit = "0017bd4a"; /* the start */
|
|
git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit);
|
|
git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit);
|
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
|
git_diff_list *diff = NULL;
|
|
git_strarray paths = { NULL, 1 };
|
|
char *path;
|
|
git_pathspec *ps;
|
|
git_pathspec_match_list *matches;
|
|
|
|
cl_assert(a);
|
|
cl_assert(b);
|
|
|
|
path = "*_file";
|
|
paths.strings = &path;
|
|
cl_git_pass(git_pathspec_new(&ps, &paths));
|
|
|
|
cl_git_pass(git_pathspec_match_tree(&matches, a, GIT_PATHSPEC_DEFAULT, ps));
|
|
cl_assert_equal_i(7, git_pathspec_match_list_entrycount(matches));
|
|
cl_assert_equal_s("current_file", git_pathspec_match_list_entry(matches,0));
|
|
cl_assert(git_pathspec_match_list_diff_entry(matches,0) == NULL);
|
|
git_pathspec_match_list_free(matches);
|
|
|
|
cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, NULL, a, &opts));
|
|
|
|
cl_git_pass(git_pathspec_match_diff(
|
|
&matches, diff, GIT_PATHSPEC_DEFAULT, ps));
|
|
cl_assert_equal_i(7, git_pathspec_match_list_entrycount(matches));
|
|
cl_assert(git_pathspec_match_list_diff_entry(matches, 0) != NULL);
|
|
cl_assert(git_pathspec_match_list_entry(matches, 0) == NULL);
|
|
cl_assert_equal_s("current_file",
|
|
git_pathspec_match_list_diff_entry(matches,0)->new_file.path);
|
|
cl_assert_equal_i(GIT_DELTA_ADDED,
|
|
git_pathspec_match_list_diff_entry(matches,0)->status);
|
|
git_pathspec_match_list_free(matches);
|
|
|
|
git_diff_list_free(diff);
|
|
diff = NULL;
|
|
|
|
cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts));
|
|
|
|
cl_git_pass(git_pathspec_match_diff(
|
|
&matches, diff, GIT_PATHSPEC_DEFAULT, ps));
|
|
cl_assert_equal_i(3, git_pathspec_match_list_entrycount(matches));
|
|
cl_assert(git_pathspec_match_list_diff_entry(matches, 0) != NULL);
|
|
cl_assert(git_pathspec_match_list_entry(matches, 0) == NULL);
|
|
cl_assert_equal_s("subdir/current_file",
|
|
git_pathspec_match_list_diff_entry(matches,0)->new_file.path);
|
|
cl_assert_equal_i(GIT_DELTA_DELETED,
|
|
git_pathspec_match_list_diff_entry(matches,0)->status);
|
|
git_pathspec_match_list_free(matches);
|
|
|
|
git_diff_list_free(diff);
|
|
diff = NULL;
|
|
|
|
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
|
|
|
|
cl_git_pass(git_pathspec_match_diff(
|
|
&matches, diff, GIT_PATHSPEC_DEFAULT, ps));
|
|
cl_assert_equal_i(4, git_pathspec_match_list_entrycount(matches));
|
|
cl_assert(git_pathspec_match_list_diff_entry(matches, 0) != NULL);
|
|
cl_assert(git_pathspec_match_list_entry(matches, 0) == NULL);
|
|
cl_assert_equal_s("modified_file",
|
|
git_pathspec_match_list_diff_entry(matches,0)->new_file.path);
|
|
cl_assert_equal_i(GIT_DELTA_MODIFIED,
|
|
git_pathspec_match_list_diff_entry(matches,0)->status);
|
|
git_pathspec_match_list_free(matches);
|
|
|
|
git_diff_list_free(diff);
|
|
diff = NULL;
|
|
|
|
git_tree_free(a);
|
|
git_tree_free(b);
|
|
}
|