From: Wen Bei Li <wenbei123@gmail.com>
To: johannes.schindelin@gmx.de
Cc: git@vger.kernel.org
Subject: [PATCH] mergetools: add support for VS Code
Date: Tue, 4 Jun 2019 19:21:34 -0400 [thread overview]
Message-ID: <20190604232134.14748-1-wenbei123@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1906041542050.1775@tvgsbejvaqbjf.bet>
Teach difftool and mergetool about VS Code and VS Code Insiders
Signed-off-by: Wen Bei Li <wenbei123@gmail.com>
---
Hello Johannes, thank you for reviewing my patch. It's the first time I've done this via email.
I've added `code-insiders` as you suggested, but I wasn't sure if I should send it as a v2.
I used this commit as a reference:
https://github.com/git/git/commit/5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701
contrib/completion/git-completion.bash | 2 +-
git-mergetool--lib.sh | 2 +-
mergetools/code | 7 +++++++
mergetools/code-insiders | 7 +++++++
4 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 mergetools/code
create mode 100644 mergetools/code-insiders
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3eefbabdb1..6eaa0df5b2 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1502,7 +1502,7 @@ _git_diff ()
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
- codecompare smerge
+ codecompare smerge code code-insiders
"
_git_difftool ()
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 204a5acd66..44f1967c84 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -283,7 +283,7 @@ list_merge_tool_candidates () {
fi
tools="$tools gvimdiff diffuse diffmerge ecmerge"
tools="$tools p4merge araxis bc codecompare"
- tools="$tools smerge"
+ tools="$tools smerge code code-insiders"
fi
case "${VISUAL:-$EDITOR}" in
*vim*)
diff --git a/mergetools/code b/mergetools/code
new file mode 100644
index 0000000000..566a0d9d63
--- /dev/null
+++ b/mergetools/code
@@ -0,0 +1,7 @@
+diff_cmd () {
+ "$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ "$merge_tool_path" --wait "$MERGED"
+}
diff --git a/mergetools/code-insiders b/mergetools/code-insiders
new file mode 100644
index 0000000000..566a0d9d63
--- /dev/null
+++ b/mergetools/code-insiders
@@ -0,0 +1,7 @@
+diff_cmd () {
+ "$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ "$merge_tool_path" --wait "$MERGED"
+}
--
2.21.0.windows.1
next prev parent reply other threads:[~2019-06-04 23:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 15:03 [PATCH] mergetools: add support for VS Code Wen Bei Li
2019-06-04 13:45 ` Johannes Schindelin
2019-06-04 23:21 ` Wen Bei Li [this message]
2019-06-05 12:08 ` Johannes Schindelin
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=20190604232134.14748-1-wenbei123@gmail.com \
--to=wenbei123@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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).