[PATCH 10/15] for-each-ref: introduce format specifier %>(*) and %<(*)
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 4, 2013, 12:35 UTC
- Message-ID
- <1370349337-20938-11-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1370349337-20938-1-git-send-email-artagnon@gmail.com>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Pretty placeholders %>(N) and %<(N) require a user provided width N, which makes sense because the commit chain could be really long and the user only needs to look at a few at the top, going to the end just to calculate the best width wastes CPU cycles.
for-each-ref is different; the display set is small, and we display them all at once. We even support sorting, which goes through all display items anyway. This patch introduces new %>(*) and %<(*), which are supposed to be followed immediately by %(fieldname) (i.e. original for-each-ref specifiers, not ones coming from pretty.c). They calculate the best width for the %(fieldname), ignoring ansi escape sequences if any.
[rr: documentation]
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> --- Documentation/git-for-each-ref.txt | 7 +++++++ builtin/for-each-ref.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 6135812..7d6db7f 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -47,6 +47,10 @@ OPTIONS are hex digits interpolates to character with hex code `xx`; for example `%00` interpolates to `\0` (NUL), `%09` to `\t` (TAB) and `%0a` to `\n` (LF). ++ +Placeholders `%<(*)` and `%>(*)` work like `%<(<N>)` and `%>(<N>)` +respectively, except that the width of the next placeholder is +calculated. <pretty>:: A format string with supporting placeholders described in the @@ -67,6 +71,9 @@ Caveats: 3. Only the placeholders inherited from `<format>` will respect quoting settings. +3. Only the placeholders inherited from `<format>` will work with the + alignment placeholders `%<(*)` and '%>(*)`. + <pattern>...:: If one or more patterns are given, only refs are shown that match against at least one pattern, either using fnmatch(3) or diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index f8a3880..053a622 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -9,6 +9,7 @@ #include "quote.h" #include "parse-options.h" #include "remote.h" +#include "utf8.h" /* Quoting styles */ #define QUOTE_NONE 0 @@ -966,10 +967,30 @@ static void show_refs(struct refinfo **refs, int maxcount, } struct format_one_atom_context { + struct refinfo **refs; + int maxcount; + struct refinfo *info; int quote_style; }; +static unsigned int get_atom_width(struct format_one_atom_context *ctx, + const char *start, const char *end) +{ + struct strbuf sb = STRBUF_INIT; + int i, atom = parse_atom(start, end); + unsigned int len = 0, sb_len; + for (i = 0; i < ctx->maxcount; i++) { + print_value(&sb, ctx->refs[i], atom, ctx->quote_style); + sb_len = utf8_strnwidth(sb.buf, sb.len, 1); + if (sb_len > len) + len = sb_len; + strbuf_reset(&sb); + } + strbuf_release(&sb); + return len; +} + static size_t format_one_atom(struct strbuf *sb, const char *placeholder, void *format_context, void *user_data, struct strbuf *subst) @@ -982,6 +1003,21 @@ static size_t format_one_atom(struct strbuf *sb, const char *placeholder, return 1; } + /* + * Substitute %>(*)%(atom) and friends with real width. + */ + if (*placeholder == '>' || *placeholder == '<') { + const char *star = placeholder + 1; + if (!prefixcmp(star, "(*)%(") && + ((ep = strchr(star + strlen("(*)%("), ')')) != NULL)) { + star++; + strbuf_addf(subst, "%c(%u)", + *placeholder, + get_atom_width(ctx, star + strlen("*)%("), ep)); + return 1 + strlen("(*)"); + } + } + if (*placeholder != '(') return 0; @@ -1003,6 +1039,8 @@ static void show_pretty_refs(struct refinfo **refs, int maxcount, ctx.format = format_one_atom; ctx.user_data = &fctx; + fctx.refs = refs; + fctx.maxcount = maxcount; fctx.quote_style = quote_style; for (i = 0; i < maxcount; i++) { struct commit *commit = NULL;
-- 1.8.3.GIT