Alexandre Julliard : winetest: Use gitlab instead of gitweb.
Alexandre Julliard
julliard at winehq.org
Wed Jun 15 15:31:50 CDT 2022
Module: tools
Branch: master
Commit: 395ba4283f5705663c80f176d4b3e2f8d52372bb
URL: https://source.winehq.org/git/tools.git/?a=commit;h=395ba4283f5705663c80f176d4b3e2f8d52372bb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jun 15 12:20:28 2022 +0200
winetest: Use gitlab instead of gitweb.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
winetest/build-index | 6 +++---
winetest/build-patterns | 8 ++++----
winetest/dissect | 8 ++++----
winetest/gather | 6 +++---
winetest/winetest.conf | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/winetest/build-index b/winetest/build-index
index d6f04a0c..2a61b165 100755
--- a/winetest/build-index
+++ b/winetest/build-index
@@ -32,7 +32,7 @@ sub BEGIN
}
unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=);
}
-use vars qw/$workdir $gitdir $gitweb @groups/;
+use vars qw/$workdir $gitdir $gitlab @groups/;
require "winetest.conf";
my $name0=$0;
@@ -323,7 +323,7 @@ EOF
print OUT " <td class=\"note\"></td>\n";
}
}
- print OUT " <td class=\"links\"><a href=\"$gitweb?a=shortlog;h=$build->{name}\">shortlog</a>";
+ print OUT " <td class=\"links\"><a href=\"$gitlab/commit/$build->{name}\">history</a>";
print OUT "</td></tr>\n";
}
print OUT "</table></body></html>\n";
@@ -451,7 +451,7 @@ foreach my $build (@builds)
print OUT "\n <td> </td><td class=\"note\"> </td><td> </td>\n";
}
print OUT " <td class=\"commitlink\">";
- if ($build->{subj}) { printf OUT "<a href=\"$gitweb?a=shortlog;h=%s\">%s</a>", $build->{name}, escapeHTML($build->{subj}); }
+ if ($build->{subj}) { printf OUT "<a href=\"$gitlab/commit/%s\">%s</a>", $build->{name}, escapeHTML($build->{subj}); }
print OUT "</td></tr>\n";
}
diff --git a/winetest/build-patterns b/winetest/build-patterns
index 0bab1718..2e909697 100755
--- a/winetest/build-patterns
+++ b/winetest/build-patterns
@@ -36,7 +36,7 @@ sub BEGIN
}
unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=);
}
-use vars qw/$workdir $bugweb $gitdir $gitweb @groups $patternbuilds $fixed_threshold/;
+use vars qw/$workdir $bugweb $gitdir $gitlab @groups $patternbuilds $fixed_threshold/;
require "winetest.conf";
my $name0=$0;
@@ -846,7 +846,7 @@ if (open(my $fh, "-|", $cmd))
$test->{desc} .= "<a href='$bugweb/show_bug.cgi?id=$bug->{id}'>$bug->{id}</a> <span class='$bug->{class}'>$bug->{desc}</span>";
if ($bug->{regression})
{
- $test->{desc} .= " (<a href='$gitweb/commitdiff/$bug->{regression}->{id}'>bisected</a>)";
+ $test->{desc} .= " (<a href='$gitlab/commit/$bug->{regression}->{id}'>bisected</a>)";
}
$test->{desc} .= "<br>";
}
@@ -1180,9 +1180,9 @@ sub write_commits($$)
}
}
- my $desc = sprintf(" <a class='commit%s' title='%s'>%s</a> <a href='%s/commitdiff/%s' title='%s'>%s</a>",
+ my $desc = sprintf(" <a class='commit%s' title='%s'>%s</a> <a href='%s/commit/%s' title='%s'>%s</a>",
$scope, $scope_descs{$scope}, $scope,
- $gitweb, $commit->{id},
+ $gitlab, $commit->{id},
short_date($build->{date}),
$commit->{summary});
if ($scope eq "R" or $scope eq "U")
diff --git a/winetest/dissect b/winetest/dissect
index c66293df..b4970c39 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -35,7 +35,7 @@ sub BEGIN
}
unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=);
}
-use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxunitsize $maxfilesize $acceptprediluvianwin/;
+use vars qw/$workdir $gitdir $gitlab $maxmult $maxuserskips $maxfailedtests $maxunitsize $maxfilesize $acceptprediluvianwin/;
require "winetest.conf";
my $name0=$0;
@@ -314,7 +314,7 @@ $line =~ /^Build info:\r?$/ or mydie "no build info header: $line";
my $box = create_box( "version", "version", "$tag $short_date information" );
$box->{data} .= "<h2>Build version</h2>\n";
$box->{data} .= "<table class=\"output\">\n";
-$box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitweb/?a=shortlog;h=$testbuild\">$shortbuild</a></td></tr>\n";
+$box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitlab/commit/$testbuild\">$shortbuild</a></td></tr>\n";
$box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n";
$box->{data} .= "<div class=\"output\"> </div>\n";
while ($line = <IN> || "")
@@ -530,8 +530,8 @@ sub get_source_link($$)
$source_link .= ":$_lnum" if (defined $_lnum);
if ($source ne "-")
{
- my $url = "$gitweb/?a=blob;f=$source;hb=$testbuild";
- $url .= "#l$_lnum" if (defined $_lnum);
+ my $url = "$gitlab/blob/$testbuild/$source";
+ $url .= "#L$_lnum" if (defined $_lnum);
$source_link = "<a href=\"$url\">$source_link</a>";
}
return $source_link;
diff --git a/winetest/gather b/winetest/gather
index 5aabe4e4..ce5009a0 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -32,7 +32,7 @@ sub BEGIN
}
unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=);
}
-use vars qw/$workdir $gitdir $gitweb @groups/;
+use vars qw/$workdir $gitdir $gitlab @groups/;
require "winetest.conf";
my $name0=$0;
@@ -762,8 +762,8 @@ sub test_links($$)
my $source = $alltests{$testname};
return "<td></td>" if (!defined $source);
- return "<td class=\"links\"><a href=\"$gitweb/?a=history;f=$source;hb=$build\" title=\"$source change history\">history</a>" .
- " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\" title=\"$source source code\">source</a>" .
+ return "<td class=\"links\"><a href=\"$gitlab/commits/$build/$source\" title=\"$source change history\">history</a>" .
+ " | <a href=\"$gitlab/blob/$build/$source\" title=\"$source source code\">source</a>" .
(defined($group) ? " | <a href=\"index.html#$testname\" title=\"summary of $testname results across platforms\">summary</a>" : "") .
"</td>";
}
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index 411382be..54ab7928 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -5,7 +5,7 @@ $workdir = "/home/winehq/opt/winetest";
$bugweb = "https://bugs.winehq.org/";
$gitdir = "/home/winehq/opt/source/git/wine.git";
-$gitweb = "//source.winehq.org/git/wine.git";
+$gitlab = "https://gitlab.winehq.org/wine/wine/-";
# Maximum number of reports for one version and tag
$maxmult = 10;
More information about the wine-cvs
mailing list