On Wed, Aug 26, 2015 at 9:40 PM, Michael Haggerty <[email protected]> wrote:
> Comments inline.
>
> On 08/22/2015 05:39 AM, Karthik Nayak wrote:
>> 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.
>>
>> 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;
>
> I think this would be clearer written like so:
>
> if (filter->kind == FILTER_REFS_BRANCHES ||
> filter->kind == FILTER_REFS_REMOTES ||
> filter->kind == FILTER_REFS_TAGS)
> return filter->kind;
> if (!strcmp(refname, "HEAD"))
> return FILTER_REFS_DETACHED_HEAD;
>
This looks good.
> Or, even better, if you can set filter->kind to zero if it is not one of
> these constants, then you could simplify this to
>
> if (filter->kind)
> return filter->kind;
> if (!strcmp(refname, "HEAD"))
> return FILTER_REFS_DETACHED_HEAD;
>
But then that would mean we would loose the ability of having each
ref_array_item
know its kind, as we return the kind and set it in ref_filter_handler().
This would work in the current scenario. This is particularly needed
in the future for
branch.c using ref-filter where we might have to append "remotes/" for
printing remotes
via "git branch - a".
>> +
>> + 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;
>> +
>> if (*filter->name_patterns &&
>> !match_name_as_path(filter->name_patterns, refname))
>> return 0;
>>
>> @@ -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;
>> + }
>
> I wouldn't mask out the FILTER_REFS_INCLUDE_BROKEN bit here. Instead I
> would write
>
>> +
>> + filter->kind = type;
>
> as
>
> filter->kind = type & FILTER_REFS_KIND_MASK;
>
> where FILTER_REFS_KIND_MASK is the OR of all of the kind bits. The
> advantage is that this approach would remain correct if more bits are
> added to type. Then in the following if statements, test filter->kind
> instead of type.
>
Thats brilliant.
>> + 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);
>
> The usual promise of the for_each_ref functions is that they stop
> iterating if the function ever returns a nonzero value. So the above
> should be
>
> if (! ret && (type & FILTER_REFS_DETACHED_HEAD))
> ret = head_ref(ref_filter_handler, &ref_cbdata);
>
> Also, these functions usually iterate in lexicographic order, so I think
> you should process HEAD before the others.
This is done on purpose, cause we need to print the HEAD ref separately
so we print the last ref_array_item in the ref_array, free that memory and
sort and print the rest, hence HEAD ref is attached to the last.
>
> But there's another problem here. It seems like
> FILTER_REFS_DETACHED_HEAD is only processed if (type & FILTER_REFS_ALL)
> is nonzero. But shouldn't it be allowed to process *only* HEAD?
>
> So, finally, I think this code should look like
>
> else if (!filter->kind)
> die("filter_refs: invalid type");
> else {
> if (filter->kind & FILTER_REFS_DETACHED_HEAD)
> ret = head_ref(ref_filter_handler, &ref_cbdata);
> if (! ret && (filter->kind & FILTER_REFS_ALL))
> ret =
> for_each_reftype_fullpath(ref_filter_handler, "", broken, &ref_cbdata);
> }
>
So finally something like this perhaps
if (!filter->kind)
die("filter_refs: invalid type");
else {
if (filter->kind == FILTER_REFS_BRANCHES)
ret = for_each_reftype_fullpath(ref_filter_handler,
"refs/heads/", broken, &ref_cbdata);
else if (filter->kind == FILTER_REFS_REMOTES)
ret = for_each_reftype_fullpath(ref_filter_handler,
"refs/remotes/", broken, &ref_cbdata);
else if (filter->kind == FILTER_REFS_TAGS)
ret = for_each_reftype_fullpath(ref_filter_handler,
"refs/tags/", broken, &ref_cbdata);
else if (filter->kind & FILTER_REFS_ALL)
ret = for_each_reftype_fullpath(ref_filter_handler, "",
broken, &ref_cbdata);
if (filter->kind & 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
>
> Do you expect it to be useful to OR these bits together, or will (in
> practice) all callers want to iterate over one or the other type of
> reference, or all references? I ask because allowing an arbitrary
> bitmask complicates the code a bit (otherwise filter_ref_kind() wouldn't
> be needed).
>
> If there is code that wants to iterate over, say, branches *and* tags,
> then maybe it is an acceptable imposition for it to make two function calls,
>
> for_each_reftype_fullpath(fn, "refs/heads/", broken, cb_data) ||
> for_each_reftype_fullpath(fn, "refs/tags/", broken, cb_data);
>
> which might even be a bit more efficient because it only has to iterate
> over those two namespaces rather than all references.
>
> But the more flexible bitmask code is not a lot of extra overhead, so if
> you think it will have a use case then it is fine to keep this interface.
>
Yeah, 'git branch -l' has '-a' option which iterates over remotes, branches and
also the head ref. Hence the option. Thats also why if only a single
type is needed
we only iterate through those refs.
>>
>> 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);
>
> This function is most like for_each_ref_in(prefix, fn, cb_data).
> Therefore, I suggest that you rename the "type" parameter" to "prefix",
> maybe reorder its arguments, and maybe rename it (to
> for_each_fullref_in()?) for consistency, and maybe put its declaration
> next to that function's. (I see that the argument orders among these
> functions are already pretty inconsistent, but it seems best to be
> consistent with the function that is most similar to it.)
>
> I think the "type"/"prefix" argument can be "const char *".
>
Agree with everything said here, will do.
>>
>> 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);
>>
>
> Michael
>
> --
> Michael Haggerty
> [email protected]
>
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
