Bug 190904 – [webkitpy] Run 'git clean -xdf' in git.discard_working_directory_changes()

• Component: Tools / Tests
• Status: NEW

[Guillaume Emont]

In the jsc-armv7 EWS bot, we've seen issues with some patches that break tests, such as https://bug-187373-attachments.webkit.org/attachment.cgi?id=352913 where we have issues when checking the ability to pass tests without the patch. The leftovers from the patch in WebKitBuild/ seem to prevent from regenerating something (unsure what), meaning that the tests don't pass any more when we're supposed to check ToT without the patch, thus giving a false negative on the status of the tree ("tree is red?" message), and making the EWS trying this many times (always with the same result) while the queue builds up. Adding a 'git clean -xdf' call in git.discard_working_directory_changes() seems to solve the issue.

[Guillaume Emont]

Created attachment 353089 [details]
Patch

Patch doing that.

[Michael Catanzaro]

Comment on attachment 353089 [details]
Patch

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

Well...

 (a) The change is clearly correct. The function does not currently discard working directory changes. It needs the git clean to do that properly.

 (b) It's *really* bad to have the functions implemented differently for different platforms!

So I'm hesitant to r+ this. Doesn't subversion have some equivalent behavior that can be implemented?

Also I think you should abort the rebase first, then clean last.

> Tools/Scripts/webkitpy/common/checkout/scm/git.py:165
> +        # Running git clean and aborting rebase,  even though that does not match subversion

There's an extra space here

[Alex Christensen]

Comment on attachment 353089 [details]
Patch

This has been requesting review for more than one year.  If this is still needed, please rebase and re-request review.

[Michael Catanzaro]

Comment on attachment 353089 [details]
Patch

This is going to clean ignored files like WebKitBuild/, __pycache__, etc.  Seems too aggressive tbh.