* [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one()
@ 2010-05-01 10:56 Alexander Shishkin
2010-05-01 17:18 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Alexander Shishkin @ 2010-05-01 10:56 UTC (permalink / raw)
To: git; +Cc: Alexander Shishkin
This specifier represents the number of each commit in the output
stream.
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
---
Documentation/pretty-formats.txt | 3 ++-
pretty.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 1686a54..7b0cab1 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -137,7 +137,8 @@ The placeholders are:
- '%%': a raw '%'
- '%x00': print a byte from a hex code
- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
- linkgit:git-shortlog[1].
+ linkgit:git-shortlog[1]
+- '%O': number of the record in the output.
NOTE: Some placeholders may depend on other options given to the
revision traversal engine. For example, the `%g*` reflog options will
diff --git a/pretty.c b/pretty.c
index 7cb3a2a..3e3d399 100644
--- a/pretty.c
+++ b/pretty.c
@@ -11,6 +11,7 @@
#include "reflog-walk.h"
static char *user_format;
+static int record_number;
static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
{
@@ -639,6 +640,9 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
/* these are independent of the commit */
switch (placeholder[0]) {
+ case 'O':
+ strbuf_addf(sb, "%d", record_number);
+ return 1;
case 'C':
if (placeholder[1] == '(') {
const char *end = strchr(placeholder + 2, ')');
@@ -899,6 +903,7 @@ void format_commit_message(const struct commit *commit,
context.wrap_start = sb->len;
strbuf_expand(sb, format, format_commit_item, &context);
rewrap_message_tail(sb, &context, 0, 0, 0);
+ record_number++;
}
static void pp_header(enum cmit_fmt fmt,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one()
2010-05-01 10:56 [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one() Alexander Shishkin
@ 2010-05-01 17:18 ` Junio C Hamano
2010-05-01 17:56 ` Alexander Shishkin
2010-05-02 4:55 ` Jeff King
0 siblings, 2 replies; 5+ messages in thread
From: Junio C Hamano @ 2010-05-01 17:18 UTC (permalink / raw)
To: Alexander Shishkin; +Cc: git
Alexander Shishkin <ash@koowaldah.org> writes:
> This specifier represents the number of each commit in the output
> stream.
I don't like this. What does such a number _mean_ in a non-linear
history?
Also the next person who sees this will inevitably ask for %TOTAL to so
that the output can say [N/M], but that would mean the list has to be
limited and we cannot stream the output anymore.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one()
2010-05-01 17:18 ` Junio C Hamano
@ 2010-05-01 17:56 ` Alexander Shishkin
2010-05-01 19:39 ` Jakub Narebski
2010-05-02 4:55 ` Jeff King
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Shishkin @ 2010-05-01 17:56 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Alexander Shishkin, git
On Sat, May 01, 2010 at 10:18:35 -0700, Junio C Hamano wrote:
> Alexander Shishkin <ash@koowaldah.org> writes:
>
> > This specifier represents the number of each commit in the output
> > stream.
>
> I don't like this. What does such a number _mean_ in a non-linear
> history?
My idea is to have something like
$ git log --pretty=oneline | nl | less -R
This is generally useful when my local topic branch contains more than 5
(or so) commits and I can't immediately see which one's which if I want
to do a
$ git show HEAD~$n
to see what's inside, which is useful when reordering and/or squashing
commits by an interactive rebase. So this %O gives me this $n quicker
than counting.
> Also the next person who sees this will inevitably ask for %TOTAL to so
> that the output can say [N/M], but that would mean the list has to be
> limited and we cannot stream the output anymore.
Well, for me this kind of numbering only makes sense on a short part of
the topmost history.
Regards,
--
Alex
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one()
2010-05-01 17:56 ` Alexander Shishkin
@ 2010-05-01 19:39 ` Jakub Narebski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Narebski @ 2010-05-01 19:39 UTC (permalink / raw)
To: Alexander Shishkin; +Cc: Junio C Hamano, git
Alexander Shishkin <ash@koowaldah.org> writes:
> On Sat, May 01, 2010 at 10:18:35 -0700, Junio C Hamano wrote:
> > Alexander Shishkin <ash@koowaldah.org> writes:
> >
> > > This specifier represents the number of each commit in the output
> > > stream.
> >
> > I don't like this. What does such a number _mean_ in a non-linear
> > history?
>
> My idea is to have something like
>
> $ git log --pretty=oneline | nl | less -R
>
> This is generally useful when my local topic branch contains more than 5
> (or so) commits and I can't immediately see which one's which if I want
> to do a
>
> $ git show HEAD~$n
>
> to see what's inside, which is useful when reordering and/or squashing
> commits by an interactive rebase. So this %O gives me this $n quicker
> than counting.
Wouldn't somthing like
git log --pretty=oneline | git name-rev --stdin | less -R
be good enough?
--
Jakub Narebski
Poland
ShadeHawk on #git
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one()
2010-05-01 17:18 ` Junio C Hamano
2010-05-01 17:56 ` Alexander Shishkin
@ 2010-05-02 4:55 ` Jeff King
1 sibling, 0 replies; 5+ messages in thread
From: Jeff King @ 2010-05-02 4:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Alexander Shishkin, git
On Sat, May 01, 2010 at 10:18:35AM -0700, Junio C Hamano wrote:
> Alexander Shishkin <ash@koowaldah.org> writes:
>
> > This specifier represents the number of each commit in the output
> > stream.
>
> I don't like this. What does such a number _mean_ in a non-linear
> history?
>
> Also the next person who sees this will inevitably ask for %TOTAL to so
> that the output can say [N/M], but that would mean the list has to be
> limited and we cannot stream the output anymore.
Hmph. I started on a patch a while ago (but never finished) that would
allow an [N/M] output. My intent was to allow pretty-format specifiers
for generating cover letters[1].
Of course you can't stream when asking for %TOTAL, but that is already
the case with format-patch, which does such a calculation when numbering
patch subjects. We could use userformat_find_requirements to do the
lookup when needed, and then only formats which use the placeholder
would have to pay the penalty.
-Peff
[1] These days I do:
git format-patch --stdout "$@" |
sed -ne 's/^Subject: //p' |
sed -e 's/\[PATCH /[/' \
-e 's/]/]:/' \
-e 's/^/ /'
and pull the result into a cover letter that I write manually.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-05-02 4:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-01 10:56 [PATCH/RFC] pretty.c: add %O format specifier to format_commit_one() Alexander Shishkin
2010-05-01 17:18 ` Junio C Hamano
2010-05-01 17:56 ` Alexander Shishkin
2010-05-01 19:39 ` Jakub Narebski
2010-05-02 4:55 ` Jeff King
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 NNTP newsgroup(s).