UndoRedo: Fix MERGE_ALL commit from repeating actions
#85390
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TheSofox
force-pushed
the
merge-all-commit-fix
branch
2 times, most recently
from
1d5c507
to
c1faf28
Compare
This was referenced Dec 15, 2023
Open
TheSofox
force-pushed
the
merge-all-commit-fix
branch
from
c1faf28
to
af79dac
Compare
|
I've added Unit Tests that prove the bug has been fixed and test one or two other parts of |
akien-mga
changed the title
MERGE_ALL commit from repeating actions
KoBeWi
reviewed
Mar 5, 2024
KoBeWi
approved these changes
Mar 5, 2024
TheSofox
force-pushed
the
merge-all-commit-fix
branch
from
af79dac
to
f249667
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #26118
Committing an UNDO action will run the action. This is fine if it's set to not merge or only merge the ends, but with MERGE_ALL it meant that the action could be merged into previous actions, then the operations from ALL the merged actions would be run, instead of from the most recent action.
This pull request fixes this by keeping a record (merge_total) of the amount of operations that are in the current action that the new action is being merged into. Then, when the action is committed. This variable is used to skip over operations until we get to the ones that only the newest action added.