Attachment 167045 Details for Bug 207216 – patch for Phabricator and add option for MOREBUGURL and VOTING

[patch] patch for Phabricator and add option for MOREBUGURL and VOTING

PR207216_bugzilla50.diff (text/plain), 7.55 KB, created by Olli Hauer on 2016-02-15 19:17:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2016-02-15 19:17:18 UTC

Size: 7.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 408951)
>+++ Makefile	(working copy)
>@@ -207,4 +207,12 @@
> 	@${MKDIR} ${STAGEDIR}${WWWDIR}/contrib
> 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/contrib)
> 
>+do-install-MOREBUGURL-on:
>+	@${MKDIR} ${STAGEDIR}${WWWDIR}/extensions/MoreBugUrl
>+	(cd ${WRKSRC}/extensions/MoreBugUrl && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/extensions/MoreBugUrl)
>+
>+do-install-VOTING-on:
>+	@${MKDIR} ${STAGEDIR}${WWWDIR}/extensions/Voting
>+	(cd ${WRKSRC}/extensions/Voting && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/extensions/Voting)
>+
> .include <bsd.port.post.mk>
>Index: Makefile.options
>===================================================================
>--- Makefile.options	(revision 408951)
>+++ Makefile.options	(working copy)
>@@ -4,7 +4,7 @@
> OPTIONS_DEFINE=		\
> 	MODPERL
> 
>-OPTIONS_GROUP=	UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN
>+OPTIONS_GROUP=	UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN EXTENSIONS
> 
> OPTIONS_GROUP_ADMIN=	\
> 	MOVE_BUGZ	\
>@@ -45,6 +45,10 @@
> 	PATCH_VIEWER	\
> 	MORE_HTML
> 
>+OPTIONS_GROUP_EXTENSIONS=\
>+	MOREBUGURL	\
>+	VOTING
>+
> OPTIONS_DEFAULT=	\
> 	CHARTING_MODULES\
> 	CONTRIB		\
>@@ -80,4 +84,5 @@
> EMAIL_DESC=		Email handling
> REPORTING_DESC= 	Reports and Charts
> WEBSERVICE_DESC=	Web Services
>+EXTENSIONS_DESC=	Extensions
> 
>Index: files/patch-PR207213
>===================================================================
>--- files/patch-PR207213	(revision 0)
>+++ files/patch-PR207213	(working copy)
>@@ -0,0 +1,63 @@
>+# Upstream PR: https://bugzilla.mozilla.org/show_bug.cgi?id=1128119
>+===================================================================
>+--- extensions/MoreBugUrl/Extension.pm.orig	2016-02-15 15:30:02 UTC
>++++ extensions/MoreBugUrl/Extension.pm
>+@@ -22,6 +22,7 @@ use constant MORE_SUB_CLASSES => qw(
>+     Bugzilla::Extension::MoreBugUrl::PHP
>+     Bugzilla::Extension::MoreBugUrl::Redmine
>+     Bugzilla::Extension::MoreBugUrl::Savane
>++    Bugzilla::Extension::MoreBugUrl::Phabricator
>+ );
>+ 
>+ # We need to update bug_see_also table because both
>+--- extensions/MoreBugUrl/lib/Phabricator.pm.orig	2016-02-15 15:40:28 UTC
>++++ extensions/MoreBugUrl/lib/Phabricator.pm
>+@@ -0,0 +1,41 @@
>++# This Source Code Form is subject to the terms of the Mozilla Public
>++# License, v. 2.0. If a copy of the MPL was not distributed with this
>++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>++#
>++# This Source Code Form is "Incompatible With Secondary Licenses", as
>++# defined by the Mozilla Public License, v. 2.0.
>++
>++package Bugzilla::Extension::MoreBugUrl::Phabricator;
>++
>++use 5.10.1;
>++use strict;
>++use warnings;
>++
>++use parent qw(Bugzilla::BugUrl);
>++
>++###############################
>++####        Methods        ####
>++###############################
>++
>++sub should_handle {
>++    my ($class, $uri) = @_;
>++    return ($uri->path =~ m|^/T\d+$|) ? 1 : 0;
>++}
>++
>++sub _check_value {
>++    my $class = shift;
>++
>++    my $uri = $class->SUPER::_check_value(@_);
>++
>++    # Phabricator URLs have only one form:
>++    #   http://example.com/T111
>++
>++    # Make sure there are no query parameters.
>++    $uri->query(undef);
>++    # And remove any # part if there is one.
>++    $uri->fragment(undef);
>++
>++    return $uri;
>++}
>++
>++1;
>+--- extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl.orig	2015-12-22 21:22:11 UTC
>++++ extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
>+@@ -14,3 +14,4 @@
>+ <li>A b[% %]ug on b[% %]ugs.php.net.</li>
>+ <li>An issue in a Redmine installation.</li>
>+ <li>A b[% %]ug in a Savane installation.</li>
>++<li>A task in a Phabricator installation.</li>
>
>Property changes on: files/patch-PR207213
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 408951)
>+++ pkg-plist	(working copy)
>@@ -211,6 +211,45 @@
> %%WWWDIR%%/editworkflow.cgi
> %%WWWDIR%%/email_in.pl
> %%WWWDIR%%/enter_bug.cgi
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/Config.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/Extension.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/disabled
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/BitBucket.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/GetSatisfaction.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/PHP.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Phabricator.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/RT.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Redmine.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/ReviewBoard.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Rietveld.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Savane.pm
>+%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/Config.pm
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/Extension.pm
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/disabled
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/voting/delete-all.html.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
>+%%VOTING%%%%WWWDIR%%/extensions/Voting/web/style.css
> %%WWWDIR%%/images/csv.png
> %%WWWDIR%%/images/favicon.ico
> %%WWWDIR%%/images/ical.png

Actions: View | Diff

Attachments on bug 207216: 167034 | 167045