Lubuntu
/
ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use lambdas instead of manual frees for libgit2

Browse Source
Simon Quigley 2 days ago
parent 19620ff4d1
commit 81c481fb6f
1 changed files with 78 additions and 35 deletions
Show Stats Download Patch File Download Diff File

113
cpp/build-packages.cpp
Unescape View File

@ -200,17 +200,23 @@ static void git_init_once() {
static void git_fetch_and_checkout(const fs::path &repo_path, const std::string &repo_url, const std::optional<std::string> &branch) { static void git_fetch_and_checkout(const fs::path &repo_path, const std::string &repo_url, const std::optional<std::string> &branch) {
log_info("Fetching and checking out repository: " + repo_url + " into " + repo_path.string()); log_info("Fetching and checking out repository: " + repo_url + " into " + repo_path.string());
git_init_once(); git_init_once();
git_repository* repo = nullptr;
// Define unique_ptrs with lambda-based deleters for libgit2 resources
auto repo_deleter = [](git_repository* r) { if (r) git_repository_free(r); };
std::unique_ptr<git_repository, decltype(repo_deleter)> repo(nullptr, repo_deleter);
bool need_clone = false; bool need_clone = false;
if(fs::exists(repo_path)) { if(fs::exists(repo_path)) {
log_verbose("Repository path exists. Attempting to open repository."); log_verbose("Repository path exists. Attempting to open repository.");
int err = git_repository_open(&repo, repo_path.string().c_str()); git_repository* raw_repo = nullptr;
int err = git_repository_open(&raw_repo, repo_path.string().c_str());
if(err < 0) { if(err < 0) {
log_warning("Cannot open repo at " + repo_path.string() + ", recloning."); log_warning("Cannot open repo at " + repo_path.string() + ", recloning.");
fs::remove_all(repo_path); fs::remove_all(repo_path);
need_clone = true; need_clone = true;
} else { } else {
repo.reset(raw_repo);
log_verbose("Repository opened successfully."); log_verbose("Repository opened successfully.");
} }
} else { } else {
@ -218,64 +224,85 @@ static void git_fetch_and_checkout(const fs::path &repo_path, const std::string
need_clone = true; need_clone = true;
} }
if(!need_clone && repo != nullptr) { if(!need_clone && repo) {
git_remote* remote = nullptr; // Define unique_ptr for git_remote with lambda-based deleter
int err = git_remote_lookup(&remote, repo, "origin"); auto remote_deleter = [](git_remote* r) { if (r) git_remote_free(r); };
std::unique_ptr<git_remote, decltype(remote_deleter)> remote(nullptr, remote_deleter);
git_remote* raw_remote = nullptr;
int err = git_remote_lookup(&raw_remote, repo.get(), "origin");
if(err < 0) { if(err < 0) {
log_warning("No origin remote found. Recloning."); log_warning("No origin remote found. Recloning.");
git_repository_free(repo);
fs::remove_all(repo_path); fs::remove_all(repo_path);
need_clone = true; need_clone = true;
} else { } else {
const char* url = git_remote_url(remote); remote.reset(raw_remote);
const char* url = git_remote_url(remote.get());
if(!url || repo_url != url) { if(!url || repo_url != url) {
log_warning("Remote URL differs. Recloning."); log_warning("Remote URL differs. Recloning.");
git_remote_free(remote);
git_repository_free(repo);
fs::remove_all(repo_path); fs::remove_all(repo_path);
need_clone = true; need_clone = true;
} else { } else {
log_verbose("Remote URL matches. Fetching latest changes."); log_verbose("Remote URL matches. Fetching latest changes.");
git_remote_free(remote); // Fetch
git_remote* origin = nullptr;
git_remote_lookup(&origin, repo, "origin");
git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT;
git_remote_fetch(origin, nullptr, &fetch_opts, nullptr); err = git_remote_fetch(remote.get(), nullptr, &fetch_opts, nullptr);
git_remote_free(origin); if(err < 0){
const git_error* e = git_error_last();
log_error(std::string("Git fetch failed: ") + (e ? e->message : "unknown error"));
throw std::runtime_error("Git fetch failed");
}
log_verbose("Fetch completed."); log_verbose("Fetch completed.");
if(branch) { if(branch) {
git_reference* ref = nullptr; // Define unique_ptr for git_reference with lambda-based deleter
auto ref_deleter = [](git_reference* r) { if (r) git_reference_free(r); };
std::unique_ptr<git_reference, decltype(ref_deleter)> ref(nullptr, ref_deleter);
std::string fullbranch = "refs/remotes/origin/" + *branch; std::string fullbranch = "refs/remotes/origin/" + *branch;
if(git_reference_lookup(&ref, repo, fullbranch.c_str()) == 0) { int ref_err = git_reference_lookup(&ref, repo.get(), fullbranch.c_str());
git_object* target = nullptr; if(ref_err == 0){
git_reference_peel(&target, ref, GIT_OBJECT_COMMIT); // Define unique_ptr for git_object with lambda-based deleter
auto target_deleter = [](git_object* o) { if (o) git_object_free(o); };
std::unique_ptr<git_object, decltype(target_deleter)> target(nullptr, target_deleter);
git_object* raw_target = nullptr;
git_reference_peel(&raw_target, ref.get(), GIT_OBJECT_COMMIT);
if(raw_target == nullptr) {
const git_error* e = git_error_last();
log_error(std::string("Failed to peel reference: ") + (e ? e->message : "unknown error"));
throw std::runtime_error("Failed to peel reference");
}
target.reset(raw_target);
git_checkout_options co_opts = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options co_opts = GIT_CHECKOUT_OPTIONS_INIT;
co_opts.checkout_strategy = GIT_CHECKOUT_FORCE; co_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
git_checkout_tree(repo, target, &co_opts); int checkout_err = git_checkout_tree(repo.get(), target.get(), &co_opts);
git_reference_free(ref); if(checkout_err != 0){
git_repository_set_head_detached(repo, git_object_id(target)); const git_error* e = git_error_last();
git_object_free(target); log_error(std::string("Failed to checkout tree: ") + (e ? e->message : "unknown error"));
throw std::runtime_error("Git checkout failed");
}
git_repository_set_head_detached(repo.get(), git_object_id(target.get()));
log_info("Checked out branch: " + *branch); log_info("Checked out branch: " + *branch);
} else { } else {
log_warning("Branch " + *branch + " not found, recloning."); log_warning("Branch " + *branch + " not found, recloning.");
git_repository_free(repo);
fs::remove_all(repo_path); fs::remove_all(repo_path);
need_clone = true; need_clone = true;
} }
} }
git_repository_free(repo);
} }
} }
} }
if(need_clone) { if(need_clone) {
// Define unique_ptr for new repository with lambda-based deleter
auto newrepo_deleter = [](git_repository* r) { if (r) git_repository_free(r); };
std::unique_ptr<git_repository, decltype(newrepo_deleter)> newrepo(nullptr, newrepo_deleter);
log_info("Cloning repository from " + repo_url + " to " + repo_path.string()); log_info("Cloning repository from " + repo_url + " to " + repo_path.string());
git_clone_options clone_opts = GIT_CLONE_OPTIONS_INIT; git_clone_options clone_opts = GIT_CLONE_OPTIONS_INIT;
git_checkout_options co_opts = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options co_opts = GIT_CHECKOUT_OPTIONS_INIT;
co_opts.checkout_strategy = GIT_CHECKOUT_FORCE; co_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
clone_opts.checkout_opts = co_opts; clone_opts.checkout_opts = co_opts;
git_repository* newrepo = nullptr;
int err = git_clone(&newrepo, repo_url.c_str(), repo_path.string().c_str(), &clone_opts); int err = git_clone(&newrepo, repo_url.c_str(), repo_path.string().c_str(), &clone_opts);
if(err < 0) { if(err < 0) {
const git_error* e = git_error_last(); const git_error* e = git_error_last();
@ -285,25 +312,41 @@ static void git_fetch_and_checkout(const fs::path &repo_path, const std::string
log_info("Repository cloned successfully."); log_info("Repository cloned successfully.");
if(branch) { if(branch) {
git_reference* ref = nullptr; // Define unique_ptr for git_reference with lambda-based deleter
auto ref_deleter = [](git_reference* r) { if (r) git_reference_free(r); };
std::unique_ptr<git_reference, decltype(ref_deleter)> ref(nullptr, ref_deleter);
std::string fullbranch = "refs/remotes/origin/" + *branch; std::string fullbranch = "refs/remotes/origin/" + *branch;
if(git_reference_lookup(&ref, newrepo, fullbranch.c_str()) == 0) { int ref_err = git_reference_lookup(&ref, newrepo.get(), fullbranch.c_str());
git_object* target = nullptr; if(ref_err == 0) {
git_reference_peel(&target, ref, GIT_OBJECT_COMMIT); // Define unique_ptr for git_object with lambda-based deleter
auto target_deleter = [](git_object* o) { if (o) git_object_free(o); };
std::unique_ptr<git_object, decltype(target_deleter)> target(nullptr, target_deleter);
git_object* raw_target = nullptr;
git_reference_peel(&raw_target, ref.get(), GIT_OBJECT_COMMIT);
if(raw_target == nullptr) {
const git_error* e = git_error_last();
log_error(std::string("Failed to peel reference after clone: ") + (e ? e->message : "unknown error"));
throw std::runtime_error("Failed to peel reference after clone");
}
target.reset(raw_target);
git_checkout_options co_opts_clone = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options co_opts_clone = GIT_CHECKOUT_OPTIONS_INIT;
co_opts_clone.checkout_strategy = GIT_CHECKOUT_FORCE; co_opts_clone.checkout_strategy = GIT_CHECKOUT_FORCE;
git_checkout_tree(newrepo, target, &co_opts_clone); int checkout_err = git_checkout_tree(newrepo.get(), target.get(), &co_opts_clone);
git_reference_free(ref); if(checkout_err != 0){
git_repository_set_head_detached(newrepo, git_object_id(target)); const git_error* e = git_error_last();
git_object_free(target); log_error(std::string("Failed to checkout tree after clone: ") + (e ? e->message : "unknown error"));
throw std::runtime_error("Git checkout after clone failed");
}
git_repository_set_head_detached(newrepo.get(), git_object_id(target.get()));
log_info("Checked out branch: " + *branch + " after clone."); log_info("Checked out branch: " + *branch + " after clone.");
} else { } else {
log_warning("Git checkout of branch " + *branch + " failed after clone."); log_warning("Git checkout of branch " + *branch + " failed after clone.");
git_repository_free(newrepo);
throw std::runtime_error("Branch checkout failed"); throw std::runtime_error("Branch checkout failed");
} }
} }
git_repository_free(newrepo); // newrepo will be automatically freed when it goes out of scope
} }
log_verbose("Finished fetching and checking out repository: " + repo_path.string()); log_verbose("Finished fetching and checking out repository: " + repo_path.string());
} }

Write Preview
Loading…
Cancel
Save