Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232079
Change subject: Convert bugzilla references in source code to phabricator
references.
......................................................................
Convert bugzilla references in source code to phabricator references.
Not all of the bug references in parserTests.txt were updated, since
(a) we should sync with core before doing that, and (b) it would
entail a largeish patch to the blacklist as well. Punted for a
future follow-up patch.
Change-Id: I674d74e3f489c4ba246378697853f192002c64c5
---
M lib/dom.cleanup.js
M lib/dom.markTreeBuilderFixups.js
M lib/dom.t.TableFixups.js
M lib/dom.wrapTemplates.js
M lib/ext.core.LinkHandler.js
M lib/ext.core.Sanitizer.js
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.ParsoidConfig.js
M lib/mediawiki.Title.js
M lib/mediawiki.WikiConfig.js
M lib/mediawiki.wikitext.constants.js
M lib/pegTokenizer.pegjs.txt
M lib/wts.LinkHandler.js
M lib/wts.escapeWikitext.js
M tests/parserTests.txt
15 files changed, 32 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/79/232079/1
diff --git a/lib/dom.cleanup.js b/lib/dom.cleanup.js
index f75023c..a4f70ed 100644
--- a/lib/dom.cleanup.js
+++ b/lib/dom.cleanup.js
@@ -122,7 +122,7 @@
// outside the table from where this came.
//
// But, do not zero it out if the node has template encapsulation
- // information. That will be disastrous (see bug 52638, 52488).
+ // information. That will be disastrous (see T54638, T54488).
if (dp.fostered && dp.dsr && !DU.isFirstEncapsulationWrapperNode(node))
{
dp.dsr[0] = dp.dsr[1];
}
diff --git a/lib/dom.markTreeBuilderFixups.js b/lib/dom.markTreeBuilderFixups.js
index 5f44193..accde01 100644
--- a/lib/dom.markTreeBuilderFixups.js
+++ b/lib/dom.markTreeBuilderFixups.js
@@ -337,7 +337,7 @@
findAutoInsertedTags(env, body);
findDeletedStartTags(env, body);
- // Bug 63642 and friends
+ // T65642 and friends
cleanupFormattingTagFixup(env, body);
}
diff --git a/lib/dom.t.TableFixups.js b/lib/dom.t.TableFixups.js
index c270440..6859b51 100644
--- a/lib/dom.t.TableFixups.js
+++ b/lib/dom.t.TableFixups.js
@@ -14,7 +14,7 @@
* TableFixups class
*
* Provides two DOMTraverser visitors that implement the two parts of
- * https://bugzilla.wikimedia.org/show_bug.cgi?id=50603:
+ * https://phabricator.wikimedia.org/T52603 :
* - stripDoubleTDs
* - reparseTemplatedAttributes
*/
@@ -42,7 +42,7 @@
*
* @public
*
- * See https://bugzilla.wikimedia.org/show_bug.cgi?id=50603
+ * See https://phabricator.wikimedia.org/T52603
*/
TableFixups.prototype.stripDoubleTDs = function(node, env) {
var nextNode = node.nextSibling;
@@ -245,7 +245,7 @@
};
/**
- * Bug 44498, second part of bug 50603
+ * T46498, second part of T52603
*
* @public
*
diff --git a/lib/dom.wrapTemplates.js b/lib/dom.wrapTemplates.js
index fffc920..6870f4b 100644
--- a/lib/dom.wrapTemplates.js
+++ b/lib/dom.wrapTemplates.js
@@ -232,7 +232,7 @@
// information being set on this element node. So, this HACK
here
// is supporting that HACK there.
//
- // (The parser test for bug 50603 will fail without this fix)
+ // (The parser test for T52603 will fail without this fix)
updateDSRForFirstTplNode(startElem, tcStart.nextSibling);
}
diff --git a/lib/ext.core.LinkHandler.js b/lib/ext.core.LinkHandler.js
index 4fc51f5..a9130e3 100644
--- a/lib/ext.core.LinkHandler.js
+++ b/lib/ext.core.LinkHandler.js
@@ -95,7 +95,7 @@
ns, nsPrefix, env);
} else if (interwikiInfo && interwikiInfo.localinterwiki !==
undefined) {
if (hrefBits[2] === '') {
- // Empty title => main page (bug 64167)
+ // Empty title => main page (T66167)
info.title = new
Title(env.normalizeTitle(env.conf.wiki.mainpage, false, true), 0, '', env);
} else {
info.href = hrefBits[2];
@@ -1354,7 +1354,7 @@
// Unlike other options, use last-specified width.
if (optInfo.ck === 'width') {
// We support a trailing 'px' here for
historical reasons
- // (bug 13500, 51628)
+ // (T15500, T53628)
var maybeSize =
optInfo.v.match(/^(\d*)(?:x(\d+))?\s*(?:px\s*)?$/);
if (maybeSize !== null) {
opts.size.v.width = maybeSize[1] &&
Number(maybeSize[1]) || null;
@@ -1387,7 +1387,7 @@
// options
if (opts.format && opts.format.v === 'framed') {
// width and height is ignored for framed images
- // https://bugzilla.wikimedia.org/show_bug.cgi?id=62258
+ // https://phabricator.wikimedia.org/T64258
opts.size.v.width = null;
opts.size.v.height = null;
} else if (opts.format) {
@@ -1480,7 +1480,7 @@
// allowedPrefixes = ['']; // allow all external images
// allowedPrefixes = ['http://127.0.0.1/', 'http://example.com'];
// Note that the values include the http:// or https:// protocol.
- // See https://bugzilla.wikimedia.org/show_bug.cgi?id=51092
+ // See https://phabricator.wikimedia.org/T53092
return hasImageExtension && Array.isArray(allowedPrefixes) &&
// true iff some prefix in the list matches href
allowedPrefixes.some(function(prefix) {
diff --git a/lib/ext.core.Sanitizer.js b/lib/ext.core.Sanitizer.js
index a93c8d0..82ed097 100644
--- a/lib/ext.core.Sanitizer.js
+++ b/lib/ext.core.Sanitizer.js
@@ -42,10 +42,10 @@
'https://',
'ftp://',
'irc://',
- 'ircs://', // @bug 28503
+ 'ircs://', // T30503
'gopher://',
'telnet://', // Well if we're going to support the above.. -ævar
- 'nntp://', // @bug 3808 RFC 1738
+ 'nntp://', // T5808 RFC 1738
'worldwind://',
'mailto:',
'news:',
@@ -591,7 +591,7 @@
function Sanitizer(manager) {
// FIXME: would be good to make the sanitizer independent of the manager
// so that it can be used separately. See
- // https://bugzilla.wikimedia.org/show_bug.cgi?id=52941
+ // https://phabricator.wikimedia.org/T54941
this.manager = manager;
this.register(manager);
this.constants = SanitizerConstants;
@@ -602,7 +602,7 @@
* Utility function: Sanitize an array of tokens. Not used in normal token
* pipelines. The only caller is currently in dom.t.TDFixups.js.
*
- * TODO: Move to Util / generalize when working on bug 52941?
+ * TODO: Move to Util / generalize when working on T54941?
*/
Sanitizer.prototype.sanitizeTokens = function(tokens) {
var res = [];
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index f7febc3..1405fd2 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -1097,7 +1097,7 @@
cb(null, env.pageCache[title] /* , type */);
} else if (!env.conf.parsoid.fetchTemplates) {
// TODO: Set mw:Error and provide error info in data-mw
- // see https://bugzilla.wikimedia.org/show_bug.cgi?id=48900
+ // see https://phabricator.wikimedia.org/T50900
var spanStart = new TagTk('span', [
new KV('typeof', 'mw:Placeholder'),
new KV('about', '#' + state.wrappedObjectId),
@@ -1192,7 +1192,7 @@
// the source and encapsulate it for round-tripping.
//
// Without async operations here, we also avoid issues like
- // the token sharing encountered in bug 61298 when tokens are
also
+ // the token sharing encountered in T63298 when tokens are also
// processed all the way to DOM which involves destructive
// modifications of tokens in the sanitizer.
newCB({tokens: [token.dataAttribs.src]});
diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index 06fd57e..dad498e 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -214,7 +214,7 @@
/**
* @property {number} version
* Parsoid DOM format version.
- * See https://bugzilla.wikimedia.org/show_bug.cgi?id=52937
+ * See https://phabricator.wikimedia.org/T54937
*/
ParsoidConfig.prototype.version = 0;
diff --git a/lib/mediawiki.Title.js b/lib/mediawiki.Title.js
index cce2569..15a5d84 100644
--- a/lib/mediawiki.Title.js
+++ b/lib/mediawiki.Title.js
@@ -25,7 +25,7 @@
// Some titles can have subpages enabled, have a "/" in the name
// and have a namespace-like string in it
// Ex: Utilisateur:Steven De Oliveira/Brouillon/007 : Quitte ou
double
- // from bug 63636
+ // from T65636
if
(env.conf.wiki.namespaceIds[Util.normalizeNamespaceName(keyParts[0])] === ns) {
this.key = keyParts.pop();
}
diff --git a/lib/mediawiki.WikiConfig.js b/lib/mediawiki.WikiConfig.js
index 6228457..185472a 100644
--- a/lib/mediawiki.WikiConfig.js
+++ b/lib/mediawiki.WikiConfig.js
@@ -394,7 +394,7 @@
if (general.imagewhitelistenabled !== undefined) {
this.enableImageWhitelist = true;
- // XXX we don't actually support the on-wiki whitelist
(bug 51268)
+ // XXX we don't actually support the on-wiki whitelist
(T53268)
// if we did, we would probably want to fetch and cache
// MediaWiki:External image whitelist
// here (rather than do so on every parse)
diff --git a/lib/mediawiki.wikitext.constants.js
b/lib/mediawiki.wikitext.constants.js
index 85f3ca8..2c480e3 100644
--- a/lib/mediawiki.wikitext.constants.js
+++ b/lib/mediawiki.wikitext.constants.js
@@ -24,7 +24,7 @@
'img_link': 'link',
'img_alt': 'alt',
'img_page': 'page',
- 'img_lang': 'lang', // see bug 32987
+ 'img_lang': 'lang', // see T34987
'img_upright': 'upright',
'img_width': 'width',
'img_class': 'class',
diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 84bb402..39a4120 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -199,7 +199,7 @@
=
// avoid recursion via nested_block_in_table, as that can lead to stack
// overflow in large tables
- // See https://bugzilla.wikimedia.org/show_bug.cgi?id=57670
+ // See https://phabricator.wikimedia.org/T59670
& { return stops.push('tableDataBlock', true); }
// XXX: don't rely on a lame look-ahead like this; use syntax stops
// instead, so that multi-line th content followed by a line prefixed with
@@ -1288,7 +1288,7 @@
/ ! inline_breaks
! '/>'
// /=>"' is the html5 attribute name set we do not want.
- // \[ is to avoid eating links. (see: BUG 553: link with two
variables in a piped link)
+ // \[ is to avoid eating links. (see: T2553: link with two variables
in a piped link)
t:( directive / !( space_or_newline / [\[/=>"'] ) c:. { return c; }
) { return t; }
)+ {
@@ -1546,7 +1546,7 @@
table_start_tag "table_start_tag"
= sc:(space / comment)* startPos:("" { return endOffset(); }) b:"{" p:pipe
- // ok to normalize away stray |} on rt (see bug 57360)
+ // ok to normalize away stray |} on rt (see T59360)
& { return stops.push('table', false); }
ta:(table_attribute / broken_table_attribute_name_char)*
tsEndPos:("" { stops.pop('table'); return endOffset(); })
diff --git a/lib/wts.LinkHandler.js b/lib/wts.LinkHandler.js
index 8c0f620..99d8ed1 100644
--- a/lib/wts.LinkHandler.js
+++ b/lib/wts.LinkHandler.js
@@ -994,7 +994,7 @@
var opts = outerDP.optList || []; // original wikitext options
- // Add bogus options from old optlist in order to round-trip cleanly
(bug 62500)
+ // Add bogus options from old optlist in order to round-trip cleanly
(T64500)
opts.forEach(function(o) {
if (o.ck === 'bogus') {
nopts.push({
@@ -1031,8 +1031,7 @@
});
if (idx < 0) {
// New option, default to English localization for most
languages
- // TODO: use first alias (localized) instead for RTL
languages (bug
- // 51852)
+ // TODO: use first alias (localized) instead for RTL
languages (T53852)
no.ak = no.ak.last();
changed = true;
return; /* new option */
@@ -1049,8 +1048,7 @@
// use the alias (incl whitespace) from the original option
wikitext
// if found; otherwise use the last alias given (English
default by
// convention that works everywhere).
- // TODO: use first alias (localized) instead for RTL languages
(bug
- // 51852)
+ // TODO: use first alias (localized) instead for RTL languages
(T53852)
if (a !== undefined && no.ck !== 'caption') {
no.ak = opts[idx].ak;
no.v = undefined; // prevent double substitution
@@ -1065,7 +1063,7 @@
// Filter out bogus options if the image options/caption have changed.
if (changed) {
nopts = nopts.filter(function(no) { return no.ck !== 'bogus';
});
- // empty captions should get filtered out in this case, too
(bug 62264)
+ // empty captions should get filtered out in this case, too
(T64264)
nopts = nopts.filter(function(no) {
return !(no.ck === 'caption' && no.ak === '');
});
diff --git a/lib/wts.escapeWikitext.js b/lib/wts.escapeWikitext.js
index e60eb82..c9f73cb 100644
--- a/lib/wts.escapeWikitext.js
+++ b/lib/wts.escapeWikitext.js
@@ -248,7 +248,7 @@
return true;
}
- // Always escape isolated extension tags (bug 57469).
Consider this:
+ // Always escape isolated extension tags (T59469).
Consider this:
// echo "<ref>foo<p></ref></p>" | node
parse --html2wt
// The <ref> and </ref> tag-like text is spread across
the DOM, and in
// the worst case can be anywhere. So, we
conservatively escape these
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 1f3f427..c2a10c9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -3814,7 +3814,7 @@
##
## All Parsoid only definition list tests have this difference.
##
-## See also: https://bugzilla.wikimedia.org/show_bug.cgi?id=6569
+## See also: https://phabricator.wikimedia.org/T8569
## and
http://lists.wikimedia.org/pipermail/wikitext-l/2011-November/000483.html
!! test
@@ -10619,7 +10619,7 @@
!! end
!! test
-Parsoid: Merge double tds (bug 50603)
+Parsoid: Merge double tds (T52603)
!! options
parsoid
!! wikitext
@@ -10633,7 +10633,7 @@
!! end
!! test
-Parsoid: Merge double tds in nested transclusion content (bug 50603)
+Parsoid: Merge double tds in nested transclusion content (T52603)
!! options
parsoid
!! wikitext
@@ -12927,7 +12927,7 @@
###################
# Image sizing.
# See https://www.mediawiki.org/wiki/Help:Images#Size_and_frame
-# and https://bugzilla.wikimedia.org/show_bug.cgi?id=62258
+# and https://phabricator.wikimedia.org/T64258
# Foobar has actual size of 1941x220
# 1. Thumbs & frameless always reduce, can't be enlarged unless it's
# a scalable format.
--
To view, visit https://gerrit.wikimedia.org/r/232079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I674d74e3f489c4ba246378697853f192002c64c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
