refs: introduce refs_for_each_include_root_refs()
Introduce a new ref iteration flag `DO_FOR_EACH_INCLUDE_ROOT_REFS`, which will be used to iterate over regular refs plus pseudorefs and HEAD. Refs which fall outside the `refs/` and aren't either pseudorefs or HEAD are more of a grey area. This is because we don't block the users from creating such refs but they are not officially supported. Introduce `refs_for_each_include_root_refs()` which calls `do_for_each_ref()` with this newly introduced flag. In `refs/files-backend.c`, introduce a new function `add_pseudoref_and_head_entries()` to add pseudorefs and HEAD to the `ref_dir`. We then finally call `add_pseudoref_and_head_entries()` whenever the `DO_FOR_EACH_INCLUDE_ROOT_REFS` flag is set. Any new ref backend will also have to implement similar changes on its end. Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
f768296cf1
commit
d0f00c1ac1
7
refs.c
7
refs.c
@ -1765,6 +1765,13 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
|
|||||||
return refs_for_each_rawref(get_main_ref_store(the_repository), fn, cb_data);
|
return refs_for_each_rawref(get_main_ref_store(the_repository), fn, cb_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int refs_for_each_include_root_refs(struct ref_store *refs, each_ref_fn fn,
|
||||||
|
void *cb_data)
|
||||||
|
{
|
||||||
|
return do_for_each_ref(refs, "", NULL, fn, 0,
|
||||||
|
DO_FOR_EACH_INCLUDE_ROOT_REFS, cb_data);
|
||||||
|
}
|
||||||
|
|
||||||
static int qsort_strcmp(const void *va, const void *vb)
|
static int qsort_strcmp(const void *va, const void *vb)
|
||||||
{
|
{
|
||||||
const char *a = *(const char **)va;
|
const char *a = *(const char **)va;
|
||||||
|
6
refs.h
6
refs.h
@ -398,6 +398,12 @@ int for_each_namespaced_ref(const char **exclude_patterns,
|
|||||||
int refs_for_each_rawref(struct ref_store *refs, each_ref_fn fn, void *cb_data);
|
int refs_for_each_rawref(struct ref_store *refs, each_ref_fn fn, void *cb_data);
|
||||||
int for_each_rawref(each_ref_fn fn, void *cb_data);
|
int for_each_rawref(each_ref_fn fn, void *cb_data);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Iterates over all refs including root refs, i.e. pseudorefs and HEAD.
|
||||||
|
*/
|
||||||
|
int refs_for_each_include_root_refs(struct ref_store *refs, each_ref_fn fn,
|
||||||
|
void *cb_data);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Normalizes partial refs to their fully qualified form.
|
* Normalizes partial refs to their fully qualified form.
|
||||||
* Will prepend <prefix> to the <pattern> if it doesn't start with 'refs/'.
|
* Will prepend <prefix> to the <pattern> if it doesn't start with 'refs/'.
|
||||||
|
@ -315,9 +315,59 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
|
|||||||
add_per_worktree_entries_to_dir(dir, dirname);
|
add_per_worktree_entries_to_dir(dir, dirname);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
|
/*
|
||||||
|
* Add pseudorefs to the ref dir by parsing the directory for any files
|
||||||
|
* which follow the pseudoref syntax.
|
||||||
|
*/
|
||||||
|
static void add_pseudoref_and_head_entries(struct ref_store *ref_store,
|
||||||
|
struct ref_dir *dir,
|
||||||
|
const char *dirname)
|
||||||
|
{
|
||||||
|
struct files_ref_store *refs =
|
||||||
|
files_downcast(ref_store, REF_STORE_READ, "fill_ref_dir");
|
||||||
|
struct strbuf path = STRBUF_INIT, refname = STRBUF_INIT;
|
||||||
|
struct dirent *de;
|
||||||
|
size_t dirnamelen;
|
||||||
|
DIR *d;
|
||||||
|
|
||||||
|
files_ref_path(refs, &path, dirname);
|
||||||
|
|
||||||
|
d = opendir(path.buf);
|
||||||
|
if (!d) {
|
||||||
|
strbuf_release(&path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
strbuf_addstr(&refname, dirname);
|
||||||
|
dirnamelen = refname.len;
|
||||||
|
|
||||||
|
while ((de = readdir(d)) != NULL) {
|
||||||
|
unsigned char dtype;
|
||||||
|
|
||||||
|
if (de->d_name[0] == '.')
|
||||||
|
continue;
|
||||||
|
if (ends_with(de->d_name, ".lock"))
|
||||||
|
continue;
|
||||||
|
strbuf_addstr(&refname, de->d_name);
|
||||||
|
|
||||||
|
dtype = get_dtype(de, &path, 1);
|
||||||
|
if (dtype == DT_REG && (is_pseudoref(ref_store, de->d_name) ||
|
||||||
|
is_headref(ref_store, de->d_name)))
|
||||||
|
loose_fill_ref_dir_regular_file(refs, refname.buf, dir);
|
||||||
|
|
||||||
|
strbuf_setlen(&refname, dirnamelen);
|
||||||
|
}
|
||||||
|
strbuf_release(&refname);
|
||||||
|
strbuf_release(&path);
|
||||||
|
closedir(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs,
|
||||||
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
if (!refs->loose) {
|
if (!refs->loose) {
|
||||||
|
struct ref_dir *dir;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mark the top-level directory complete because we
|
* Mark the top-level directory complete because we
|
||||||
* are about to read the only subdirectory that can
|
* are about to read the only subdirectory that can
|
||||||
@ -328,12 +378,17 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
|
|||||||
/* We're going to fill the top level ourselves: */
|
/* We're going to fill the top level ourselves: */
|
||||||
refs->loose->root->flag &= ~REF_INCOMPLETE;
|
refs->loose->root->flag &= ~REF_INCOMPLETE;
|
||||||
|
|
||||||
|
dir = get_ref_dir(refs->loose->root);
|
||||||
|
|
||||||
|
if (flags & DO_FOR_EACH_INCLUDE_ROOT_REFS)
|
||||||
|
add_pseudoref_and_head_entries(dir->cache->ref_store, dir,
|
||||||
|
refs->loose->root->name);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add an incomplete entry for "refs/" (to be filled
|
* Add an incomplete entry for "refs/" (to be filled
|
||||||
* lazily):
|
* lazily):
|
||||||
*/
|
*/
|
||||||
add_entry_to_dir(get_ref_dir(refs->loose->root),
|
add_entry_to_dir(dir, create_dir_entry(refs->loose, "refs/", 5));
|
||||||
create_dir_entry(refs->loose, "refs/", 5));
|
|
||||||
}
|
}
|
||||||
return refs->loose;
|
return refs->loose;
|
||||||
}
|
}
|
||||||
@ -861,7 +916,7 @@ static struct ref_iterator *files_ref_iterator_begin(
|
|||||||
* disk, and re-reads it if not.
|
* disk, and re-reads it if not.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs),
|
loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs, flags),
|
||||||
prefix, ref_store->repo, 1);
|
prefix, ref_store->repo, 1);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1222,7 +1277,7 @@ static int files_pack_refs(struct ref_store *ref_store,
|
|||||||
|
|
||||||
packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
|
packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
|
||||||
|
|
||||||
iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL,
|
iter = cache_ref_iterator_begin(get_loose_ref_cache(refs, 0), NULL,
|
||||||
the_repository, 0);
|
the_repository, 0);
|
||||||
while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
|
while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
|
||||||
/*
|
/*
|
||||||
|
@ -260,6 +260,12 @@ enum do_for_each_ref_flags {
|
|||||||
* INCLUDE_BROKEN, since they are otherwise not included at all.
|
* INCLUDE_BROKEN, since they are otherwise not included at all.
|
||||||
*/
|
*/
|
||||||
DO_FOR_EACH_OMIT_DANGLING_SYMREFS = (1 << 2),
|
DO_FOR_EACH_OMIT_DANGLING_SYMREFS = (1 << 2),
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Include root refs i.e. HEAD and pseudorefs along with the regular
|
||||||
|
* refs.
|
||||||
|
*/
|
||||||
|
DO_FOR_EACH_INCLUDE_ROOT_REFS = (1 << 3),
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user