cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-07 00:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,562 Commits 144 Branches 35 Tags
Commit Graph

10 Commits

Author SHA1 Message Date
Martin von Zweigbergk
ea5a208ca5 cli: make *Args::tool fields non-public, except for DiffFormatArgs 
Probably just a bad copy&paste.
 2024-03-10 20:37:44 -07:00
Yuya Nishihara
7ce25f8408 cli: add --tool=<name> option to diff/merge editing commands 
I didn't add e2e tests to all commands, but the added tests should cover
diff_editor/diff_selector/merge_editor() calls.

Closes #2575
 2024-03-04 01:33:43 +09:00
Yuya Nishihara
97024e5be4 cli: extract CommandError and helper functions to new module 
The cli_util module is big enough to slow down Emacs, so let's split it up.
This change is an easy one.
 2024-03-03 01:11:46 +09:00
Yuya Nishihara
5cc89dde57 merge_tools: capture base_ignores and "ui.diff-instructions" by DiffEditor 
For the same reason as the previous commit. The editor has nothing to be done
with the transaction.
 2024-03-02 23:33:45 +09:00
Yuya Nishihara
003b40d276 merge_tools: load diff/merge editor settings by caller 
This moves the config loading closer to CLI args where --tool=<name> option
will be processed. The factory function are proxied through the command helper
so that the base_ignores can be attached there later.
 2024-03-02 10:31:27 +09:00
Yuya Nishihara
fbabd0c9a7 merge_tools: take diff editor instruction as Option<&str> 
This clarifies that the instructions text can be omitted. All callers appear to
pass non-empty instructions, though.
 2024-03-02 10:31:27 +09:00
Yuya Nishihara
c73a092759 cli: drop handling of legacy revset dag range operator 
This basically reverts the change c183b94aeffc "cli: warn when using `:` revset
operator."
 2024-02-14 10:04:56 +09:00
Yuya Nishihara
fa5e40719c object_id: extract ObjectId trait and macros to separate module 
I'm going to add a prefix resolution method to OpStore, but OpStore is
unrelated to the index. I think ObjectId, HexPrefix, and PrefixResolution can
be extracted to this module.
 2024-01-05 10:20:57 +09:00
Martin von Zweigbergk
60fae3114e transaction: take description at end instead of start 
It seems better to have the caller pass the transaction description
when we finish the transaction than when we start it. That way we have
all the information we want to include more readily available.
 2023-12-13 08:12:49 -08:00
Antoine Cezar
e4a1af1dda commands: move diffedit code to diffedit.rs 2023-10-28 15:59:08 +02:00