ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/src
Martin von Zweigbergk 82883e648d conflicts: move describe_conflict() etc. onto Conflict
Before we had `conflicts::Conflict`, most of these functions took a
`backend::Conflict`. I think I didn't want to pollute the `backend`
module with this kind of logic, trying to keep it focused on
storage. Now that we have the type in `conflicts`, however, I think it
makes sense to move these functions onto it.
2023-06-19 07:05:02 +02:00
..
commands conflicts: move describe_conflict() etc. onto Conflict 2023-06-19 07:05:02 +02:00
config templates: rename "show" template alias to "builtin_log_detailed" 2023-04-22 14:37:39 +09:00
cleanup_guard.rs fix windows warnings in src/cleanup_guard.rs 2023-04-30 15:18:30 +09:00
cli_util.rs feat(revset): suggest similar branch names 2023-06-05 11:11:17 -05:00
commit_templater.rs id_prefix: remove repo field from IdPrefixContext 2023-05-11 23:41:24 -07:00
config-schema.json cli: allow resolving shorter ids within a configured revset 2023-05-11 23:41:24 -07:00
config.rs cli: load revset/template aliases in order of config layers 2023-05-23 14:20:55 +09:00
diff_util.rs conflicts: move describe_conflict() etc. onto Conflict 2023-06-19 07:05:02 +02:00
formatter.rs formatter: allow using "default" terminal color 2023-04-09 22:56:33 -07:00
graphlog.rs Switch graph node to use for commit instead of 2023-04-02 23:15:37 -07:00
lib.rs
main.rs cli: move $JJ_VERSION out of CLI library 2023-04-20 19:22:47 -07:00
merge_tools.rs conflicts: move describe_conflict() etc. onto Conflict 2023-06-19 07:05:02 +02:00
operation_templater.rs templater: add support for unformattable property 2023-03-24 12:17:38 +09:00
progress.rs ui: create separate io wrapper for progress output 2023-06-13 21:50:01 +09:00
template.pest
template_builder.rs templater: implement list methods for unformattable property 2023-03-24 12:17:38 +09:00
template_parser.rs templater: add list.map(|x| ...) operation 2023-03-18 12:04:00 +09:00
templater.rs templater: add trait that represents a mapped template 2023-03-18 12:04:00 +09:00
text_util.rs
time_util.rs
ui.rs ui: send progress output to stderr 2023-06-13 21:50:01 +09:00