Map conversion checks and mapmerge2 fixup rework #7595
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
Tweak mapmerge to print notice for unused keys unless supressed
Implement mergemap conversion detection in dmm_test and fixup
Refactor dmm_test Rework fixup using upstream/master as ancestor
cmss13-ci
bot
added
Github
Drulikar
changed the title
Drulikar
force-pushed
the
Map_Conversion_Check
branch
from
82af4f9
to
3942f4b
Compare
(Why is names() not available?)
This reverts commit e6ff910.
Drulikar
changed the title
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.
About the pull request
This PR is an experimental change to mapmerge2 where now free keys are gotten in sequential order rather than random, the map linter now attempts to merge all maps to determine if mapmerge2 would want to alter the maps (to detect a failure of using hooks or non-tgm format), and hopefully a more robust fixup script.
The other changes to maplint are to allow it to more gracefully handle var edits to areas (we already lint against this but it won't be properly handled), and var edits as newlist.
Fixup now forces the upstream remote to be added to their repo (I don't know of a different way to get the merge_base I want), merges based off of the merge_base version of the map (rather than really only looking at the HEAD commit), detects mapmerge2 changes for any map the HEAD tree is altering, and performs them. However, fixup does take significantly more time, but it really only checked for TGM format previously...
I also tweaked all [ci skip] checks to suppress the errors linted in VSC.
Explain why it's good for the game
Hopefully less mapping conflicts in the scenario when a contributor is not using the hooks.
Testing Photographs and Procedure
See the commit history of me testing changes as well as images below...
Screenshots & Videos
Commiting a map w/o hooks (and various commits in between):
Fixup script:
And then again:
A new map in DMM format:
Changelog
🆑
code: dmm_test now checks if there are pending mapmerge2 conversions.
code: Improved dmm_test error handling
code: mapmerge2 now uses keys sequentially rather than randomly.
code: mapmerge2 fixup script now assigns upstream remote if needed, and checks/fixes pending mapmerge2 conversions.
/:cl: