mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-03 01:58:32 +00:00
5dca201072
This updates all the `foreach()` type functions across the library that take callbacks from the user to have a consistent behavior. The rules are: * A callback terminates the loop by returning any non-zero value * Once the callback returns non-zero, it will not be called again (i.e. the loop stops all iteration regardless of state) * If the callback returns non-zero, the parent fn returns GIT_EUSER * Although the parent returns GIT_EUSER, no error will be set in the library and `giterr_last()` will return NULL if called. This commit makes those changes across the library and adds tests for most of the iteration APIs to make sure that they follow the above rules.
143 lines
3.2 KiB
C
143 lines
3.2 KiB
C
#include "clar_libgit2.h"
|
|
#include "diff_helpers.h"
|
|
|
|
static git_repository *g_repo = NULL;
|
|
|
|
void test_diff_index__initialize(void)
|
|
{
|
|
g_repo = cl_git_sandbox_init("status");
|
|
}
|
|
|
|
void test_diff_index__cleanup(void)
|
|
{
|
|
cl_git_sandbox_cleanup();
|
|
}
|
|
|
|
void test_diff_index__0(void)
|
|
{
|
|
/* grabbed a couple of commit oids from the history of the attr repo */
|
|
const char *a_commit = "26a125ee1bf"; /* the current HEAD */
|
|
const char *b_commit = "0017bd4ab1ec3"; /* 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 = {0};
|
|
git_diff_list *diff = NULL;
|
|
diff_expects exp;
|
|
|
|
cl_assert(a);
|
|
cl_assert(b);
|
|
|
|
opts.context_lines = 1;
|
|
opts.interhunk_lines = 1;
|
|
|
|
memset(&exp, 0, sizeof(exp));
|
|
|
|
cl_git_pass(git_diff_index_to_tree(g_repo, &opts, a, &diff));
|
|
|
|
cl_git_pass(git_diff_foreach(
|
|
diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
|
|
|
/* to generate these values:
|
|
* - cd to tests/resources/status,
|
|
* - mv .gitted .git
|
|
* - git diff --name-status --cached 26a125ee1bf
|
|
* - git diff -U1 --cached 26a125ee1bf
|
|
* - mv .git .gitted
|
|
*/
|
|
cl_assert(exp.files == 8);
|
|
cl_assert(exp.file_adds == 3);
|
|
cl_assert(exp.file_dels == 2);
|
|
cl_assert(exp.file_mods == 3);
|
|
|
|
cl_assert(exp.hunks == 8);
|
|
|
|
cl_assert(exp.lines == 11);
|
|
cl_assert(exp.line_ctxt == 3);
|
|
cl_assert(exp.line_adds == 6);
|
|
cl_assert(exp.line_dels == 2);
|
|
|
|
git_diff_list_free(diff);
|
|
diff = NULL;
|
|
memset(&exp, 0, sizeof(exp));
|
|
|
|
cl_git_pass(git_diff_index_to_tree(g_repo, &opts, b, &diff));
|
|
|
|
cl_git_pass(git_diff_foreach(
|
|
diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
|
|
|
/* to generate these values:
|
|
* - cd to tests/resources/status,
|
|
* - mv .gitted .git
|
|
* - git diff --name-status --cached 0017bd4ab1ec3
|
|
* - git diff -U1 --cached 0017bd4ab1ec3
|
|
* - mv .git .gitted
|
|
*/
|
|
cl_assert(exp.files == 12);
|
|
cl_assert(exp.file_adds == 7);
|
|
cl_assert(exp.file_dels == 2);
|
|
cl_assert(exp.file_mods == 3);
|
|
|
|
cl_assert(exp.hunks == 12);
|
|
|
|
cl_assert(exp.lines == 16);
|
|
cl_assert(exp.line_ctxt == 3);
|
|
cl_assert(exp.line_adds == 11);
|
|
cl_assert(exp.line_dels == 2);
|
|
|
|
git_diff_list_free(diff);
|
|
diff = NULL;
|
|
|
|
git_tree_free(a);
|
|
git_tree_free(b);
|
|
}
|
|
|
|
static int diff_stop_after_2_files(
|
|
void *cb_data,
|
|
git_diff_delta *delta,
|
|
float progress)
|
|
{
|
|
diff_expects *e = cb_data;
|
|
|
|
GIT_UNUSED(progress);
|
|
GIT_UNUSED(delta);
|
|
|
|
e->files++;
|
|
|
|
return (e->files == 2);
|
|
}
|
|
|
|
void test_diff_index__1(void)
|
|
{
|
|
/* grabbed a couple of commit oids from the history of the attr repo */
|
|
const char *a_commit = "26a125ee1bf"; /* the current HEAD */
|
|
const char *b_commit = "0017bd4ab1ec3"; /* 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 = {0};
|
|
git_diff_list *diff = NULL;
|
|
diff_expects exp;
|
|
|
|
cl_assert(a);
|
|
cl_assert(b);
|
|
|
|
opts.context_lines = 1;
|
|
opts.interhunk_lines = 1;
|
|
|
|
memset(&exp, 0, sizeof(exp));
|
|
|
|
cl_git_pass(git_diff_index_to_tree(g_repo, &opts, a, &diff));
|
|
|
|
cl_assert_equal_i(
|
|
GIT_EUSER,
|
|
git_diff_foreach(diff, &exp, diff_stop_after_2_files, NULL, NULL)
|
|
);
|
|
|
|
cl_assert(exp.files == 2);
|
|
|
|
git_diff_list_free(diff);
|
|
diff = NULL;
|
|
|
|
git_tree_free(a);
|
|
git_tree_free(b);
|
|
}
|