git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Adam Simpkins <adam@adamsimpkins.net>, git@vger.kernel.org
Subject: Re: [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph
Date: Mon, 7 Apr 2008 09:17:29 -0400	[thread overview]
Message-ID: <20080407131728.GA20319@sigill.intra.peff.net> (raw)
In-Reply-To: <7vwsnaoxlz.fsf@gitster.siamese.dyndns.org>

On Mon, Apr 07, 2008 at 01:52:40AM -0700, Junio C Hamano wrote:

> Some alternatives to specify terminator semantics I considered are:
> [...]
> The first one is what I suggested in the message, but it feels somewhat
> hacky.  I suspect that the second one would catch 99% of the cases, but it
> is DWIM and it is known that DWIM can go wrong.  I favor design along
> the lines of (3) or (4), which I think would be much cleaner.

How about:

  (5) There is no automagic terminator or separator for user formats. %n
      translates to a newline. %N translates to a newline, unless this
      is the final record, in which case it translates to the empty
      string.

So:
    # oneline
    git log --pretty=format:'%h %s%n'
    # multiline
    git log --pretty=format:'%h%nSubject: %s%n%N'

The main drawback is that dropping the automatic separator breaks
existing uses. We could work around this by automatically appending '%n'
if there is no use of "%n" or "%N", but I think that DWIM won't work for
formats which want a non-newline record separator. So maybe a %x/%X
string to mean "separator / terminator" instead of building on newline.
If one doesn't exist, we append "%x" to the format (to give oneline
semantics).

-Peff

  reply	other threads:[~2008-04-07 13:18 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-06 18:42 [PATCH 1/4] Add history graph API Adam Simpkins
2008-04-06 18:42 ` [PATCH 2/4] graph API: Added additional utility functions to the " Adam Simpkins
2008-04-06 18:42   ` [PATCH 3/4] git log and git rev-list: Add --graph option Adam Simpkins
2008-04-06 18:42     ` [PATCH 4/4] git log: Updated --graph to work even when the commit list is pruned Adam Simpkins
2008-04-06 21:47       ` [PATCH 5/5] Document the new --graph option for log and rev-list Adam Simpkins
2008-04-07  8:01         ` [PATCH 1/4] graph API: Fixed coding style problems Adam Simpkins
2008-04-07  8:01           ` [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph Adam Simpkins
2008-04-07  8:01             ` [PATCH 3/4] log and rev-list: Fix --graph output with --pretty=email Adam Simpkins
2008-04-07  8:01               ` [PATCH 4/4] log and rev-list: Improve --graph output when commits have been pruned Adam Simpkins
2008-04-07  8:21             ` [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph Junio C Hamano
2008-04-07  8:52               ` Junio C Hamano
2008-04-07 13:17                 ` Jeff King [this message]
2008-04-07 17:43                   ` Junio C Hamano
2008-04-07 19:01                     ` Adam Simpkins
2008-04-07 13:19                 ` Jakub Narebski
2008-04-08  0:11                 ` Junio C Hamano
2008-04-08  0:25                   ` Govind Salinas
2008-04-08  0:58                     ` Junio C Hamano
2008-04-06 21:15     ` [PATCH 3/4] git log and git rev-list: Add --graph option Teemu Likonen
2008-04-06 22:51       ` Adam Simpkins
2008-04-06 20:30 ` [PATCH 1/4] Add history graph API Teemu Likonen
2008-04-06 21:44   ` Adam Simpkins
2008-04-06 20:42 ` Johannes Schindelin
2008-04-06 22:47   ` Adam Simpkins
2008-04-07  5:24     ` Teemu Likonen
2008-04-07  8:34       ` Adam Simpkins
2008-04-07  8:56         ` Teemu Likonen
2008-04-06 21:06 ` Johannes Schindelin
2008-04-06 22:04   ` Adam Simpkins
2008-04-06 22:15     ` Johannes Schindelin
2008-04-06 22:58       ` Adam Simpkins
2008-04-07 16:15       ` Linus Torvalds
2008-04-07  3:12     ` Junio C Hamano
2008-04-06 21:25 ` [PATCH] bash: Add command line completion of --graph (git log) Teemu Likonen
2008-04-07 12:25   ` [PATCH v2] bash: Add more command line option completions for 'git log' Teemu Likonen
2008-04-07  7:26 ` [PATCH 1/4] Add history graph API Teemu Likonen
2008-04-07  8:06   ` Adam Simpkins

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080407131728.GA20319@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=adam@adamsimpkins.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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.
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).