launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #16755
[Merge] lp:~cjwatson/launchpad/freenode-hostname into lp:launchpad
Colin Watson has proposed merging lp:~cjwatson/launchpad/freenode-hostname into lp:launchpad.
Commit message:
Replace irc.freenode.net with chat.freenode.net throughout.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
Bug #1319151 in Launchpad itself: "Editing IRC nicknames gives "irc.freenode.net" as example instead of "chat.freenode.net""
https://bugs.launchpad.net/launchpad/+bug/1319151
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/freenode-hostname/+merge/220016
Replace irc.freenode.net with chat.freenode.net throughout.
--
https://code.launchpad.net/~cjwatson/launchpad/freenode-hostname/+merge/220016
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/freenode-hostname into lp:launchpad.
=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql 2013-11-28 13:34:57 +0000
+++ database/sampledata/current-dev.sql 2014-05-19 11:57:14 +0000
@@ -4505,15 +4505,15 @@
ALTER TABLE ircid DISABLE TRIGGER ALL;
-INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'irc.freenode.net', 'mark');
-INSERT INTO ircid (id, person, network, nickname) VALUES (2, 11, 'irc.freenode.net', 'SteveA');
-INSERT INTO ircid (id, person, network, nickname) VALUES (3, 10, 'irc.freenode.net', 'limi');
-INSERT INTO ircid (id, person, network, nickname) VALUES (4, 8, 'irc.freenode.net', 'jblack');
-INSERT INTO ircid (id, person, network, nickname) VALUES (5, 3, 'irc.freenode.net', 'justdave');
-INSERT INTO ircid (id, person, network, nickname) VALUES (6, 9, 'irc.freenode.net', 'kiko');
-INSERT INTO ircid (id, person, network, nickname) VALUES (7, 4, 'irc.freenode.net', 'cjwatson');
-INSERT INTO ircid (id, person, network, nickname) VALUES (8, 5, 'irc.freenode.net', 'Keybuk');
-INSERT INTO ircid (id, person, network, nickname) VALUES (9, 6, 'irc.freenode.net', 'jeff');
+INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'chat.freenode.net', 'mark');
+INSERT INTO ircid (id, person, network, nickname) VALUES (2, 11, 'chat.freenode.net', 'SteveA');
+INSERT INTO ircid (id, person, network, nickname) VALUES (3, 10, 'chat.freenode.net', 'limi');
+INSERT INTO ircid (id, person, network, nickname) VALUES (4, 8, 'chat.freenode.net', 'jblack');
+INSERT INTO ircid (id, person, network, nickname) VALUES (5, 3, 'chat.freenode.net', 'justdave');
+INSERT INTO ircid (id, person, network, nickname) VALUES (6, 9, 'chat.freenode.net', 'kiko');
+INSERT INTO ircid (id, person, network, nickname) VALUES (7, 4, 'chat.freenode.net', 'cjwatson');
+INSERT INTO ircid (id, person, network, nickname) VALUES (8, 5, 'chat.freenode.net', 'Keybuk');
+INSERT INTO ircid (id, person, network, nickname) VALUES (9, 6, 'chat.freenode.net', 'jeff');
ALTER TABLE ircid ENABLE TRIGGER ALL;
=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql 2013-11-28 13:34:57 +0000
+++ database/sampledata/current.sql 2014-05-19 11:57:14 +0000
@@ -4432,15 +4432,15 @@
ALTER TABLE ircid DISABLE TRIGGER ALL;
-INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'irc.freenode.net', 'mark');
-INSERT INTO ircid (id, person, network, nickname) VALUES (2, 11, 'irc.freenode.net', 'SteveA');
-INSERT INTO ircid (id, person, network, nickname) VALUES (3, 10, 'irc.freenode.net', 'limi');
-INSERT INTO ircid (id, person, network, nickname) VALUES (4, 8, 'irc.freenode.net', 'jblack');
-INSERT INTO ircid (id, person, network, nickname) VALUES (5, 3, 'irc.freenode.net', 'justdave');
-INSERT INTO ircid (id, person, network, nickname) VALUES (6, 9, 'irc.freenode.net', 'kiko');
-INSERT INTO ircid (id, person, network, nickname) VALUES (7, 4, 'irc.freenode.net', 'cjwatson');
-INSERT INTO ircid (id, person, network, nickname) VALUES (8, 5, 'irc.freenode.net', 'Keybuk');
-INSERT INTO ircid (id, person, network, nickname) VALUES (9, 6, 'irc.freenode.net', 'jeff');
+INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'chat.freenode.net', 'mark');
+INSERT INTO ircid (id, person, network, nickname) VALUES (2, 11, 'chat.freenode.net', 'SteveA');
+INSERT INTO ircid (id, person, network, nickname) VALUES (3, 10, 'chat.freenode.net', 'limi');
+INSERT INTO ircid (id, person, network, nickname) VALUES (4, 8, 'chat.freenode.net', 'jblack');
+INSERT INTO ircid (id, person, network, nickname) VALUES (5, 3, 'chat.freenode.net', 'justdave');
+INSERT INTO ircid (id, person, network, nickname) VALUES (6, 9, 'chat.freenode.net', 'kiko');
+INSERT INTO ircid (id, person, network, nickname) VALUES (7, 4, 'chat.freenode.net', 'cjwatson');
+INSERT INTO ircid (id, person, network, nickname) VALUES (8, 5, 'chat.freenode.net', 'Keybuk');
+INSERT INTO ircid (id, person, network, nickname) VALUES (9, 6, 'chat.freenode.net', 'jeff');
ALTER TABLE ircid ENABLE TRIGGER ALL;
=== modified file 'lib/lp/answers/templates/sourcepackage-gethelp.pt'
--- lib/lp/answers/templates/sourcepackage-gethelp.pt 2011-12-24 17:49:30 +0000
+++ lib/lp/answers/templates/sourcepackage-gethelp.pt 2014-05-19 11:57:14 +0000
@@ -38,8 +38,8 @@
</p>
<ul class="support">
<li>
- <a href="irc://irc.freenode.net/#ubuntu">the <code>#ubuntu</code>
- IRC channel</a> on <code>irc.freenode.net</code>
+ <a href="irc://chat.freenode.net/#ubuntu">the <code>#ubuntu</code>
+ IRC channel</a> on <code>chat.freenode.net</code>
</li>
<li>
<a href="http://ubuntuforums.org/";>the Ubuntu Forums</a>.
=== modified file 'lib/lp/app/doc/displaying-paragraphs-of-text.txt'
--- lib/lp/app/doc/displaying-paragraphs-of-text.txt 2012-12-11 05:41:50 +0000
+++ lib/lp/app/doc/displaying-paragraphs-of-text.txt 2014-05-19 11:57:14 +0000
@@ -98,7 +98,7 @@
... 'You can check the PPC md5sums at '
... 'ftp://ftp.ubuntu.com/ubuntu/dists/breezy/main/installer-powerpc'
... '/current/images/MD5SUMS\n'
- ... 'irc://irc.freenode.net/#launchpad\n'
+ ... 'irc://chat.freenode.net/#launchpad\n'
... '\n'
... 'I have a Jabber account (jabber:foo@xxxxxxxxxxxxxxxxxx)\n'
... 'Foo Bar <mailto:foo.bar@xxxxxxxxxxx>')
@@ -106,7 +106,7 @@
<p><a rel="nofollow" href="https://launchpad.net/";>https:/<wbr />/launchpad.<wbr />net/</a> is the new Launchpad site<br />
<a rel="nofollow" href="http://example.com/something?foo=bar&hum=baz";>http://<wbr />example.<wbr />com/something?<wbr />foo=bar&<wbr />hum=baz</a><br />
You can check the PPC md5sums at <a rel="nofollow" href="ftp://ftp.ubuntu.com/ubuntu/dists/breezy/main/installer-powerpc/current/images/MD5SUMS";>ftp://ftp.<wbr />ubuntu.<wbr />com/ubuntu/<wbr />dists/breezy/<wbr />main/installer-<wbr />powerpc/<wbr />current/<wbr />images/<wbr />MD5SUMS</a><br />
- <a rel="nofollow" href="irc://irc.freenode.net/#launchpad">irc://irc.<wbr />freenode.<wbr />net/#launchpad</a></p>
+ <a rel="nofollow" href="irc://chat.freenode.net/#launchpad">irc://chat.<wbr />freenode.<wbr />net/#launchpad</a></p>
<p>I have a Jabber account (<a rel="nofollow" href="jabber:foo@xxxxxxxxxxxxxxxxxx">jabber:<wbr />foo@jabber.<wbr />example.<wbr />com</a>)<br />
Foo Bar <<a rel="nofollow" href="mailto:foo.bar@xxxxxxxxxxx";>mailto:<wbr />foo.bar@<wbr />example.<wbr />net</a>></p>
@@ -149,8 +149,8 @@
... 'http://www.searchtools.com/test/urls/!exclamation.html\n'
... 'http://www.searchtools.com/test/urls/~tilde.html\n'
... 'http://www.searchtools.com/test/urls/*asterisk.html\n'
- ... 'irc://irc.freenode.net/launchpad\n'
- ... 'irc://irc.freenode.net/%23launchpad,isserver\n'
+ ... 'irc://chat.freenode.net/launchpad\n'
+ ... 'irc://chat.freenode.net/%23launchpad,isserver\n'
... 'mailto:noreply@xxxxxxxxxxxxx\n'
... 'jabber:noreply@xxxxxxxxxxxxx\n'
... 'http://localhost/foo?xxx&\n'
@@ -189,8 +189,8 @@
<a rel="nofollow" href="http://www.searchtools.com/test/urls/!exclamation.html";>http://<wbr />www.searchtools<wbr />.com/test/<wbr />urls/!exclamati<wbr />on.html</a><br />
<a rel="nofollow" href="http://www.searchtools.com/test/urls/~tilde.html";>http://<wbr />www.searchtools<wbr />.com/test/<wbr />urls/~tilde.<wbr />html</a><br />
<a rel="nofollow" href="http://www.searchtools.com/test/urls/*asterisk.html";>http://<wbr />www.searchtools<wbr />.com/test/<wbr />urls/*asterisk.<wbr />html</a><br />
- <a rel="nofollow" href="irc://irc.freenode.net/launchpad">irc://irc.<wbr />freenode.<wbr />net/launchpad</a><br />
- <a rel="nofollow" href="irc://irc.freenode.net/%23launchpad,isserver">irc://irc.<wbr />freenode.<wbr />net/%23launchpa<wbr />d,isserver</a><br />
+ <a rel="nofollow" href="irc://chat.freenode.net/launchpad">irc://chat.<wbr />freenode.<wbr />net/launchpad</a><br />
+ <a rel="nofollow" href="irc://chat.freenode.net/%23launchpad,isserver">irc://chat.<wbr />freenode.<wbr />net/%23launchpa<wbr />d,isserver</a><br />
<a rel="nofollow" href="mailto:noreply@xxxxxxxxxxxxx";>mailto:<wbr />noreply@<wbr />launchpad.<wbr />net</a><br />
<a rel="nofollow" href="jabber:noreply@xxxxxxxxxxxxx">jabber:<wbr />noreply@<wbr />launchpad.<wbr />net</a><br />
<a rel="nofollow" href="http://localhost/foo?xxx&";>http://<wbr />localhost/<wbr />foo?xxx&</a><br />
=== modified file 'lib/lp/app/javascript/picker/tests/test_picker.js'
--- lib/lp/app/javascript/picker/tests/test_picker.js 2013-03-20 03:41:40 +0000
+++ lib/lp/app/javascript/picker/tests/test_picker.js 2014-05-19 11:57:14 +0000
@@ -195,7 +195,7 @@
value: 'jschmo',
title: 'Joe Schmo',
description: 'joe@xxxxxxxxxxx',
- details: ['joe on irc.freenode.net', 'Member since 2007'],
+ details: ['joe on chat.freenode.net', 'Member since 2007'],
alt_title_link: '/~jschmo'
}
]);
@@ -206,7 +206,7 @@
'A', expander_action.get('tagName'), 'Tab key is broken.');
var details = li.expander.content_node;
Assert.areEqual(
- 'joe on irc.freenode.net<br>Member since 2007',
+ 'joe on chat.freenode.net<br>Member since 2007',
details.one('div').getContent());
Assert.areEqual(
'Select Joe Schmo',
@@ -224,7 +224,7 @@
value: 'jschmo',
title: 'Joe <Schmo>',
description: 'joe@xxxxxxxxxxx',
- details: ['<joe> on irc.freenode.net',
+ details: ['<joe> on chat.freenode.net',
'f<nor>d maintainer'],
alt_title_link: '/~jschmo'
}
@@ -233,7 +233,7 @@
var li = bb.one('.yui3-picker-results li');
var details = li.expander.content_node;
Assert.areEqual(
- '<joe> on irc.freenode.net<br>f<nor>d maintainer',
+ '<joe> on chat.freenode.net<br>f<nor>d maintainer',
details.one('div').getContent());
Assert.areEqual(
'Select Joe <Schmo>',
=== modified file 'lib/lp/app/templates/launchpad-discoveryfailure.pt'
--- lib/lp/app/templates/launchpad-discoveryfailure.pt 2012-02-24 04:29:17 +0000
+++ lib/lp/app/templates/launchpad-discoveryfailure.pt 2014-05-19 11:57:14 +0000
@@ -11,8 +11,8 @@
<h1 class="exception">OpenID Provider Is Unavailable at This Time</h1>
<p>The openid provider was unavailable. Please try again in a
moment.</p>
- <p>You can also join <a href="irc://irc.freenode.net/launchpad">the
- #launchpad IRC support channel on irc.freenode.net</a> to ask for
+ <p>You can also join <a href="irc://chat.freenode.net/launchpad">the
+ #launchpad IRC support channel on chat.freenode.net</a> to ask for
further assistance.</p>
</div>
</body>
=== modified file 'lib/lp/app/templates/launchpad-noreferrer.pt'
--- lib/lp/app/templates/launchpad-noreferrer.pt 2012-02-24 04:29:17 +0000
+++ lib/lp/app/templates/launchpad-noreferrer.pt 2014-05-19 11:57:14 +0000
@@ -18,8 +18,8 @@
href="https://answers.launchpad.net/launchpad/+faq/1024";>the
FAQ <em>Why does Launchpad require a REFERER header?</em></a> for
more information.</p>
- <p>You can also join <a href="irc://irc.freenode.net/launchpad">the
- #launchpad IRC support channel on irc.freenode.net</a> for further
+ <p>You can also join <a href="irc://chat.freenode.net/launchpad">the
+ #launchpad IRC support channel on chat.freenode.net</a> for further
assistance.</p>
</div>
</body>
=== modified file 'lib/lp/app/tests/test_tales.py'
--- lib/lp/app/tests/test_tales.py 2013-06-21 13:37:38 +0000
+++ lib/lp/app/tests/test_tales.py 2014-05-19 11:57:14 +0000
@@ -296,8 +296,8 @@
'http://www.searchtools.com/test/urls/!exclamation.html\n'
'http://www.searchtools.com/test/urls/~tilde.html\n'
'http://www.searchtools.com/test/urls/*asterisk.html\n'
- 'irc://irc.freenode.net/launchpad\n'
- 'irc://irc.freenode.net/%23launchpad,isserver\n'
+ 'irc://chat.freenode.net/launchpad\n'
+ 'irc://chat.freenode.net/%23launchpad,isserver\n'
'mailto:noreply@xxxxxxxxxxxxx\n'
'jabber:noreply@xxxxxxxxxxxxx\n'
'http://localhost/foo?xxx&\n'
=== modified file 'lib/lp/registry/browser/tests/person-edit-views.txt'
--- lib/lp/registry/browser/tests/person-edit-views.txt 2012-04-10 14:01:17 +0000
+++ lib/lp/registry/browser/tests/person-edit-views.txt 2014-05-19 11:57:14 +0000
@@ -25,7 +25,7 @@
The IRC form requires a nickname.
>>> form = {
- ... 'newnetwork': 'irc.freenode.net',
+ ... 'newnetwork': 'chat.freenode.net',
... 'newnick': '',
... 'field.actions.save': 'Save Changes',
... }
@@ -67,7 +67,7 @@
The IRC nickname is added when both the nickname and network are submitted.
>>> form = {
- ... 'newnetwork': 'irc.freenode.net',
+ ... 'newnetwork': 'chat.freenode.net',
... 'newnick': 'basil',
... 'field.actions.save': 'Save Changes',
... }
@@ -93,7 +93,7 @@
>>> id = ircnickname.id
>>> form = {
- ... 'newnetwork_%s' % ircnickname.id: 'irc.freenode.net',
+ ... 'newnetwork_%s' % ircnickname.id: 'chat.freenode.net',
... 'newnick_%s' % ircnickname.id: 'basil',
... 'remove_%s' % ircnickname.id: 'Remove',
... 'field.actions.save': 'Save Changes',
=== modified file 'lib/lp/registry/doc/irc.txt'
--- lib/lp/registry/doc/irc.txt 2012-12-26 01:32:19 +0000
+++ lib/lp/registry/doc/irc.txt 2014-05-19 11:57:14 +0000
@@ -12,7 +12,7 @@
>>> salgado = getUtility(IPersonSet).getByName('salgado')
>>> irc_id = getUtility(IIrcIDSet).new(
- ... salgado, 'irc.freenode.net', 'salgado')
+ ... salgado, 'chat.freenode.net', 'salgado')
The returned IrcID object provides both IIrcID and IHasOwner.
=== modified file 'lib/lp/registry/doc/vocabularies.txt'
--- lib/lp/registry/doc/vocabularies.txt 2013-06-05 09:40:19 +0000
+++ lib/lp/registry/doc/vocabularies.txt 2014-05-19 11:57:14 +0000
@@ -847,7 +847,7 @@
>>> irc_person = factory.makePerson(name='ircperson')
>>> irc_id = ircid_set.new(
- ... irc_person, 'irc.freenode.net', 'team')
+ ... irc_person, 'chat.freenode.net', 'team')
>>> [person.displayname for person in vocab.search('team')]
[u'Ircperson', u'HWDB Team', u'No Team Memberships', u'Simple Team',
u'Ubuntu Team', u'testing Spanish team', u'Hoary Gnome Team',
@@ -857,7 +857,7 @@
A match on launchpad name ranks higher than irc nickname:
>>> lifeless2 = factory.makePerson(name='anotherlifeless')
>>> irc_id = ircid_set.new(
- ... lifeless2, 'irc.freenode.net', 'lifeless')
+ ... lifeless2, 'chat.freenode.net', 'lifeless')
>>> [person.displayname for person in vocab.search('lifeless')]
[u'Robert Collins', u'Anotherlifeless']
@@ -879,7 +879,7 @@
>>> symbolic_person = factory.makePerson(name='symbolic')
>>> irc_id = ircid_set.new(
- ... symbolic_person, 'irc.freenode.net', '%percent')
+ ... symbolic_person, 'chat.freenode.net', '%percent')
>>> irc_id =ircid_set.new(
... symbolic_person, 'irc.fnord.net', 'question?')
>>> transaction.commit()
=== modified file 'lib/lp/registry/stories/webservice/xx-person.txt'
--- lib/lp/registry/stories/webservice/xx-person.txt 2012-12-20 21:38:43 +0000
+++ lib/lp/registry/stories/webservice/xx-person.txt 2014-05-19 11:57:14 +0000
@@ -580,7 +580,7 @@
>>> irc_id = sorted(webservice.get(irc_ids_link).jsonBody()['entries'])[0]
>>> pprint_entry(irc_id)
- network: u'irc.freenode.net'
+ network: u'chat.freenode.net'
nickname: u'mark'
person_link: u'http://.../~mark'
resource_type_link: u'http://.../#irc_id'
=== modified file 'lib/lp/registry/templates/person-editircnicknames.pt'
--- lib/lp/registry/templates/person-editircnicknames.pt 2009-09-01 19:34:46 +0000
+++ lib/lp/registry/templates/person-editircnicknames.pt 2014-05-19 11:57:14 +0000
@@ -66,7 +66,7 @@
</tr>
<tr>
- <td class="formHelp">Example: irc.freenode.net</td>
+ <td class="formHelp">Example: chat.freenode.net</td>
<td class="formHelp">Example: mark</td>
</tr>
</table>
Follow ups
