Bug 200691 - Web Inspector: Update Esprima to trunk (minor fixes)
Summary: Web Inspector: Update Esprima to trunk (minor fixes)
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Web Inspector (show other bugs)
Version: WebKit Nightly Build
Hardware: All All
: P2 Normal
Assignee: Joseph Pecoraro
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2019-08-13 15:11 PDT by Joseph Pecoraro
Modified: 2019-08-15 11:15 PDT (History)
5 users (show)

See Also:


Attachments
[PATCH] Proposed Fix (606.67 KB, patch)
2019-08-13 15:24 PDT, Joseph Pecoraro
hi: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Joseph Pecoraro 2019-08-13 15:11:35 PDT
Update Esprima to trunk (minor fixes)

Suggesting master:
https://github.com/jquery/esprima/commit/5e55171feb5adbc2b1d28ef4b2628d5ea9af0848

Some minor fixes and changes:
- RestProperty => RestElement
- SpreadProperty => SpreadElement
- some "async" fixes
Comment 1 Radar WebKit Bug Importer 2019-08-13 15:11:55 PDT
<rdar://problem/54276170>
Comment 2 Joseph Pecoraro 2019-08-13 15:24:12 PDT
Created attachment 376219 [details]
[PATCH] Proposed Fix
Comment 3 Devin Rousso 2019-08-13 21:58:01 PDT
Comment on attachment 376219 [details]
[PATCH] Proposed Fix

View in context: https://bugs.webkit.org/attachment.cgi?id=376219&action=review

rs=me

> Source/WebInspectorUI/ChangeLog:24
> +        - SpreadProperty => SpreadElement.
> +        - RestProperty => RestElement.

It seems more like `SpreadProperty`/`RestProperty` was merged into `SpreadElement`/`RestElement`, rather than a rename.  May be worth mentioning?
Comment 4 Joseph Pecoraro 2019-08-14 09:57:35 PDT
(In reply to Devin Rousso from comment #3)
> Comment on attachment 376219 [details]
> [PATCH] Proposed Fix
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=376219&action=review
> 
> rs=me
> 
> > Source/WebInspectorUI/ChangeLog:24
> > +        - SpreadProperty => SpreadElement.
> > +        - RestProperty => RestElement.
> 
> It seems more like `SpreadProperty`/`RestProperty` was merged into
> `SpreadElement`/`RestElement`, rather than a rename.  May be worth
> mentioning?

They were the same thing with a different name. Now they are just the same thing.
Comment 5 WebKit Commit Bot 2019-08-14 11:07:44 PDT
Comment on attachment 376219 [details]
[PATCH] Proposed Fix

Rejecting attachment 376219 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 376219, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as commit-queue@webkit.org...
Fetching: https://bugs.webkit.org/attachment.cgi?id=376219&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=200691&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Processing patch 376219 from bug 200691.
Fetching: https://bugs.webkit.org/attachment.cgi?id=376219
Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt
	M	LayoutTests/inspector/model/parse-script-syntax-tree.html
	M	Source/WebInspectorUI/ChangeLog
	M	Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js
	M	Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/ESTreeWalker.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:

    The following files contain tab characters:

        trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js

    Please use spaces instead to indent.
    If you must commit a file with tabs, use svn propset to set the "allow-tabs" property.
W: 738da21a39f8ef42cd34568369bf0476eab356d2 and refs/remotes/origin/master differ, using rebase:
:040000 040000 a2606a1eb605a439182493b9b7ca161c6280121d 3553b61c78e6af3c708de29caacf28ce93cdbc29 M	LayoutTests
:040000 040000 ace9f9995967f92ba8cc115d49db77b2f574fe2d 9e565ad35cf15b58a84e791e99a364a0afd1ad2a M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt
	M	LayoutTests/inspector/model/parse-script-syntax-tree.html
	M	Source/WebInspectorUI/ChangeLog
	M	Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js
	M	Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/ESTreeWalker.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:

    The following files contain tab characters:

        trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js

    Please use spaces instead to indent.
    If you must commit a file with tabs, use svn propset to set the "allow-tabs" property.
W: 738da21a39f8ef42cd34568369bf0476eab356d2 and refs/remotes/origin/master differ, using rebase:
:040000 040000 a2606a1eb605a439182493b9b7ca161c6280121d 3553b61c78e6af3c708de29caacf28ce93cdbc29 M	LayoutTests
:040000 040000 ace9f9995967f92ba8cc115d49db77b2f574fe2d 9e565ad35cf15b58a84e791e99a364a0afd1ad2a M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.

Full output: https://webkit-queues.webkit.org/results/12911865
Comment 6 Joseph Pecoraro 2019-08-15 11:15:18 PDT
https://trac.webkit.org/changeset/248732/webkit