diff options
author | Steve McIntyre <steve@einval.com> | 2018-05-31 10:09:58 +0100 |
---|---|---|
committer | Steve McIntyre <steve@einval.com> | 2018-05-31 10:09:58 +0100 |
commit | 6d46b2dad858368a60bc52f193b70d968bee2b74 (patch) | |
tree | a4b313f8dd2c0181dd3d881ffb884235d0e589a3 /stattrans.pl | |
parent | f2634c3a397946fd8be00708bf37afa9a0ff548f (diff) |
Improve stattrans.pl output
Fix daft bug in text matching, so we actually recognise alioth/salsa
correctly.
Diffstat (limited to 'stattrans.pl')
-rwxr-xr-x | stattrans.pl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/stattrans.pl b/stattrans.pl index 019047d57b2..2e56506bae3 100755 --- a/stattrans.pl +++ b/stattrans.pl @@ -398,10 +398,10 @@ if ($config{'difftype'} eq 'u') { sub vcs_log_url { my ($path) = @_; - if ($VCSHOST == "alioth") { - return "$VCSBASE/$path"; - } elsif ($VCSHOST == "salsa") { - return "$VCSBASE/commits/master/$path"; + if ($VCSHOST =~ m/alioth/) { + return "$VCSBASE/$path#rev$rev"; + } elsif ($VCSHOST =~ m/salsa/) { + return "$VCSBASE/commits/$rev/$path"; } else { die "Unknown/unsupported VCSHOST $VCSHOST - ABORT\n"; } @@ -410,10 +410,10 @@ sub vcs_log_url { sub vcs_diff_url { my ( $path, $r1, $r2, $diff_format ) = @_; - if ($VCSHOST == "alioth") { + if ($VCSHOST =~ m/alioth/) { return "$VCSBASE/$path/?r1=$r1&r2=$r2&diff_format=$diff_format"; - } elsif ($VCSHOST == "salsa") { - return "$VCSBASE/BROKEN_DIFF_SUPPORT_FIXME/$path"; + } elsif ($VCSHOST =~ m/salsa/) { + return "$VCSBASE/compare?from=$r1&to=$r2"; } else { die "Unknown/unsupported VCSHOST $VCSHOST - ABORT\n"; } @@ -422,9 +422,9 @@ sub vcs_diff_url { sub vcs_view_url { my ($path) = @_; - if ($VCSHOST == "alioth") { + if ($VCSHOST =~ m/alioth/) { return "$VCSBASE/$path?view=markup"; - } elsif ($VCSHOST == "salsa") { + } elsif ($VCSHOST =~ m/salsa/) { return "$VCSBASE/blob/master/$path"; } else { die "Unknown/unsupported VCSHOST $VCSHOST - ABORT\n"; @@ -434,9 +434,9 @@ sub vcs_view_url { sub vcs_raw_url { my ($path) = @_; - if ($VCSHOST == "alioth") { + if ($VCSHOST =~ m/alioth/) { return "$VCSBASE/$path?view=co"; - } elsif ($VCSHOST == "salsa") { + } elsif ($VCSHOST =~ m/salsa/) { return "$VCSBASE/raw/master/$path"; } else { die "Unknown/unsupported VCSHOST $VCSHOST - ABORT\n"; |