Skip to content
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: 1 addition & 1 deletion src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ pub(crate) fn draw_with_controls(
app.horizontal = app.horizontal.min(horizontal_limit(app)?);
}
let layout = if app.split() { "SPLIT" } else { "UNIFIED" };
let title = format!(" native-diff / {}", app.label);
let title = format!(" diffs / {}", app.label);
let right = format!(
"{} files · {layout} · {} ",
app.doc.files.len(),
Expand Down
7 changes: 2 additions & 5 deletions src/render/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,12 @@ fn header_label_keeps_a_gap_before_the_file_count() {
let title = header.strip_suffix(&right).unwrap();
assert!(title.ends_with(" "), "width {width}: {header:?}");
assert!(title.trim_end().ends_with('…'), "width {width}: {header:?}");
assert!(title.starts_with(" native-d"), "width {width}: {header:?}");
assert!(title.starts_with(" diffs"), "width {width}: {header:?}");
}
// A short label stays complete.
let mut app = review(&rename(1), "review.patch");
let header = draw(&mut app, 80, 24, None).remove(0);
assert!(
header.starts_with(" native-diff / review.patch "),
"{header:?}"
);
assert!(header.starts_with(" diffs / review.patch "), "{header:?}");
assert!(!header.contains('…'), "{header:?}");
}

Expand Down
2 changes: 1 addition & 1 deletion tools/freeze_trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def chrome(grid, label, count):
width = grid["width"]
title = [" "] * width
right = f"{count} files · {'SPLIT' if grid['split'] else 'UNIFIED'} · dark "
put(title, 0, f" native-diff / {label}", width - len(right))
put(title, 0, f" diffs / {label}", width - len(right))
put(title, width - len(right), right, len(right))
hint = " u layout w wrap t theme ? help q quit "
footers = []
Expand Down
2 changes: 1 addition & 1 deletion tools/owner_census.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ def controls(binary, ordinary, trace, out):
startup = out / "startup"
with process(binary, trace, startup) as (session, report):
deadline = time.monotonic() + 120
while not session.frames.screen.display[0].lstrip().startswith("native-diff"):
while not session.frames.screen.display[0].lstrip().startswith(("diffs", "native-diff")):
packet = session.read(.01)
if packet:
list(session.frames.feed(packet[0]))
Expand Down
Loading