[PATCH 1/4] pretty: Add %D for script-friendly decoration
- From
Greg Price <price@ksplice.com>
- Date
- Dec 22, 2009, 22:22 UTC
- Message-ID
- <20091222222217.GV30538@dr-wily.mit.edu>
- In-Reply-To
- <20091222222032.GU30538@dr-wily.mit.edu>
When in a script or porcelain one wants to identify what refs point to which commits in a series, the functionality of 'git log --decorate' is extremely useful. This is available with the %d format code in a form optimized for humans, but for scripts a more raw format is better. Make such a format available through a new format code %D.
Signed-off-by: Greg Price <price@ksplice.com> --- Documentation/pretty-formats.txt | 1 + pretty.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 53a9168..b6b840e 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -119,6 +119,7 @@ The placeholders are: - '%ct': committer date, UNIX timestamp - '%ci': committer date, ISO 8601 format - '%d': ref names, like the --decorate option of linkgit:git-log[1] +- '%D': full ref names, like the --decorate=full option of linkgit:git-log[1] - '%e': encoding - '%s': subject - '%f': sanitized subject line, suitable for a filename diff --git a/pretty.c b/pretty.c index 8f5bd1a..18ce2ff 100644 --- a/pretty.c +++ b/pretty.c @@ -582,21 +582,35 @@ static void parse_commit_message(struct format_commit_context *c) c->commit_message_parsed = 1; } -static void format_decoration(struct strbuf *sb, const struct commit *commit) + +static void format_decoration(struct strbuf *sb, const struct commit *commit, + int decoration_style, const char *affixes[3]) { struct name_decoration *d; - const char *prefix = " ("; + const char *affix = affixes[0]; - load_ref_decorations(DECORATE_SHORT_REFS); + load_ref_decorations(decoration_style); d = lookup_decoration(&name_decoration, &commit->object); while (d) { - strbuf_addstr(sb, prefix); - prefix = ", "; + strbuf_addstr(sb, affix); + affix = affixes[1]; strbuf_addstr(sb, d->name); d = d->next; } - if (prefix[0] == ',') - strbuf_addch(sb, ')'); + if (affix == affixes[1]) + strbuf_addstr(sb, affixes[2]); +} + +static void format_decoration_short(struct strbuf *sb, const struct commit *commit) +{ + const char *affixes[3] = {" (", ", ", ")"}; + format_decoration(sb, commit, DECORATE_SHORT_REFS, affixes); +} + +static void format_decoration_full(struct strbuf *sb, const struct commit *commit) +{ + const char *affixes[3] = {"", " ", ""}; + format_decoration(sb, commit, DECORATE_FULL_REFS, affixes); } static void strbuf_wrap(struct strbuf *sb, size_t pos, @@ -756,7 +770,10 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, : '>'); return 1; case 'd': - format_decoration(sb, commit); + format_decoration_short(sb, commit); + return 1; + case 'D': + format_decoration_full(sb, commit); return 1; case 'g': /* reflog info */ switch(placeholder[1]) {
-- 1.6.6.rc1.9.g2ad41.dirty