On Tue, Aug 25, 2015 at 3:54 AM, Junio C Hamano <[email protected]> wrote:
> Karthik Nayak <[email protected]> writes:
>
>> From: Karthik Nayak <[email protected]>
>>
>> Add a function called 'for_each_reftype_fullpath()' to refs.{c,h}
>> which iterates through each ref for the given path without trimming
>> the path and also accounting for broken refs, if mentioned.
>
> For this part, I think you would want to borrow an extra pair of
> eyes from Michael.
>
>>
>> Add 'filter_ref_kind()' in ref-filter.c to check the kind of ref being
>> handled and return the kind to 'ref_filter_handler()', where we
>> discard refs which we do not need and assign the kind to needed refs.
>>
>> Mentored-by: Christian Couder <[email protected]>
>> Mentored-by: Matthieu Moy <[email protected]>
>> Signed-off-by: Karthik Nayak <[email protected]>
>> ---
>> ref-filter.c | 59
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
>> ref-filter.h | 12 ++++++++++--
>> refs.c | 9 +++++++++
>> refs.h | 1 +
>> 4 files changed, 74 insertions(+), 7 deletions(-)
>>
>> diff --git a/ref-filter.c b/ref-filter.c
>> index ffec10a..d5fae1a 100644
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>> @@ -1123,6 +1123,36 @@ static struct ref_array_item
>> *new_ref_array_item(const char *refname,
>> return ref;
>> }
>>
>> +static int filter_ref_kind(struct ref_filter *filter, const char *refname)
>> +{
>> + unsigned int i;
>> +
>> + static struct {
>> + const char *prefix;
>> + unsigned int kind;
>> + } ref_kind[] = {
>> + { "refs/heads/" , FILTER_REFS_BRANCHES },
>> + { "refs/remotes/" , FILTER_REFS_REMOTES },
>> + { "refs/tags/", FILTER_REFS_TAGS}
>> + };
>> +
>> + if (filter->kind == FILTER_REFS_BRANCHES)
>> + return FILTER_REFS_BRANCHES;
>> + else if (filter->kind == FILTER_REFS_REMOTES)
>> + return FILTER_REFS_REMOTES;
>> + else if (filter->kind == FILTER_REFS_TAGS)
>> + return FILTER_REFS_TAGS;
>> + else if (!strcmp(refname, "HEAD"))
>> + return FILTER_REFS_DETACHED_HEAD;
>> +
>> + for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
>> + if (starts_with(refname, ref_kind[i].prefix))
>> + return ref_kind[i].kind;
>> + }
>> +
>> + return FILTER_REFS_OTHERS;
>> +}
>> +
>> /*
>> * A call-back given to for_each_ref(). Filter refs and keep them for
>> * later object processing.
>> @@ -1133,6 +1163,7 @@ static int ref_filter_handler(const char *refname,
>> const struct object_id *oid,
>> struct ref_filter *filter = ref_cbdata->filter;
>> struct ref_array_item *ref;
>> struct commit *commit = NULL;
>> + unsigned int kind;
>>
>> if (flag & REF_BAD_NAME) {
>> warning("ignoring ref with broken name %s", refname);
>> @@ -1144,6 +1175,10 @@ static int ref_filter_handler(const char *refname,
>> const struct object_id *oid,
>> return 0;
>> }
>>
>> + kind = filter_ref_kind(filter, refname);
>> + if (!(kind & filter->kind))
>> + return 0;
>> +
>
> When filter->kind is set to some single-bit thing (e.g.
> FILTER_REFS_BRANCHES) by the caller of ref_filter_handler(), then
> this call of filter_ref_kind() will just parrot that without even
> looking at refname. And then the if statement says "yes, they have
> common bit(s)". Even when refname is "refs/tags/v1.0" or "HEAD".
>
This happens for branches remotes and tags, and this is intentional so as to
skip the uncessary checking to be done, if you see filter_refs() if it's called
with a single bit (branches, tags or remotes) then it calls
for_each_reftype_fullpath()
with the corresponding path, which would only give us the refs which we needed
hence checking them is not really needed. But the call to
filter_ref_kind() would just
give us the kind of the ref.
> And if this code knows that "refs/tags/v1.0" or "HEAD" will never
> come when filter->kind is exactly FILTER_REFS_BRANCHES, then I do
> not see the point of calling filter_ref_kind().
>
The point is to have a common function which returns the current ref kind,
Even if we know that the current ref kind is the same as the filter->kind.
> I am not sure what this is trying to do. Can you clarify the
> thinking behind this as a comment to filter_ref_kind()?
I should added a comment here, I will do so now.
>
>> @@ -1175,6 +1210,7 @@ static int ref_filter_handler(const char *refname,
>> const struct object_id *oid,
>>
>> REALLOC_ARRAY(ref_cbdata->array->items, ref_cbdata->array->nr + 1);
>> ref_cbdata->array->items[ref_cbdata->array->nr++] = ref;
>> + ref->kind = kind;
>> return 0;
>> }
>>
>> @@ -1251,16 +1287,29 @@ int filter_refs(struct ref_array *array, struct
>> ref_filter *filter, unsigned int
>> {
>> struct ref_filter_cbdata ref_cbdata;
>> int ret = 0;
>> + unsigned int broken = 0;
>>
>> ref_cbdata.array = array;
>> ref_cbdata.filter = filter;
>>
>> /* Simple per-ref filtering */
>> - if (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN))
>> - ret = for_each_rawref(ref_filter_handler, &ref_cbdata);
>> - else if (type & FILTER_REFS_ALL)
>> - ret = for_each_ref(ref_filter_handler, &ref_cbdata);
>> - else if (type)
>> + if (type & FILTER_REFS_INCLUDE_BROKEN) {
>> + type &= ~FILTER_REFS_INCLUDE_BROKEN;
>> + broken = 1;
>> + }
>> +
>> + filter->kind = type;
>> + if (type == FILTER_REFS_BRANCHES)
>> + ret = for_each_reftype_fullpath(ref_filter_handler,
>> "refs/heads/", broken, &ref_cbdata);
>> + else if (type == FILTER_REFS_REMOTES)
>> + ret = for_each_reftype_fullpath(ref_filter_handler,
>> "refs/remotes/", broken, &ref_cbdata);
>> + else if (type == FILTER_REFS_TAGS)
>> + ret = for_each_reftype_fullpath(ref_filter_handler,
>> "refs/tags/", broken, &ref_cbdata);
>> + else if (type & FILTER_REFS_ALL) {
>> + ret = for_each_reftype_fullpath(ref_filter_handler, "",
>> broken, &ref_cbdata);
>> + if (type & FILTER_REFS_DETACHED_HEAD)
>> + head_ref(ref_filter_handler, &ref_cbdata);
>> + } else
>> die("filter_refs: invalid type");
>>
>> /* Filters that need revision walking */
>> diff --git a/ref-filter.h b/ref-filter.h
>> index 45026d0..99f081b 100644
>> --- a/ref-filter.h
>> +++ b/ref-filter.h
>> @@ -13,8 +13,14 @@
>> #define QUOTE_PYTHON 4
>> #define QUOTE_TCL 8
>>
>> -#define FILTER_REFS_INCLUDE_BROKEN 0x1
>> -#define FILTER_REFS_ALL 0x2
>> +#define FILTER_REFS_INCLUDE_BROKEN 0x0001
>> +#define FILTER_REFS_TAGS 0x0002
>> +#define FILTER_REFS_BRANCHES 0x0004
>> +#define FILTER_REFS_REMOTES 0x0008
>> +#define FILTER_REFS_OTHERS 0x0010
>> +#define FILTER_REFS_ALL (FILTER_REFS_TAGS | FILTER_REFS_BRANCHES
>> | \
>> + FILTER_REFS_REMOTES | FILTER_REFS_OTHERS)
>> +#define FILTER_REFS_DETACHED_HEAD 0x0020
>>
>> struct atom_value;
>>
>> @@ -27,6 +33,7 @@ struct ref_sorting {
>> struct ref_array_item {
>> unsigned char objectname[20];
>> int flag;
>> + unsigned int kind;
>> const char *symref;
>> struct commit *commit;
>> struct atom_value *value;
>> @@ -51,6 +58,7 @@ struct ref_filter {
>> struct commit *merge_commit;
>>
>> unsigned int with_commit_tag_algo : 1;
>> + unsigned int kind;
>> };
>>
>> struct ref_filter_cbdata {
>> diff --git a/refs.c b/refs.c
>> index 4e15f60..3266617 100644
>> --- a/refs.c
>> +++ b/refs.c
>> @@ -2150,6 +2150,15 @@ int for_each_replace_ref(each_ref_fn fn, void
>> *cb_data)
>> strlen(git_replace_ref_base), 0, cb_data);
>> }
>>
>> +int for_each_reftype_fullpath(each_ref_fn fn, char *type, unsigned int
>> broken, void *cb_data)
>> +{
>> + unsigned int flag = 0;
>> +
>> + if (broken)
>> + flag = DO_FOR_EACH_INCLUDE_BROKEN;
>> + return do_for_each_ref(&ref_cache, type, fn, 0, flag, cb_data);
>> +}
>> +
>> int head_ref_namespaced(each_ref_fn fn, void *cb_data)
>> {
>> struct strbuf buf = STRBUF_INIT;
>> diff --git a/refs.h b/refs.h
>> index e9a5f32..6e913ee 100644
>> --- a/refs.h
>> +++ b/refs.h
>> @@ -179,6 +179,7 @@ extern int for_each_remote_ref(each_ref_fn fn, void
>> *cb_data);
>> extern int for_each_replace_ref(each_ref_fn fn, void *cb_data);
>> extern int for_each_glob_ref(each_ref_fn fn, const char *pattern, void
>> *cb_data);
>> extern int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, const
>> char *prefix, void *cb_data);
>> +extern int for_each_reftype_fullpath(each_ref_fn fn, char *type, unsigned
>> int broken, void *cb_data);
>>
>> extern int head_ref_submodule(const char *submodule, each_ref_fn fn, void
>> *cb_data);
>> extern int for_each_ref_submodule(const char *submodule, each_ref_fn fn,
>> void *cb_data);
Thanks for the review.
--
Regards,
Karthik Nayak
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
