diff rust/hg-core/src/dirstate_tree/on_disk.rs @ 49156:09984dc70352 stable

rust-dirstate-v2: fix the unused bytes counter when rewriting the dirstate

As per the previous patch, the counter was incorrectly carried over from the
old docket when it should be reset for a complete rewrite.

Differential Revision: https://phab.mercurial-scm.org/D12594

--- a/rust/hg-core/src/dirstate_tree/on_disk.rs	Thu Apr 28 17:11:51 2022 +0200
+++ b/rust/hg-core/src/dirstate_tree/on_disk.rs	Thu Apr 28 17:15:35 2022 +0200
@@ -622,13 +622,18 @@
 
     let root_nodes = writer.write_nodes(dirstate_map.root.as_ref())?;
 
+    let unreachable_bytes = if append {
+        dirstate_map.unreachable_bytes
+    } else {
+        0
+    };
     let meta = TreeMetadata {
         root_nodes,
         nodes_with_entry_count: dirstate_map.nodes_with_entry_count.into(),
         nodes_with_copy_source_count: dirstate_map
             .nodes_with_copy_source_count
             .into(),
-        unreachable_bytes: dirstate_map.unreachable_bytes.into(),
+        unreachable_bytes: unreachable_bytes.into(),
         unused: [0; 4],
         ignore_patterns_hash: dirstate_map.ignore_patterns_hash,
     };