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: [RFC/PATCH 4/9] ref-filter: add support to sort by version
Date: Thu, 25 Jun 2015 17:13:11 +0530 [thread overview]
Message-ID: <1435232596-27466-4-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1435232596-27466-1-git-send-email-karthik.188@gmail.com>
Add support to sort by version using the "v:refname" and
"version:refname" option. This is achieved by using the
'version_cmp()' function as the comparing function for qsort.
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>
---
ref-filter.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 57a5cfb..e307fab 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -10,8 +10,9 @@
#include "quote.h"
#include "ref-filter.h"
#include "revision.h"
+#include "version.h"
-typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
+typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME, FIELD_VER } cmp_type;
static struct {
const char *name;
@@ -53,6 +54,8 @@ static struct {
{ "flag" },
{ "HEAD" },
{ "color" },
+ { "version", FIELD_VER },
+ { "v", FIELD_VER },
};
/*
@@ -629,7 +632,9 @@ static void populate_value(struct ref_array_item *ref)
name++;
}
- if (starts_with(name, "refname"))
+ if (starts_with(name, "refname") ||
+ starts_with(name, "version:") ||
+ starts_with(name, "v:"))
refname = ref->refname;
else if (starts_with(name, "symref"))
refname = ref->symref ? ref->symref : "";
@@ -695,7 +700,13 @@ static void populate_value(struct ref_array_item *ref)
int num_ours, num_theirs;
formatp++;
- if (starts_with(formatp, "lalign")) {
+ if (starts_with(name, "version") || starts_with(name, "v")) {
+ if (strcmp(formatp, "refname"))
+ die("unknown %.*s format %s",
+ (int)(formatp - name), name, formatp);
+ v->s = refname;
+ continue;
+ } else if (starts_with(formatp, "lalign")) {
const char *valp;
int val;
@@ -1165,6 +1176,9 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru
case FIELD_STR:
cmp = strcmp(va->s, vb->s);
break;
+ case FIELD_VER:
+ cmp = versioncmp(va->s, vb->s);
+ break;
default:
if (va->ul < vb->ul)
cmp = -1;
--
2.4.4
next prev parent reply other threads:[~2015-06-25 11:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 9:55 [RFC/PATCH 0/9] port tag.c to use ref-filter library Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 2/9] ref-filter: add option to filter only tags Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 3/9] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-06-25 11:43 ` Karthik Nayak [this message]
2015-07-12 9:09 ` [RFC/PATCH 4/9] ref-filter: add support to sort by version Duy Nguyen
2015-07-12 13:37 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 5/9] ref-filter: add option to match literal pattern Karthik Nayak
2015-06-26 21:15 ` Karthik Nayak
2015-06-29 18:20 ` Junio C Hamano
2015-06-30 13:36 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 6/9] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 7/9] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 8/9] tag.c: implement '--format' option Karthik Nayak
2015-06-25 13:03 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 9/9] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-06-27 20:02 ` [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option Christian Couder
2015-06-28 4:53 ` Christian Couder
2015-06-28 6:59 ` Karthik Nayak
2015-06-27 23:43 ` Duy Nguyen
2015-06-28 7:39 ` Junio C Hamano
2015-06-28 9:13 ` Karthik Nayak
2015-06-29 4:44 ` 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=1435232596-27466-4-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).