From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v4 05/10] ref-filter: add support to sort by version
Date: Sat, 25 Jul 2015 00:34:40 +0530 [thread overview]
Message-ID: <1437764685-8633-6-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1437764685-8633-1-git-send-email-Karthik.188@gmail.com>
From: Karthik Nayak <karthik.188@gmail.com>
Add support to sort by version using the "v:refname" and
"version:refname" option. This is achieved by using the 'versioncmp()'
function as the comparing function for qsort.
This option is included to support sorting by versions in `git tag -l`
which will eventaully be ported to use ref-filter APIs.
Add documentation and tests for the same.
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>
---
Documentation/git-for-each-ref.txt | 3 +++
ref-filter.c | 26 ++++++++++++++------------
ref-filter.h | 3 ++-
t/t6302-for-each-ref-filter.sh | 36 ++++++++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index e49d578..224dc8c 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -145,6 +145,9 @@ For sorting purposes, fields with numeric values sort in numeric
order (`objectsize`, `authordate`, `committerdate`, `taggerdate`).
All other fields are used to sort in their byte-value order.
+There is also an option to sort by versions, this can be done by using
+the fieldname `version:refname` or in short `v:refname`.
+
In any case, a field name that refers to a field inapplicable to
the object referred by the ref does not cause an error. It
returns an empty string instead.
diff --git a/ref-filter.c b/ref-filter.c
index 08ecce5..8f2148f 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -12,6 +12,7 @@
#include "revision.h"
#include "utf8.h"
#include "git-compat-util.h"
+#include "version.h"
typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
@@ -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;
+
return (s->reverse) ? -cmp : cmp;
}
@@ -1420,6 +1419,9 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)
s->reverse = 1;
arg++;
}
+ if (skip_prefix(arg, "version:", &arg) ||
+ skip_prefix(arg, "v:", &arg))
+ s->version = 1;
len = strlen(arg);
s->atom = parse_ref_filter_atom(arg, arg+len);
return 0;
diff --git a/ref-filter.h b/ref-filter.h
index 1e2ee65..a12fe0c 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -26,7 +26,8 @@ struct atom_value {
struct ref_sorting {
struct ref_sorting *next;
int atom; /* index into used_atom array (internal) */
- unsigned reverse : 1;
+ unsigned reverse : 1,
+ version : 1;
};
struct ref_formatting_state {
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 505a360..5017032 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -81,4 +81,40 @@ test_expect_success 'filtering with --contains' '
test_cmp expect actual
'
+test_expect_success 'setup for version sort' '
+ test_commit foo1.3 &&
+ test_commit foo1.6 &&
+ test_commit foo1.10
+'
+
+test_expect_success 'version sort' '
+ git tag -l --sort=version:refname | grep "foo" >actual &&
+ cat >expect <<-\EOF &&
+ foo1.3
+ foo1.6
+ foo1.10
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'version sort (shortened)' '
+ git tag -l --sort=v:refname | grep "foo" >actual &&
+ cat >expect <<-\EOF &&
+ foo1.3
+ foo1.6
+ foo1.10
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'reverse version sort' '
+ git tag -l --sort=-version:refname | grep "foo" >actual &&
+ cat >expect <<-\EOF &&
+ foo1.10
+ foo1.6
+ foo1.3
+ EOF
+ test_cmp expect actual
+'
+
test_done
--
2.4.6
next prev parent reply other threads:[~2015-07-24 19:05 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 ` Karthik Nayak [this message]
2015-07-25 22:40 ` [PATCH v4 05/10] ref-filter: add support to sort by version Junio C Hamano
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=1437764685-8633-6-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).