jj config list: escape keys
#3725
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
Fixes jj-vcs#1322. There may be more places where keys need escaping, I'm not completely sure.
|
Copying from Discord, the values are currently escaped in https://github.com/martinvonz/jj/blob/1f7c4ec60ab4c430ea46c141d8f46f144cfbec18/cli/src/cli_util.rs#L2132-L2150. I'm not sure at the moment whether that's 100% correct or whether it should also use |
martinvonz
approved these changes
May 21, 2024
Cretezy
approved these changes
May 21, 2024
|
There's also the pathological case of a value like But, I guess, we can indeed leave it for later. |
ilyagr
added a commit
to ilyagr/jj
that referenced
this pull request
May 21, 2024
ilyagr
added a commit
to ilyagr/jj
that referenced
this pull request
May 21, 2024
ilyagr
added a commit
to ilyagr/jj
that referenced
this pull request
May 21, 2024
Follows up on jj-vcs#3725 Apart from the bugfix, this also makes `jj config list` output ``` template-aliases.builtin_log_node=""" coalesce( if(!self, label(\"elided\", \"~\")), label( separate(\" \", if(current_working_copy, \"working_copy\"), if(immutable, \"immutable\"), if(conflict, \"conflict\"), ), coalesce( if(current_working_copy, \"@\"), if(immutable, \"◆\"), if(conflict, \"×\"), \"○\", ) ) ) """ ``` instead of ``` template-aliases.builtin_log_node="coalesce(\n if(!self, label(\"elided\", \"~\")),\n label(\n separate(\" \",\n if(current_working_copy, \"working_copy\"),\n if(immutable, \"immutable\"),\n if(conflict, \"conflict\"),\n ),\n coalesce(\n if(current_working_copy, \"@\"),\n if(immutable, \"◆\"),\n if(conflict, \"×\"),\n \"○\",\n )\n )\n)\n" ```. `toml_edit` also seems to use single-quoted strings sometimes.
ilyagr
added a commit
to ilyagr/jj
that referenced
this pull request
May 21, 2024
Follows up on jj-vcs#3725 Apart from the bugfix, this also makes `jj config list` output ``` template-aliases.builtin_log_node=""" coalesce( if(!self, label(\"elided\", \"~\")), label( separate(\" \", if(current_working_copy, \"working_copy\"), if(immutable, \"immutable\"), if(conflict, \"conflict\"), ), coalesce( if(current_working_copy, \"@\"), if(immutable, \"◆\"), if(conflict, \"×\"), \"○\", ) ) ) """ ``` instead of ``` template-aliases.builtin_log_node="coalesce(\n if(!self, label(\"elided\", \"~\")),\n label(\n separate(\" \",\n if(current_working_copy, \"working_copy\"),\n if(immutable, \"immutable\"),\n if(conflict, \"conflict\"),\n ),\n coalesce(\n if(current_working_copy, \"@\"),\n if(immutable, \"◆\"),\n if(conflict, \"×\"),\n \"○\",\n )\n )\n)\n" ```. `toml_edit` also seems to use single-quoted strings sometimes.
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 #1322. There may be more places where keys need escaping, I'm not completely sure.
Checklist
If applicable:
CHANGELOG.md