Skip to content

Commit 4cd63d8

Browse files
authored
Merge pull request #570 from dscho/fsmonitor-is-no-longer-experimental
installer: reflect the fact that FSMonitor is no longer experimental
2 parents a469d4f + a75602a commit 4cd63d8

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

installer/install.iss

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,6 +1807,7 @@ var
18071807
Data:String;
18081808
LblInfo:TLabel;
18091809
AslrSetting: AnsiString;
1810+
WasFSMonitorEnabled:Boolean;
18101811
begin
18111812
SanitizeGitEnvironmentVariables();
18121813
@@ -2410,10 +2411,19 @@ begin
24102411
#endif
24112412
24122413
#ifdef WITH_EXPERIMENTAL_BUILTIN_FSMONITOR
2413-
RdbExperimentalOptions[GP_EnableFSMonitor]:=CreateCheckBox(ExperimentalOptionsPage,'Enable experimental built-in file system monitor','<RED>(NEW!)</RED> Automatically run a <A HREF=https://github.com/git-for-windows/git/discussions/3251>built-in file system watcher</A>, to speed up common'+#13+'operations such as `git status`, `git add`, `git commit`, etc in worktrees'+#13+'containing many files.',TabOrder,Top,Left);
2414+
WasFSMonitorEnabled:=ReplayChoice('Enable FSMonitor','Auto')='Enabled';
2415+
Data:='<RED>The FSMonitor feature is no longer experimental, and now needs to be'+#13+'configured per repository via the core.fsmonitor config setting.</RED>';
2416+
if not WasFSMonitorEnabled then
2417+
Data:=''; // Avoid rendering in red because we want to hide the option, and the way we render red text, it is added as separate `TLabel` that would _still_ be shown.
2418+
RdbExperimentalOptions[GP_EnableFSMonitor]:=CreateCheckBox(ExperimentalOptionsPage,'Built-in file system monitor',Data,TabOrder,Top,Left);
24142419
24152420
// Restore the settings chosen during a previous install
2416-
RdbExperimentalOptions[GP_EnableFSMonitor].Checked:=ReplayChoice('Enable FSMonitor','Auto')='Enabled';
2421+
RdbExperimentalOptions[GP_EnableFSMonitor].Checked:=WasFSMonitorEnabled;
2422+
// FSMonitor is no longer experimental, and it is also no longer supported to be enabled by the installer for all repositories.
2423+
RdbExperimentalOptions[GP_EnableFSMonitor].Enabled:=False;
2424+
// If the FSMonitor was not enabled previously, do not even bother to show the option.
2425+
if not WasFSMonitorEnabled then
2426+
RdbExperimentalOptions[GP_EnableFSMonitor].Visible:=False;
24172427
#endif
24182428
24192429
#endif
@@ -3671,9 +3681,6 @@ begin
36713681
36723682
#ifdef WITH_EXPERIMENTAL_BUILTIN_FSMONITOR
36733683
Data:='Disabled';
3674-
if RdbExperimentalOptions[GP_EnableFSMonitor].Checked then begin
3675-
Data:='Enabled';
3676-
end;
36773684
RecordChoice(PreviousDataKey,'Enable FSMonitor',Data);
36783685
#endif
36793686

0 commit comments

Comments
 (0)