From: Junio C Hamano <gitster@pobox.com>
To: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Denton Liu <liu.denton@gmail.com>,
David Aguilar <davvid@gmail.com>,
John Keeping <john@keeping.me.uk>,
Ryan Zoeller <rtzoeller@rtzoeller.com>,
ZheNing Hu <adlternative@gmail.com>
Subject: Re: [PATCH v5 2/2] difftool.c: learn a new way start at specified file
Date: Wed, 17 Feb 2021 02:31:24 -0800 [thread overview]
Message-ID: <xmqq8s7nm1dv.fsf@gitster.g> (raw)
In-Reply-To: 98e2707ee2faf653e972b0706311ddd099765ce5.1613480198.git.gitgitgadget@gmail.com
"ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: ZheNing Hu <adlternative@gmail.com>
>
> `git difftool` only allow us to select file to view in turn.
> If there is a commit with many files and we exit in the search,
I am not sure what "in the search" refers to. "in the middle" I
would understand, though.
> We will have to traverse list again to get the file diff which
Let's downcase this "We".
> we want to see. Therefore, here is a new method: user can use
> `git difftool --rotate-to=<filename>` or `git difftool --skip-to=<filename>`
> to start viewing from the specified file, This will improve the
> user experience.
Do we need both? I'd rather not to give end-user-facing commands
too many knobs that would do similar things. Too many choices to
choose from without clear answer to "which one should I prefer to
use?" is a bad combination for end-users.
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 7c5b3cf42bcc..aa2b5c11f20b 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -701,7 +701,7 @@ components matches the pattern. For example, the pattern "`foo*bar`"
> matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
>
> --skip-to=<file>::
> ---rotate-to=<file::
> +--rotate-to=<file>::
> Discard the files before the named <file> from the output
> (i.e. 'skip to'), or move them to the end of the output
> (i.e. 'rotate to'). These were invented primarily for use
Thanks for correcting, but this change should not be a part of this
patch. Instead, you help the other's topic by giving a review (and
you could just have said "there there is closing '>' missing").
> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
> index 484c485fd06c..c64dff69c976 100644
> --- a/Documentation/git-difftool.txt
> +++ b/Documentation/git-difftool.txt
> @@ -34,6 +34,16 @@ OPTIONS
> This is the default behaviour; the option is provided to
> override any configuration settings.
>
> +--rotate-to=<file>::
> + Internally call `git diff --rotate-to=<file>`,
> + show the change in the specified path first.
> + Files before the specified path will be moved to the last output.
> +
> +--skip-to=<file>::
> + Internally call `git diff --skip-to=<file>`,
> + skip the output to the specified path.
> + Files before the specified path will not output.
> +
This, unlike the "diffcore" stuff, is end-user facing, and it is
better not to force the readers even know what --skip-to option
to the diff does (after all, difftool users are using 'git difftool'
and they are not necessarily 'git diff' users).
--skip-to=<file>::
Start showing the diff for the given path, skipping all
the paths before it.
or something, perhaps.
> +test_expect_success 'difftool --skip-to' '
> + difftool_test_setup &&
> + test_when_finished git reset --hard &&
> + git difftool --no-prompt --extcmd=cat --skip-to="2" HEAD^ >output &&
> + cat >expect <<-\EOF &&
> + 2
> + 4
> + EOF
> + test_cmp output expect &&
> + test_must_fail git difftool --no-prompt --extcmd=cat --skip-to="3" HEAD^
> +'
This probably should be split into two independent tests. One to
check that the non-failing case works as expected, the other to
check that a bogus command line option errors out as expected.
Thanks.
next prev parent reply other threads:[~2021-02-17 10:32 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-07 15:19 [PATCH] git-difftool-helper.sh: learn a new way skip to save point 阿德烈 via GitGitGadget
2021-02-07 18:29 ` Junio C Hamano
2021-02-07 19:04 ` Junio C Hamano
2021-02-08 8:06 ` 胡哲宁
2021-02-08 17:02 ` [PATCH v2] git-difftool-helper.sh: learn a new way go back to last " ZheNing Hu via GitGitGadget
2021-02-08 20:13 ` Junio C Hamano
2021-02-08 22:15 ` David Aguilar
2021-02-08 23:34 ` Junio C Hamano
2021-02-09 6:19 ` 胡哲宁
2021-02-09 6:04 ` 胡哲宁
2021-02-09 15:30 ` [PATCH v3] difftool.c: learn a new way start from specified file ZheNing Hu via GitGitGadget
2021-02-09 18:17 ` Junio C Hamano
2021-02-10 17:00 ` 胡哲宁
2021-02-10 18:16 ` Junio C Hamano
2021-02-10 20:05 ` Junio C Hamano
2021-02-14 7:53 ` ZheNing Hu
2021-02-14 13:09 ` [PATCH v4] difftool.c: learn a new way start at " ZheNing Hu via GitGitGadget
2021-02-16 1:46 ` Junio C Hamano
2021-02-16 12:56 ` [PATCH v5 0/2] " ZheNing Hu via GitGitGadget
2021-02-16 12:56 ` [PATCH v5 1/2] diff: --{rotate,skip}-to=<path> Junio C Hamano via GitGitGadget
2021-02-16 12:56 ` [PATCH v5 2/2] difftool.c: learn a new way start at specified file ZheNing Hu via GitGitGadget
2021-02-17 10:31 ` Junio C Hamano [this message]
2021-02-17 16:18 ` ZheNing Hu
2021-02-16 18:45 ` [PATCH v5 0/2] " Junio C Hamano
2021-02-17 4:12 ` ZheNing Hu
2021-02-17 11:14 ` Denton Liu
2021-02-17 11:40 ` ZheNing Hu
2021-02-17 18:56 ` Junio C Hamano
2021-02-18 5:20 ` ZheNing Hu
2021-02-18 15:04 ` ZheNing Hu
2021-02-18 19:11 ` Junio C Hamano
2021-02-19 10:59 ` ZheNing Hu
2021-02-25 11:08 ` Johannes Schindelin
2021-02-25 19:01 ` Junio C Hamano
2021-02-19 12:53 ` [PATCH v6] " ZheNing Hu via GitGitGadget
2021-02-22 15:11 ` ZheNing Hu
2021-02-22 21:40 ` 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=xmqq8s7nm1dv.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=adlternative@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=john@keeping.me.uk \
--cc=liu.denton@gmail.com \
--cc=rtzoeller@rtzoeller.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.
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).