diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2013-08-06 09:59:45 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-06 14:47:04 -0700 |
| commit | a6ac5f9864958f65269d8d58a049324403b039fd (patch) | |
| tree | 5ed8209b561686b7424f9d683072ff34be66236a | |
| parent | 0bc2cdd5507ea4acad06c6d872245e4a3fd2a4b6 (diff) | |
| download | git-a6ac5f9864958f65269d8d58a049324403b039fd.tar.gz | |
line-range: teach -L^/RE/ to search from start of file
The -L/RE/ option of blame/log searches from the end of the previous -L
range, if any. Add new notation -L^/RE/ to override this behavior and
search from start of file.
The new ^/RE/ syntax is valid only as the <start> argument of
-L<start>,<end>. The <end> argument, as usual, is relative to <start>.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/line-range-format.txt | 1 | ||||
| -rw-r--r-- | line-range.c | 10 | ||||
| -rw-r--r-- | t/annotate-tests.sh | 21 |
3 files changed, 30 insertions, 2 deletions
diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.txt index 42d74f75ad..cf84417060 100644 --- a/Documentation/line-range-format.txt +++ b/Documentation/line-range-format.txt @@ -11,6 +11,7 @@ absolute line number (lines count from 1). This form will use the first line matching the given POSIX regex. If <start> is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. +If <start> is ``^/regex/'', it will search from the start of file. If <end> is a regex, it will search starting at the line given by <start>. + diff --git a/line-range.c b/line-range.c index bbf3c0f448..70484899ac 100644 --- a/line-range.c +++ b/line-range.c @@ -59,8 +59,14 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line, return term; } - if (begin < 0) - begin = -begin; + if (begin < 0) { + if (spec[0] != '^') + begin = -begin; + else { + begin = 1; + spec++; + } + } if (spec[0] != '/') return spec; diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index b963d36325..5a7d7c72d1 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -323,6 +323,23 @@ test_expect_success 'blame -L /RE/ (relative: end-of-file)' ' test_must_fail $PROG -L, -L/$/ file ' +test_expect_success 'blame -L ^/RE/ (absolute)' ' + check_count -L3,3 -L^/dog/,+2 A 1 B2 1 +' + +test_expect_success 'blame -L ^/RE/ (absolute: no preceding range)' ' + check_count -L^/dog/,+2 A 1 B2 1 +' + +test_expect_success 'blame -L ^/RE/ (absolute: not found)' ' + test_must_fail $PROG -L4,4 -L^/tambourine/ file +' + +test_expect_success 'blame -L ^/RE/ (absolute: end-of-file)' ' + n=$(expr $(wc -l <file) + 1) && + check_count -L$n -L^/$/,+2 A 1 C 1 E 1 +' + test_expect_success 'setup -L :regex' ' tr Q "\\t" >hello.c <<-\EOF && int main(int argc, const char *argv[]) @@ -464,3 +481,7 @@ test_expect_success 'blame -L X,+N (non-numeric N)' ' test_expect_success 'blame -L X,-N (non-numeric N)' ' test_must_fail $PROG -L1,-N file ' + +test_expect_success 'blame -L ,^/RE/' ' + test_must_fail $PROG -L1,^/99/ file +' |