No longer read saved state project info from cli flags

Reviewed By: stroxler Differential Revision: D45407210 fbshipit-source-id: 9e66051fd648f107f96dca5ed2d0d0008742eb03
facebook · May 3, 2023 · 6bd1e24 · 6bd1e24
1 parent b8e56c3
commit 6bd1e24
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 41 deletions.
diff --git a/client/command_arguments.py b/client/command_arguments.py
@@ -88,7 +88,6 @@ class CommandArguments:
     save_initial_state_to: Optional[str] = None
     load_initial_state_from: Optional[str] = None
     changed_files_path: Optional[str] = None
-    saved_state_project: Optional[str] = None
     dot_pyre_directory: Optional[Path] = None
     isolation_prefix: Optional[str] = None
     python_version: Optional[str] = None
@@ -115,7 +114,6 @@ class StartArguments:
     no_watchman: bool = False
     noninteractive: bool = False
     save_initial_state_to: Optional[str] = None
-    saved_state_project: Optional[str] = None
     sequential: bool = False
     show_error_traces: bool = False
     store_type_check_resolution: bool = False
@@ -148,7 +146,6 @@ def create(
             no_watchman=no_watchman,
             noninteractive=command_argument.noninteractive,
             save_initial_state_to=command_argument.save_initial_state_to,
-            saved_state_project=command_argument.saved_state_project,
             sequential=command_argument.sequential,
             show_error_traces=command_argument.show_error_traces,
             store_type_check_resolution=store_type_check_resolution,

diff --git a/client/commands/start.py b/client/commands/start.py
@@ -281,18 +281,7 @@ def get_saved_state_action(
             changed_files_path=start_arguments.changed_files_path,
         )
 
-    saved_state_project = (
-        frontend_configuration.SavedStateProject(
-            name=start_arguments.saved_state_project,
-            metadata=(
-                relative_local_root.replace("/", "$")
-                if relative_local_root is not None
-                else None
-            ),
-        )
-        if start_arguments.saved_state_project is not None
-        else configuration.get_saved_state_project()
-    )
+    saved_state_project = configuration.get_saved_state_project()
     if saved_state_project is not None:
         return LoadSavedStateFromProject(
             project_name=saved_state_project.name,

diff --git a/client/commands/tests/start_test.py b/client/commands/tests/start_test.py
@@ -338,24 +338,6 @@ def test_get_saved_state_action(self) -> None:
             LoadSavedStateFromFile(shared_memory_path="foo", changed_files_path="bar"),
         )
 
-        # Ensure command_arguments override internal_configuration
-        self.assertEqual(
-            get_saved_state_action(
-                command_arguments.StartArguments(saved_state_project="my_project"),
-                saved_state_configuration,
-            ),
-            LoadSavedStateFromProject(project_name="my_project"),
-        )
-        self.assertEqual(
-            get_saved_state_action(
-                command_arguments.StartArguments(saved_state_project="my_project"),
-                saved_state_configuration,
-                relative_local_root="local/root",
-            ),
-            LoadSavedStateFromProject(
-                project_name="my_project", project_metadata="local$root"
-            ),
-        )
         self.assertEqual(
             get_saved_state_action(
                 command_arguments.StartArguments(
@@ -414,7 +396,6 @@ def test_create_server_arguments(self) -> None:
                     command_arguments.StartArguments(
                         debug=True,
                         no_watchman=False,
-                        saved_state_project="project",
                         sequential=False,
                         show_error_traces=True,
                         store_type_check_resolution=True,
@@ -460,9 +441,7 @@ def test_create_server_arguments(self) -> None:
                             MatchPolicy.FULL_PATH, str(root_path / "critical")
                         ),
                     ],
-                    saved_state_action=LoadSavedStateFromProject(
-                        project_name="project", project_metadata="local"
-                    ),
+                    saved_state_action=None,
                     show_error_traces=True,
                     store_type_check_resolution=True,
                     strict=True,
@@ -515,9 +494,7 @@ def test_create_server_arguments_disable_saved_state(self) -> None:
                         root_path,
                     )
                 ),
-                command_arguments.StartArguments(
-                    no_saved_state=True, saved_state_project="some/project"
-                ),
+                command_arguments.StartArguments(no_saved_state=True),
             )
             self.assertIsNone(arguments.saved_state_action)
 

diff --git a/client/pyre.py b/client/pyre.py
@@ -364,7 +364,6 @@ def pyre(
         save_initial_state_to=save_initial_state_to,
         load_initial_state_from=load_initial_state_from,
         changed_files_path=changed_files_path,
-        saved_state_project=None,
         dot_pyre_directory=Path(dot_pyre_directory)
         if dot_pyre_directory is not None
         else None,