ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli/src
Yuya Nishihara 529acb3d16 merge_tools: process "ui.diff-instructions" option by caller
This gets rid of the last UserSettings dependency from edit_diff_external().
I'm going to remove it from edit_diff() too, and let callers pass a
preconfigured MergeTool struct instead.

These changes will make it easier to add --tool=<name> argument #2575.
2024-03-02 10:31:27 +09:00
..
commands merge_tools: take diff editor instruction as Option<&str> 2024-03-02 10:31:27 +09:00
config cli: change workspace@ symbol color to green (the color of HEAD@git) 2024-02-16 11:12:43 +09:00
merge_tools merge_tools: process "ui.diff-instructions" option by caller 2024-03-02 10:31:27 +09:00
cleanup_guard.rs
cli_util.rs merge_tools: process "ui.diff-instructions" option by caller 2024-03-02 10:31:27 +09:00
commit_templater.rs commit_templater: support extensions of the template language 2024-03-01 10:42:51 -05:00
config-schema.json cli: change default log revset to not include all tagged heads 2024-02-23 00:25:58 +09:00
config.rs cli: show executable name in error message, include underlying error details 2023-11-23 10:05:45 +09:00
description_util.rs cli_util: improve API for editing text in a tempfile 2024-01-23 23:49:35 -08:00
diff_util.rs cli: don't ignore 'diff --tool=:builtin', report error 2024-03-01 08:51:06 +09:00
formatter.rs formatter: reset colors on early drop 2023-11-01 21:41:25 -07:00
git_util.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
graphlog.rs graphlog: refactor graphlog::Edge enum and its usage 2024-02-17 20:54:20 +05:00
lib.rs cli: move some git utilities to new crate::git_utils 2024-01-20 15:58:37 -06:00
main.rs
operation_templater.rs templater: turn some integer overflow into evaluation error 2024-02-29 00:39:31 +09:00
progress.rs
template.pest templater: parse negative integer as unary operator and literal 2024-02-10 09:15:21 +09:00
template_builder.rs template_builder: support extending the core template build fn table 2024-03-01 10:42:51 -05:00
template_parser.rs templater: expand similarity hint with aliases 2024-02-28 09:03:04 +09:00
templater.rs templater: propagate <out-of-range date> as an error 2024-02-29 01:30:43 +09:00
text_util.rs formatter: reset colors on early drop 2023-11-01 21:41:25 -07:00
time_util.rs templater: propagate <out-of-range date> as an error 2024-02-29 01:30:43 +09:00
ui.rs Use minus as a builtin pager 2024-02-12 18:55:15 -05:00