Hi,
Attached is my fifth re-roll of the series to add '--column' to
'git-grep(1)'.
The main changes are from a René's concerns in [1]. He points out that
'--column' with certain extended expressions can produce nonsense
(particularly because we leave the regmatch_t uninitialized).
> So at least the combination of extended matches and --column should error
> out. Supporting it would be better, of course. That could get tricky for
> negations, though (e.g. git grep --not -e foo).
I have opted for the die() option, instead of supporting extended
matches with --column. The problem with extended matches in this case is
that _sometimes_ --column can produce sensible results, and other times
it cannot.
For instance, an extended expression containing a single atom
has a known answer for --column, but one containing a negative atom does
only sometimes. Specifically: if an NOT atom is at the top-level, we
_never_ have a sensible answer for --column, but only sometimes do when
it is not at the top-level.
So, this leaves us two choices: (1) don't support --column and extended
expressions, or (2) support --column with extended expressions by not
printing columnar information when we don't have an answer. Option (2)
requires callers to perform deep inspection of their extended
expressions, and determine whether or not there is a answer that Git
could produce. This is too much to ask a caller to reasonably consider
when scripting. On the other hand, option (1) does not allow the caller
to do as much under certain circumstances, but simplifies their lives
when scripting, etc. For those reasons, let's pick (1).
Beyond that, here is a summary of what has changed since last time:
* die() when given --extended, or compiling to an extended grammar,
like in the case of 'git grep --column --not -e foo' [1].
* Clarify patch 5/7 and indicate the intended purpose of supporting
'--column' [2].
* Clarify that '--column' gives a 1-indexed _byte_ offset, nothing
else [3,5].
* Remove a dangling reference to '--column-number' [4].
* Clean up contrib/git-jump/README to Ævar's suggestion [6].
Thanks as always for your kind review.
Thanks,
Taylor
[1]: https://public-inbox.org/git/d030b4ee-5a92-4863-a29c-de2642bfa...@web.de
[2]:
https://public-inbox.org/git/CACsJy8BdJ0=gwzqvfsqy-vjtzvt4uznzrapyxryxx2wnzal...@mail.gmail.com
[3]:
https://public-inbox.org/git/20bc9baf-a85e-f00e-859e-e796ab432...@talktalk.net
[4]: https://public-inbox.org/git/87efioy8f9....@evledraar.gmail.com
[5]: https://public-inbox.org/git/xmqqk1sfpn9j....@gitster-ct.c.googlers.com
[6]: https://public-inbox.org/git/87d0y8y84q....@evledraar.gmail.com/
Taylor Blau (7):
Documentation/config.txt: camel-case lineNumber for consistency
grep.c: expose matched column in match_line()
grep.[ch]: extend grep_opt to allow showing matched column
grep.c: display column number of first match
builtin/grep.c: add '--column' option to 'git-grep(1)'
grep.c: add configuration variables to show matched option
contrib/git-jump/git-jump: jump to match column in addition to line
Documentation/config.txt | 7 ++++++-
Documentation/git-grep.txt | 9 +++++++-
builtin/grep.c | 4 ++++
contrib/git-jump/README | 12 +++++++++--
contrib/git-jump/git-jump | 2 +-
grep.c | 42 ++++++++++++++++++++++++++++++--------
grep.h | 2 ++
t/t7810-grep.sh | 32 +++++++++++++++++++++++++++++
8 files changed, 96 insertions(+), 14 deletions(-)
Inter-diff (since v5):
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index d451cd8883..dc8f76ce99 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -173,7 +173,8 @@ providing this option will cause it to die.
Prefix the line number to matching lines.
--column::
- Prefix the 1-indexed column number of the first match on non-context
lines.
+ Prefix the 1-indexed byte-offset of the first match on non-context
lines. This
+ option is incompatible with '--invert-match', and extended expressions.
-l::
--files-with-matches::
diff --git a/builtin/grep.c b/builtin/grep.c
index 5c83f17759..f9f516dfc4 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1112,6 +1112,9 @@ int cmd_grep(int argc, const char **argv, const char
*prefix)
hit = grep_objects(&opt, &pathspec, the_repository, &list);
}
+ if (opt.columnnum && opt.invert)
+ die(_("--column and --invert-match cannot be combined"));
+
if (num_threads)
hit |= wait_all();
if (hit && show_in_pager)
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
index 7630e16854..2f618a7f97 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:9: 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.
@@ -35,7 +42,8 @@ Git-jump can generate four types of interesting lists:
2. The beginning of any merge conflict markers.
- 3. Any grep matches, including the column of the first match on a line.
+ 3. Any grep matches, including the column of the first match on a
+ line.
4. Any whitespace errors detected by `git diff --check`.
@@ -65,7 +73,7 @@ git jump grep foo_bar
git jump grep -i foo_bar
# use the silver searcher for git jump grep
-git config jump.grepCmd "ag"
+git config jump.grepCmd "ag --column"
--------------------------------------------------
diff --git a/grep.c b/grep.c
index 37bb39a4a8..5d904810ad 100644
--- a/grep.c
+++ b/grep.c
@@ -1001,6 +1001,9 @@ static void compile_grep_patterns_real(struct grep_opt
*opt)
else if (!opt->extended && !opt->debug)
return;
+ if (opt->columnnum && opt->extended)
+ die(_("--column and extended expressions cannot be combined"));
+
p = opt->pattern_list;
if (p)
opt->pattern_expression = compile_pattern_expr(&p);
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index a03c3416e7..aa56b21ed9 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -110,7 +110,7 @@ do
test_cmp expected actual
'
- test_expect_success "grep -w $L (with --{line,column}-number)" '
+ test_expect_success "grep -w $L (with --line-number, --column)" '
{
echo ${HC}file:1:5:foo mmap bar
echo ${HC}file:3:14:foo_mmap bar mmap
@@ -1612,4 +1612,14 @@ test_expect_success 'grep does not report i-t-a and
assume unchanged with -L' '
test_cmp expected actual
'
+test_expect_success 'grep does not allow --column, --invert-match' '
+ test_must_fail git grep --column --invert-match pat 2>err &&
+ test_i18ngrep "\-\-column and \-\-invert-match cannot be combined" err
+'
+
+test_expect_success 'grep does not allow --column, extended' '
+ test_must_fail git grep --column --not -e pat 2>err &&
+ test_i18ngrep "\-\-column and extended expressions cannot be combined"
err
+'
+
test_done
--
2.17.0
