# HG changeset patch
# User Arseniy Alekseyev <aalekseyev@janestreet.com>
# Date 2023-03-24 19:02:46
# Node ID 0b84474ebd0a693b8f6f6e7c8dfc1fcfa0a9504c
# Parent  eb07591825faa34140490121360bbb3d1088a4f4

rhg: fix a bug in path encoding, demonstrated in the parent commit

diff --git a/rust/hg-core/src/revlog/path_encode.rs b/rust/hg-core/src/revlog/path_encode.rs
--- a/rust/hg-core/src/revlog/path_encode.rs
+++ b/rust/hg-core/src/revlog/path_encode.rs
@@ -546,7 +546,13 @@ fn hash_mangle(src: &[u8], sha: &[u8]) -
             if dest.len() + slice.len() > maxshortdirslen + 3 {
                 break;
             } else {
-                dest.write_bytes(slice);
+                let last_char = slice[slice.len() - 1];
+                if last_char == b'.' || last_char == b' ' {
+                    dest.write_bytes(&slice[0..slice.len() - 1]);
+                    dest.write_byte(b'_');
+                } else {
+                    dest.write_bytes(slice);
+                }
             }
             dest.write_byte(b'/');
         }
@@ -612,8 +618,7 @@ mod tests {
     #[test]
     fn test_dirname_ends_with_underscore() {
         let input = b"data/dir1234.foo/ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ.i";
-        // TODO: BUG: trailing dot should become an underscore
-        let expected = b"dh/dir1234./abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij.if2e9ce59e095eff5f8f334dc809e65606a0aa50b.i";
+        let expected = b"dh/dir1234_/abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij.if2e9ce59e095eff5f8f334dc809e65606a0aa50b.i";
         let res = path_encode(input);
         assert_eq!(
             HgPathBuf::from_bytes(&res),