git-svn: Fix git svn log --show-commit
PATCH v2 1/1 git-svn: Fix git svn log --show-commit
In reply to a message not in the archivegit svn log --show-commit had no tests and, consequently, no attention by the author of
b1b4755 (git-log: put space after commit mark, 2011-03-10)
who kept git svn log working only without --show-commit.
Introduce a test and fix it.
---
git svn scares me. It exits with 0 even with these problems! Consequently, the tests in t9116 completely ignore the return codes because of the pipes.
Patch directly on top of b1b4755. Thanks for the report!
v2 uses the grouped regexp again. I've learned to count to 2 meanwhile.
--- git-svn.perl | 2 +- t/t9116-git-svn-log.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-)
git-svn.perl +1 -1
@@ -5735,7 +5735,7 @@ sub cmd_show_log { my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { if (/^${esc_color}commit (- )?($::sha1_short)/o) { - my $cmt = $1; + my $cmt = $2; if ($c && cmt_showable($c) && $c->{r} != $r_last) { $r_last = $c->{r}; process_commit($c, $r_min, $r_max, \@k) or
t/t9116-git-svn-log.sh +15 -0
@@ -60,6 +60,21 @@ test_expect_success 'test ascending revision range' " git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - " +test_expect_success 'test ascending revision range with --show-commit' " + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - + " + +test_expect_success 'test ascending revision range with --show-commit (sha1)' " + git svn find-rev r1 >expected-range-r1-r2-r4-sha1 && + git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 && + git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 && + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out && + git rev-parse \$(cat out) >actual && + test_cmp expected-range-r1-r2-r4-sha1 actual + " + printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1 test_expect_success 'test descending revision range' "
Signature · 1 line
1.7.5.1.558.gc8bec
PATCH v2 1/1 git-svn: Fix git svn log --show-commit
From: Michael J Gruber <[email protected]>
From: Michael J Gruber <[email protected]>
git svn log --show-commit had no tests and, consequently, no attention by the author of
b1b4755 (git-log: put space after commit mark, 2011-03-10)
who kept git svn log working only without --show-commit.
Introduce a test and fix it.
---
This patch works for me. Thanks!
git-svn.perl | 2 +- t/t9116-git-svn-log.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-)
git-svn.perl +1 -1
@@ -5766,7 +5766,7 @@ sub cmd_show_log { my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { if (/^${esc_color}commit (- )?($::sha1_short)/o) { - my $cmt = $1; + my $cmt = $2; if ($c && cmt_showable($c) && $c->{r} != $r_last) { $r_last = $c->{r}; process_commit($c, $r_min, $r_max, \@k) or
t/t9116-git-svn-log.sh +15 -0
@@ -60,6 +60,21 @@ test_expect_success 'test ascending revision range' " git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - " +test_expect_success 'test ascending revision range with --show-commit' " + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - + " + +test_expect_success 'test ascending revision range with --show-commit (sha1)' " + git svn find-rev r1 >expected-range-r1-r2-r4-sha1 && + git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 && + git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 && + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out && + git rev-parse \$(cat out) >actual && + test_cmp expected-range-r1-r2-r4-sha1 actual + " + printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1 test_expect_success 'test descending revision range' "
Signature · 1 line
1.7.5.2.316.g687f
Quoted 5 lines · Michael J Gruber
git svn log --show-commit had no tests and, consequently, no attention by the author of
b1b4755 (git-log: put space after commit mark, 2011-03-10)
Quoted 8 lines
who kept git svn log working only without --show-commit.
Introduce a test and fix it.
Reported-by Bernt Hansen <[email protected]>Signed-off-by Michael J Gruber <[email protected]>---
git svn scares me.
Sorry about this breakage.
git-svn.perl sub cmd_show_log { · line 5738
Quoted 10 lines
git-svn.perl +1
-1@@ -5735,7 +5735,7 @@ sub cmd_show_log { my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { if (/^${esc_color}commit (- )?($::sha1_short)/o) { - my $cmt = $1; + my $cmt = $2;
Even more defensive approach would be not to grab the grouping by doing:
- if (/^${esc_color}commit (- )?($::sha1_short)/o) {
+ if (/^${esc_color}commit (?:- )?($::sha1_short)/o) {
and not to change anything else. I should have noticed the $1 reference that was immediately on the next line when I saw and applied your patch, but if there were more references in the scope that is outside of the patch context, the same bug would be likely to have gone unnoticed.
I do not have enough bandwidth to read every single line of the patch from everybody, so small bugs in patches from known to be good people (you included) can slip through, unless marked with "I am not familiar with this codepath" or "I am not strong in Perl regexp" or somesuch, in which case I try to allocate more time to give it another pass of eyeballing.
In any case, thanks for the fix. I think being defensive with (?:) would be a better idea, so I'll tweak the patch before applying with your test.
Junio C Hamano venit, vidit, dixit 20.05.2011 18:17:
Quoted 9 lines
Quoted 7 lines · Michael J Gruber
git svn log --show-commit had no tests and, consequently, no attention by the author of
b1b4755 (git-log: put space after commit mark, 2011-03-10)
who kept git svn log working only without --show-commit.
Quoted 8 lines
Quoted 6 lines
Introduce a test and fix it.
Reported-by Bernt Hansen <[email protected]>Signed-off-by Michael J Gruber <[email protected]>---
git svn scares me.Sorry about this breakage.
I have to be sorry, I broke it!
Which is why I took responsibility to fix it asap.
Quoted 21 lines
git-svn.perl sub cmd_show_log { · line 5738
Quoted 10 lines
git-svn.perl +1
-1@@ -5735,7 +5735,7 @@ sub cmd_show_log { my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { if (/^${esc_color}commit (- )?($::sha1_short)/o) { - my $cmt = $1; + my $cmt = $2;Even more defensive approach would be not to grab the grouping by doing:
(quoted diff) +1
-1- if (/^${esc_color}commit (- )?($::sha1_short)/o) { + if (/^${esc_color}commit (?:- )?($::sha1_short)/o) {and not to change anything else. I should have noticed the $1 reference that was immediately on the next line when I saw and applied your patch, but if there were more references in the scope that is outside of the patch context, the same bug would be likely to have gone unnoticed.
Quoted 5 lines
I do not have enough bandwidth to read every single line of the patch from everybody, so small bugs in patches from known to be good people (you included) can slip through, unless marked with "I am not familiar with this codepath" or "I am not strong in Perl regexp" or somesuch, in which case I try to allocate more time to give it another pass of eyeballing.
So, for the record:
I don't grok perl.
I don't grok perl regexps
I don't like either ;)
I use perl when I have to (fixing others' cgi, hacking git-svn) and try my best, or ask for help. Here, three things came together: I did not really comprehend the full regexp with the ($::thingy), probably because /foo bar/ looks separated to my eyes, but was not aware of that lack of understanding; there was no test for the codepath which used $cmt (which ends up being used as $foo->c somewhere else); I didn't even know about "--show-commit" (and that codepath).
Quoted 2 lines
In any case, thanks for the fix. I think being defensive with (?:) would be a better idea, so I'll tweak the patch before applying with your test.
Inserting a few more "?" or even "???" definitely describes the issue well..
Turns out that "non-capturing groups" are a regexp feature which is not even specific to perl.
So, thanks Bernt for teaching me a new "git svn log" option and Junio and Andreas for a new regexp feature ;)
Michael
PATCH 1/1 git-svn: Fix git svn log --show-commit
In reply to a message not in the archivegit svn log --show-commit had no tests and, consequently, no attention by the author of
b1b4755 (git-log: put space after commit mark, 2011-03-10)
who kept git svn log working only without --show-commit.
Introduce a test and fix it.
---
git svn scares me. It exits with 0 even with these problems! Consequently, the tests in t9116 completely ignore the return codes because of the pipes.
Patch directly on top of b1b4755. Thanks for the report!
The fix replaces a group "(- )?" by "-? ?" which works in this case (though not being equivalent). It's easier than dealing with the problem the grouping introduced.
--- git-svn.perl | 2 +- t/t9116-git-svn-log.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-)
git-svn.perl +1 -1
@@ -5734,7 +5734,7 @@ sub cmd_show_log { my (@k, $c, $d, $stat); my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { - if (/^${esc_color}commit (- )?($::sha1_short)/o) { + if (/^${esc_color}commit -? ?($::sha1_short)/o) { my $cmt = $1; if ($c && cmt_showable($c) && $c->{r} != $r_last) { $r_last = $c->{r};
t/t9116-git-svn-log.sh +15 -0
@@ -60,6 +60,21 @@ test_expect_success 'test ascending revision range' " git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - " +test_expect_success 'test ascending revision range with --show-commit' " + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - + " + +test_expect_success 'test ascending revision range with --show-commit (sha1)' " + git svn find-rev r1 >expected-range-r1-r2-r4-sha1 && + git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 && + git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 && + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out && + git rev-parse \$(cat out) >actual && + test_cmp expected-range-r1-r2-r4-sha1 actual + " + printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1 test_expect_success 'test descending revision range' "
Signature · 1 line
1.7.5.1.558.gc8bec
Quoted 3 lines · Michael J Gruber
The fix replaces a group "(- )?" by "-? ?" which works in this case (though not being equivalent). It's easier than dealing with the problem the grouping introduced.
You could also use "(?:- )?" to make it a non-capturing group.
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."