From: Junio C Hamano <gitster@pobox.com>
To: Karthik Nayak <karthik.188@gmail.com>
Cc: git@vger.kernel.org, christian.couder@gmail.com,
Matthieu.Moy@grenoble-inp.fr
Subject: Re: [PATCH v4 05/10] ref-filter: add support to sort by version
Date: Sat, 25 Jul 2015 15:40:52 -0700 [thread overview]
Message-ID: <xmqqd1zfkgi3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1437764685-8633-6-git-send-email-Karthik.188@gmail.com> (Karthik Nayak's message of "Sat, 25 Jul 2015 00:34:40 +0530")
Karthik Nayak <karthik.188@gmail.com> writes:
> @@ -1180,19 +1181,17 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru
>
> get_ref_atom_value(&state, a, s->atom, &va);
> get_ref_atom_value(&state, b, s->atom, &vb);
> - switch (cmp_type) {
> - case FIELD_STR:
> + if (s->version)
> + cmp = versioncmp(va->s, vb->s);
> + else if (cmp_type == FIELD_STR)
> cmp = strcmp(va->s, vb->s);
> - break;
> - default:
> - if (va->ul < vb->ul)
> - cmp = -1;
> - else if (va->ul == vb->ul)
> - cmp = 0;
> - else
> - cmp = 1;
> - break;
> - }
> + else if (va->ul < vb->ul)
> + cmp = -1;
> + else if (va->ul == vb->ul)
> + cmp = 0;
> + else
> + cmp = 1;
> +
So there are generally three kinds of comparison possible:
- if it is to be compared as versions, do versioncmp
- if it is to be compared as strings, do strcmp
- if it is to be compared as numbers, do <=> but because
we are writing in C, not in Perl, do so as if/else/else
Having understood that, the above is not really easy to read and
extend. We should structure the above more like this:
if (s->version)
... versioncmp
else if (... FIELD_STR)
... strcmp
else {
if (a < b)
...
else if (a == b)
...
else
...
}
so that it would be obvious how this code need to be updated
when we need to add yet another kind of comparison.
Without looking at the callers, s->version looks like a misdesign
that should be updated to use the same cmp_type mechanism? That
would lead to even more obvious construct that is easy to enhance,
i.e.
switch (cmp_type) {
case CMP_VERSION:
...
case CMP_STRING:
...
case CMP_NUMBER:
...
}
I dunno.
Other than that (and the structure of that "format-state" stuff we
discussed separately), the series was a pleasant read.
Thanks.
next prev parent reply other threads:[~2015-07-25 22:41 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 19:04 [PATCH v4 0/10] port tag.c to use ref-filter APIs Karthik Nayak
2015-07-24 19:04 ` [PATCH v4 01/10] ref-filter: add option to align atoms to the left Karthik Nayak
2015-07-24 21:54 ` Junio C Hamano
2015-07-24 23:00 ` Junio C Hamano
2015-07-25 4:14 ` Karthik Nayak
2015-07-26 4:08 ` Eric Sunshine
2015-07-26 4:36 ` Karthik Nayak
2015-07-26 5:58 ` Eric Sunshine
2015-07-26 6:03 ` Karthik Nayak
2015-07-27 12:01 ` Matthieu Moy
2015-07-27 0:39 ` Duy Nguyen
2015-07-27 7:39 ` Jacob Keller
2015-07-27 10:18 ` Duy Nguyen
2015-07-28 10:35 ` Duy Nguyen
2015-07-24 19:04 ` [PATCH v4 02/10] ref-filter: make the 'color' use ref_formatting_state Karthik Nayak
2015-07-24 21:46 ` Junio C Hamano
2015-07-25 4:15 ` Karthik Nayak
2015-07-26 4:28 ` Eric Sunshine
2015-07-26 4:12 ` Eric Sunshine
2015-07-26 5:40 ` Karthik Nayak
2015-07-24 19:04 ` [PATCH v4 03/10] ref-filter: add option to filter only tags Karthik Nayak
2015-07-24 19:04 ` [PATCH v4 04/10] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-07-26 4:46 ` Eric Sunshine
2015-07-26 5:15 ` Karthik Nayak
2015-07-24 19:04 ` [PATCH v4 05/10] ref-filter: add support to sort by version Karthik Nayak
2015-07-25 22:40 ` Junio C Hamano [this message]
2015-07-26 5:07 ` Karthik Nayak
2015-07-27 15:24 ` Junio C Hamano
2015-07-27 17:03 ` Karthik Nayak
2015-07-24 19:04 ` [PATCH v4 06/10] ref-filter: add option to match literal pattern Karthik Nayak
2015-07-26 5:15 ` Eric Sunshine
2015-07-26 18:21 ` Karthik Nayak
2015-07-24 19:04 ` [PATCH v4 07/10] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-07-24 19:19 ` [PATCH v4 08/10] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-07-24 19:19 ` [PATCH v4 09/10] tag.c: implement '--format' option Karthik Nayak
2015-07-24 19:19 ` [PATCH v4 10/10] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
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=xmqqd1zfkgi3.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=karthik.188@gmail.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).