diff: add "diff" label globally by outer show_diff/patch() functions

It's not so important, but this removes duplicated "diff" labels from template
output. Perhaps, this also fixes "diff access-denied" label in file-by-file
external diffs.

The inner show_*() functions no longer add "diff" labels, but that's okay
because all CLI callers (except for the templater) use DiffRenderer.

cli/src/diff_util.rs

@@ -246,6 +246,20 @@ impl<'a> DiffRenderer<'a> {
         to_tree: &MergedTree,
         matcher: &dyn Matcher,
         width: usize,
+    ) -> Result<(), DiffRenderError> {
+        formatter.with_label("diff", |formatter| {
+            self.show_diff_inner(ui, formatter, from_tree, to_tree, matcher, width)
+        })
+    }
+
+    fn show_diff_inner(
+        &self,
+        ui: &Ui,
+        formatter: &mut dyn Formatter,
+        from_tree: &MergedTree,
+        to_tree: &MergedTree,
+        matcher: &dyn Matcher,
+        width: usize,
     ) -> Result<(), DiffRenderError> {
         let store = self.repo.store();
         let path_converter = self.path_converter;
@@ -533,7 +547,6 @@ pub fn show_color_words_diff(
     path_converter: &RepoPathUiConverter,
     num_context_lines: usize,
 ) -> Result<(), DiffRenderError> {
-    formatter.push_label("diff")?;
     let mut diff_stream = materialized_diff_stream(store, tree_diff);
     async {
         while let Some((path, diff)) = diff_stream.next().await {
@@ -653,11 +666,9 @@ pub fn show_color_words_diff(
                 }
             }
         }
-        Ok::<(), DiffRenderError>(())
-    }
-    .block_on()?;
-    formatter.pop_label()?;
         Ok(())
+    }
+    .block_on()
 }
 
 pub fn show_file_by_file_diff(
@@ -1001,8 +1012,6 @@ pub fn show_git_diff(
     tree_diff: TreeDiffStream,
     num_context_lines: usize,
 ) -> Result<(), DiffRenderError> {
-    formatter.push_label("diff")?;
-
     let mut diff_stream = materialized_diff_stream(store, tree_diff);
     async {
         while let Some((path, diff)) = diff_stream.next().await {
@@ -1071,11 +1080,9 @@ pub fn show_git_diff(
                 )?;
             }
         }
-        Ok::<(), DiffRenderError>(())
-    }
-    .block_on()?;
-    formatter.pop_label()?;
         Ok(())
+    }
+    .block_on()
 }
 
 #[instrument(skip_all)]
@@ -1084,7 +1091,6 @@ pub fn show_diff_summary(
     mut tree_diff: TreeDiffStream,
     path_converter: &RepoPathUiConverter,
 ) -> io::Result<()> {
-    formatter.with_label("diff", |formatter| -> io::Result<()> {
     async {
         while let Some((repo_path, diff)) = tree_diff.next().await {
             let (before, after) = diff.unwrap();
@@ -1101,7 +1107,6 @@ pub fn show_diff_summary(
         Ok(())
     }
     .block_on()
-    })
 }
 
 struct DiffStat {
@@ -1178,7 +1183,6 @@ pub fn show_diff_stat(
         max_bar_length as f64 / max_diffs as f64
     };
 
-    formatter.with_label("diff", |formatter| {
     let mut total_added = 0;
     let mut total_removed = 0;
     let total_files = stats.len();
@@ -1210,8 +1214,6 @@ pub fn show_diff_stat(
         total_removed,
         if total_removed == 1 { "" } else { "s" },
     )?;
-        io::Result::Ok(())
-    })?;
     Ok(())
 }
 
@@ -1220,7 +1222,6 @@ pub fn show_types(
     mut tree_diff: TreeDiffStream,
     path_converter: &RepoPathUiConverter,
 ) -> io::Result<()> {
-    formatter.with_label("diff", |formatter| {
     async {
         while let Some((repo_path, diff)) = tree_diff.next().await {
             let (before, after) = diff.unwrap();
@@ -1235,7 +1236,6 @@ pub fn show_types(
         Ok(())
     }
     .block_on()
-    })
 }
 
 fn diff_summary_char(value: &MergedTreeValue) -> char {

cli/tests/test_commit_template.rs

@@ -1015,37 +1015,37 @@ fn test_log_diff_predefined_formats() {
     );
     insta::assert_snapshot!(stdout, @r###"
     <<log::=== color_words ===>>
-    <<log diff color_words diff header::Modified regular file file1:>>
+    <<log diff color_words header::Modified regular file file1:>>
-    <<log diff color_words diff removed line_number::   1>><<log diff color_words diff:: >><<log diff color_words diff added line_number::   1>><<log diff color_words diff::: a>>
+    <<log diff color_words removed line_number::   1>><<log diff color_words:: >><<log diff color_words added line_number::   1>><<log diff color_words::: a>>
-    <<log diff color_words diff removed line_number::   2>><<log diff color_words diff:: >><<log diff color_words diff added line_number::   2>><<log diff color_words diff::: b>>
+    <<log diff color_words removed line_number::   2>><<log diff color_words:: >><<log diff color_words added line_number::   2>><<log diff color_words::: b>>
-    <<log diff color_words diff::     >><<log diff color_words diff added line_number::   3>><<log diff color_words diff::: >><<log diff color_words diff added token::c>>
+    <<log diff color_words::     >><<log diff color_words added line_number::   3>><<log diff color_words::: >><<log diff color_words added token::c>>
-    <<log diff color_words diff header::Modified regular file file2:>>
+    <<log diff color_words header::Modified regular file file2:>>
-    <<log diff color_words diff removed line_number::   1>><<log diff color_words diff:: >><<log diff color_words diff added line_number::   1>><<log diff color_words diff::: >><<log diff color_words diff removed token::a>><<log diff color_words diff added token::b>><<log diff color_words diff::>>
+    <<log diff color_words removed line_number::   1>><<log diff color_words:: >><<log diff color_words added line_number::   1>><<log diff color_words::: >><<log diff color_words removed token::a>><<log diff color_words added token::b>><<log diff color_words::>>
-    <<log diff color_words diff::     >><<log diff color_words diff added line_number::   2>><<log diff color_words diff::: >><<log diff color_words diff added token::c>>
+    <<log diff color_words::     >><<log diff color_words added line_number::   2>><<log diff color_words::: >><<log diff color_words added token::c>>
     <<log::=== git ===>>
-    <<log diff git diff file_header::diff --git a/file1 b/file1>>
+    <<log diff git file_header::diff --git a/file1 b/file1>>
-    <<log diff git diff file_header::index 422c2b7ab3..de980441c3 100644>>
+    <<log diff git file_header::index 422c2b7ab3..de980441c3 100644>>
-    <<log diff git diff file_header::--- a/file1>>
+    <<log diff git file_header::--- a/file1>>
-    <<log diff git diff file_header::+++ b/file1>>
+    <<log diff git file_header::+++ b/file1>>
-    <<log diff git diff hunk_header::@@ -1,2 +1,3 @@>>
+    <<log diff git hunk_header::@@ -1,2 +1,3 @@>>
-    <<log diff git diff context:: a>>
+    <<log diff git context:: a>>
-    <<log diff git diff context:: b>>
+    <<log diff git context:: b>>
-    <<log diff git diff added::+>><<log diff git diff added token::c>>
+    <<log diff git added::+>><<log diff git added token::c>>
-    <<log diff git diff file_header::diff --git a/file2 b/file2>>
+    <<log diff git file_header::diff --git a/file2 b/file2>>
-    <<log diff git diff file_header::index 7898192261..9ddeb5c484 100644>>
+    <<log diff git file_header::index 7898192261..9ddeb5c484 100644>>
-    <<log diff git diff file_header::--- a/file2>>
+    <<log diff git file_header::--- a/file2>>
-    <<log diff git diff file_header::+++ b/file2>>
+    <<log diff git file_header::+++ b/file2>>
-    <<log diff git diff hunk_header::@@ -1,1 +1,2 @@>>
+    <<log diff git hunk_header::@@ -1,1 +1,2 @@>>
-    <<log diff git diff removed::->><<log diff git diff removed token::a>><<log diff git diff removed::>>
+    <<log diff git removed::->><<log diff git removed token::a>><<log diff git removed::>>
-    <<log diff git diff added::+>><<log diff git diff added token::b>><<log diff git diff added::>>
+    <<log diff git added::+>><<log diff git added token::b>><<log diff git added::>>
-    <<log diff git diff added::+>><<log diff git diff added token::c>>
+    <<log diff git added::+>><<log diff git added token::c>>
     <<log::=== stat ===>>
-    <<log diff stat diff::file1 | 1 >><<log diff stat diff added::+>><<log diff stat diff removed::>>
+    <<log diff stat::file1 | 1 >><<log diff stat added::+>><<log diff stat removed::>>
-    <<log diff stat diff::file2 | 3 >><<log diff stat diff added::++>><<log diff stat diff removed::->>
+    <<log diff stat::file2 | 3 >><<log diff stat added::++>><<log diff stat removed::->>
-    <<log diff stat diff stat-summary::2 files changed, 3 insertions(+), 1 deletion(-)>>
+    <<log diff stat stat-summary::2 files changed, 3 insertions(+), 1 deletion(-)>>
     <<log::=== summary ===>>
-    <<log diff summary diff modified::M file1>>
+    <<log diff summary modified::M file1>>
-    <<log diff summary diff modified::M file2>>
+    <<log diff summary modified::M file2>>
     "###);
 
     // cwd != workspace root