mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packed_ref_store: make class into a subclass of ref_store

Browse Source 
Add the infrastructure to make `packed_ref_store` implement
`ref_store`, at least formally (few of the methods are actually
implemented yet). Change the functions in its interface to take
`ref_store *` arguments. Change `files_ref_store` to store a pointer
to `ref_store *` and to call functions via the virtual `ref_store`
interface where possible. This also means that a few
`packed_ref_store` functions can become static.

This is a work in progress. Some more `ref_store` methods will soon be
implemented (e.g., those having to do with reference transactions).
But some of them will never be implemented (e.g., those having to do
with symrefs or reflogs).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2017-06-23 09:01:38 +02:00
committed by Junio C Hamano
parent 67be7c5a59
commit e0cc8ac820
4 changed files with 227 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
refs/files-backend.c
View File

@ -28,7 +28,7 @@ struct files_ref_store {
struct ref_cache *loose;
struct packed_ref_store *packed_ref_store;
struct ref_store *packed_ref_store;
};
static void clear_loose_ref_cache(struct files_ref_store *refs)
@ -311,8 +311,8 @@ stat_ref:
if (lstat(path, &st) < 0) {
if (errno != ENOENT)
goto out;
if (packed_read_raw_ref(refs->packed_ref_store, refname,
sha1, referent, type)) {
if (refs_read_raw_ref(refs->packed_ref_store, refname,
sha1, referent, type)) {
errno = ENOENT;
goto out;
}
@ -351,8 +351,8 @@ stat_ref:
* ref is supposed to be, there could still be a
* packed ref:
*/
if (packed_read_raw_ref(refs->packed_ref_store, refname,
sha1, referent, type)) {
if (refs_read_raw_ref(refs->packed_ref_store, refname,
sha1, referent, type)) {
errno = EISDIR;
goto out;
}
@ -683,7 +683,7 @@ static int files_peel_ref(struct ref_store *ref_store,
* have REF_KNOWS_PEELED.
*/
if (flag & REF_ISPACKED &&
!packed_peel_ref(refs->packed_ref_store, refname, sha1))
!refs_peel_ref(refs->packed_ref_store, refname, sha1))
return 0;
return peel_object(base, sha1);
@ -804,8 +804,8 @@ static struct ref_iterator *files_ref_iterator_begin(
* ones in files_ref_iterator_advance(), after we have merged
* the packed and loose references.
*/
packed_iter = packed_ref_iterator_begin(
refs->packed_ref_store, prefix,
packed_iter = refs_ref_iterator_begin(
refs->packed_ref_store, prefix, 0,
DO_FOR_EACH_INCLUDE_BROKEN);
iter->iter0 = overlay_ref_iterator_begin(loose_iter, packed_iter);