Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

installer: reflect the fact that FSMonitor is no longer experimental #570

Merged
merged 2 commits into from
Jul 18, 2024
Merged

installer: reflect the fact that FSMonitor is no longer experimental #570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f3e11b
installer: disable the "experimental" FSMonitor setting
dscho Jul 17, 2024
a75602a
installer: hide the "experimental" FSMonitor setting by default
dscho Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions installer/install.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,7 @@ var
Data:String;
LblInfo:TLabel;
AslrSetting: AnsiString;
WasFSMonitorEnabled:Boolean;
begin
SanitizeGitEnvironmentVariables();

Expand Down Expand Up @@ -2410,10 +2411,19 @@ begin
#endif

#ifdef WITH_EXPERIMENTAL_BUILTIN_FSMONITOR
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);
WasFSMonitorEnabled:=ReplayChoice('Enable FSMonitor','Auto')='Enabled';
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>';
if not WasFSMonitorEnabled then
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.
RdbExperimentalOptions[GP_EnableFSMonitor]:=CreateCheckBox(ExperimentalOptionsPage,'Built-in file system monitor',Data,TabOrder,Top,Left);

// Restore the settings chosen during a previous install
RdbExperimentalOptions[GP_EnableFSMonitor].Checked:=ReplayChoice('Enable FSMonitor','Auto')='Enabled';
RdbExperimentalOptions[GP_EnableFSMonitor].Checked:=WasFSMonitorEnabled;
// FSMonitor is no longer experimental, and it is also no longer supported to be enabled by the installer for all repositories.
RdbExperimentalOptions[GP_EnableFSMonitor].Enabled:=False;
// If the FSMonitor was not enabled previously, do not even bother to show the option.
if not WasFSMonitorEnabled then
RdbExperimentalOptions[GP_EnableFSMonitor].Visible:=False;
#endif

#endif
Expand Down Expand Up @@ -3671,9 +3681,6 @@ begin

#ifdef WITH_EXPERIMENTAL_BUILTIN_FSMONITOR
Data:='Disabled';
if RdbExperimentalOptions[GP_EnableFSMonitor].Checked then begin
Data:='Enabled';
end;
RecordChoice(PreviousDataKey,'Enable FSMonitor',Data);
#endif

Expand Down