From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: [PATCH] log,diff-tree: add --combined-with-paths options for merges with renames
Date: Sat, 26 Jan 2019 14:12:41 -0800 [thread overview]
Message-ID: <CABPp-BFaVwwM17Oe+-RoP5wt2V58AD=dr01uNPuV=9r4yoF3Qg@mail.gmail.com> (raw)
In-Reply-To: <xmqq8sz8fkfi.fsf@gitster-ct.c.googlers.com>
On Fri, Jan 25, 2019 at 2:21 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Elijah Newren <newren@gmail.com> writes:
>
> > Also, my first version of the patch actually showed all names, on all
> > lines, but I found the heavy repetition really annoying, and not in
> > keeping with how non-merge commits are handled (where original
> > filenames are only shown when they differ). Granted, my change isn't
> > the only one. We could just have all names shown if they are not all
> > identical, as you suggest and I also considered, but I liked this way
> > slightly better. If others feel strongly, I can change it, that was
> > just my gut feel and preference.
>
> I do not have a strong _preference_; I am only worried about ease of
> use by consumers of the raw output, i.e. scripts. From that point
> of view, --all-names showing all names always even when there is no
> rename is involved would certainly be the easiest to write a parser
> for, and lines being overly repetitive is a non-issue. For human
> consumption, it would be a separate matter, but they won't be
> reading from the --raw output that lists blob object names
> repetitively (the object names may or may not be different, but they
> are all equally gibberish) before showing the human-readble part,
> which are names.
Okay, I've switched it over.
> > You could kind of ask the same question of -c -p, actually. I looked
> > into that, but I was only interested in raw format output and --cc is
> > only about coalescing uninteresting hunks in patches. Whenever git
> > shows a combined diff in patch format, it always lists two files in
> > the header, e.g.:
> > a/foo.c
> > b/foo.c
>
> Yeah, but with a new option, it does not have to stay that way. It
> is OK to show a/foo.c, b/bar.c, c/baz.c, or perhaps an easy way to
> avoid overlong unreadable lines in these human readable output may
> be to only show b/foo.c to report the result and list the original
> names using the "rename from" "rename to" extended diff-headers
> shown in normal diff output with rename detection enabled.
>
> > ... I guess the "combined" patch is already kind of
> > special, so it could make sense, ...
>
> Absolutely. -c/--cc output with -p departs from the usual "diff is
> to compare two things" by having two +/- indicator columns and more
> than two '@'s in hunk header to begin with. It is only natural if
> we are showing more/all names in --raw, we should avoid losing info
> in the same way.
This turned out to be easier to implement than I expected, with one
small wrinkle: We have the "a/" and "b/" prefixes, and switching to
"a/", "b/" and "c/" doesn't work due to things like the
diff.mnemonicPrefix setting -- plus I didn't want to plumb multiple
prefix options everywhere they'd be needed. Instead, I decided that
instead of having a "from" and a "to" header, we would have N "from"
headers (since all parents are what we came from) and 1 "to" header.
I hope that makes sense, because otherwise I think this become to
unwieldy of a change.
next prev parent reply other threads:[~2019-01-26 22:12 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 16:46 [PATCH] log,diff-tree: add --combined-with-paths options for merges with renames Elijah Newren
2019-01-25 2:19 ` brian m. carlson
2019-01-25 16:27 ` Elijah Newren
2019-01-25 14:45 ` Derrick Stolee
2019-01-25 16:30 ` Elijah Newren
2019-01-25 16:54 ` [PATCH v2] " Elijah Newren
2019-01-25 17:40 ` Derrick Stolee
2019-01-25 17:52 ` Elijah Newren
2019-01-25 19:51 ` Eric Sunshine
2019-01-26 22:07 ` Elijah Newren
2019-01-27 1:52 ` brian m. carlson
2019-01-26 22:18 ` [PATCH v3] log,diff-tree: add --combined-all-names option Elijah Newren
2019-02-04 20:07 ` [PATCH v4] " Elijah Newren
2019-02-04 21:20 ` Junio C Hamano
2019-02-05 15:51 ` Elijah Newren
2019-02-05 20:39 ` Junio C Hamano
2019-02-07 19:50 ` Elijah Newren
2019-02-07 20:25 ` Junio C Hamano
2019-02-07 22:10 ` Elijah Newren
2019-02-07 23:31 ` Junio C Hamano
2019-02-07 23:48 ` Elijah Newren
2019-02-05 9:48 ` Johannes Schindelin
2019-02-05 15:54 ` Elijah Newren
2019-02-05 18:04 ` Junio C Hamano
2019-02-07 22:28 ` Junio C Hamano
2019-02-07 23:48 ` Elijah Newren
2019-02-08 1:12 ` [PATCH v5 0/2] add --combined-all-paths option to log and diff-tree Elijah Newren
2019-02-08 1:12 ` [PATCH v5 1/2] log,diff-tree: add --combined-all-paths option Elijah Newren
2019-02-08 4:00 ` Junio C Hamano
2019-02-08 6:52 ` Elijah Newren
2019-02-08 17:50 ` Junio C Hamano
2019-02-08 1:12 ` [PATCH v5 2/2] squash! " Elijah Newren
2019-02-08 4:14 ` Junio C Hamano
2019-02-08 6:48 ` Elijah Newren
2019-01-25 19:29 ` [PATCH] log,diff-tree: add --combined-with-paths options for merges with renames Junio C Hamano
2019-01-25 20:04 ` Elijah Newren
2019-01-25 22:21 ` Junio C Hamano
2019-01-26 22:12 ` Elijah Newren [this message]
2019-01-28 0:19 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BFaVwwM17Oe+-RoP5wt2V58AD=dr01uNPuV=9r4yoF3Qg@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).