git-svn log: include commit log for the smallest revision in a range
The "svn log -rM:N" command shows commit logs inclusive in the range [M,N]. Previously "git-svn log" always excluded the commit log for the smallest revision in a range, whether the range was ascending or descending. With this patch, the smallest revision in a range is always shown. Updated tests for ascending and descending revision ranges. Signed-off-by: David D Kilzer <ddkilzer@kilzer.net> Acked-by: Eric Wong <normalperson@yhbt.net>
David D Kilzer committed
Nov 10, 2007 at 22:10 UTC
60f3ff12573e411476f7a32ab13bbb9b8063c8f7
2 files changed
+7
-7
git-svn.perl
+3
-3
@@ -3799,9 +3799,9 @@ sub git_svn_log_cmd {
3799
$c_min = $gs->rev_db_get($r_min);
3800
if (defined $c_min && defined $c_max) {
3801
if ($r_max > $r_min) {
3802
- push @cmd, "$c_min..$c_max";
3802
+ push @cmd, "--boundary", "$c_min..$c_max";
3803
} else {
3804
- push @cmd, "$c_max..$c_min";
3804
+ push @cmd, "--boundary", "$c_max..$c_min";
3805
}
3806
} elsif ($r_max > $r_min) {
3807
push @cmd, $c_max;
@@ -3980,7 +3980,7 @@ sub cmd_show_log {
3980
my (@k, $c, $d, $stat);
3981
my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
3982
while (<$log>) {
3983
- if (/^${esc_color}commit ($::sha1_short)/o) {
3983
+ if (/^${esc_color}commit -?($::sha1_short)/o) {
3984
my $cmt = $1;
3985
if ($c && cmt_showable($c) && $c->{r} != $r_last) {
3986
$r_last = $c->{r};
t/t9116-git-svn-log.sh
+4
-4
@@ -45,18 +45,18 @@ test_expect_success 'run log against a from trunk' "
45
git svn log -r3 a | grep ^r3
46
"
47
48
-printf 'r2 \nr4 \n' > expected-range-r2-r4
48
+printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4
49
50
test_expect_success 'test ascending revision range' "
51
git reset --hard trunk &&
52
- git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r2-r4 -
52
+ git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r1-r2-r4 -
53
"
54
55
-printf 'r4 \nr2 \n' > expected-range-r4-r2
55
+printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1
56
57
test_expect_success 'test descending revision range' "
58
git reset --hard trunk &&
59
- git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4-r2 -
59
+ git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4-r2-r1 -
60
"
61
62
test_done