krinkle at svn
May 27, 2012, 5:38 PM
Post #1 of 1
(61 views)
Permalink
|
|
SVN: [115448] trunk/tools/bugzilla/bugzilla-4.0/extensions/Wikimedia/ Extension.pm
|
|
https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115448
Revision: 115448
Author: krinkle
Date: 2012-05-28 00:38:03 +0000 (Mon, 28 May 2012)
Log Message:
-----------
bug_format_comment: +git commit, +gerrit Change-Id, update gerrit change set
* bug_format_comment
- Fix redirect for GerritChangeset
As of Gerrit 3.2 the link format is https://gerrit.wikimedia.org/r/#/c/1/
instead of https://gerrit.wikimedia.org/r/#change,1
Use the permalink without the hash instead.
- Add linker for GerritChangeId (using gerrit query search)
- Add linker for GitCommit (using gerrit query search)
* See also:
- https://gerrit.wikimedia.org/r/9109
Modified Paths:
--------------
trunk/tools/bugzilla/bugzilla-4.0/extensions/Wikimedia/Extension.pm
Modified: trunk/tools/bugzilla/bugzilla-4.0/extensions/Wikimedia/Extension.pm
===================================================================
--- trunk/tools/bugzilla/bugzilla-4.0/extensions/Wikimedia/Extension.pm 2012-05-27 21:46:55 UTC (rev 115447)
+++ trunk/tools/bugzilla/bugzilla-4.0/extensions/Wikimedia/Extension.pm 2012-05-28 00:38:03 UTC (rev 115448)
@@ -49,15 +49,25 @@
match => qr{\brt\ ?\#?(\d+)}i,
replace => \&_createRTLink
};
- my $replacerGerrit = {
+ my $replacerGerritChangeset = {
match => qr{\bgerrit(\ change(set)?)?\ ?\#?(\d+)}i,
- replace => \&_createGerritLink
+ replace => \&_createGerritChangesetLink
};
+ my $replacerGerritChangeId = {
+ match => qr{\b(I[0-9a-f]{8,40})}i,
+ replace => \&_createGerritChangeidLink
+ };
+ my $replacerGitCommit = {
+ match => qr{\b([a-f0-9]{40})}i,
+ replace => \&_createGitCommitLink
+ };
push( @$regexes, $replacerWP );
push( @$regexes, $replacerCR );
push( @$regexes, $replacerRT );
- push( @$regexes, $replacerGerrit );
+ push( @$regexes, $replacerGerritChangeset );
+ push( @$regexes, $replacerGerritChangeId );
+ push( @$regexes, $replacerGitCommit );
}
sub _createWikipediaLink {
@@ -77,9 +87,19 @@
return $rev_link;
};
-sub _createGerritLink {
- my $rev_link = "<a href=\"https://gerrit.wikimedia.org/r/#change,$3\" title=\"Gerrit change #$3\">Gerrit change #$3</a>";
+sub _createGerritChangesetLink {
+ my $rev_link = "<a href=\"https://gerrit.wikimedia.org/r/$3\" title=\"Gerrit change #$3\">Gerrit change #$3</a>";
return $rev_link;
};
+
+sub _createGerritChangesetLink {
+ my $rev_link = "<a href=\"https://gerrit.wikimedia.org/r/#q,$1,n,z\" title=\"Gerrit Change-Id: $1\">$1</a>";
+ return $rev_link;
+};
+
+sub _createGitCommitLink {
+ my $rev_link = "<a href=\"https://gerrit.wikimedia.org/r/#q,$1,n,z\" title=\"Git commit $1\">$1</a>";
+ return $rev_link;
+};
__PACKAGE__->NAME;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
