mirror of
https://git.proxmox.com/git/libgit2
synced 2025-12-30 14:07:19 +00:00
This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests.
172 lines
4.6 KiB
C
172 lines
4.6 KiB
C
#include "clar_libgit2.h"
|
|
|
|
static git_repository *_repo;
|
|
static int counter;
|
|
|
|
void test_online_fetch__initialize(void)
|
|
{
|
|
cl_git_pass(git_repository_init(&_repo, "./fetch", 0));
|
|
}
|
|
|
|
void test_online_fetch__cleanup(void)
|
|
{
|
|
git_repository_free(_repo);
|
|
_repo = NULL;
|
|
|
|
cl_fixture_cleanup("./fetch");
|
|
}
|
|
|
|
static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *data)
|
|
{
|
|
GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); GIT_UNUSED(data);
|
|
|
|
++counter;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int progress(const git_transfer_progress *stats, void *payload)
|
|
{
|
|
size_t *bytes_received = (size_t *)payload;
|
|
*bytes_received = stats->received_bytes;
|
|
return 0;
|
|
}
|
|
|
|
static void do_fetch(const char *url, git_remote_autotag_option_t flag, int n)
|
|
{
|
|
git_remote *remote;
|
|
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
|
|
size_t bytes_received = 0;
|
|
|
|
callbacks.transfer_progress = progress;
|
|
callbacks.update_tips = update_tips;
|
|
callbacks.payload = &bytes_received;
|
|
counter = 0;
|
|
|
|
cl_git_pass(git_remote_create(&remote, _repo, "test", url));
|
|
git_remote_set_callbacks(remote, &callbacks);
|
|
git_remote_set_autotag(remote, flag);
|
|
cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH));
|
|
cl_git_pass(git_remote_download(remote));
|
|
cl_git_pass(git_remote_update_tips(remote));
|
|
git_remote_disconnect(remote);
|
|
cl_assert_equal_i(counter, n);
|
|
cl_assert(bytes_received > 0);
|
|
|
|
git_remote_free(remote);
|
|
}
|
|
|
|
void test_online_fetch__default_git(void)
|
|
{
|
|
do_fetch("git://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6);
|
|
}
|
|
|
|
void test_online_fetch__default_http(void)
|
|
{
|
|
do_fetch("http://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6);
|
|
}
|
|
|
|
void test_online_fetch__default_https(void)
|
|
{
|
|
do_fetch("https://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6);
|
|
}
|
|
|
|
void test_online_fetch__no_tags_git(void)
|
|
{
|
|
do_fetch("git://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_NONE, 3);
|
|
}
|
|
|
|
void test_online_fetch__no_tags_http(void)
|
|
{
|
|
do_fetch("http://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_NONE, 3);
|
|
}
|
|
|
|
static int transferProgressCallback(const git_transfer_progress *stats, void *payload)
|
|
{
|
|
bool *invoked = (bool *)payload;
|
|
|
|
GIT_UNUSED(stats);
|
|
*invoked = true;
|
|
return 0;
|
|
}
|
|
|
|
void test_online_fetch__doesnt_retrieve_a_pack_when_the_repository_is_up_to_date(void)
|
|
{
|
|
git_repository *_repository;
|
|
bool invoked = false;
|
|
git_remote *remote;
|
|
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
|
|
git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
|
|
opts.bare = true;
|
|
|
|
cl_git_pass(git_clone(&_repository, "https://github.com/libgit2/TestGitRepository.git",
|
|
"./fetch/lg2", &opts));
|
|
git_repository_free(_repository);
|
|
|
|
cl_git_pass(git_repository_open(&_repository, "./fetch/lg2"));
|
|
|
|
cl_git_pass(git_remote_load(&remote, _repository, "origin"));
|
|
cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH));
|
|
|
|
cl_assert_equal_i(false, invoked);
|
|
|
|
callbacks.transfer_progress = &transferProgressCallback;
|
|
callbacks.payload = &invoked;
|
|
git_remote_set_callbacks(remote, &callbacks);
|
|
cl_git_pass(git_remote_download(remote));
|
|
|
|
cl_assert_equal_i(false, invoked);
|
|
|
|
cl_git_pass(git_remote_update_tips(remote));
|
|
git_remote_disconnect(remote);
|
|
|
|
git_remote_free(remote);
|
|
git_repository_free(_repository);
|
|
}
|
|
|
|
static int cancel_at_half(const git_transfer_progress *stats, void *payload)
|
|
{
|
|
GIT_UNUSED(payload);
|
|
|
|
if (stats->received_objects > (stats->total_objects/2))
|
|
return -4321;
|
|
return 0;
|
|
}
|
|
|
|
void test_online_fetch__can_cancel(void)
|
|
{
|
|
git_remote *remote;
|
|
size_t bytes_received = 0;
|
|
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
|
|
|
|
cl_git_pass(git_remote_create(&remote, _repo, "test",
|
|
"http://github.com/libgit2/TestGitRepository.git"));
|
|
|
|
callbacks.transfer_progress = cancel_at_half;
|
|
callbacks.payload = &bytes_received;
|
|
git_remote_set_callbacks(remote, &callbacks);
|
|
|
|
cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH));
|
|
cl_git_fail_with(git_remote_download(remote), -4321);
|
|
git_remote_disconnect(remote);
|
|
git_remote_free(remote);
|
|
}
|
|
|
|
void test_online_fetch__ls_disconnected(void)
|
|
{
|
|
const git_remote_head **refs;
|
|
size_t refs_len_before, refs_len_after;
|
|
git_remote *remote;
|
|
|
|
cl_git_pass(git_remote_create(&remote, _repo, "test",
|
|
"http://github.com/libgit2/TestGitRepository.git"));
|
|
cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH));
|
|
cl_git_pass(git_remote_ls(&refs, &refs_len_before, remote));
|
|
git_remote_disconnect(remote);
|
|
cl_git_pass(git_remote_ls(&refs, &refs_len_after, remote));
|
|
|
|
cl_assert_equal_i(refs_len_before, refs_len_after);
|
|
|
|
git_remote_free(remote);
|
|
}
|