* Makes update paths remove keys left after merging. (#66916)
Fixes#66914
* Makes update paths remove keys left after merging.
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
* Adds support for simple subtype repathing for UpdatePaths scripts (#66469)
* Adds support for simple subtype repathing for UpdatePaths scripts
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
* UpdatePaths: Handle lists containing strings (#62595)
* UpdatePaths: Handle lists containing strings
The split_re regex considers two alternatives when splitting out property
values.
The first alternative, "(?:.+?)" looks for a value that starts and
ends with a double quote, containing any characters between, but using
the smallest length possible.
The second alternative, [^";]* looks for a value that does not contain
any double quotes or semicolons.
Neither of these cases will handle a value such as network = list("fsc");
To handle this case without a major rewrite, the second alternative is
updated to [^"][^;]+ which looks for a value that does not start with a
double quote and does not contain a semicolon.
* UpdatePaths Support @ OLD;... too
This strips the trailing semicolon, if present, which it will be if
you're overriding an old value after specifying @ OLD.
* UpdatePaths: Handle single char case
Whoops
* UpdatePaths: Handle lists containing strings
Co-authored-by: esainane <esainane+github@gmail.com>
* repaths plasteel tiles to iron
* Update robot_modules.dm
* a
* fuck me
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* Use portable Python for map merge hooks, other tools (#55658)
* Add .dmm merge driver (#55699)
This is kind of a prototype. It only fully handles a few situations,
and doesn't produce particularly easy-to-read conflict markers when it
fails. I hope that it can be useful at least some of the time, can be
improved over time, and that the lessons learned can influence a future
interactive GUI conflict resolver (integrated into StrongDMM?). In the
worst case, one can fall back to the tried and true "manually re-do one
side's changes" strategy.
**Automatic use**: In `tools/hooks/`, run `Install.bat`
**Manual use**, for Git GUIs that don't run merge drivers: while a
merge is in progress, in `tools/mapmerge2/`, double-click `Resolve Map
Conflicts.bat`
This PR also removes the error-prone "Prepare Maps.bat" /
"mapmerge.bat" workflow. Those who aren't using the hooks should
instead use `Run Before Committing.bat` before committing. First-time
contributors who opened a PR without map merging can be advised to run
`I Forgot To Map Merge.bat`.
* Fix loose double-quot in tradership_faction.dmm
Co-authored-by: Tad Hardesty <tad@platymuus.com>
