From 0a820ed7d01b4ac821f73c872e6231d4589876e6 Mon Sep 17 00:00:00 2001
From: Xavier Deguillard <xavierd@fb.com>
Date: Wed, 10 Nov 2021 10:00:51 -0800
Subject: [PATCH] config: remove overlay.enable_tree_overlay

Summary:
This config has been enabled for many months now, let's simply assume it is set
to true on Windows.

Reviewed By: genevievehelsel

Differential Revision: D32192585

fbshipit-source-id: 76829a031f859594a5139dd09a6479cabeda2089
---
 eden/fs/cli/main.py           | 8 ++------
 eden/fs/config/EdenConfig.cpp | 8 --------
 eden/fs/config/EdenConfig.h   | 9 ---------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/eden/fs/cli/main.py b/eden/fs/cli/main.py
index cdce7266c7..25794c22a6 100644
--- a/eden/fs/cli/main.py
+++ b/eden/fs/cli/main.py
@@ -815,13 +815,9 @@ class CloneCmd(Subcmd):
     def _get_enable_tree_overlay(
         self, instance: EdenInstance, overlay_type: Optional[str]
     ) -> bool:
-        if sys.platform != "win32":
-            # Tree overlay does not support non-Windows platform yet
-            return False
-
         if overlay_type is None:
-            # If no flag is specified from the user, follow system configuration
-            return instance.get_config_bool("overlay.enable_tree_overlay", False)
+            # Tree overlay does not support non-Windows platform yet
+            return sys.platform == "win32"
 
         return overlay_type == "tree"
 
diff --git a/eden/fs/config/EdenConfig.cpp b/eden/fs/config/EdenConfig.cpp
index f322e3d804..c9e6552356 100644
--- a/eden/fs/config/EdenConfig.cpp
+++ b/eden/fs/config/EdenConfig.cpp
@@ -85,14 +85,6 @@ std::pair<StringPiece, StringPiece> parseKey(StringPiece fullKey) {
       EDEN_BUG() << "not a valid section name: " << fullKey;
     }
   }
-  // This one slipped in:
-  if (key != "enable_tree_overlay") {
-    for (char c : key) {
-      if (!isConfigChar(c)) {
-        EDEN_BUG() << "not a valid key name: " << fullKey;
-      }
-    }
-  }
 
   return {section, key};
 }
diff --git a/eden/fs/config/EdenConfig.h b/eden/fs/config/EdenConfig.h
index b8df6e80c3..2c5fb95629 100644
--- a/eden/fs/config/EdenConfig.h
+++ b/eden/fs/config/EdenConfig.h
@@ -743,15 +743,6 @@ class EdenConfig : private ConfigSettingManager {
       10000,
       this};
 
-  /**
-   * Only used in CLI to control if new clones are using TreeOverlay by default.
-   * Adding here to avoid unknown configuration warning.
-   */
-  ConfigSetting<bool> cliOnlyOverlayEnableTreeOverlay{
-      "overlay:enable_tree_overlay",
-      false,
-      this};
-
   /**
    * DANGER: this option will put overlay into memory and skip persisting any
    * actual data to disk. This will guarantee to cause EdenFS corruption after