renable github actions for linux (#1135)

.github/workflows/sapling-cli-getdeps_linux.yml

@@ -3,7 +3,12 @@
 name: Sapling CLI Getdeps Linux
 
 on:
-  workflow_dispatch
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)

addons/isl/src/Bookmark.tsx

@@ -28,7 +28,6 @@ import {
   REMOTE_MASTER_BOOKMARK,
 } from './BookmarksData';
 import {Row} from './ComponentUtils';
-import {useFeatureFlagSync} from './featureFlags';
 import {T, t} from './i18n';
 import {Internal} from './Internal';
 import {BookmarkCreateOperation} from './operations/BookmarkCreateOperation';
@@ -144,7 +143,6 @@ export function AllBookmarksTruncated({
 }) {
   const bookmarksData = useAtomValue(bookmarksDataStorage);
   const recommendedBookmarks = useAtomValue(recommendedBookmarksAtom);
-  const recommendedBookmarksGK = useFeatureFlagSync(Internal.featureFlags?.RecommendedBookmarks);
   const recommendedBookmarksAvailable = useAtomValue(recommendedBookmarksAvailableAtom);
 
   const FullRepoBranchBookmark = Internal.FullRepoBranchBookmark;
@@ -171,9 +169,8 @@ export function AllBookmarksTruncated({
         .map(bookmark => {
           const value = typeof bookmark === 'string' ? bookmark : bookmark.value;
           const isRecommended =
-            recommendedBookmarksGK &&
-            (recommendedBookmarks.has(value) ||
-              (typeof bookmark === 'object' && bookmark.isRecommended === true));
+            recommendedBookmarks.has(value) ||
+            (typeof bookmark === 'object' && bookmark.isRecommended === true);
           const tooltipOverride = typeof bookmark === 'string' ? undefined : bookmark.description;
           const {icon, tooltip} = getBookmarkAddons(
             value,

addons/isl/src/BookmarksData.tsx

@@ -10,7 +10,6 @@ import type {StableLocationData} from './types';
 import {atom} from 'jotai';
 import {tracker} from './analytics';
 import serverAPI from './ClientToServerAPI';
-import {featureFlagLoadable} from './featureFlags';
 import {Internal} from './Internal';
 import {lazyAtom, localStorageBackedAtom, readAtom, writeAtom} from './jotaiUtils';
 import {latestCommits} from './serverAPIState';
@@ -124,11 +123,6 @@ export const recommendedBookmarksOnboarding = localStorageBackedAtom<boolean>(
   true,
 );
 
-export const recommendedBookmarksGKAtom = atom(get => {
-  const flag = get(featureFlagLoadable(Internal.featureFlags?.RecommendedBookmarks));
-  return flag.state === 'hasData' ? flag.data : false;
-});
-
 export const recommendedBookmarksAtom = lazyAtom(async _get => {
   const recommendedBookmarks = await (Internal.getRecommendedBookmarks?.() ??
     Promise.resolve(new Set<string>()));

addons/isl/src/BookmarksManager.tsx

@@ -42,7 +42,6 @@ import {Column, Row, ScrollY} from './ComponentUtils';
 import {DropdownFields} from './DropdownFields';
 import {useCommandEvent} from './ISLShortcuts';
 import {Internal} from './Internal';
-import {useFeatureFlagSync} from './featureFlags';
 import {T, t} from './i18n';
 import {readAtom} from './jotaiUtils';
 import {latestDag} from './serverAPIState';
@@ -100,10 +99,7 @@ function BookmarksManager(_props: {dismiss: () => void}) {
   const bookmarksData = useAtomValue(bookmarksDataStorage);
   const recommendedBookmarks = useAtomValue(recommendedBookmarksAtom);
   const recommendedBookmarksAvailable = useAtomValue(recommendedBookmarksAvailableAtom);
-  const enableRecommended =
-    useFeatureFlagSync(Internal.featureFlags?.RecommendedBookmarks) &&
-    bookmarksData.useRecommendedBookmark &&
-    recommendedBookmarksAvailable;
+  const enableRecommended = bookmarksData.useRecommendedBookmark && recommendedBookmarksAvailable;
 
   // Place recommended bookmarks (and remote/master) first if enabled, then the rest
   const priority = new Set(recommendedBookmarks).add(REMOTE_MASTER_BOOKMARK);
@@ -347,7 +343,6 @@ function BookmarksList({
   kind: BookmarkKind;
 }) {
   const [bookmarksData, setBookmarksData] = useAtom(bookmarksDataStorage);
-  const recommendedBookmarksGK = useFeatureFlagSync(Internal.featureFlags?.RecommendedBookmarks);
   const recommendedBookmarks = useAtomValue(recommendedBookmarksAtom);
   const recommendedBookmarksAvailable = useAtomValue(recommendedBookmarksAvailableAtom);
 
@@ -364,10 +359,8 @@ function BookmarksList({
           const name = typeof bookmark === 'string' ? bookmark : bookmark.name;
           const extra = typeof bookmark === 'string' ? undefined : bookmark.extra;
           const enableRecommended =
-            recommendedBookmarksGK &&
-            bookmarksData.useRecommendedBookmark &&
-            recommendedBookmarksAvailable;
-          const isRecommended = recommendedBookmarksGK && recommendedBookmarks.has(name);
+            bookmarksData.useRecommendedBookmark && recommendedBookmarksAvailable;
+          const isRecommended = recommendedBookmarks.has(name);
           const tooltipOverride = typeof bookmark === 'string' ? undefined : bookmark.info;
           const {icon, tooltip} = getBookmarkAddons(
             name,

addons/isl/src/UncommittedChanges.tsx

@@ -877,7 +877,13 @@ function MergeConflictButtons({
         key="continue"
         disabled={!allConflictsResolved || shouldDisableButtons}
         data-testid="conflict-continue-button"
-        onClick={() => {
+        onClick={async () => {
+          const conflictFiles =
+            conflicts.state === 'loaded' ? conflicts.files.map(f => f.path) : [];
+          if (!(await confirmSuggestedEditsForFiles('merge-continue', 'accept', conflictFiles))) {
+            return;
+          }
+
           if (readAtom(shouldAutoResolveAllBeforeContinue)) {
             runOperation(new RunMergeDriversOperation());
           }

addons/isl/src/serverAPIState.ts

@@ -32,7 +32,6 @@ import {
   bookmarksDataStorage,
   recommendedBookmarksAtom,
   recommendedBookmarksAvailableAtom,
-  recommendedBookmarksGKAtom,
   REMOTE_MASTER_BOOKMARK,
 } from './BookmarksData';
 import serverAPI from './ClientToServerAPI';
@@ -307,10 +306,7 @@ export const latestDag = atom(get => {
   const successorMap = get(latestSuccessorsMapAtom);
   const bookmarksData = get(bookmarksDataStorage);
   const recommendedBookmarksAvailable = get(recommendedBookmarksAvailableAtom);
-  const enableRecommended =
-    get(recommendedBookmarksGKAtom) &&
-    bookmarksData.useRecommendedBookmark &&
-    recommendedBookmarksAvailable;
+  const enableRecommended = bookmarksData.useRecommendedBookmark && recommendedBookmarksAvailable;
   const recommendedBookmarks = get(recommendedBookmarksAtom);
   const commitDag = undefined; // will be populated from `commits`
 

addons/isl/src/sloc/useFetchSignificantLinesOfCode.ts

@@ -11,7 +11,7 @@ import type {CommitInfo, RepoRelativePath, SlocInfo} from '../types';
 
 import {atom, useAtomValue} from 'jotai';
 import {loadable} from 'jotai/utils';
-import {useRef} from 'react';
+import {useEffect, useMemo, useRef, useState} from 'react';
 import serverAPI from '../ClientToServerAPI';
 import {commitInfoViewCurrentCommits} from '../CommitInfoView/CommitInfoState';
 import {getGeneratedFilesFrom} from '../GeneratedFile';
@@ -168,12 +168,6 @@ const fetchPendingAmendSloc = async (
   return slocInfo;
 };
 
-let pendingAmendRequestId = 0;
-const pendingAmendSlocAtom = atom(get => {
-  const selectedFiles = get(selectedFilesAtom);
-  return fetchPendingAmendSloc(get, selectedFiles, pendingAmendRequestId++);
-});
-
 /**
  * FETCH PENDING SLOC
  */
@@ -230,16 +224,6 @@ const fetchPendingSloc = async (
   return pendingLocData;
 };
 
-let pendingRequestId = 0;
-
-const pendingChangesSlocAtom = atom(get => {
-  const selectedFiles = get(selectedFilesAtom);
-  return fetchPendingSloc(get, selectedFiles, pendingRequestId++);
-});
-
-const pendingAmendSlocLoadableAtom = loadable(pendingAmendSlocAtom);
-const pendingChangesSlocLoadableAtom = loadable(pendingChangesSlocAtom);
-
 function useFetchWithPrevious(atom: Atom<Loadable<Promise<SlocInfo | undefined>>>): {
   slocInfo: SlocInfo | undefined;
   isLoading: boolean;
@@ -274,10 +258,65 @@ export function useFetchSignificantLinesOfCode(commit: CommitInfo) {
   return {slocInfo: result.data, isLoading: false};
 }
 
+// Debounce delay for SLOC requests to prevent spamming when many files are selected quickly
+const DEBOUNCE_DELAY_MS = 300;
+
+// Hook that debounces an atom value
+function useDebouncedAtomValue<T>(sourceAtom: Atom<T>, debounceMs: number): T {
+  const currentValue = useAtomValue(sourceAtom);
+  const [debouncedValue, setDebouncedValue] = useState(currentValue);
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  useEffect(() => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
+
+    timeoutRef.current = setTimeout(() => {
+      setDebouncedValue(currentValue);
+    }, debounceMs);
+
+    return () => {
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+      }
+    };
+  }, [currentValue, debounceMs]);
+
+  return debouncedValue;
+}
+
+let pendingRequestId = 0;
 export function useFetchPendingSignificantLinesOfCode() {
-  return useFetchWithPrevious(pendingChangesSlocLoadableAtom);
+  // Debounce selected files to prevent spamming SLOC requests
+  const debouncedSelectedFiles = useDebouncedAtomValue(selectedFilesAtom, DEBOUNCE_DELAY_MS);
+
+  // Use a derived atom that depends on the debounced value
+  const debouncedAtom = useMemo(() => {
+    return atom(get => {
+      // Force the atom to use the debounced value by creating a dependency
+      // Note: we can't pass debouncedSelectedFiles directly to the atom,
+      // so we create a new fetch call with it
+      return fetchPendingSloc(get, debouncedSelectedFiles, pendingRequestId++);
+    });
+  }, [debouncedSelectedFiles]);
+
+  const loadableAtom = loadable(debouncedAtom);
+  return useFetchWithPrevious(loadableAtom);
 }
 
+let pendingAmendRequestId = 0;
 export function useFetchPendingAmendSignificantLinesOfCode() {
-  return useFetchWithPrevious(pendingAmendSlocLoadableAtom);
+  // Debounce selected files to prevent spamming SLOC requests
+  const debouncedSelectedFiles = useDebouncedAtomValue(selectedFilesAtom, DEBOUNCE_DELAY_MS);
+
+  // Use a derived atom that depends on the debounced value
+  const debouncedAtom = useMemo(() => {
+    return atom(get => {
+      return fetchPendingAmendSloc(get, debouncedSelectedFiles, pendingAmendRequestId++);
+    });
+  }, [debouncedSelectedFiles]);
+
+  const loadableAtom = loadable(debouncedAtom);
+  return useFetchWithPrevious(loadableAtom);
 }

build/deps/github_hashes/facebook/fb303-rev.txt

@@ -1 +1 @@
-Subproject commit faed614f7626964abc445ff94e467a8d5de90b10
+Subproject commit 1aca35e24e638a0db4c9e70817af432634e16f5e

build/deps/github_hashes/facebook/fbthrift-rev.txt

@@ -1 +1 @@
-Subproject commit 4ce92f46fc271e173fce705a3b790ee14149751c
+Subproject commit 674867a3c8e254f5be9519d26a7a5b531932c62a

build/deps/github_hashes/facebook/folly-rev.txt

@@ -1 +1 @@
-Subproject commit 3f1fa35e63aee37dd25857d13d796857186b3aa0
+Subproject commit 6a4ddcd5ccd0bc91b25d3f3c1820d556ff975cf1

build/deps/github_hashes/facebook/mvfst-rev.txt

@@ -0,0 +1 @@
+Subproject commit a5683c792479a16d2faae915fffd6a2b29559d37

build/deps/github_hashes/facebook/wangle-rev.txt

@@ -1 +1 @@
-Subproject commit 34f740cfa86fd27fa039487071d319b46cab1ca2
+Subproject commit 45ff542aca0d2449bc5d3e150d2aae297e761d6d

build/deps/github_hashes/facebookexperimental/edencommon-rev.txt

@@ -1 +1 @@
-Subproject commit 414b40088d33efbc70b0b19591a8e82771462cd0
+Subproject commit 3fd57cafad19ed5fe6f3dd534868b92bb804e1dc

build/deps/github_hashes/facebookexperimental/rust-shed-rev.txt

@@ -1 +1 @@
-Subproject commit 4f3216b7bbfa27da8a3920b1c28f851ca8a5e1b6
+Subproject commit cac1924e50c59baf47428538f99288bbc82bcd0e

build/deps/github_hashes/facebookincubator/fizz-rev.txt

@@ -1 +1 @@
-Subproject commit 05415a3e812e3116d08006701381e632c2cbf206
+Subproject commit 01b31be94b35e1e000baa2b40942403e78e4b935

build/fbcode_builder/getdeps.py

@@ -964,6 +964,13 @@ def setup_project_cmd_parser(self, parser):
             default=None,
             help="Timeout in seconds for each individual test",
         )
+        parser.add_argument(
+            "--build-type",
+            help="Set the build type explicitly.  Cmake and cargo builders act on them. Only Debug and RelWithDebInfo widely supported.",
+            choices=["Debug", "Release", "RelWithDebInfo", "MinSizeRel"],
+            action="store",
+            default=None,
+        )
 
 
 @cmd(
@@ -1049,6 +1056,13 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
             args.enable_tests
             and manifest.get("github.actions", "run_tests", ctx=manifest_ctx) != "off"
         )
+        rust_version = (
+            manifest.get("github.actions", "rust_version", ctx=manifest_ctx) or "stable"
+        )
+
+        override_build_type = args.build_type or manifest.get(
+            "github.actions", "build_type", ctx=manifest_ctx
+        )
         if run_tests:
             manifest_ctx.set("test", "on")
         run_on = self.get_run_on(args)
@@ -1163,8 +1177,8 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
             out.write("    - uses: actions/checkout@v4\n")
 
             build_type_arg = ""
-            if args.build_type:
-                build_type_arg = f"--build-type {args.build_type} "
+            if override_build_type:
+                build_type_arg = f"--build-type {override_build_type} "
 
             if build_opts.free_up_disk:
                 free_up_disk = "--free-up-disk "
@@ -1241,8 +1255,8 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
                     or builder_name == "cargo"
                     or mbuilder_name == "cargo"
                 ):
-                    out.write("    - name: Install Rust Stable\n")
-                    out.write("      uses: dtolnay/rust-toolchain@stable\n")
+                    out.write(f"    - name: Install Rust {rust_version.capitalize()}\n")
+                    out.write(f"      uses: dtolnay/rust-toolchain@{rust_version}\n")
                     break
 
             # Normal deps that have manifests
@@ -1360,7 +1374,7 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
 
                 out.write("    - name: Test %s\n" % manifest.name)
                 out.write(
-                    f"      run: {getdepscmd}{allow_sys_arg} test {num_jobs_arg}--src-dir=. {manifest.name}{project_prefix}\n"
+                    f"      run: {getdepscmd}{allow_sys_arg} test {build_type_arg}{num_jobs_arg}--src-dir=. {manifest.name}{project_prefix}\n"
                 )
             if build_opts.free_up_disk and not build_opts.is_windows():
                 out.write("    - name: Show disk space at end\n")

build/fbcode_builder/getdeps/cargo.py

@@ -95,7 +95,7 @@ def cargo_config_file(self):
         if self.cargo_config_file_subdir:
             return os.path.join(build_source_dir, self.cargo_config_file_subdir)
         else:
-            return os.path.join(build_source_dir, ".cargo", "config")
+            return os.path.join(build_source_dir, ".cargo", "config.toml")
 
     def _create_cargo_config(self):
         cargo_config_file = self.cargo_config_file()
@@ -122,8 +122,12 @@ def _create_cargo_config(self):
 [profile.dev]
 debug = false
 incremental = false
+
+[profile.release]
+opt-level = "{}"
 """.format(
-                self.build_dir.replace("\\", "\\\\")
+                self.build_dir.replace("\\", "\\\\"),
+                "z" if self.build_opts.build_type == "MinSizeRel" else "s",
             )
 
         # Point to vendored sources from getdeps manifests
@@ -173,7 +177,7 @@ def _build(self, reconfigure) -> None:
         build_source_dir = self.build_source_dir()
 
         build_args = [
-            "--out-dir",
+            "--artifact-dir",
             os.path.join(self.inst_dir, "bin"),
             "-Zunstable-options",
         ]
@@ -206,20 +210,26 @@ def _build(self, reconfigure) -> None:
     def run_tests(
         self, schedule_type, owner, test_filter, retry, no_testpilot, timeout=None
     ) -> None:
+        build_args = []
+        if self.build_opts.build_type != "Debug":
+            build_args.append("--release")
+
         if test_filter:
-            args = ["--", test_filter]
+            filter_args = ["--", test_filter]
         else:
-            args = []
+            filter_args = []
 
         if self.manifests_to_build is None:
-            self.run_cargo(self.install_dirs, "test", args)
-            if self.build_doc:
+            self.run_cargo(self.install_dirs, "test", build_args + filter_args)
+            if self.build_doc and not filter_args:
                 self.run_cargo(self.install_dirs, "doc", ["--no-deps"])
         else:
             for manifest in self.manifests_to_build:
                 margs = ["--manifest-path", self.manifest_dir(manifest)]
-                self.run_cargo(self.install_dirs, "test", args + margs)
-                if self.build_doc:
+                self.run_cargo(
+                    self.install_dirs, "test", build_args + filter_args + margs
+                )
+                if self.build_doc and not filter_args:
                     self.run_cargo(self.install_dirs, "doc", ["--no-deps"] + margs)
 
     def _patchup_workspace(self, dep_to_git) -> None: