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

for-each-ref: introduce filter_refs()

Browse Source 
Introduce filter_refs() which will act as an API for filtering
a set of refs. Based on the type of refs the user has requested,
we iterate through those refs and apply filters as per the
given ref_filter structure and finally store the filtered refs
in the ref_array structure.

Currently this will wrap around ref_filter_handler(). Hence,
ref_filter_handler is made file scope static.

As users of this API will no longer send a ref_filter_cbdata
structure directly, we make the elements of ref_filter_cbdata
pointers. We can now use the information given by the users
to obtain our own ref_filter_cbdata structure. Changes are made to
support the change in ref_filter_cbdata structure.

Make 'for-each-ref' use this API.

Helped-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karthik Nayak
2015-06-14 01:07:28 +05:30
committed by Junio C Hamano
parent c95b758587
commit 14de7fba34
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ref-filter.c
View File

@ -859,10 +859,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
* A call-back given to for_each_ref(). Filter refs and keep them for
* later object processing.
*/
int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data)
static int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data)
{
struct ref_filter_cbdata *ref_cbdata = cb_data;
struct ref_filter *filter = &ref_cbdata->filter;
struct ref_filter *filter = ref_cbdata->filter;
struct ref_array_item *ref;
if (flag & REF_BAD_NAME) {
@ -880,8 +880,8 @@ int ref_filter_handler(const char *refname, const struct object_id *oid, int fla
*/
ref = new_ref_array_item(refname, oid->hash, flag);
REALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);
ref_cbdata->array.items[ref_cbdata->array.nr++] = ref;
REALLOC_ARRAY(ref_cbdata->array->items, ref_cbdata->array->nr + 1);
ref_cbdata->array->items[ref_cbdata->array->nr++] = ref;
return 0;
}
@ -905,6 +905,28 @@ void ref_array_clear(struct ref_array *array)
array->nr = array->alloc = 0;
}
/*
* API for filtering a set of refs. Based on the type of refs the user
* has requested, we iterate through those refs and apply filters
* as per the given ref_filter structure and finally store the
* filtered refs in the ref_array structure.
*/
int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type)
{
struct ref_filter_cbdata ref_cbdata;
ref_cbdata.array = array;
ref_cbdata.filter = filter;
if (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN))
return for_each_rawref(ref_filter_handler, &ref_cbdata);
else if (type & FILTER_REFS_ALL)
return for_each_ref(ref_filter_handler, &ref_cbdata);
else
die("filter_refs: invalid type");
return 0;
}
static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
{
struct atom_value *va, *vb;