Merge pull request #12362 from Byron/fix3

Fix absorb file count by deduplicating it

Author: Byron

crates/but/src/command/legacy/absorb.rs

@@ -10,6 +10,7 @@ use gitbutler_oplog::{
     OplogExt,
     entry::{OperationKind, SnapshotDetails},
 };
+use itertools::Itertools;
 
 use crate::{CliId, IdMap, command::legacy::rub::parse_sources, id::UncommittedCliId, utils::OutputChannel};
 /// Amends changes into the appropriate commits where they belong.
@@ -188,7 +189,11 @@ fn display_absorption_plan(
     write_json: bool,
 ) -> anyhow::Result<Option<JsonAbsorbOutput>> {
     // Count total files
-    let total_files: usize = commit_absorptions.iter().map(|c| c.files.len()).sum();
+    let total_files: usize = commit_absorptions
+        .iter()
+        .flat_map(|c| c.files.iter().map(|f| &f.path))
+        .unique()
+        .count();
 
     // Handle empty case
     if commit_absorptions.is_empty() || total_files == 0 {

crates/but/tests/but/command/absorb.rs

@@ -34,7 +34,7 @@ fn uncommitted_file() -> anyhow::Result<()> {
         .assert()
         .success()
         .stdout_eq(snapbox::str![[r#"
-Found 2 changed files to absorb:
+Found 1 changed file to absorb:
 
 Absorbed to commit: f4ea7f8 a.txt
   (files locked to commit due to hunk range overlap)
@@ -309,7 +309,7 @@ Hint: run `but diff` to see uncommitted changes and `but stage <file>` to stage
         .assert()
         .success()
         .stdout_eq(snapbox::str![[r#"
-Found 2 changed files to absorb:
+Found 1 changed file to absorb:
 
 Absorbed to commit: 889385c partial change to a.txt 2
   (files locked to commit due to hunk range overlap)
@@ -403,7 +403,7 @@ fn uncommitted_file_new() -> anyhow::Result<()> {
         .assert()
         .success()
         .stdout_eq(snapbox::str![[r#"
-Found 2 changed files to absorb:
+Found 1 changed file to absorb:
 
 Created on top of commit: f4ea7f8 a.txt
   (files locked to commit due to hunk range overlap)
@@ -624,7 +624,7 @@ fn dry_run_new_shows_plan_without_changes() -> anyhow::Result<()> {
         .assert()
         .success()
         .stdout_eq(snapbox::str![[r#"
-Found 2 changed files to absorb:
+Found 1 changed file to absorb:
 
 Created on top of commit: f4ea7f8 a.txt
   (files locked to commit due to hunk range overlap)
@@ -695,7 +695,7 @@ fn dry_run_shows_plan_without_changes() -> anyhow::Result<()> {
         .assert()
         .success()
         .stdout_eq(snapbox::str![[r#"
-Found 2 changed files to absorb:
+Found 1 changed file to absorb:
 
 Absorbed to commit: f4ea7f8 a.txt
   (files locked to commit due to hunk range overlap)