On Tue, Sep 09, 2014 at 12:37:48PM -0700, Junio C Hamano wrote:
> Harry Jeffery <ha...@exec64.co.uk> writes:
>
> > On 09/09/14 20:15, Junio C Hamano wrote:
> >> Is this different from "%n%-d"?
> >>
> >
> > Yes. "%n%-d" will place the newline before the expansion, not after.
>
> Maybe "%[-+ ]" needs to be rethought, instead of making things worse
> by turning it into "%[-_+ ]", as the next person who comes would
> want to add space after the expansion and would need to find yet
> another letter like you did with '_'.
Yeah, that was my thought on reading the initial patch, too. Why limit
ourselves to newlines and spaces. I'd much rather have full conditional
expansion, like "${foo:+prefix $foo suffix}" in the shell.
Something like the patch below might work, but I didn't test it very
thoroughly (and note the comments, which might need dealing with). Maybe
it would make a sensible base for Harry to build on if he wants to
pursue this.
With it, you can do:
git log --format='%h %s%if(%d,%n Decoration:%d)' origin
to get:
85f0837 Start the post-2.1 cycle
Decoration: (origin/master, origin/HEAD, github/foo)
f655651 Merge branch 'rs/strbuf-getcwd'
51eeaea Merge branch 'ta/pretty-parse-config'
4740891 Merge branch 'bc/archive-pax-header-mode'
0e28161 Merge branch 'pr/remotes-in-hashmap'
44ceb79 Merge branch 'jk/pretty-empty-format'
56f214e Merge branch 'ta/config-set'
e8e4ce7 Merge branch 'rs/init-no-duplicate-real-path'
1d8a6f6 Merge branch 'mm/config-edit-global'
c518279 Merge branch 'jc/reopen-lock-file'
96db324 Merge git://github.com/git-l10n/git-po
Decoration: (origin/maint)
You could also make "%d" more flexible with it. We unconditionally
include the " (...)" wrapper when expanding it. But assuming we
introduced a "%D" that is _just_ the decoration names, you could do:
%if(%D, (%D))
to get the same effect with much more flexibility.
---
diff --git a/pretty.c b/pretty.c
index fe34ddc..96cd512 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1398,6 +1398,42 @@ static size_t format_commit_item(struct strbuf *sb, /*
in UTF-8 */
ADD_SP_BEFORE_NON_EMPTY
} magic = NO_MAGIC;
+ if (starts_with(placeholder, "if(")) {
+ const char *cond_beg, *cond_end;
+ const char *data_beg, *data_end;
+ char *buf;
+ struct strbuf scratch = STRBUF_INIT;
+
+ /* can't handle commas in conditions; allow backslash-escaping?
*/
+ cond_beg = cond_end = placeholder + 3;
+ for (cond_end = cond_beg; *cond_end != ','; cond_end++)
+ if (!*cond_end)
+ return 0;
+
+ /* ditto for nested parentheses; backslash escaping? */
+ data_beg = cond_end + 1;
+ for (data_end = data_beg; *data_end != ')'; data_end++)
+ if (!*data_end)
+ return 0;
+
+ /*
+ * Should teach formatters to return size only without
+ * actually writing to scratch buffer?
+ */
+ buf = xmemdupz(cond_beg, cond_end - cond_beg);
+ strbuf_expand(&scratch, buf, format_commit_item, context);
+ free(buf);
+
+ if (scratch.len) {
+ buf = xmemdupz(data_beg, data_end - data_beg);
+ strbuf_expand(sb, buf, format_commit_item, context);
+ free(buf);
+ }
+ strbuf_release(&scratch);
+
+ return data_end - placeholder + 1;
+ }
+
switch (placeholder[0]) {
case '-':
magic = DEL_LF_BEFORE_EMPTY;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
