The inline conflicted-file listing over however the caller obtained the entries (the local repository read, or the wire's conflict listing) — one render, byte-identical by construction.
(entries: &[ConflictSummaryEntry])
| 788 | /// the entries (the local repository read, or the wire's conflict |
| 789 | /// listing) — one render, byte-identical by construction. |
| 790 | pub(crate) fn print_conflict_summary_entries(entries: &[ConflictSummaryEntry]) { |
| 791 | if entries.is_empty() { |
| 792 | return; |
| 793 | } |
| 794 | println!(); |
| 795 | let file_word = if entries.len() == 1 { "file" } else { "files" }; |
| 796 | output::print_warning(&format!( |
| 797 | "{} conflicted {} — resolve markers, then record:", |
| 798 | entries.len(), |
| 799 | file_word |
| 800 | )); |
| 801 | for entry in entries { |
| 802 | let where_ = entry |
| 803 | .line |
| 804 | .map(|l| format!(" (line {})", l)) |
| 805 | .unwrap_or_default(); |
| 806 | println!(" {}{}", entry.path, where_); |
| 807 | } |
| 808 | output::print_hint("See 'atomic conflicts' for details."); |
| 809 | } |
| 810 | |
| 811 | /// Print the outcome of a cross-view insert operation. |
| 812 | pub(crate) fn print_cross_view_outcome(outcome: &CrossViewInsertOutcome, dry_run: bool) { |
no test coverage detected