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.

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

fs: protect fs.watch from monkeypatches #45265

Merged
merged 2 commits into from Nov 1, 2022

Conversation

anonrig
Copy link
Member

@anonrig anonrig commented Nov 1, 2022

Follow up on comments from #45098

CC @nodejs/fs

@nodejs-github-bot nodejs-github-bot added fs Issues and PRs related to the fs subsystem / file system. needs-ci PRs that need a full CI run. labels Nov 1, 2022
@anonrig anonrig mentioned this pull request Nov 1, 2022
5 tasks
@anonrig anonrig added the request-ci Add this label to start a Jenkins CI on a PR. label Nov 1, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Nov 1, 2022
@nodejs-github-bot
Copy link
Collaborator

@aduh95 aduh95 added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Nov 1, 2022
@anonrig anonrig added the fast-track PRs that do not need to wait for 48 hours to land. label Nov 1, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Fast-track has been requested by @anonrig. Please 👍 to approve.

@anonrig anonrig added the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 1, 2022
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Nov 1, 2022
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/45265
✔  Done loading data for nodejs/node/pull/45265
----------------------------------- PR info ------------------------------------
Title      fs: protect fs.watch from monkeypatches (#45265)
Author     Yagiz Nizipli  (@anonrig)
Branch     anonrig:fs/recursive-followup -> nodejs:main
Labels     fs, fast-track, author ready, needs-ci
Commits    2
 - fs: update todo message
 - fs: protect fs.watch from monkeypatches
Committers 1
 - Yagiz Nizipli 
PR-URL: https://github.com/nodejs/node/pull/45265
Reviewed-By: Antoine du Hamel 
Reviewed-By: Rafael Gonzaga 
Reviewed-By: Moshe Atlow 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/45265
Reviewed-By: Antoine du Hamel 
Reviewed-By: Rafael Gonzaga 
Reviewed-By: Moshe Atlow 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Tue, 01 Nov 2022 13:52:48 GMT
   ✔  Approvals: 3
   ✔  - Antoine du Hamel (@aduh95) (TSC): https://github.com/nodejs/node/pull/45265#pullrequestreview-1163697719
   ✔  - Rafael Gonzaga (@RafaelGSS): https://github.com/nodejs/node/pull/45265#pullrequestreview-1163772612
   ✔  - Moshe Atlow (@MoLow): https://github.com/nodejs/node/pull/45265#pullrequestreview-1163822822
   ℹ  This PR is being fast-tracked
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2022-11-01T13:59:09Z: https://ci.nodejs.org/job/node-test-pull-request/47617/
- Querying data for job/node-test-pull-request/47617/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/main up to date...
From https://github.com/nodejs/node
 * branch                  main       -> FETCH_HEAD
✔  origin/main is now up-to-date
- Downloading patch for 45265
From https://github.com/nodejs/node
 * branch                  refs/pull/45265/merge -> FETCH_HEAD
✔  Fetched commits as acd6f6c6082f..1673db412c4b
--------------------------------------------------------------------------------
[main 1e03c3af54] fs: update todo message
 Author: Yagiz Nizipli 
 Date: Tue Nov 1 09:51:49 2022 -0400
 2 files changed, 2 insertions(+), 2 deletions(-)
[main d1b8cb5ca8] fs: protect fs.watch from monkeypatches
 Author: Yagiz Nizipli 
 Date: Tue Nov 1 09:52:19 2022 -0400
 1 file changed, 14 insertions(+), 9 deletions(-)
   ✔  Patches applied
There are 2 commits in the PR. Attempting autorebase.
Rebasing (2/4)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
fs: update todo message

PR-URL: #45265
Reviewed-By: Antoine du Hamel duhamelantoine1995@gmail.com
Reviewed-By: Rafael Gonzaga rafael.nunu@hotmail.com
Reviewed-By: Moshe Atlow moshe@atlow.co.il

[detached HEAD 517608ead3] fs: update todo message
Author: Yagiz Nizipli yagiz@nizipli.com
Date: Tue Nov 1 09:51:49 2022 -0400
2 files changed, 2 insertions(+), 2 deletions(-)
Rebasing (3/4)
Rebasing (4/4)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
fs: protect fs.watch from monkeypatches

PR-URL: #45265
Reviewed-By: Antoine du Hamel duhamelantoine1995@gmail.com
Reviewed-By: Rafael Gonzaga rafael.nunu@hotmail.com
Reviewed-By: Moshe Atlow moshe@atlow.co.il

[detached HEAD ab4b72a62d] fs: protect fs.watch from monkeypatches
Author: Yagiz Nizipli yagiz@nizipli.com
Date: Tue Nov 1 09:52:19 2022 -0400
1 file changed, 14 insertions(+), 9 deletions(-)

Successfully rebased and updated refs/heads/main.

ℹ Add commit-queue-squash label to land the PR as one commit, or commit-queue-rebase to land as separate commits.

https://github.com/nodejs/node/actions/runs/3371785169

@anonrig anonrig added commit-queue Add this label to land a pull request using GitHub Actions. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Nov 1, 2022
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 1, 2022
@nodejs-github-bot nodejs-github-bot merged commit a5c6f3e into nodejs:main Nov 1, 2022
@nodejs-github-bot
Copy link
Collaborator

Landed in a5c6f3e

@RafaelGSS
Copy link
Member

@anonrig fyi the commit title looks confusing a5c6f3e

it was squashed and used the last commit as main title

RafaelGSS pushed a commit that referenced this pull request Nov 1, 2022
PR-URL: #45265
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
@anonrig
Copy link
Member Author

anonrig commented Nov 2, 2022

Yes @RafaelGSS. This was an educational experience for me. Sorry for the disturbance (and future ones) I've caused. It seems squash gets the first commit title. I thought it was the pull requests title. In this scenario, does the pull request require node-core-utils intervention to select the correct commit message for squash? Is there an automated way of selecting the squash title using labels?

lucshi pushed a commit to lucshi/node that referenced this pull request Nov 9, 2022
PR-URL: nodejs#45265
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
RafaelGSS pushed a commit that referenced this pull request Nov 10, 2022
PR-URL: #45265
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
@RafaelGSS RafaelGSS mentioned this pull request Nov 10, 2022
danielleadams pushed a commit that referenced this pull request Dec 30, 2022
PR-URL: #45265
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
danielleadams pushed a commit that referenced this pull request Dec 30, 2022
PR-URL: #45265
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
danielleadams pushed a commit that referenced this pull request Jan 3, 2023
PR-URL: #45265
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. fast-track PRs that do not need to wait for 48 hours to land. fs Issues and PRs related to the fs subsystem / file system. needs-ci PRs that need a full CI run.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants