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

deps: V8: cherry-pick 35c6d4d #29520

Closed
wants to merge 1 commit into from

Conversation

cclauss
Copy link
Contributor

@cclauss cclauss commented Sep 10, 2019

Original commit message:

Make code generator python3.7 compatible (async keyword).

Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29326

@nodejs-github-bot nodejs-github-bot added the v8 engine Issues and PRs related to the V8 dependency. label Sep 10, 2019
@sam-github
Copy link
Contributor

I agree we should backport, @targos @bnoordhuis , do you?

@cclauss We have a tool for v8 backports that ensures consistent process. npm i -g node-core-utils; ncu-config set branch master; ncu-config set upstream upstream; git node v8 backport Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109. Would you like to try, or shall I?

I'll need a link to what to backport. The 2 SHAs mentioned here aren't working for me, even when I remove the leading "I":

core/node (master $% u=) % git node v8 backport Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109                                                                                    
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → 'git <command> [<revision>...] -- [<file>...]'
      Apply and commit patches to deps/v8
✖ fatal: ambiguous argument 'Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

core/node (master $% u=) % git node v8 backport fcd8b8cb1de60a007c7bbd4564d7869e83cb7109 
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → 'git <command> [<revision>...] -- [<file>...]'
      Apply and commit patches to deps/v8
✖ fatal: ambiguous argument 'fcd8b8cb1de60a007c7bbd4564d7869e83cb7109^..fcd8b8cb1de60a007c7bbd4564d7869e83cb7109': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

core/node (master $% u=) % git node v8 backport 35c6d4d                                 
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → 'git <command> [<revision>...] -- [<file>...]'
      Apply and commit patches to deps/v8
✖ fatal: ambiguous argument '35c6d4d': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

@cclauss cclauss added the python PRs and issues that require attention from people who are familiar with Python. label Sep 10, 2019
@cclauss
Copy link
Contributor Author

cclauss commented Sep 10, 2019

Thanks Sam -- please go ahead with the tool-based approach.

https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351 is what we are trying to backport.

Ben’s request that we fix Google’s code first and then backport is at #29346 (comment)

Targos’ commitment to do so in that order is at #29340 (comment)

Closing now in favor of your effort.

@cclauss cclauss closed this Sep 10, 2019
@cclauss cclauss deleted the deps-v8-cherrypick-async-fix branch September 10, 2019 16:38
@sam-github
Copy link
Contributor

@targos every try I've made has failed so far, any idea what I'm doing wrong? I'm trying to backport https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351

core/node (master $% u=) % git node v8 backport https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → fatal: Invalid object name 'https'.
      Apply and commit patches to deps/v8
✖ fatal: Invalid object name 'https'.

core/node (master $% u=) % git node v8 backport 35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a                                    
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → 'git <command> [<revision>...] -- [<file>...]'
      Apply and commit patches to deps/v8
✖ fatal: ambiguous argument '35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a^..35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

core/node (master $% u=) % git node v8 backport 3fdaf21204b8a2bbaf12e7509031209eeff4b971
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → 'git <command> [<revision>...] -- [<file>...]'
      Apply and commit patches to deps/v8
✖ fatal: ambiguous argument '3fdaf21204b8a2bbaf12e7509031209eeff4b971^..3fdaf21204b8a2bbaf12e7509031209eeff4b971': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

core/node (master $% u=) % git node v8 backport         35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a
  ✔ Update local V8 clone
  ❯ V8 commit backport
    ✔ Get current V8 version
    ✖ Generate patches
      → 'git <command> [<revision>...] -- [<file>...]'
      Apply and commit patches to deps/v8
✖ fatal: ambiguous argument '35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a^..35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

@targos
Copy link
Member

targos commented Sep 10, 2019

@sam-github you can't use the tool because the commit isn't in the V8 repository.
I'm +1 on floating it before V8 ugrades its dependency.

@sam-github sam-github mentioned this pull request Sep 16, 2019
4 tasks
sam-github added a commit to sam-github/node that referenced this pull request Sep 16, 2019
cclauss pushed a commit that referenced this pull request Sep 18, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: #29585
Refs: #29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
targos pushed a commit that referenced this pull request Sep 20, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: #29585
Refs: #29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
BridgeAR pushed a commit that referenced this pull request Sep 25, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: #29585
Refs: #29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
cjihrig pushed a commit to cjihrig/node that referenced this pull request Sep 27, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: nodejs#29548
Refs:
- nodejs#29548 (comment)
- nodejs#29520
- nodejs#29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: nodejs#29585
Refs: nodejs#29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request Oct 7, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: nodejs#29548
Refs:
- nodejs#29548 (comment)
- nodejs#29520
- nodejs#29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: nodejs#29585
Refs: nodejs#29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
targos pushed a commit that referenced this pull request Oct 8, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: #29585
Refs: #29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
targos pushed a commit to targos/node that referenced this pull request Oct 25, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: nodejs#29548
Refs:
- nodejs#29548 (comment)
- nodejs#29520
- nodejs#29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: nodejs#29585
Refs: nodejs#29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
targos pushed a commit to targos/node that referenced this pull request Dec 5, 2019
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: nodejs#29548
Refs:
- nodejs#29548 (comment)
- nodejs#29520
- nodejs#29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: nodejs#29585
Refs: nodejs#29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit to targos/node that referenced this pull request Jan 7, 2020
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: nodejs#29548
Refs:
- nodejs#29548 (comment)
- nodejs#29520
- nodejs#29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

PR-URL: nodejs#29585
Refs: nodejs#29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit that referenced this pull request Jan 8, 2020
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

Backport-PR-URL: #30109
PR-URL: #29585
Refs: #29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
BethGriggs pushed a commit that referenced this pull request Feb 6, 2020
Original commit message:

    Make code generator python3.7 compatible (async keyword).

    Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109

Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a

Backport-PR-URL: #30109
PR-URL: #29585
Refs: #29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
python PRs and issues that require attention from people who are familiar with Python. v8 engine Issues and PRs related to the V8 dependency.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

'async' is a reserved word in Python >= 3.7
5 participants