Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: do not write() to channel if builtin pager has terminated #4209

Merged
merged 1 commit into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* Windows binaries no longer require `vcruntime140.dll` to be installed
(normally through Visual Studio.)

* On quit, the builtin pager no longer waits for all outputs to be discarded.

* `jj branch rename` no longer shows a warning in colocated repos.

## [0.19.0] - 2024-07-03
Expand Down
5 changes: 5 additions & 0 deletions cli/src/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ impl Write for &BuiltinPager {
}

fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
// Since minus::Pager holds the rx end internally, push_str() doesn't
yuja marked this conversation as resolved.
Show resolved Hide resolved
// fail even after the paging thread gets terminated.
if self.dynamic_pager_thread.is_finished() {
yuja marked this conversation as resolved.
Show resolved Hide resolved
return Err(io::ErrorKind::BrokenPipe.into());
}
let string = std::str::from_utf8(buf).map_err(io::Error::other)?;
self.pager.push_str(string).map_err(io::Error::other)?;
Ok(buf.len())
Expand Down