1856427 - After deleting two messages from a local folder, undo is required three times to bring them both back

Status: RESOLVED FIXED

(MailNews Core :: General, defect, P2)

Description

[betterbird.project+10]

STR:
Local folder, delete, delete, undo, undo, undo.

Mozregression shows:
https://hg.mozilla.org/comm-central/pushloghtml?fromchange=8484dd98e2092f6e21ac50ec3f26c71b564555b2&tochange=70121c0b97d08ff1022ee44263dcd7f79da31591

Looks like there were some changes in transaction management here:
https://hg.mozilla.org/comm-central/rev/7fa895a86b552264242c797f1380d646f0ae5d4b#l10.213
leading to some extra transactions. Note that deleting a local message moves it to the trash, to likely this change is at fault:
https://hg.mozilla.org/comm-central/rev/7fa895a86b552264242c797f1380d646f0ae5d4b#l10.180

Comment 1

[betterbird.project+10]

https://github.com/Betterbird/thunderbird-patches/blob/main/115/bugs/1856427-double-undo.patch

Comment 2

[Magnus Melin [:mkmelin]]

Attachment: Bug 1856427 - Fix double-undo when deleting local messages. r=gds

For "delete, delete, undo, undo, undo" the second undo wouldn't "take".

Based on https://github.com/Betterbird/thunderbird-patches/blob/main/115/bugs/1856427-double-undo.patch

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/45fa5c550224
Fix double-undo when deleting local messages. r=gds

Comment 4

[Magnus Melin [:mkmelin]]

Comment on attachment 9364706 [details]
Bug 1856427 - Fix double-undo when deleting local messages. r=gds

[Approval Request Comment]
Regression caused by (bug #): bug 1828372
User impact if declined: undo doesn't work as it should
Testing completed (on c-c, etc.): c-c
Risk to taking this patch (and alternatives if risky): pretty safe, just moving code a bit

Comment 5

[Wayne Mery (:wsmwk)]

Comment on attachment 9364706 [details]
Bug 1856427 - Fix double-undo when deleting local messages. r=gds

[Triage Comment]
Approved for beta

Comment 6

[Daniel Darnell [:dandarnell]]

Thunderbird 121.0b2:
https://hg.mozilla.org/releases/comm-beta/rev/fbe053f30f79

Comment 7

[Wayne Mery (:wsmwk)]

Comment on attachment 9364706 [details]
Bug 1856427 - Fix double-undo when deleting local messages. r=gds

[Triage Comment]
Approved for esr115

Comment 8

[Rob Lemley [:rjl]]

Thunderbird 115.5.2:
https://hg.mozilla.org/releases/comm-esr115/rev/cf5f249e10b9