From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v2 01/10] ref-filter: add %(refname:shortalign=X) option
Date: Thu, 9 Jul 2015 15:57:42 +0530 [thread overview]
Message-ID: <1436437671-25600-1-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <CAOLa=ZQyHwza6L9r6iFX1GkVrC+F-XNwegO=bGyxafjY3JoYpw@mail.gmail.com>
Add support for %(refname:shortalign=X) where X is a number.
This will print a shortened refname aligned to the left
followed by spaces for a total length of X characters.
If X is less than the shortened refname size, the entire
shortened refname is printed.
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 | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/ref-filter.c b/ref-filter.c
index dd0709d..3098497 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -10,6 +10,7 @@
#include "quote.h"
#include "ref-filter.h"
#include "revision.h"
+#include "utf8.h"
typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
@@ -695,7 +696,23 @@ static void populate_value(struct ref_array_item *ref)
int num_ours, num_theirs;
formatp++;
- if (!strcmp(formatp, "short"))
+ if (starts_with(formatp, "shortalign=")) {
+ const char *valp, *short_refname = NULL;
+ int val, len;
+
+ skip_prefix(formatp, "shortalign=", &valp);
+ val = atoi(valp);
+ refname = short_refname = shorten_unambiguous_ref(refname,
+ warn_ambiguous_refs);
+ len = utf8_strwidth(refname);
+ if (val > len) {
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_addstr(&buf, refname);
+ strbuf_addchars(&buf, ' ', val - len);
+ free((char *)short_refname);
+ refname = strbuf_detach(&buf, NULL);
+ }
+ } else if (!strcmp(formatp, "short"))
refname = shorten_unambiguous_ref(refname,
warn_ambiguous_refs);
else if (!strcmp(formatp, "track") &&
--
2.4.5
next prev parent reply other threads:[~2015-07-09 10:28 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 10:27 [PATCH v2 00/10] Port tag.c to use ref-filter APIs Karthik Nayak
2015-07-09 10:27 ` Karthik Nayak [this message]
2015-07-09 10:27 ` [PATCH v2 02/10] ref-filter: add option to filter only tags Karthik Nayak
2015-07-09 10:27 ` [PATCH v2 03/10] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-07-09 13:07 ` Matthieu Moy
2015-07-10 10:38 ` Karthik Nayak
2015-07-09 10:27 ` [PATCH v2 04/10] ref-filter: add support to sort by version Karthik Nayak
2015-07-09 13:29 ` Matthieu Moy
2015-07-10 10:52 ` Karthik Nayak
2015-07-10 11:01 ` Karthik Nayak
2015-07-10 12:18 ` Matthieu Moy
2015-07-11 5:54 ` Karthik Nayak
2015-07-09 10:27 ` [PATCH v2 05/10] ref-filter: add option to match literal pattern Karthik Nayak
2015-07-09 13:32 ` Matthieu Moy
2015-07-10 11:11 ` Karthik Nayak
2015-07-10 16:43 ` Junio C Hamano
2015-07-11 5:55 ` Karthik Nayak
2015-07-11 9:26 ` Matthieu Moy
2015-07-11 12:54 ` Karthik Nayak
2015-07-09 10:27 ` [PATCH v2 06/10] Documentation/tag: remove double occurance of "<pattern>" Karthik Nayak
2015-07-09 12:19 ` Christian Couder
2015-07-09 12:56 ` Karthik Nayak
2015-07-10 16:44 ` Junio C Hamano
2015-07-12 12:39 ` Karthik Nayak
2015-07-09 10:27 ` [PATCH v2 07/10] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-07-09 10:55 ` [PATCH v2 08/10] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-07-09 12:48 ` Matthieu Moy
2015-07-09 12:55 ` Karthik Nayak
2015-07-09 13:43 ` Matthieu Moy
2015-07-10 9:41 ` Karthik Nayak
2015-07-09 13:41 ` Matthieu Moy
2015-07-09 10:58 ` Karthik Nayak
2015-07-12 9:45 ` Duy Nguyen
2015-07-12 19:36 ` Karthik Nayak
2015-07-13 10:46 ` Duy Nguyen
2015-07-13 20:34 ` Karthik Nayak
2015-07-09 10:59 ` [PATCH v2 09/10] tag.c: implement '--format' option Karthik Nayak
2015-07-09 11:00 ` [PATCH v2 10/10] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-07-09 12:58 ` [PATCH v2 01/10] ref-filter: add %(refname:shortalign=X) option Matthieu Moy
2015-07-11 6:07 ` Karthik Nayak
2015-07-11 10:20 ` Matthieu Moy
2015-07-10 16:20 ` Junio C Hamano
2015-07-11 12:05 ` Karthik Nayak
2015-07-12 1:47 ` Duy Nguyen
2015-07-12 8:59 ` Duy Nguyen
2015-07-12 19:56 ` Karthik Nayak
2015-07-13 10:51 ` Duy Nguyen
2015-07-13 20:36 ` 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=1436437671-25600-1-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 \
/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).