Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

grafts: use a typed oid hashmap

Browse Source
This commit is contained in:
Edward Thomson
2024-09-29 16:28:35 +01:00
parent 90f1785800
commit 9a7d920f73
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libgit2/grafts.c
View File

@@ -11,10 +11,13 @@
#include "oid.h"
#include "oidarray.h"
#include "parse.h"
#include "hashmap.h"
GIT_HASHMAP_SETUP(git_grafts_oidmap, const git_oid *, git_commit_graft *, git_oid_hash32, git_oid_equal);
struct git_grafts {
/* Map of `git_commit_graft`s */
git_oidmap *commits;
git_grafts_oidmap commits;
/* Type of object IDs */
git_oid_t oid_type;
@@ -33,11 +36,6 @@ int git_grafts_new(git_grafts **out, git_oid_t oid_type)
grafts = git__calloc(1, sizeof(*grafts));
GIT_ERROR_CHECK_ALLOC(grafts);
if ((git_oidmap_new(&grafts->commits)) < 0) {
git__free(grafts);
return -1;
}
grafts->oid_type = oid_type;
*out = grafts;
@@ -88,23 +86,24 @@ void git_grafts_free(git_grafts *grafts)
return;
git__free(grafts->path);
git_grafts_clear(grafts);
git_oidmap_free(grafts->commits);
git_grafts_oidmap_dispose(&grafts->commits);
git__free(grafts);
}
void git_grafts_clear(git_grafts *grafts)
{
git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
git_commit_graft *graft;
if (!grafts)
return;
git_oidmap_foreach_value(grafts->commits, graft, {
while (git_grafts_oidmap_iterate(&iter, NULL, &graft, &grafts->commits) == 0) {
git__free(graft->parents.ptr);
git__free(graft);
});
}
git_oidmap_clear(grafts->commits);
git_grafts_oidmap_clear(&grafts->commits);
}
int git_grafts_refresh(git_grafts *grafts)
@@ -205,7 +204,7 @@ int git_grafts_add(git_grafts *grafts, const git_oid *oid, git_array_oid_t paren
if ((error = git_grafts_remove(grafts, &graft->oid)) < 0 && error != GIT_ENOTFOUND)
goto cleanup;
if ((error = git_oidmap_set(grafts->commits, &graft->oid, graft)) < 0)
if ((error = git_grafts_oidmap_put(&grafts->commits, &graft->oid, graft)) < 0)
goto cleanup;
return 0;
@@ -223,10 +222,10 @@ int git_grafts_remove(git_grafts *grafts, const git_oid *oid)
GIT_ASSERT_ARG(grafts && oid);
if ((graft = git_oidmap_get(grafts->commits, oid)) == NULL)
if (git_grafts_oidmap_get(&graft, &grafts->commits, oid) != 0)
return GIT_ENOTFOUND;
if ((error = git_oidmap_delete(grafts->commits, oid)) < 0)
if ((error = git_grafts_oidmap_remove(&grafts->commits, oid)) < 0)
return error;
git__free(graft->parents.ptr);
@@ -238,23 +237,22 @@ int git_grafts_remove(git_grafts *grafts, const git_oid *oid)
int git_grafts_get(git_commit_graft **out, git_grafts *grafts, const git_oid *oid)
{
GIT_ASSERT_ARG(out && grafts && oid);
if ((*out = git_oidmap_get(grafts->commits, oid)) == NULL)
return GIT_ENOTFOUND;
return 0;
return git_grafts_oidmap_get(out, &grafts->commits, oid);
}
int git_grafts_oids(git_oid **out, size_t *out_len, git_grafts *grafts)
{
git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
git_array_oid_t array = GIT_ARRAY_INIT;
const git_oid *oid;
size_t existing, i = 0;
size_t existing;
GIT_ASSERT_ARG(out && grafts);
if ((existing = git_oidmap_size(grafts->commits)) > 0)
if ((existing = git_grafts_oidmap_size(&grafts->commits)) > 0)
git_array_init_to_size(array, existing);
while (git_oidmap_iterate(NULL, grafts->commits, &i, &oid) == 0) {
while (git_grafts_oidmap_iterate(&iter, &oid, NULL, &grafts->commits) == 0) {
git_oid *cpy = git_array_alloc(array);
GIT_ERROR_CHECK_ALLOC(cpy);
git_oid_cpy(cpy, oid);
@@ -268,5 +266,5 @@ int git_grafts_oids(git_oid **out, size_t *out_len, git_grafts *grafts)
size_t git_grafts_size(git_grafts *grafts)
{
return git_oidmap_size(grafts->commits);
return git_grafts_oidmap_size(&grafts->commits);
}

1
src/libgit2/grafts.h
View File

@@ -9,7 +9,6 @@
#include "common.h"
#include "oidarray.h"
#include "oidmap.h"
/** graft commit */
typedef struct {