fix various hard coded ".hg" usages in Rust

Summary: Use the identity instead of hard coded ".hg".

Reviewed By: DurhamG

Differential Revision: D39040641

fbshipit-source-id: cb90040e36d33e2039965a51d37fa743175aa2b0

Author: Muir Manders

eden/scm/lib/backingstore/Cargo.toml

@@ -15,6 +15,7 @@ configparser = { version = "0.1.0", path = "../configparser" }
 eagerepo = { version = "0.1.0", path = "../eagerepo" }
 edenapi = { version = "0.1.0", path = "../edenapi" }
 env_logger = "0.7"
+identity = { version = "0.1.0", path = "../identity" }
 libc = "0.2.121"
 log = { version = "0.4.14", features = ["kv_unstable", "kv_unstable_std"] }
 manifest = { version = "0.1.0", path = "../manifest" }

eden/scm/lib/backingstore/src/backingstore/mod.rs

@@ -43,12 +43,18 @@ impl BackingStore {
             config.set("edenapi", "max-retry-per-request", Some("0"), &source);
         }
 
-        let hg = root.join(".hg");
+        let ident = identity::must_sniff_dir(root)?;
+        let dot_path = root.join(ident.dot_dir());
 
         Ok(if config.get_or_default("scmstore", "backingstore")? {
-            New(BackingScmStores::new(&config, &hg, use_edenapi, aux_data)?)
+            New(BackingScmStores::new(
+                &config,
+                &dot_path,
+                use_edenapi,
+                aux_data,
+            )?)
         } else {
-            Old(BackingContentStores::new(&config, &hg, use_edenapi)?)
+            Old(BackingContentStores::new(&config, &dot_path, use_edenapi)?)
         })
     }
 

eden/scm/lib/clidispatch/src/dispatch.rs

@@ -131,7 +131,7 @@ fn initialize_blackbox(optional_repo: &OptionalRepo) -> Result<()> {
             })?
             .value();
         let max_files = config.get_or("blackbox", "maxfiles", || 3)?;
-        let path = repo.shared_path().join(".hg/blackbox/v1");
+        let path = repo.shared_dot_hg_path().join("blackbox/v1");
         if let Ok(blackbox) = ::blackbox::BlackboxOptions::new()
             .max_bytes_per_log(max_size)
             .max_log_count(max_files as u8)

eden/scm/lib/edenfs-client/Cargo.toml

@@ -10,6 +10,7 @@ anyhow = "1.0.56"
 byteorder = "1.3"
 chrono = { version = "0.4", features = ["clock", "serde", "std"], default-features = false }
 fbthrift_socket = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
+identity = { version = "0.1.0", path = "../identity" }
 io = { version = "0.1.0", path = "../io" }
 sha2 = "0.10"
 status = { version = "0.1.0", path = "../status" }

eden/scm/lib/edenfs-client/src/status.rs

@@ -63,13 +63,17 @@ pub struct OperationNotSupported;
 ///   - Print status (Move to another crate).
 /// - Avoid `print!` directly. Use `clidispatch::io` instead.
 pub fn maybe_status_fastpath(
-    repo_root: &Path,
+    repo_dot_path: &Path,
     io: &IO,
     list_ignored: bool,
 ) -> Result<(status::Status, HashMap<RepoPathBuf, RepoPathBuf>)> {
     let rt = tokio::runtime::Runtime::new()?;
 
-    rt.block_on(maybe_status_fastpath_internal(repo_root, io, list_ignored))
+    rt.block_on(maybe_status_fastpath_internal(
+        repo_dot_path,
+        io,
+        list_ignored,
+    ))
 }
 
 fn get_eden_root(repo_root: &Path) -> Result<String> {
@@ -114,10 +118,15 @@ async fn get_status_internal(repo_root: &Path) -> Result<GetScmStatusResult> {
 }
 
 async fn maybe_status_fastpath_internal(
-    repo_root: &Path,
+    repo_dot_path: &Path,
     io: &IO,
     list_ignored: bool,
 ) -> Result<(status::Status, HashMap<RepoPathBuf, RepoPathBuf>)> {
+    let repo_root = match repo_dot_path.parent() {
+        Some(p) => p,
+        None => bail!("invalid dot dir {}", repo_dot_path.display()),
+    };
+
     let eden_root = get_eden_root(repo_root).map_err(|_| OperationNotSupported)?;
 
     let transport = get_socket_transport(repo_root)
@@ -137,8 +146,7 @@ async fn maybe_status_fastpath_internal(
     // the wrapper here and default to the Python implementation. D9025269 has a prototype
     // implementation of 'morestatus' in Rust, but we should gradually rewrite Mercurial in-place
     // and call out to it here rather than maintain a parallel implementation in the wrapper.
-    let hg_dir = repo_root.join(".hg");
-    if needs_morestatus_extension(&hg_dir, &dirstate_data.p2) {
+    if needs_morestatus_extension(repo_dot_path, &dirstate_data.p2) {
         return Err(OperationNotSupported.into());
     }
 
@@ -461,7 +469,8 @@ impl DirstateReader {
 }
 
 fn read_hg_dirstate(repo_root: &Path) -> Result<DirstateData> {
-    let dirstate = repo_root.join(".hg").join("dirstate");
+    let ident = identity::must_sniff_dir(repo_root)?;
+    let dirstate = repo_root.join(ident.dot_dir()).join("dirstate");
     let mut reader = DirstateReader {
         reader: BufReader::new(File::open(dirstate)?),
         sha256: Sha256::new(),

eden/scm/lib/hgcommands/src/commands/debug/segmentclone.rs

@@ -62,7 +62,9 @@ pub fn run(opts: StatusOpts, _io: &IO, config: &mut ConfigSet) -> Result<u8> {
     }
     .context("error cloning segmented changelog")?;
 
-    let namedag_path = IndexedLogNameDagPath(destination.join(".hg/store/segments/v1"));
+    let ident = identity::sniff_env();
+    let dot_path = destination.join(ident.dot_dir());
+    let namedag_path = IndexedLogNameDagPath(dot_path.join("store/segments/v1"));
     let mut namedag = namedag_path
         .open()
         .context("error opening segmented changelog")?;
@@ -92,14 +94,14 @@ pub fn run(opts: StatusOpts, _io: &IO, config: &mut ConfigSet) -> Result<u8> {
         block_on(namedag.flush(&heads)).context("error writing segmented changelog to disk")?;
 
         fs::write(
-            destination.join(".hg/store/remotenames"),
+            dot_path.join("store/remotenames"),
             format!("{} bookmarks remote/master\n", master.to_hex()).as_bytes(),
         )
         .context("error writing to remotenames")?;
     }
 
     fs::write(
-        destination.join(".hg/requires"),
+        dot_path.join("requires"),
         b"dotencode\n\
           fncache\n\
           generaldelta\n\
@@ -110,15 +112,15 @@ pub fn run(opts: StatusOpts, _io: &IO, config: &mut ConfigSet) -> Result<u8> {
     .context("error writing to hg requires")?;
 
     fs::write(
-        destination.join(".hg/store/requires"),
+        dot_path.join("store/requires"),
         b"lazychangelog\n\
           narrowheads\n\
           visibleheads\n",
     )
     .context("error writing to hg store requires")?;
 
     fs::write(
-        destination.join(".hg/hgrc"),
+        dot_path.join("hgrc"),
         format!(
             "[paths]\n\
              default = ssh://hg.vip.facebook.com//data/scm/{0}\n\

eden/scm/lib/hgcommands/src/commands/status.rs

@@ -153,7 +153,7 @@ pub fn run(opts: StatusOpts, io: &IO, repo: &mut Repo) -> Result<u8> {
     {
         // Attempt to fetch status information from EdenFS.
         let (status, copymap) = edenfs_client::status::maybe_status_fastpath(
-            repo.path(),
+            repo.dot_hg_path(),
             io,
             print_config.status_types.ignored,
         )

eden/scm/lib/workingcopy/Cargo.toml

@@ -12,6 +12,7 @@ configmodel = { version = "0.1.0", path = "../configmodel" }
 crossbeam = "0.8"
 edenfs_client = { version = "0.1.0", path = "../edenfs-client", optional = true }
 futures = { version = "0.3.13", features = ["async-await", "compat"] }
+identity = { version = "0.1.0", path = "../identity" }
 manifest = { version = "0.1.0", path = "../manifest" }
 manifest-tree = { version = "0.1.0", path = "../manifest-tree" }
 parking_lot = { version = "0.11.2", features = ["send_guard"] }

eden/scm/lib/workingcopy/src/watchmanfs/watchmanfs.rs

@@ -58,8 +58,9 @@ impl WatchmanFileSystem {
             .resolve_root(CanonicalPath::canonicalize(self.vfs.root())?)
             .await?;
 
+        let ident = identity::must_sniff_dir(self.vfs.root())?;
         let excludes = Expr::Any(vec![Expr::DirName(DirNameTerm {
-            path: PathBuf::from(".hg"),
+            path: PathBuf::from(ident.dot_dir()),
             depth: None,
         })]);