mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jacob Keller <>
To: Junio C Hamano <>
Cc: Git mailing list <>
Subject: Re: [PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix
Date: Sun, 14 Aug 2016 22:32:49 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Sun, Aug 14, 2016 at 2:21 PM, Junio C Hamano <> wrote:
> Jacob Keller <> writes:
>> On Fri, Aug 12, 2016 at 2:58 PM, Junio C Hamano <> wrote:
>>> On Fri, Aug 12, 2016 at 2:43 PM, Jacob Keller <> wrote:
>>>> Ok so the big problem here is that unlike with diff which has support
>>>> for line-prefixes already due to needing it for graph mode, I can't
>>>> figure out where to get the prefix added for log output.
>>> Doesn't the --graph mode show the graph lines already? I think most
>>> if not all of that processing happens inside log-tree.c::show_log().
>> Yes but the problem is how to get this additional prefix to be displayed for
>> (a) non graph mode
>> (b) for graph mode but display the prefix before the graph prefix
>> It doesn't seem straight forward, and I haven't figured out how the
>> graph code already works.
> Because you only need "diff --line-prefix" to work while leaving
> "log --line-prefix" broken for the purpose of your immediate purpose
> to update "diff/log [--graph and other options] --submodule=<type>"
> to show "diff A B" in the submodule, I think it is OK to leave it
> broken, as long as it is clearly documented that "--line-prefix"
> should also apply to the log message part but the current code
> doesn't.  Eventually, when somebody wants to add a new <type> that
> runs "log -p A..B" instead of "diff A B" in submodules and wants to
> make it interact well with "log --graph" at the superproject level,
> they need to fix the breakage you leave behind.  That would be much
> better than "because I cannot figure out how to prefix on the log
> part, I'll name this --diff-line-prefix", which will force us to
> support that half-baked option forever while having to add a proper
> "--line-prefix" eventually anyway.

I will look more into how to do the log version tomorrow, if I am
still stuck I will re-work the patches as you suggest here.

I am hoping I can find a good solution for how to handle it though.


  reply	other threads:[~2016-08-15  5:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-11 22:59 [PATCH v5 1/3] diff.c: remove output_prefix_length field Jacob Keller
2016-08-11 22:59 ` [PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix Jacob Keller
2016-08-12 21:15   ` Junio C Hamano
2016-08-12 21:21     ` Jacob Keller
2016-08-12 21:43       ` Jacob Keller
     [not found]         ` <>
     [not found]           ` <>
2016-08-14 21:21             ` Junio C Hamano
2016-08-15  5:32               ` Jacob Keller [this message]
2016-08-15 15:37                 ` Junio C Hamano
2016-08-15 23:09                   ` Jacob Keller
2016-08-11 22:59 ` [PATCH v5 3/3] diff: add SUBMODULE_DIFF format to display submodule diff Jacob Keller

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:

  List information:

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

  git send-email \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).