Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: inform the user of the command which disables the hint #3017

Merged
merged 1 commit into from
Feb 11, 2024

Conversation

benbrittain
Copy link
Member

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@benbrittain benbrittain requested a review from arxanas February 10, 2024 16:53
@benbrittain benbrittain force-pushed the disable-diff-editor-msg branch from 41b2e21 to f3b6ed2 Compare February 10, 2024 16:54
@benbrittain
Copy link
Member Author

This is in the same style as the ui.default-command message

@benbrittain benbrittain force-pushed the disable-diff-editor-msg branch from f3b6ed2 to 68c122e Compare February 10, 2024 16:58
@benbrittain benbrittain enabled auto-merge (rebase) February 10, 2024 16:59
cli/src/merge_tools/mod.rs Outdated Show resolved Hide resolved
cli/src/merge_tools/mod.rs Outdated Show resolved Hide resolved
@benbrittain benbrittain force-pushed the disable-diff-editor-msg branch 2 times, most recently from d573eec to db116a0 Compare February 10, 2024 19:44
cli/src/merge_tools/mod.rs Outdated Show resolved Hide resolved
@benbrittain benbrittain disabled auto-merge February 10, 2024 23:55
@benbrittain benbrittain force-pushed the disable-diff-editor-msg branch from db116a0 to 7591086 Compare February 10, 2024 23:57
@benbrittain benbrittain enabled auto-merge (rebase) February 10, 2024 23:57
@benbrittain benbrittain merged commit 416bde2 into jj-vcs:main Feb 11, 2024
15 checks passed
@@ -175,7 +175,8 @@ fn editor_args_from_settings(
let default_editor = BUILTIN_EDITOR_NAME;
writeln!(
ui.hint(),
"Using default editor '{default_editor}'; you can change this by setting {key}"
"Using default editor '{default_editor}'; run `jj config set --user {key} :builtin` \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The string should probably interpolate BUILTIN_EDITOR_NAME as well :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants