proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 18:22:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3550 from libgit2/vmg/index-fill-2

Browse Source 
Index fill: Small fixups
This commit is contained in:
Vicent Marti 2015-12-17 10:09:02 +01:00
commit 1850c99ce2
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/idxmap.h
View File

@ -70,6 +70,7 @@ static kh_inline khint_t idxentry_hash(const git_index_entry *e)
#define git_idxmap_valid_index(h, idx) (idx != kh_end(h))
#define git_idxmap_has_data(h, idx) kh_exist(h, idx)
#define git_idxmap_resize(h,s) kh_resize(idx, h, s)
#define git_idxmap_free(h) kh_destroy(idx, h), h = NULL
#define git_idxmap_clear(h) kh_clear(idx, h)

37
src/index.c
View File

@ -879,6 +879,18 @@ void git_index_entry__init_from_stat(
entry->file_size = st->st_size;
}
static void index_entry_adjust_namemask(
git_index_entry *entry,
size_t path_length)
{
entry->flags &= ~GIT_IDXENTRY_NAMEMASK;
if (path_length < GIT_IDXENTRY_NAMEMASK)
entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK;
else
entry->flags |= GIT_IDXENTRY_NAMEMASK;
}
static int index_entry_create(
git_index_entry **out,
git_repository *repo,
@ -1279,13 +1291,7 @@ static int index_insert(
/* make sure that the path length flag is correct */
path_length = ((struct entry_internal *)entry)->pathlen;
entry->flags &= ~GIT_IDXENTRY_NAMEMASK;
if (path_length < GIT_IDXENTRY_NAMEMASK)
entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK;
else
entry->flags |= GIT_IDXENTRY_NAMEMASK;
index_entry_adjust_namemask(entry, path_length);
/* this entry is now up-to-date and should not be checked for raciness */
entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
@ -1550,21 +1556,28 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
assert(index);
if (!source_entries->length)
return 0;
if (git_mutex_lock(&index->lock) < 0) {
giterr_set(GITERR_OS, "Unable to acquire index lock");
return -1;
}
git_vector_size_hint(&index->entries, source_entries->length);
git_idxmap_resize(index->entries_map, source_entries->length * 1.3);
git_vector_foreach(source_entries, i, source_entry) {
git_index_entry *entry = NULL;
if ((ret = index_entry_dup(&entry, index, source_entry)) < 0)
break;
index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen);
entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
entry->mode = git_index__create_mode(entry->mode);
ret = git_vector_insert(&index->entries, entry);
if (ret < 0)
if ((ret = git_vector_insert(&index->entries, entry)) < 0)
break;
INSERT_IN_MAP(index, entry, ret);
@ -2889,11 +2902,7 @@ static int read_tree_cb(
entry->flags_extended = 0;
}
if (path.size < GIT_IDXENTRY_NAMEMASK)
entry->flags = path.size & GIT_IDXENTRY_NAMEMASK;
else
entry->flags = GIT_IDXENTRY_NAMEMASK;
index_entry_adjust_namemask(entry, path.size);
git_buf_free(&path);
if (git_vector_insert(data->new_entries, entry) < 0) {

7
src/vector.c
View File

@ -40,6 +40,13 @@ GIT_INLINE(int) resize_vector(git_vector *v, size_t new_size)
return 0;
}
int git_vector_size_hint(git_vector *v, size_t size_hint)
{
if (v->_alloc_size >= size_hint)
return 0;
return resize_vector(v, size_hint);
}
int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp)
{
size_t bytes;

1
src/vector.h
View File

@ -32,6 +32,7 @@ void git_vector_free_deep(git_vector *v); /* free each entry and self */
void git_vector_clear(git_vector *v);
int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp);
void git_vector_swap(git_vector *a, git_vector *b);
int git_vector_size_hint(git_vector *v, size_t size_hint);
void **git_vector_detach(size_t *size, size_t *asize, git_vector *v);