From: "Yoichi NAKAYAMA via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
Subject: [PATCH v4 0/2] git-jump: support Emacs
Date: Tue, 22 Nov 2022 14:18:21 +0000 [thread overview]
Message-ID: <pull.1423.v4.git.1669126703.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1423.v3.git.1669033620.gitgitgadget@gmail.com>
Add an optional argument 'stdout' to print the quickfix lines to standard
output. It can be used with M-x grep on Emacs.
Detect emacsclient by GIT_EDITOR and invoke the function. Tested with
EDITOR="emacsclient" and EDITOR="emacsclient -t".
Yoichi Nakayama (2):
git-jump: add an optional argument '--stdout'
git-jump: invoke emacs/emacsclient
contrib/git-jump/README | 10 +++++++++-
contrib/git-jump/git-jump | 40 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 48 insertions(+), 2 deletions(-)
base-commit: eea7033409a0ed713c78437fc76486983d211e25
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1423%2Fyoichi%2Fgit-jump-emacs-support-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1423/yoichi/git-jump-emacs-support-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1423
Range-diff vs v3:
1: ccfea26de33 ! 1: 446777d300d git-jump: add an optional argument '--stdout'
@@ contrib/git-jump/README: git jump grep -i foo_bar
+
+--------------------------------------------------
+# In Emacs, M-x grep and invoke "git jump --stdout <mode>"
-+Run grep (like this): git jump --stdout diff
++M-x grep<RET>git jump --stdout diff<RET>
+--------------------------------------------------
Related Programs
@@ contrib/git-jump/git-jump: grep: elements are grep hits. Arguments are given to
EOF
}
-@@ contrib/git-jump/git-jump: if test $# -lt 1; then
+@@ contrib/git-jump/git-jump: mode_ws() {
+ git diff --check "$@"
+ }
+
++use_stdout=
++while test $# -gt 0; do
++ case "$1" in
++ --stdout)
++ use_stdout=t
++ shift
++ ;;
++ --*)
++ usage >&2
++ exit 1
++ ;;
++ *)
++ break
++ ;;
++ esac
++done
+ if test $# -lt 1; then
+ usage >&2
exit 1
fi
mode=$1; shift
-+if test "$mode" = "--stdout"; then
-+ mode=$1; shift
-+ type "mode_$mode" >/dev/null 2>&1 || { usage >&2; exit 1; }
-+ "mode_$mode" "$@" 2>/dev/null
++if test "$use_stdout" = "t"; then
++ "mode_$mode" "$@"
+ exit 0
+fi
2: b4ad4c083c9 ! 2: 2f0bffb484b git-jump: invoke emacs/emacsclient
@@ contrib/git-jump/git-jump: open_editor() {
}
+open_emacs() {
++ # Supported editor values are:
++ # - emacs
++ # - emacsclient
++ # - emacsclient -t
+ editor=`git var GIT_EDITOR`
-+ eval "$editor --eval \"(prog1 (switch-to-buffer-other-frame (compilation-start \\\"git jump --stdout $@\\\" 'grep-mode)) (delete-other-windows) (select-frame-set-input-focus (selected-frame)))\""
++ # Wait for completion of the asynchronously executed process
++ # to avoid race conditions in case of "emacsclient".
++ eval "$editor --eval \"(prog1 (switch-to-buffer-other-frame (compilation-start \\\"cat $@\\\" 'grep-mode)) (delete-other-windows) (while (get-buffer-process (current-buffer)) (sleep-for 0.1)) (select-frame-set-input-focus (selected-frame)))\""
+}
+
mode_diff() {
git diff --no-prefix --relative "$@" |
perl -ne '
-@@ contrib/git-jump/git-jump: if test "$mode" = "--stdout"; then
- exit 0
- fi
-
-+# For emacs/emacsclient, call "git jump --stdout" from inside of them.
+@@ contrib/git-jump/git-jump: tmp=`mktemp -t git-jump.XXXXXX` || exit 1
+ type "mode_$mode" >/dev/null 2>&1 || { usage >&2; exit 1; }
+ "mode_$mode" "$@" >"$tmp"
+ test -s "$tmp" || exit 0
+if git var GIT_EDITOR | grep emacs >/dev/null; then
-+ type "mode_$mode" >/dev/null 2>&1 || { usage >&2; exit 1; }
-+ open_emacs "$mode" "$@"
++ open_emacs "$tmp"
+ exit 0
+fi
-+
- trap 'rm -f "$tmp"' 0 1 2 3 15
- tmp=`mktemp -t git-jump.XXXXXX` || exit 1
- type "mode_$mode" >/dev/null 2>&1 || { usage >&2; exit 1; }
+ open_editor "$tmp"
--
gitgitgadget
next prev parent reply other threads:[~2022-11-22 14:18 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-19 14:02 [PATCH 0/2] git-jump: support Emacs Yoichi NAKAYAMA via GitGitGadget
2022-11-19 14:02 ` [PATCH 1/2] git-jump: add an optional argument 'stdout' Yoichi Nakayama via GitGitGadget
2022-11-19 14:02 ` [PATCH 2/2] git-jump: invoke emacsclient Yoichi Nakayama via GitGitGadget
2022-11-19 15:53 ` Eric Sunshine
2022-11-19 23:44 ` Yoichi Nakayama
2022-11-19 23:59 ` Eric Sunshine
2022-11-21 4:05 ` Yoichi Nakayama
2022-11-20 1:27 ` [PATCH v2 0/2] git-jump: support Emacs Yoichi NAKAYAMA via GitGitGadget
2022-11-20 1:27 ` [PATCH v2 1/2] git-jump: add an optional argument 'stdout' Yoichi Nakayama via GitGitGadget
2022-11-21 5:43 ` Junio C Hamano
2022-11-21 11:25 ` Yoichi Nakayama
2022-11-21 18:18 ` Jeff King
2022-11-20 1:27 ` [PATCH v2 2/2] git-jump: invoke emacsclient Yoichi Nakayama via GitGitGadget
2022-11-21 12:26 ` [PATCH v3 0/2] git-jump: support Emacs Yoichi NAKAYAMA via GitGitGadget
2022-11-21 12:26 ` [PATCH v3 1/2] git-jump: add an optional argument '--stdout' Yoichi Nakayama via GitGitGadget
2022-11-21 18:38 ` Jeff King
2022-11-21 23:38 ` Junio C Hamano
2022-11-22 13:00 ` Yoichi Nakayama
2022-11-22 18:23 ` Jeff King
2022-11-22 13:29 ` Yoichi Nakayama
2022-11-21 12:27 ` [PATCH v3 2/2] git-jump: invoke emacs/emacsclient Yoichi Nakayama via GitGitGadget
2022-11-21 18:50 ` Jeff King
2022-11-22 12:06 ` Yoichi Nakayama
2022-11-22 14:18 ` Yoichi NAKAYAMA via GitGitGadget [this message]
2022-11-22 14:18 ` [PATCH v4 1/2] git-jump: add an optional argument '--stdout' Yoichi Nakayama via GitGitGadget
2022-11-22 18:30 ` Jeff King
2022-11-22 14:18 ` [PATCH v4 2/2] git-jump: invoke emacs/emacsclient Yoichi Nakayama via GitGitGadget
2022-11-22 16:40 ` Phillip Wood
2022-11-23 5:01 ` Yoichi Nakayama
2022-11-22 18:54 ` Jeff King
2022-11-23 5:33 ` Yoichi Nakayama
2022-11-24 1:09 ` Jeff King
2022-11-24 12:32 ` Yoichi Nakayama
2022-11-24 12:58 ` Yoichi Nakayama
2022-11-24 16:31 ` Jeff King
2022-11-24 16:29 ` Jeff King
2022-11-25 3:46 ` Yoichi Nakayama
2022-11-23 7:04 ` [PATCH v5 0/3] git-jump: support Emacs Yoichi NAKAYAMA via GitGitGadget
2022-11-23 7:04 ` [PATCH v5 1/3] git-jump: add an optional argument '--stdout' Yoichi Nakayama via GitGitGadget
2022-11-23 7:04 ` [PATCH v5 2/3] git-jump: move valid-mode check earlier Jeff King via GitGitGadget
2022-11-23 7:04 ` [PATCH v5 3/3] git-jump: invoke emacs/emacsclient Yoichi Nakayama via GitGitGadget
2022-11-23 14:58 ` Phillip Wood
2022-11-23 21:54 ` Yoichi Nakayama
2022-11-24 1:11 ` [PATCH v5 0/3] git-jump: support Emacs Jeff King
2022-11-24 3:47 ` [PATCH v6 " Yoichi NAKAYAMA via GitGitGadget
2022-11-24 3:47 ` [PATCH v6 1/3] git-jump: add an optional argument '--stdout' Yoichi Nakayama via GitGitGadget
2022-11-24 3:47 ` [PATCH v6 2/3] git-jump: move valid-mode check earlier Jeff King via GitGitGadget
2022-11-24 3:47 ` [PATCH v6 3/3] git-jump: invoke emacs/emacsclient Yoichi Nakayama via GitGitGadget
2022-11-25 3:36 ` [PATCH v7 0/3] git-jump: support Emacs Yoichi NAKAYAMA via GitGitGadget
2022-11-25 3:36 ` [PATCH v7 1/3] git-jump: add an optional argument '--stdout' Yoichi Nakayama via GitGitGadget
2022-11-25 9:06 ` Ævar Arnfjörð Bjarmason
2022-11-27 0:31 ` Yoichi Nakayama
2022-11-25 3:37 ` [PATCH v7 2/3] git-jump: move valid-mode check earlier Jeff King via GitGitGadget
2022-11-25 3:37 ` [PATCH v7 3/3] git-jump: invoke emacs/emacsclient Yoichi Nakayama via GitGitGadget
2022-11-25 8:55 ` Ævar Arnfjörð Bjarmason
2022-11-25 16:01 ` Yoichi Nakayama
2022-11-25 23:52 ` Ævar Arnfjörð Bjarmason
2022-11-28 5:10 ` Jeff King
2022-11-28 10:54 ` Ævar Arnfjörð Bjarmason
2022-11-28 15:38 ` Yoichi Nakayama
2022-11-27 0:37 ` Yoichi Nakayama
2022-11-27 1:18 ` [PATCH v8 0/3] git-jump: support Emacs Yoichi NAKAYAMA via GitGitGadget
2022-11-27 1:18 ` [PATCH v8 1/3] git-jump: add an optional argument '--stdout' Yoichi Nakayama via GitGitGadget
2022-11-27 1:18 ` [PATCH v8 2/3] git-jump: move valid-mode check earlier Jeff King via GitGitGadget
2022-11-27 1:18 ` [PATCH v8 3/3] git-jump: invoke emacs/emacsclient Yoichi Nakayama via GitGitGadget
2022-11-28 10:13 ` [PATCH v8 0/3] git-jump: support Emacs Phillip Wood
2022-11-28 23:35 ` Junio C Hamano
2022-11-29 21:05 ` Yoichi Nakayama
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=pull.1423.v4.git.1669126703.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=yoichi.nakayama@gmail.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).