4 Commits

Author	SHA1	Message	Date
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
Martin von Zweigbergk	9b24d24612	conflicts: add another helper for materializing a tree value ... We have a few places where we have a `MergedTreeValue` and need to read the data associated with it so we can write to the working copy or include it in a diff. Let's extract some of that shared logic to a function so we can reuse it. I plan to use it for reading file contents in advance while streaming a diff in `local_working_copy` soon (and probably in `jj diff` thereafter), but I think it seems like an improvement on its own.	2023-11-08 21:21:38 -08:00
Martin von Zweigbergk	24b706641f	async: switch to pollster's block_on() ... During the transition to using more async code, I keep running into https://github.com/rust-lang/futures-rs/issues/2090. Right now, I want to convert `MergedTree::diff()` into a `Stream`. I don't want to update all call sites at once, so instead I'm adding a `MergedTree::diff_stream()` method, which just wraps `MergedTree::diff()` in a `Stream. However, since the iterator is synchronous, it needs to block on the async `Backend::read_tree()` calls. If we then also block on the `Stream` in the CLI, we run into the panic.	2023-11-03 08:15:10 -07:00
Antoine Cezar	e19ac4e385	commands: move cat code to cat.rs	2023-10-28 15:59:08 +02:00