proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 20:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: refactor common read_index functionality

Browse Source 
Most of `git_index_read_index` is common to reading any iterator.
Refactor it out in case we want to implement `read_tree` in terms of it
in the future.
This commit is contained in:
Edward Thomson 2016-06-29 17:01:47 -04:00
parent 59a0005ddd
commit 6f7ec7283d
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/index.c
View File

@ -2925,38 +2925,38 @@ cleanup:
return error; return error;
} }
int git_index_read_index( static int git_index_read_iterator(
git_index *index, git_index *index,
const git_index *new_index) git_iterator *new_iterator,
size_t new_length_hint)
{ {
git_vector new_entries = GIT_VECTOR_INIT, git_vector new_entries = GIT_VECTOR_INIT,
remove_entries = GIT_VECTOR_INIT; remove_entries = GIT_VECTOR_INIT;
git_idxmap *new_entries_map = NULL; git_idxmap *new_entries_map = NULL;
git_iterator *index_iterator = NULL; git_iterator *index_iterator = NULL;
git_iterator *new_iterator = NULL;
git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT;
const git_index_entry *old_entry, *new_entry; const git_index_entry *old_entry, *new_entry;
git_index_entry *entry; git_index_entry *entry;
size_t i; size_t i;
int error; int error;
if ((error = git_vector_init(&new_entries, new_index->entries.length, index->entries._cmp)) < 0 || assert((new_iterator->flags & GIT_ITERATOR_DONT_IGNORE_CASE));
if ((error = git_vector_init(&new_entries, new_length_hint, index->entries._cmp)) < 0 ||
(error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 || (error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 ||
(error = git_idxmap_alloc(&new_entries_map)) < 0) (error = git_idxmap_alloc(&new_entries_map)) < 0)
goto done; goto done;
if (index->ignore_case) if (index->ignore_case && new_length_hint)
kh_resize(idxicase, (khash_t(idxicase) *) new_entries_map, new_index->entries.length); kh_resize(idxicase, (khash_t(idxicase) *) new_entries_map, new_length_hint);
else else if (new_length_hint)
kh_resize(idx, new_entries_map, new_index->entries.length); kh_resize(idx, new_entries_map, new_length_hint);
opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE;
if ((error = git_iterator_for_index(&index_iterator, git_index_owner(index), index, &opts)) < 0 || if ((error = git_iterator_for_index(&index_iterator,
(error = git_iterator_for_index(&new_iterator, git_index_owner(new_index), (git_index *)new_index, &opts)) < 0) git_index_owner(index), index, &opts)) < 0 ||
goto done; ((error = git_iterator_current(&old_entry, index_iterator)) < 0 &&
if (((error = git_iterator_current(&old_entry, index_iterator)) < 0 &&
error != GIT_ITEROVER) || error != GIT_ITEROVER) ||
((error = git_iterator_current(&new_entry, new_iterator)) < 0 && ((error = git_iterator_current(&new_entry, new_iterator)) < 0 &&
error != GIT_ITEROVER)) error != GIT_ITEROVER))
@ -3050,6 +3050,8 @@ int git_index_read_index(
index_entry_free(entry); index_entry_free(entry);
} }
clear_uptodate(index);
error = 0; error = 0;
done: done:
@ -3057,6 +3059,27 @@ done:
git_vector_free(&new_entries); git_vector_free(&new_entries);
git_vector_free(&remove_entries); git_vector_free(&remove_entries);
git_iterator_free(index_iterator); git_iterator_free(index_iterator);
return error;
}
int git_index_read_index(
git_index *index,
const git_index *new_index)
{
git_iterator *new_iterator = NULL;
git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT;
int error;
opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE;
if ((error = git_iterator_for_index(&new_iterator,
git_index_owner(new_index), (git_index *)new_index, &opts)) < 0)
goto done;
error = git_index_read_iterator(index, new_iterator,
new_index->entries.length);
done:
git_iterator_free(new_iterator); git_iterator_free(new_iterator);
return error; return error;
} }