908024 - Sort patcher configs to make diffs clearer

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Other, defect, P3)

Description

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: [tools] Sort patcher config when writing to disk

We get a lot of churn in the patcher configs because perl's Config::General doesn't enforce any sort order by default, eg http://hg.mozilla.org/build/tools/rev/105800cd997d.

You can turn sorting on if you have v2.40 or later, and we have 2.44, so yay. I've confirmed that changing the config ordering doesn't change the snippets we get for the five patcher configs we use.

Comment 1

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: [tools] one-off sorting of configs

The sort order isn't perfect:
         past-update   22.0b6 23.0b1 betatest releasetest beta
         past-update   23.0b1 23.0b2 betatest releasetest beta
+        past-update   23.0b10 24.0b1 betatest releasetest beta
         past-update   23.0b2 23.0b3 betatest releasetest beta
and similar for the likes of the <23.b10> release block, but it doesn't regress anything in my testing and I'll live with that for the win.

These were all generated with a script that read the config in with the '-SaveSorted => 1' set on the Config::General object, then written straight back out again.

Comment 2

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: [tools] one-off sorting of configs

Upload the right patch.

Comment 3

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 793802 [details] [diff] [review]
[tools] Sort patcher config when writing to disk

https://hg.mozilla.org/build/tools/rev/adc48ae1e242

Comment 4

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 793812 [details] [diff] [review]
[tools] one-off sorting of configs

With refreshed mozBeta-branch-patcher2.cfg:
https://hg.mozilla.org/build/tools/rev/917367ef222c

Comment 5

[Nick Thomas [:nthomas] (UTC+12)]

Bump looks good in 24.0b6.

Comment 6

[Rail Aliiev [:rail]]

Wooot! So much better now. Thank a lot, Nick!

Comment 7

[Nick Thomas [:nthomas] (UTC+12)]

Turns out the machines used for ESR17 only have version 2.30 of Config::General.

Comment 8

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: [tools] Test for version of Config::General

Thankfully this version seems to do sane things with ordering even without the pref.

Comment 9

[Rail Aliiev [:rail]]

Comment on attachment 803606 [details] [diff] [review]
[tools] Test for version of Config::General

remote:   https://hg.mozilla.org/build/tools/rev/d2814ad96008
remote:   https://hg.mozilla.org/build/tools/rev/0d43d91724b6

Comment 10

[Nick Thomas [:nthomas] (UTC+12)]

Updates for ESR went fine with that.