grepo: set PathTranslator trait for overlapping path resolution

Summary: Set optional `path_translator` field on `TreeManifest` to `GrepoPathTranslator` to handle overlapping paths.

Reviewed By: quark-zju

Differential Revision: D102906290

fbshipit-source-id: b2d669387d2a1bcee6ea06fc54cd33915353ce6b

Author: taidaii

eden/scm/lib/grepocompat/src/trees.rs

@@ -21,7 +21,9 @@ use types::HgId;
 use types::RepoPath;
 use types::RepoPathBuf;
 
-/// Parse .repo manifest xml files and synthesizes repo projects as trees
+use crate::path::GrepoPathTranslator;
+
+/// Parse .repo manifest xml files and synthesizes repo projects as trees.
 /// TODO: linkfile and copyfile support
 pub fn synthesize_grepo_projects(
     tree_store: &Arc<dyn TreeStore>,
@@ -39,6 +41,11 @@ pub fn synthesize_grepo_projects(
     let projects = parse_manifest(&xml_data)?.projects;
 
     let mut new_manifest = TreeManifest::ephemeral(tree_store.clone());
+    // Project paths are stored with suffix encoding so a path can be both
+    // a file (GitSubmodule entry) and a directory (containing nested projects).
+    // The returned manifest has a `PathTranslator` set so consumers see
+    // decoded paths transparently.
+    new_manifest.set_path_translator(Arc::new(GrepoPathTranslator));
 
     for (path, project) in projects {
         if let Some(revision) = &project.revision {

eden/scm/tests/test-dotrepo.t

@@ -91,34 +91,27 @@ Sapling recognizes .repo identity
 
 clean status
   $ sl status
-  abort: synthesizing tree for root *: failure inserting 'vendor/a/sub/c' in manifest: 'vendor/a' is already a file (glob)
-  [255]
 
   $ sl log -r . -T "desc:\n  {desc}\nfiles:\n{files % '  {file}\n'}"
-  abort: synthesizing tree for root * (glob)
-  
-  Caused by:
-      0: failure inserting 'vendor/a/sub/c' in manifest
-      1: 'vendor/a' is already a file
-  [255]
+  desc:
+    add manifest
+  files:
+    frameworks/b
+    vendor/a
+    vendor/a/sub/c
 
 modified outer project is reported by status
   $ cd vendor/a
   $ echo "project vendor/a" > README
   $ git add README && git commit -qm 'add README'
   $ cd ../..
   $ sl status
-  abort: synthesizing tree for root *: failure inserting 'vendor/a/sub/c' in manifest: 'vendor/a' is already a file (glob)
-  [255]
+  M vendor/a
 
 Diff shows subproject commit change for the outer project:
 
-  $ sl diff 
-  abort: synthesizing tree for root * (glob)
-  
-  Caused by:
-      0: failure inserting 'vendor/a/sub/c' in manifest
-      1: 'vendor/a' is already a file
+  $ sl diff
+  abort: Is a directory: $TESTTMP/repodir/vendor/a
   [255]
 
 Modified nested (overlapping) project is reported by status:
@@ -128,17 +121,13 @@ Modified nested (overlapping) project is reported by status:
   $ git add README && git commit -qm 'modify c'
   $ cd ../../../..
   $ sl status
-  abort: synthesizing tree for root *: failure inserting 'vendor/a/sub/c' in manifest: 'vendor/a' is already a file (glob)
-  [255]
+  M vendor/a
+  M vendor/a/sub/c
 
 Exact-path diff also works for the nested overlapping project:
 
   $ sl diff vendor/a/sub/c
-  abort: synthesizing tree for root * (glob)
-  
-  Caused by:
-      0: failure inserting 'vendor/a/sub/c' in manifest
-      1: 'vendor/a' is already a file
+  abort: Is a directory: $TESTTMP/repodir/vendor/a/sub/c
   [255]
 
 Modified non-overlapping project is reported by status:
@@ -148,15 +137,12 @@ Modified non-overlapping project is reported by status:
   $ git add README && git commit -qm 'modify b'
   $ cd ../..
   $ sl status
-  abort: synthesizing tree for root *: failure inserting 'vendor/a/sub/c' in manifest: 'vendor/a' is already a file (glob)
-  [255]
+  M frameworks/b
+  M vendor/a
+  M vendor/a/sub/c
 
 Exact-path diff also works for the non-overlapping project:
 
   $ sl diff frameworks/b
-  abort: synthesizing tree for root * (glob)
-  
-  Caused by:
-      0: failure inserting 'vendor/a/sub/c' in manifest
-      1: 'vendor/a' is already a file
+  abort: Is a directory: $TESTTMP/repodir/frameworks/b
   [255]