mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Rename print_conflicted_{files=>paths}

Browse source
This commit is contained in:
Ilya Grigoriev 2023-01-04 23:51:28 -08:00
parent 6a6724fd87
commit 1f39ffce01
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/commands.rs
View file

@ -2397,7 +2397,7 @@ fn cmd_resolve(
))); )));
} }
if args.list { if args.list {
return print_conflicted_files( return print_conflicted_paths(
&conflicts, &conflicts,
ui.stdout_formatter().as_mut(), ui.stdout_formatter().as_mut(),
&workspace_command, &workspace_command,
@ -2423,7 +2423,7 @@ fn cmd_resolve(
let new_conflicts = new_tree.conflicts_matching(&EverythingMatcher); let new_conflicts = new_tree.conflicts_matching(&EverythingMatcher);
if !new_conflicts.is_empty() { if !new_conflicts.is_empty() {
ui.write("After this operation, some files at this revision still have conflicts:\n")?; ui.write("After this operation, some files at this revision still have conflicts:\n")?;
print_conflicted_files( print_conflicted_paths(
&new_conflicts, &new_conflicts,
ui.stdout_formatter().as_mut(), ui.stdout_formatter().as_mut(),
&workspace_command, &workspace_command,
@ -2433,7 +2433,7 @@ fn cmd_resolve(
Ok(()) Ok(())
} }
fn print_conflicted_files( fn print_conflicted_paths(
conflicts: &[(RepoPath, jujutsu_lib::backend::ConflictId)], conflicts: &[(RepoPath, jujutsu_lib::backend::ConflictId)],
formatter: &mut dyn Formatter, formatter: &mut dyn Formatter,
workspace_command: &WorkspaceCommandHelper, workspace_command: &WorkspaceCommandHelper,