Yuya Nishihara
00285be7a7
formatter: use write!() or writeln!() thoroughly, remove .write_str()
...
One less Formatter API.
2024-03-23 10:43:38 +09:00
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
fc4aa36a80
merge_tools: move run_mergetool() to MergeEditor::edit_file()
...
This makes sense because the editor doesn't interact 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
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
Stephen Jennings
57d5abab0c
cli: display which file's conflicts are being resolved
2024-01-23 08:59:43 -08: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
Yuya Nishihara
0a1bc2ba42
repo_path: add stub RepoPathBuf type, update callers
...
Most RepoPath::from_internal_string() callers will be migrated to the function
that returns &RepoPath, and cloning &RepoPath won't work.
2023-11-28 07:33:28 +09:00
Yuya Nishihara
d9fbf21794
merge: have Merge::adds()/removes() return iterator
...
The Merge type will be changed to store interleaved values internally.
2023-11-05 16:43:06 +09:00
Ilya Grigoriev
2571169251
clippy: run cargo clippy --fix --workspace with recent nightly
2023-10-29 20:19:44 -07:00
Ilya Grigoriev
887e5665d5
commands: move resolve code to resolve.rs
...
The print_conflicted_paths function could belong either
to `resolve.rs` or `status.rs`; I put it into the former for now.
Cc #2465 , #2457
2023-10-29 18:19:06 -07:00
