From: Taylor Blau <me@ttaylorr.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>, "Jeff King" <peff@peff.net>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v4 7/7] contrib/git-jump/git-jump: jump to match column in addition to line
Date: Mon, 7 May 2018 16:35:39 -0700 [thread overview]
Message-ID: <20180507233539.GA77370@syl.local> (raw)
In-Reply-To: <87d0y8y84q.fsf@evledraar.gmail.com>
On Sun, May 06, 2018 at 08:03:01PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
> On Sun, May 06 2018, Martin Ågren wrote:
>
> > On 5 May 2018 at 04:43, Taylor Blau <me@ttaylorr.com> wrote:
> >> Take advantage of 'git-grep(1)''s new option, '--column' in order to
> >> teach Peff's 'git-jump' script how to jump to the correct column for any
> >> given match.
> >>
> >> 'git-grep(1)''s output is in the correct format for Vim's jump list, so
> >> no additional cleanup is necessary.
> >
> >> diff --git a/contrib/git-jump/README b/contrib/git-jump/README
> >> index 4484bda410..7630e16854 100644
> >
> >> # use the silver searcher for git jump grep
> >> -git config jump.grepCmd "ag --column"
> >> +git config jump.grepCmd "ag"
> >
> > I think this change originates from Ævar's comment that it "also makes
> > sense to update the example added in 007d06aa57 [...] which seems to
> > have added jump.grepCmd as a workaround for not having this" [1].
> >
> > Somehow though, this approach seems a bit backwards to me. I do believe
> > that your series reduces the reasons for using `jump.grepCmd`, but
> > regressing this example usage of `jump.grepCmd` seems a bit hostile. If
> > someone wants to use `ag`, wouldn't we want to hint that they will
> > probably want to use `--column`?
> >
> > Is there some other `ag --column --foo` that we can give, where `--foo`
> > is not yet in `git grep`? ;-)
> >
> > Martin
> >
> > [1] https://public-inbox.org/git/874lk2e4he.fsf@evledraar.gmail.com/
>
> Yeah it doesn't make sense to drop --column here, FWIW what I had in
> mind was something closer to:
Thanks; I wasn't quite clear on what you had suggested in [1], so the
attached diff is very helpful.
> diff --git a/contrib/git-jump/README b/contrib/git-jump/README
> index 4484bda410..357f79371a 100644
> --- a/contrib/git-jump/README
> +++ b/contrib/git-jump/README
> @@ -25,6 +25,13 @@ git-jump will feed this to the editor:
> foo.c:2: printf("hello word!\n");
> -----------------------------------
>
> +Or, when running 'git jump grep' column numbers will also be emitted,
> +e.g. `git jump grep "hello"' would return:
> +
> +-----------------------------------
> +foo.c:2:10: printf("hello word!\n");
> +-----------------------------------
> +
> Obviously this trivial case isn't that interesting; you could just open
> `foo.c` yourself. But when you have many changes scattered across a
> project, you can use the editor's support to "jump" from point to point.
>
> I.e. let's note what the output format is now like for 'grep', and no
> need to change the jump.grepCmd.
Applied (mostly) the above patch to my copy, and will attach as part of
v5.
> The above patch may be incorrect when it comes to the line numbe /
> column number / format, I just wrote that by hand.
Yes; the only thing that was wrong was the column number. The "w" is in
the 10th 1-indexed column, and 'git grep --column' uses 1-indexed
columns.
Thanks,
Taylor
next prev parent reply other threads:[~2018-05-07 23:35 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1524281843.git.me@ttaylorr.com>
2018-04-21 3:45 ` [PATCH 1/6] grep.c: take regmatch_t as argument in match_line() Taylor Blau
2018-04-22 20:47 ` [PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)' Taylor Blau
2018-04-22 20:47 ` [PATCH v2 1/6] grep.c: take regmatch_t as argument in match_line() Taylor Blau
2018-04-22 23:14 ` Eric Sunshine
2018-04-22 23:30 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 2/6] grep.c: take column number as argument to show_line() Taylor Blau
2018-04-23 0:16 ` Eric Sunshine
2018-04-23 1:17 ` Taylor Blau
2018-04-23 3:30 ` Eric Sunshine
2018-04-23 7:27 ` Ævar Arnfjörð Bjarmason
2018-04-23 7:34 ` Eric Sunshine
2018-04-24 4:27 ` Taylor Blau
2018-04-23 8:01 ` Ævar Arnfjörð Bjarmason
2018-04-24 4:31 ` Taylor Blau
2018-04-24 6:13 ` Junio C Hamano
2018-04-24 18:34 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt Taylor Blau
2018-04-22 21:42 ` Ævar Arnfjörð Bjarmason
2018-04-22 23:24 ` Taylor Blau
2018-04-23 0:21 ` Eric Sunshine
2018-04-23 1:11 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 4/6] grep.c: display column number of first match Taylor Blau
2018-04-23 0:24 ` Eric Sunshine
2018-04-23 1:12 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 5/6] builtin/grep.c: show column numbers via --column-number Taylor Blau
2018-04-22 21:48 ` Ævar Arnfjörð Bjarmason
2018-04-22 23:26 ` Taylor Blau
2018-04-23 0:32 ` Eric Sunshine
2018-04-23 1:14 ` Taylor Blau
2018-04-22 20:47 ` [PATCH v2 6/6] contrib/git-jump/git-jump: use column number when grep-ing Taylor Blau
2018-04-22 21:49 ` Ævar Arnfjörð Bjarmason
2018-04-22 23:27 ` Taylor Blau
2018-04-22 23:28 ` [PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)' Junio C Hamano
2018-04-22 23:34 ` Taylor Blau
2018-04-23 13:46 ` Junio C Hamano
2018-04-24 5:07 ` [PATCH v3 0/7] " Taylor Blau
2018-04-24 5:07 ` [PATCH v3 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-04-24 5:07 ` [PATCH v3 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-04-24 5:07 ` [PATCH v3 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-04-24 5:07 ` [PATCH v3 4/7] grep.c: display column number of first match Taylor Blau
2018-04-24 5:42 ` Eric Sunshine
2018-04-24 5:07 ` [PATCH v3 5/7] builtin/grep.c: add '--column-number' option to 'git-grep(1)' Taylor Blau
2018-04-24 5:07 ` [PATCH v3 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-04-24 5:07 ` [PATCH v3 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-04-24 5:37 ` Eric Sunshine
2018-04-24 18:39 ` Taylor Blau
2018-05-05 2:42 ` [PATCH v4 0/7] Teach '--column' to 'git-grep(1)' Taylor Blau
2018-05-05 2:42 ` [PATCH v4 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-05-05 2:42 ` [PATCH v4 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-05-08 6:08 ` René Scharfe
2018-05-05 2:42 ` [PATCH v4 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-05-05 2:43 ` [PATCH v4 4/7] grep.c: display column number of first match Taylor Blau
2018-05-05 2:43 ` [PATCH v4 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)' Taylor Blau
2018-05-05 6:15 ` Duy Nguyen
2018-05-07 23:38 ` Taylor Blau
2018-05-06 17:43 ` Phillip Wood
2018-05-06 17:56 ` Ævar Arnfjörð Bjarmason
2018-05-07 23:40 ` Taylor Blau
2018-05-07 14:13 ` Junio C Hamano
2018-05-08 0:08 ` Taylor Blau
2018-05-05 2:43 ` [PATCH v4 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-05-05 2:43 ` [PATCH v4 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-05-06 14:43 ` Martin Ågren
2018-05-06 18:03 ` Ævar Arnfjörð Bjarmason
2018-05-07 23:35 ` Taylor Blau [this message]
2018-05-09 2:13 ` [PATCH v5 0/7] Teach '--column' to 'git-grep(1)' Taylor Blau
2018-05-09 2:13 ` [PATCH v5 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-05-09 2:13 ` [PATCH v5 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-05-09 2:13 ` [PATCH v5 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-05-09 2:13 ` [PATCH v5 4/7] grep.c: display column number of first match Taylor Blau
2018-05-09 2:13 ` [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)' Taylor Blau
2018-05-09 10:41 ` Phillip Wood
2018-05-09 17:26 ` Martin Ågren
2018-05-09 23:52 ` Taylor Blau
2018-05-10 0:04 ` Junio C Hamano
2018-05-10 5:58 ` René Scharfe
2018-05-10 6:43 ` Junio C Hamano
2018-05-12 3:27 ` Taylor Blau
2018-05-12 5:08 ` Junio C Hamano
2018-05-12 5:19 ` Taylor Blau
2018-05-12 6:07 ` Junio C Hamano
2018-05-18 3:38 ` Taylor Blau
2018-05-18 6:27 ` Junio C Hamano
2018-05-18 21:50 ` Taylor Blau
2018-05-19 4:44 ` Taylor Blau
2018-05-09 23:49 ` Taylor Blau
2018-05-09 16:17 ` Duy Nguyen
2018-05-09 23:48 ` Taylor Blau
2018-05-09 2:13 ` [PATCH v5 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-05-09 2:13 ` [PATCH v5 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-05-12 3:10 ` [PATCH v6 0/7] Teach '--column' to 'git-grep(1)' Taylor Blau
2018-05-12 3:11 ` [PATCH v6 1/7] Documentation/config.txt: camel-case lineNumber for consistency Taylor Blau
2018-05-12 3:11 ` [PATCH v6 2/7] grep.c: expose matched column in match_line() Taylor Blau
2018-05-12 3:11 ` [PATCH v6 3/7] grep.[ch]: extend grep_opt to allow showing matched column Taylor Blau
2018-05-12 3:11 ` [PATCH v6 4/7] grep.c: display column number of first match Taylor Blau
2018-05-12 3:11 ` [PATCH v6 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)' Taylor Blau
2018-05-12 3:11 ` [PATCH v6 6/7] grep.c: add configuration variables to show matched option Taylor Blau
2018-05-12 3:11 ` [PATCH v6 7/7] contrib/git-jump/git-jump: jump to match column in addition to line Taylor Blau
2018-04-21 3:45 ` [PATCH 2/6] grep.c: take column number as argument to show_line() Taylor Blau
2018-04-21 3:45 ` [PATCH 3/6] grep.[ch]: teach columnnum, color_columnno to grep_opt Taylor Blau
2018-04-21 8:32 ` Martin Ågren
2018-04-21 3:45 ` [PATCH 4/6] grep.c: display column number of first match Taylor Blau
2018-04-21 3:45 ` [PATCH 5/6] builtin/grep.c: show column numbers via --column-number Taylor Blau
2018-04-21 4:07 ` Junio C Hamano
2018-04-21 4:14 ` Junio C Hamano
2018-04-21 5:36 ` René Scharfe
2018-04-21 8:39 ` Martin Ågren
2018-04-21 3:45 ` [PATCH 6/6] contrib/git-jump/git-jump: use column number when grep-ing Taylor Blau
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=20180507233539.GA77370@syl.local \
--to=me@ttaylorr.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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).