1605845 - Port bug 1579952 - Mass rename .xul files to .xhtml

Status: RESOLVED FIXED

(Thunderbird :: General, task)

Description

[Geoff Lankow (:darktrojan)]

Once bug 1579952 lands, none of our .xul files are going to work any more. I've done a mechanical replacement as a bustage fix that appears to work.

Here's what I did:

• Rename all .xul files to .xhtml
• Replaced everything matching /\.xul\b/ with .xhtml, except if it is part of there.is.only.xul
• Replaced everything matching chrome://messenger/content/ with chrome://messenger/content/messenger.xhtml
• Tidied up manually
• Disabled the linter on .xhtml files for now. There's not much to fix but I've got better things to do right now.

So far the Try run looks good: https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&group_state=expanded&revision=da85b26e3abcf181c65084aaa320ed68a4dbbce0

Comment 1

[Geoff Lankow (:darktrojan)]

Attachment: 1605845-rename-xul-files.diff

Comment 2

[Geoff Lankow (:darktrojan)]

Attachment: 1605845-fix-references.diff

Comment 3

[Geoff Lankow (:darktrojan)]

I think I'm just going to land this stuff, alongside bug 1604420, but if I don't it's here for the next person seeking to put out a burning tree.

Mozilla-central merge is expected at 1600 or 2200 UTC.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/0ff64b19c513
Rename all .xul files to .xhtml; rs=bustage-fix
https://hg.mozilla.org/comm-central/rev/d58d6a653555
Change all references to .xul files to .xhtml instead; rs=bustage-fix

Comment 5

[Richard Marti (:Paenglab)]

This makes that the configs in the xulstore aren't restored because the references are no longer xul but xhtml. Maybe a migration should be needed to not let the users with an initial appearance and then needed to made it again like they want.

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/5a0b6e3a4343
Follow-up: reformat. rs=reformat

Comment 7

[:aceman]

(In reply to Richard Marti (:Paenglab) from comment #5)

This makes that the configs in the xulstore aren't restored because the references are no longer xul but xhtml. Maybe a migration should be needed to not let the users with an initial appearance and then needed to made it again like they want.

Probably, but if m-c does not do it (did they decide it isn't needed?) I'm not sure we want to poke so deep in the internals of xulstore. Can we even ask for the references stored there? This toolkit code usually works transparently to TB.

Comment 8

[Tim Nguyen :ntim]

(In reply to :aceman from comment #7)

(In reply to Richard Marti (:Paenglab) from comment #5)

This makes that the configs in the xulstore aren't restored because the references are no longer xul but xhtml. Maybe a migration should be needed to not let the users with an initial appearance and then needed to made it again like they want.

Probably, but if m-c does not do it (did they decide it isn't needed?) I'm not sure we want to poke so deep in the internals of xulstore. Can we even ask for the references stored there? This toolkit code usually works transparently to TB.

FWIW, m-c did do some migrations: https://searchfox.org/mozilla-central/rev/c79fc6e32a5b561205a71fcfef9112d34b4037ae/browser/components/BrowserGlue.jsm#3240

See bug 1603457 and bug 1603612.

Comment 9

[Jorg K (CEST = GMT+2)]

Did you really mean to rename in editor/ui as well, not that we care.

Comment 10

[Axel Hecht [:Pike]]

https://hg.mozilla.org/comm-central/rev/d58d6a653555#l187.12 didn't pan out for localized builds, the localizations still reference the XUL file, and with cross-channel, should continue to do so for the given string ID.

Possible ways to fix this would be to just drop the localized pref, or to do a proper string change for this.
Personally, the fewer localized prefs we have, the better, so I'd prefer to just get rid of this.

Comment 11

[Geoff Lankow (:darktrojan)]

Oh yuck, why is that even a thing? I'm going to remove it since it appears no translations have any other value.