WIP: Bug 1904364 - chore(webgpu): CTS revendoring: also detect .jj …

…repo root dirs r=#webgpu-reviewers!
erichdongubler-mozilla · Jul 1, 2024 · b00c970 · b00c970
1 parent 923c1ee
commit b00c970
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/dom/webgpu/tests/cts/vendor/src/main.rs b/dom/webgpu/tests/cts/vendor/src/main.rs
@@ -82,16 +82,19 @@ fn run(args: CliArgs) -> miette::Result<()> {
                     dir
                 })
         };
-        let gecko_source_root = find_up(".hg").or_else(|hg_err| match find_up(".git") {
-            Ok(path) => {
-                log::debug!("{hg_err:?}");
-                Ok(path)
-            }
-            Err(git_err) => {
-                log::warn!("{hg_err:?}");
-                log::warn!("{git_err:?}");
-                bail!("failed to find a Gecko repository root")
-            }
+        let gecko_source_root = find_up(".hg").or_else(|hg_err| {
+            find_up(".git").or_else(|git_err| match find_up(".jj") {
+                Ok(path) => {
+                    log::debug!("{hg_err:?}");
+                    Ok(path)
+                }
+                Err(jj_err) => {
+                    log::warn!("{hg_err:?}");
+                    log::warn!("{git_err:?}");
+                    log::warn!("{jj_err:?}");
+                    bail!("failed to find a Gecko repository root")
+                }
+            })
         })?;
 
         let root = FileRoot::new("gecko", &gecko_source_root)?;