From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Matthew DeVore <matvore@google.com>,
git@matthieu-moy.fr, olyatelezhnaya@gmail.com,
samuel.maftoul@gmail.com, Johannes.Schindelin@gmx.de,
karthik.188@gmail.com, pclouds@gmail.com,
sunshine@sunshineco.com, emilyshaffer@google.com,
jrnieder@gmail.com
Subject: Re: [PATCH 3/5] ref-filter: add a "detached_head_first" sorting option
Date: Wed, 06 Jan 2021 15:45:50 -0800 [thread overview]
Message-ID: <xmqqy2h5oci9.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20210106100139.14651-4-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Wed, 6 Jan 2021 11:01:37 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> +static int compare_detached_head(struct ref_array_item *a, struct ref_array_item *b)
> +{
> + if (a->kind & FILTER_REFS_DETACHED_HEAD)
> + return -1;
> + else if (b->kind & FILTER_REFS_DETACHED_HEAD)
> + return 1;
> + BUG("compare_detached_head() is guarded by an xor on [ab]->kind & FILTER_REFS_DETACHED_HEAD");
> + return 0;
> +}
OK.
> +void ref_sorting_detached_head_first_all(struct ref_sorting *sorting, int flag)
> +{
> + for (; sorting; sorting = sorting->next)
> + sorting->detached_head_first = !!flag;
> +}
This, taken together with existing ref_sorting_icase_all(), looks
somewhat ugly, especially when you ponder how you would add a third
similar option to the mix.
Perhaps "ignore_case" and "detached_head_first" shouldn't be
separate bitfields, but bits in the same flag word member in the
"struct ref_sorting", and "set/unset these flags to all the sort
ops" helper function should just take a flags word that has two
bits?
Or maybe it is good enough for now. I hesitate to say so myself,
though, after already saying it is "somewhat ugly" ;-)
> void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
> {
> QSORT_S(array->items, array->nr, compare_refs, sorting);
> diff --git a/ref-filter.h b/ref-filter.h
> index feaef4a8fde..3b92e0f2696 100644
> --- a/ref-filter.h
> +++ b/ref-filter.h
> @@ -30,6 +30,7 @@ struct ref_sorting {
> int atom; /* index into used_atom array (internal) */
> unsigned reverse : 1,
> ignore_case : 1,
> + detached_head_first : 1,
> version : 1;
> };
>
> @@ -111,6 +112,8 @@ int verify_ref_format(struct ref_format *format);
> void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
> /* Set the ignore_case flag for all elements of a sorting list */
> void ref_sorting_icase_all(struct ref_sorting *sorting, int flag);
> +/* Set the detached_head_first flag for all elements of a sorting list */
> +void ref_sorting_detached_head_first_all(struct ref_sorting *sorting, int flag);
> /* Based on the given format and quote_style, fill the strbuf */
> int format_ref_array_item(struct ref_array_item *info,
> const struct ref_format *format,
next prev parent reply other threads:[~2021-01-06 23:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-06 21:38 [RFC PATCH] ref-filter: sort detached HEAD lines firstly Matthew DeVore
2019-06-09 8:17 ` [RFC PATCH] ref-filter: sort detached HEAD lines firstlyxy Johannes Schindelin
2019-06-09 16:39 ` Johannes Schindelin
2019-06-10 23:49 ` [RFC PATCH] ref-filter: sort detached HEAD lines firstly Matthew DeVore
2019-06-11 0:41 ` Jonathan Nieder
2019-06-11 16:48 ` Matthew DeVore
2019-06-11 19:53 ` Junio C Hamano
2019-06-11 18:28 ` [PATCH v2 0/1] Sort " Matthew DeVore
2019-06-11 18:28 ` [PATCH v2 1/1] ref-filter: sort " Matthew DeVore
2019-06-11 20:10 ` Junio C Hamano
2019-06-12 21:09 ` Junio C Hamano
2019-06-12 21:21 ` Matthew DeVore
2019-06-13 1:56 ` Matthew DeVore
2019-06-12 19:51 ` Johannes Schindelin
2019-06-13 16:58 ` Jeff King
2019-06-18 22:29 ` [PATCH v3 0/1] Sort detached heads line firstly Matthew DeVore
2019-06-18 22:29 ` [PATCH v3 1/1] ref-filter: sort detached HEAD lines firstly Matthew DeVore
2019-06-19 15:29 ` Junio C Hamano
2021-01-06 10:01 ` [PATCH 0/5] branch: --sort improvements Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 0/7] " Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 1/7] branch: change "--local" to "--list" in comment Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 2/7] branch tests: add to --sort tests Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 3/7] ref-filter: add braces to if/else if/else chain Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 4/7] ref-filter: move "cmp_fn" assignment into "else if" arm Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 5/7] ref-filter: move ref_sorting flags to a bitfield Ævar Arnfjörð Bjarmason
2021-01-07 23:24 ` Junio C Hamano
2021-01-07 9:51 ` [PATCH v2 6/7] branch: sort detached HEAD based on a flag Ævar Arnfjörð Bjarmason
2021-01-07 9:51 ` [PATCH v2 7/7] branch: show "HEAD detached" first under reverse sort Ævar Arnfjörð Bjarmason
2021-01-06 10:01 ` [PATCH 1/5] branch: change "--local" to "--list" in comment Ævar Arnfjörð Bjarmason
2021-01-06 10:01 ` [PATCH 2/5] branch tests: add to --sort tests Ævar Arnfjörð Bjarmason
2021-01-06 23:21 ` Junio C Hamano
2021-01-06 10:01 ` [PATCH 3/5] ref-filter: add a "detached_head_first" sorting option Ævar Arnfjörð Bjarmason
2021-01-06 23:45 ` Junio C Hamano [this message]
2021-01-06 10:01 ` [PATCH 4/5] branch: use the " Ævar Arnfjörð Bjarmason
2021-01-06 10:01 ` [PATCH 5/5] branch: show "HEAD detached" first under reverse sort Ævar Arnfjörð Bjarmason
2021-01-06 23:49 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy2h5oci9.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=karthik.188@gmail.com \
--cc=matvore@google.com \
--cc=olyatelezhnaya@gmail.com \
--cc=pclouds@gmail.com \
--cc=samuel.maftoul@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).