mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

diff_util: pass term_width() in to show_diff_stat() by argument

Browse source 
This patch removes ui dependency from show_diff_stat().
This commit is contained in:
Yuya Nishihara 2024-05-11 17:58:17 +09:00
parent f614c96383
commit 6e7c9f15fd
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cli/src/diff_util.rs
View file

@ -217,7 +217,9 @@ pub fn show_diff(
}
DiffFormat::Stat => {
let tree_diff = from_tree.diff_stream(to_tree, matcher);
show_diff_stat(ui, formatter, workspace_command, tree_diff)?;
// TODO: In graph log, graph width should be subtracted
let width = usize::from(ui.term_width().unwrap_or(80));
show_diff_stat(formatter, workspace_command, tree_diff, width)?;
}
DiffFormat::Types => {
let tree_diff = from_tree.diff_stream(to_tree, matcher);
@ -939,10 +941,10 @@ fn get_diff_stat(
}
pub fn show_diff_stat(
ui: &Ui,
formatter: &mut dyn Formatter,
workspace_command: &WorkspaceCommandHelper,
tree_diff: TreeDiffStream,
display_width: usize,
) -> Result<(), DiffRenderError> {
let mut stats: Vec<DiffStat> = vec![];
let mut max_path_width = 0;
@ -966,8 +968,7 @@ pub fn show_diff_stat(
let number_padding = max_diffs.to_string().len();
// 4 characters padding for the graph
let available_width =
usize::from(ui.term_width().unwrap_or(80)).saturating_sub(4 + " | ".len() + number_padding);
let available_width = display_width.saturating_sub(4 + " | ".len() + number_padding);
// Always give at least a tiny bit of room
let available_width = max(available_width, 5);
let max_path_width = max_path_width.clamp(3, (0.7 * available_width as f64) as usize);