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

git-push: skip print-changes loop if --quiet

Browse source
This commit is contained in:
Yuya Nishihara 2024-09-14 11:41:44 +09:00
parent 42f7908b8d
commit 2f78c25d35
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cli/src/commands/git/push.rs
View file

@ -48,6 +48,7 @@ use crate::command_error::user_error_with_hint;
use crate::command_error::CommandError; use crate::command_error::CommandError;
use crate::commands::git::get_single_remote; use crate::commands::git::get_single_remote;
use crate::commands::git::map_git_error; use crate::commands::git::map_git_error;
use crate::formatter::Formatter;
use crate::git_util::get_git_repo; use crate::git_util::get_git_repo;
use crate::git_util::with_remote_git_callbacks; use crate::git_util::with_remote_git_callbacks;
use crate::git_util::GitSidebandProgressMessageWriter; use crate::git_util::GitSidebandProgressMessageWriter;
@ -265,9 +266,10 @@ pub fn cmd_git_push(
} }
validate_commits_ready_to_push(&bookmark_updates, &remote, &tx, command, args)?; validate_commits_ready_to_push(&bookmark_updates, &remote, &tx, command, args)?;
if let Some(mut formatter) = ui.status_formatter() {
writeln!(ui.status(), "Bookmark changes to push to {}:", &remote)?; writeln!(formatter, "Bookmark changes to push to {remote}:")?;
print_commits_ready_to_push(ui, repo.as_ref(), &bookmark_updates)?; print_commits_ready_to_push(formatter.as_mut(), repo.as_ref(), &bookmark_updates)?;
}
if args.dry_run { if args.dry_run {
writeln!(ui.status(), "Dry-run requested, not pushing.")?; writeln!(ui.status(), "Dry-run requested, not pushing.")?;
@ -378,7 +380,7 @@ fn validate_commits_ready_to_push(
} }
fn print_commits_ready_to_push( fn print_commits_ready_to_push(
ui: &Ui, formatter: &mut dyn Formatter,
repo: &dyn Repo, repo: &dyn Repo,
bookmark_updates: &[(String, BookmarkPushUpdate)], bookmark_updates: &[(String, BookmarkPushUpdate)],
) -> io::Result<()> { ) -> io::Result<()> {
@ -426,18 +428,18 @@ fn print_commits_ready_to_push(
format!("Move sideways bookmark {bookmark_name} from {old} to {new}") format!("Move sideways bookmark {bookmark_name} from {old} to {new}")
} }
}; };
writeln!(ui.status(), " {msg}")?; writeln!(formatter, " {msg}")?;
} }
(Some(old_target), None) => { (Some(old_target), None) => {
writeln!( writeln!(
ui.status(), formatter,
" Delete bookmark {bookmark_name} from {}", " Delete bookmark {bookmark_name} from {}",
short_commit_hash(old_target) short_commit_hash(old_target)
)?; )?;
} }
(None, Some(new_target)) => { (None, Some(new_target)) => {
writeln!( writeln!(
ui.status(), formatter,
" Add bookmark {bookmark_name} to {}", " Add bookmark {bookmark_name} to {}",
short_commit_hash(new_target) short_commit_hash(new_target)
)?; )?;