1783250 - Uplift issues caused by bug 1779145

Status: RESOLVED FIXED

(Thunderbird :: Upstream Synchronization, task)

Description

[Rob Lemley [:rjl]]

Bug 1779145 was supposed to only remove the "Services" imports from javascript files.

Unfortunately, it also included some white-space & line-length reformatting such as https://hg.mozilla.org/comm-central/diff/2f4f7096c6f65daf861d6a7bafc7072feeb8690e/mail/components/addrbook/content/aboutAddressBook.js which is wreaking havoc on efforts to uplift later changes to comm-esr102.

This bug is for a c-esr102 only patch that is essentially 2f4f7096c6f65daf861d6a7bafc7072feeb8690e with the "Services" import removals removed in order to facilitate future uplifts.

Comment 1

[Rob Lemley [:rjl]]

Attachment: aboutAddressBook.patch

More to come, this is just what's needed for 102.1.1.

Comment 2

[Rob Lemley [:rjl]]

Thunderbird 102.1.1:
https://hg.mozilla.org/releases/comm-esr102/rev/5d6784d446fe

Comment 3

[Magnus Melin [:mkmelin]]

It's a mystery to me why those changes happened. I mean, it's all up to the linter!

Comment 4

[Rob Lemley [:rjl]]

How the incoming patch was produced:

# Remove the first hunk from patched files where the change contains the Services.jsm resource URL
grepdiff  resource://gre/modules/Services.jsm  2f4f7096c6f65daf861d6a7bafc7072feeb8690e.patch  | xargs -rn1 filterdiff 2f4f7096c6f65daf861d6a7bafc7072feeb8690e.patch -\#2- -i > tmp1.patch
# Save the list of files in tmp1.patch
lsdiff tmp1.patch > files2remove.txt
# Extract patched files that did not have Services.jsm imported
filterdiff -X files2remove.txt 2f4f7096c6f65daf861d6a7bafc7072feeb8690e.patch > tmp2.patch
# Save the list of files in tmp2.patch
lsdiff tmp2.patch > noservices.txt
# Combine tmp1.patch and tmp2.patch into a single file
cat tmp1.patch tmp2.patch > tmp3.patch
# Using the original patches file order, reorder the files in tmp3.patch
lsdiff 2f4f7096c6f65daf861d6a7bafc7072feeb8690e.patch| xargs -rn1 filterdiff  tmp3.patch -i > output.patch

output.patch is easily compared to the original patch to verify that it's correct.

Additional changes were needed to some`chat protocol files due to conflicts from bug 1772283 in the reformatted lines.

Comment 5

[Rob Lemley [:rjl]]

Attachment: Bug1783250.patch

Comment 6

[Rob Lemley [:rjl]]

Attachment: Bug1783250.patch

Comment 7

[Rob Lemley [:rjl]]

Comment on attachment 9290098 [details] [diff] [review]
Bug1783250.patch

[Triage Comment]
Formatting changes only to prevent merge issues upliftng.

Comment 8

[Rob Lemley [:rjl]]

Thunderbird 102.2.0:
https://hg.mozilla.org/releases/comm-esr102/rev/37aff7568033