Merge branch 'es/blame-L-breakage'

The refactoring made for parsing "-L" option recently to support
"git log -L" seems to have broken "git blame -L X,-5" to show 5
lines leading to X.

* es/blame-L-breakage:
  blame-options.txt: explain that -L <start> and <end> are optional
  blame-options.txt: place each -L option variation on its own line
  t8001/t8002 (blame): add blame -L :funcname tests
  t8001/t8002 (blame): add blame -L tests
  t8001/t8002 (blame): modernize style
  line-range: fix "blame -L X,-N" regression

Documentation/blame-options.txt

@@ -9,9 +9,13 @@
 --show-stats::
 	Include additional statistics at the end of blame output.
 
--L <start>,<end>, -L :<regex>::
+-L <start>,<end>::
-	Annotate only the given line range.  <start> and <end> can take
+-L :<regex>::
-	one of these forms:
+	Annotate only the given line range.  <start> and <end> are optional.
+	``-L <start>'' or ``-L <start>,'' spans from <start> to end of file.
+	``-L ,<end>'' spans from start of file to <end>.
++
+<start> and <end> can take one of these forms:
 
 include::line-range-format.txt[]
 

line-range.c

@@ -211,6 +211,8 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
 		    void *cb_data, long lines, long *begin, long *end,
 		    const char *path)
 {
+	*begin = *end = 0;
+
 	if (*arg == ':') {
 		arg = parse_range_funcname(arg, nth_line_cb, cb_data, lines, begin, end, path);
 		if (!arg || *arg)
@@ -226,6 +228,11 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
 	if (*arg)
 		return -1;
 
+	if (*begin && *end && *end < *begin) {
+		long tmp;
+		tmp = *end; *end = *begin; *begin = tmp;
+	}
+
 	return 0;
 }
 

t/annotate-tests.sh

@@ -2,11 +2,21 @@
 # sourced from t8001-annotate.sh and t8002-blame.sh.
 
 check_count () {
-	head=
+	head= &&
-	case "$1" in -h) head="$2"; shift; shift ;; esac
+	file='file' &&
-	echo "$PROG file $head" >&4
+	options= &&
-	$PROG file $head >.result || return 1
+	while :
-	cat .result | perl -e '
+	do
+		case "$1" in
+		-h) head="$2"; shift; shift ;;
+		-f) file="$2"; shift; shift ;;
+		-*) options="$options $1"; shift ;;
+		*) break ;;
+		esac
+	done &&
+	echo "$PROG $options $file $head" >&4 &&
+	$PROG $options $file $head >actual &&
+	perl -e '
 		my %expect = (@ARGV);
 		my %count = map { $_ => 0 } keys %expect;
 		while (<STDIN>) {
@@ -31,107 +41,246 @@ check_count () {
 			print STDERR "Author $author (expected $value, attributed $count) $ok\n";
 		}
 		exit($bad);
-	' "$@"
+	' "$@" <actual
 }
 
-test_expect_success \
+test_expect_success 'setup A lines' '
-    'prepare reference tree' \
+	echo "1A quick brown fox jumps over the" >file &&
-    'echo "1A quick brown fox jumps over the" >file &&
+	echo "lazy dog" >>file &&
-     echo "lazy dog" >>file &&
+	git add file &&
-     git add file &&
+	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
-     GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" git commit -a -m "Initial."'
+	git commit -a -m "Initial."
+'
 
-test_expect_success \
+test_expect_success 'blame 1 author' '
-    'check all lines blamed on A' \
+	check_count A 2
-    'check_count A 2'
+'
 
-test_expect_success \
+test_expect_success 'setup B lines' '
-    'Setup new lines blamed on B' \
+	echo "2A quick brown fox jumps over the" >>file &&
-    'echo "2A quick brown fox jumps over the" >>file &&
+	echo "lazy dog" >>file &&
-     echo "lazy dog" >> file &&
+	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
-     GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" git commit -a -m "Second."'
+	git commit -a -m "Second."
+'
 
-test_expect_success \
+test_expect_success 'blame 2 authors' '
-    'Two lines blamed on A, two on B' \
+	check_count A 2 B 2
-    'check_count A 2 B 2'
+'
 
-test_expect_success \
+test_expect_success 'setup B1 lines (branch1)' '
-    'merge-setup part 1' \
+	git checkout -b branch1 master &&
-    'git checkout -b branch1 master &&
+	echo "3A slow green fox jumps into the" >>file &&
-     echo "3A slow green fox jumps into the" >> file &&
+	echo "well." >>file &&
-     echo "well." >> file &&
+	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
-     GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" git commit -a -m "Branch1-1"'
+	git commit -a -m "Branch1-1"
+'
 
-test_expect_success \
+test_expect_success 'blame 2 authors + 1 branch1 author' '
-    'Two lines blamed on A, two on B, two on B1' \
+	check_count A 2 B 2 B1 2
-    'check_count A 2 B 2 B1 2'
+'
 
-test_expect_success \
+test_expect_success 'setup B2 lines (branch2)' '
-    'merge-setup part 2' \
+	git checkout -b branch2 master &&
-    'git checkout -b branch2 master &&
+	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
-     sed -e "s/2A quick brown/4A quick brown lazy dog/" < file > file.new &&
+	mv file.new file &&
-     mv file.new file &&
+	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
-     GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" git commit -a -m "Branch2-1"'
+	git commit -a -m "Branch2-1"
+'
 
-test_expect_success \
+test_expect_success 'blame 2 authors + 1 branch2 author' '
-    'Two lines blamed on A, one on B, one on B2' \
+	check_count A 2 B 1 B2 1
-    'check_count A 2 B 1 B2 1'
+'
 
-test_expect_success \
+test_expect_success 'merge branch1 & branch2' '
-    'merge-setup part 3' \
+	git pull . branch1
-    'git pull . branch1'
+'
 
-test_expect_success \
+test_expect_success 'blame 2 authors + 2 merged-in authors' '
-    'Two lines blamed on A, one on B, two on B1, one on B2' \
+	check_count A 2 B 1 B1 2 B2 1
-    'check_count A 2 B 1 B1 2 B2 1'
+'
 
-test_expect_success \
+test_expect_success 'blame ancestor' '
-    'Annotating an old revision works' \
+	check_count -h master A 2 B 2
-    'check_count -h master A 2 B 2'
+'
 
-test_expect_success \
+test_expect_success 'blame great-ancestor' '
-    'Annotating an old revision works' \
+	check_count -h master^ A 2
-    'check_count -h master^ A 2'
+'
 
-test_expect_success \
+test_expect_success 'setup evil merge' '
-    'merge-setup part 4' \
+	echo "evil merge." >>file &&
-    'echo "evil merge." >>file &&
+	git commit -a --amend
-     git commit -a --amend'
+'
 
-test_expect_success \
+test_expect_success 'blame evil merge' '
-    'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
-    'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1'
+'
 
-test_expect_success \
+test_expect_success 'setup incomplete line' '
-    'an incomplete line added' \
+	echo "incomplete" | tr -d "\\012" >>file &&
-    'echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
-    GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" git commit -a -m "Incomplete"'
+	git commit -a -m "Incomplete"
+'
 
-test_expect_success \
+test_expect_success 'blame incomplete line' '
-    'With incomplete lines.' \
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
-    'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1'
+'
 
-test_expect_success \
+test_expect_success 'setup edits' '
-    'some edit' \
+	mv file file.orig &&
-    'mv file file.orig &&
+	{
-    {
+		cat file.orig &&
-	cat file.orig &&
+		echo
-	echo
+	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
-    } | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" > file &&
+	echo "incomplete" | tr -d "\\012" >>file &&
-    echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
-    GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" git commit -a -m "edit"'
+	git commit -a -m "edit"
+'
 
-test_expect_success \
+test_expect_success 'blame edits' '
-    'some edit' \
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
-    'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1'
+'
 
-test_expect_success \
+test_expect_success 'setup obfuscated email' '
-    'an obfuscated email added' \
+	echo "No robots allowed" >file.new &&
-    'echo "No robots allowed" > file.new &&
+	cat file >>file.new &&
-     cat file >> file.new &&
+	mv file.new file &&
-     mv file.new file &&
+	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
-     GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" git commit -a -m "norobots"'
+	git commit -a -m "norobots"
+'
 
-test_expect_success \
+test_expect_success 'blame obfuscated email' '
-    'obfuscated email parsed' \
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-    'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1'
+'
+
+test_expect_success 'blame -L 1 (all)' '
+	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+'
+
+test_expect_success 'blame -L , (all)' '
+	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+'
+
+test_expect_success 'blame -L X (X to end)' '
+	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L X, (X to end)' '
+	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L ,Y (up to Y)' '
+	check_count -L,3 A 1 B2 1 E 1
+'
+
+test_expect_success 'blame -L X,X' '
+	check_count -L3,3 B2 1
+'
+
+test_expect_success 'blame -L X,Y' '
+	check_count -L3,6 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L Y,X (undocumented)' '
+	check_count -L6,3 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L X,+1' '
+	check_count -L3,+1 B2 1
+'
+
+test_expect_success 'blame -L X,+N' '
+	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L X,-1' '
+	check_count -L3,-1 B2 1
+'
+
+test_expect_success 'blame -L X,-N' '
+	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L /RE/ (RE to end)' '
+	check_count -L/evil/ C 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,/RE2/' '
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+'
+
+test_expect_success 'blame -L X,/RE/' '
+	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,Y' '
+	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,+N' '
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,-N' '
+	check_count -L/99/,-3 B 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L X (X > nlines)' '
+	test_must_fail $PROG -L12345 file
+'
+
+test_expect_success 'blame -L ,Y (Y > nlines)' '
+	test_must_fail $PROG -L,12345 file
+'
+
+test_expect_success 'setup -L :regex' '
+	tr Q "\\t" >hello.c <<-\EOF &&
+	int main(int argc, const char *argv[])
+	{
+	Qputs("hello");
+	}
+	EOF
+	git add hello.c &&
+	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+	git commit -m "hello" &&
+
+	mv hello.c hello.orig &&
+	sed -e "/}/i\\
+	Qputs(\"goodbye\");" <hello.orig | tr Q "\\t" >hello.c &&
+	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+	git commit -a -m "goodbye" &&
+
+	mv hello.c hello.orig &&
+	echo "#include <stdio.h>" >hello.c &&
+	cat hello.orig >>hello.c &&
+	tr Q "\\t" >>hello.c <<-\EOF
+	void mail()
+	{
+	Qputs("mail");
+	}
+	EOF
+	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+	git commit -a -m "mail"
+'
+
+test_expect_success 'blame -L :literal' '
+	check_count -f hello.c -L:main F 4 G 1
+'
+
+test_expect_success 'blame -L :regex' '
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+'
+
+test_expect_success 'blame -L :nomatch' '
+	test_must_fail $PROG -L:nomatch hello.c
+'
+
+test_expect_success 'blame -L bogus' '
+	test_must_fail $PROG -L file &&
+	test_must_fail $PROG -L1,+ file &&
+	test_must_fail $PROG -L1,- file &&
+	test_must_fail $PROG -LX file &&
+	test_must_fail $PROG -L1,X file &&
+	test_must_fail $PROG -L1,+N file &&
+	test_must_fail $PROG -L1,-N file
+'

t/t8001-annotate.sh

@@ -6,9 +6,9 @@ test_description='git annotate'
 PROG='git annotate'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
-test_expect_success 'Annotating an old revision works' '
+test_expect_success 'annotate old revision' '
-	git annotate file master >result &&
+	git annotate file master >actual &&
-	awk "{ print \$3; }" <result >authors &&
+	awk "{ print \$3; }" <actual >authors &&
 	test 2 = $(grep A <authors | wc -l) &&
 	test 2 = $(grep B <authors | wc -l)
 '

t/t8002-blame.sh

@@ -7,8 +7,16 @@ PROG='git blame -c'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
 PROG='git blame -c -e'
-test_expect_success 'Blame --show-email works' '
+test_expect_success 'blame --show-email' '
-    check_count "<A@test.git>" 1 "<B@test.git>" 1 "<B1@test.git>" 1 "<B2@test.git>" 1 "<author@example.com>" 1 "<C@test.git>" 1 "<D@test.git>" 1 "<E at test dot git>" 1
+	check_count \
+		"<A@test.git>" 1 \
+		"<B@test.git>" 1 \
+		"<B1@test.git>" 1 \
+		"<B2@test.git>" 1 \
+		"<author@example.com>" 1 \
+		"<C@test.git>" 1 \
+		"<D@test.git>" 1 \
+		"<E at test dot git>" 1
 '
 
 test_done