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

Warn if the fsmonitor-daemon is running #2891

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Warn if the fsmonitor-daemon is running #2891

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9eb68e6
Work around a bug in fsmonitor daemon by stopping it
LenaWil May 18, 2023
9628f51
Replace disabling the fsmonitor--daemon by just warning about it
LenaWil May 18, 2023
b7a86c8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 18, 2023
44ed393
Improve the fsmonitor detection code
LenaWil May 18, 2023
c919a1d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 18, 2023
c2deff9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 18, 2023
0355349
Add instruction on how to disable the monitor and switch to cmd_output_b
LenaWil May 19, 2023
f3e30a0
Add pragma no cover
LenaWil May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pre_commit/staged_files_only.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ def _intent_to_add_cleared() -> Generator[None, None, None]:

@contextlib.contextmanager
def _unstaged_changes_cleared(patch_dir: str) -> Generator[None, None, None]:
if cmd_output('git', 'fsmonitor--daemon', 'status')[1].startswith('fsmonitor-daemon is watching'):
logger.warning('The fsmonitor-daemon is running; a bug in the fsmonitor-daemon sometimes causes data loss when run with pre-commit.')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will break on old versions of git

this will also add this subprocess overhead to every execution -- ~20ms on my machine

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will break on old versions of git

Good point, switched it to checking for the return code.

this will also add this subprocess overhead to every execution -- ~20ms on my machine

I added two extra checks, a platform check, since it’s only available on Windows & macOS, and a check for the ipc file that should by default be there, although it’s seems to be possible to change it on macOS. Does this speed it up enough?


tree = cmd_output('git', 'write-tree')[1].strip()
diff_cmd = (
'git', 'diff-index', '--ignore-submodules', '--binary',
Expand Down