From: Nicholas Guriev <nicholas@guriev.su>
To: git@vger.kernel.org
Subject: [PATCH v3 0/4] difftools in tabbed mode
Date: Tue, 26 Jan 2021 00:21:28 +0300 [thread overview]
Message-ID: <20210125212132.894458-1-nicholas@guriev.su> (raw)
In-Reply-To: <20210118210003.3071205-1-nicholas@guriev.su>
Junio C Hamano, thank you for the comment. I added the diff_combo_supported
function as you suggested. Though it calls to the `true` or the `false` builtins
as I find them much clearer than the "return" command with inverted status. It
is really confusing that C and most other programming languages adequately
interpret non-zero as truth value and zero as falsity value unlike Unix Shell.
Are such changes acceptable?
As regards broken tests, it may seem silly but that error was due to a single
missing colon. I corrected the mistake and added some automated tests of this
new feature.
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 529d55c96d..85a6dc9c30 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -31,7 +31,7 @@ prompt_before_launch () {
do
printf "Launch '%s' [Y/n]? " "${GIT_DIFFTOOL_EXTCMD:-$merge_tool}"
read ans 2>/dev/null || return 1
- case "${ans-y}" in
+ case "${ans:-y}" in
[yY]*) return 0 ;;
[nN]*) return 1 ;;
esac
Changes compared to v2:
* Introduced the diff_combo_supported function.
* Fixed default answer to difftool prompting.
* More docs about the diff tool mechanism.
* New auto-tests of the feature.
Nicholas Guriev (4):
mergetools: support difftool.tabbed setting
difftool-helper: conciliate difftool.tabbed and difftool.prompt
settings
doc: describe new difftool.tabbed feature
t7800: new tests of difftool.tabbed feature
Documentation/config/difftool.txt | 6 +
Documentation/git-difftool.txt | 19 ++-
Documentation/git-mergetool--lib.txt | 62 ++++++++++
Documentation/git.txt | 8 ++
builtin/difftool.c | 7 +-
diff.c | 10 +-
git-difftool--helper.sh | 39 ++++--
git-mergetool--lib.sh | 71 ++++++++++-
mergetools/meld | 8 ++
mergetools/vimdiff | 21 ++++
t/t7800-difftool.sh | 175 ++++++++++++++++++++++++++-
11 files changed, 401 insertions(+), 25 deletions(-)
--
2.27.0
next prev parent reply other threads:[~2021-01-25 21:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 5:59 [RFC PATCH] mergetools: support difftool.tabbed setting Nicholas Guriev
2021-01-18 21:00 ` [RFC PATCH v2 0/3] implement tabbed mode in difftools Nicholas Guriev
2021-01-18 21:00 ` [RFC PATCH v2 1/3] mergetools: support difftool.tabbed setting Nicholas Guriev
2021-01-18 23:25 ` Junio C Hamano
2021-01-18 21:00 ` [RFC PATCH v2 2/3] difftool-helper: conciliate difftool.tabbed and difftool.prompt settings Nicholas Guriev
2021-01-18 21:00 ` [RFC PATCH v2 3/3] doc: describe new difftool.tabbed feature Nicholas Guriev
2021-01-25 21:21 ` Nicholas Guriev [this message]
2021-01-25 21:21 ` [PATCH v3 1/4] mergetools: support difftool.tabbed setting Nicholas Guriev
2021-01-25 21:21 ` [PATCH v3 2/4] difftool-helper: conciliate difftool.tabbed and difftool.prompt settings Nicholas Guriev
2021-01-25 23:04 ` Junio C Hamano
2021-01-25 21:21 ` [PATCH v3 3/4] doc: describe new difftool.tabbed feature Nicholas Guriev
2021-01-25 21:21 ` [PATCH v3 4/4] t7800: new tests of " Nicholas Guriev
2021-02-12 5:51 ` [RFC PATCH] mergetools: support difftool.tabbed setting David Aguilar
2021-02-12 22:21 ` 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=20210125212132.894458-1-nicholas@guriev.su \
--to=nicholas@guriev.su \
--cc=git@vger.kernel.org \
/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).