mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-20 03:20:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: inline labeling of trackable remote branches hints

Browse source 
This makes it clear that these hints are printed only if status output is
enabled.
This commit is contained in:
Yuya Nishihara 2024-06-17 12:46:17 +09:00
parent b9e29b009d
commit 1ab0c91e51
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/src/cli_util.rs
View file

@ -1993,21 +1993,17 @@ pub fn print_trackable_remote_branches(ui: &Ui, view: &View) -> io::Result<()> {
return Ok(()); return Ok(());
} }
if let Some(mut writer) = ui.hint_default() { if let Some(mut formatter) = ui.status_formatter() {
writeln!( writeln!(
writer, formatter.labeled("hint").with_heading("Hint: "),
"The following remote branches aren't associated with the existing local branches:" "The following remote branches aren't associated with the existing local branches:"
)?; )?;
}
if let Some(mut formatter) = ui.status_formatter() {
for full_name in &remote_branch_names { for full_name in &remote_branch_names {
write!(formatter, " ")?; write!(formatter, " ")?;
writeln!(formatter.labeled("branch"), "{full_name}")?; writeln!(formatter.labeled("branch"), "{full_name}")?;
} }
}
if let Some(mut writer) = ui.hint_default() {
writeln!( writeln!(
writer, formatter.labeled("hint").with_heading("Hint: "),
"Run `jj branch track {names}` to keep local branches updated on future pulls.", "Run `jj branch track {names}` to keep local branches updated on future pulls.",
names = remote_branch_names.join(" "), names = remote_branch_names.join(" "),
)?; )?;