Bug 47940 – webkit-patch doesn't get along with git rm

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Tony Gentilcore]

1. $ git rm foo
2. $ webkit-patch pretty-diff
3. You're not on a horse :-(

fatal: ambiguous argument 'foo': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions

Adam, Eric thought this might be a regression caused by http://trac.webkit.org/changeset/70059

[Adam Barth]

Seems likely.  Should be an easy fix in scm.py.  Just add the --.

[Eric Seidel (no email)]

I don't think it's the --.  The problem is we view the deleted file as a changed file.  git won't accept deleted files as arguments to git diff (maybe there is an option to allow it?)

[Adam Barth]

Created attachment 71249 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 71249 [details]
Patch

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

r- for lack of tests (and because I think this isn't a complete fix and may be wrong.)

> WebKitTools/Scripts/webkitpy/common/checkout/scm.py:656
> +        status_command = ['git', 'diff', '-r', '--name-status', '-C', '-M', "--no-ext-diff", "--full-index", "--", self.merge_base(git_commit)]

Um.  Are you sure that's the right place?  I don't think it is.  I think you'd want it after the merge base?  And what about the case where we're generating a patch?

[Adam Barth]

Created attachment 71250 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 71250 [details]
Patch

Still no tests.  And thus wrong.

[Adam Barth]

Created attachment 71253 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 71253 [details]
Patch

Thank you!

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 71253 [details]:



Please file bugs against the tests.  The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 71253 [details]
Patch

Rejecting patch 71253 from commit-queue.

Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'land-attachment', '--force-clean', '--ignore-builders', '--quiet', '--non-interactive', '--parent-command=commit-queue', 71253]" exit_code: 2
Last 500 characters of output:
bCore/rendering/RenderBlockLineLayout.cpp
r70158 = 35d2ad5c3fa6f7a0732c477ec1bce4e1655ad6a8 (refs/remotes/trunk)
First, rewinding head to replay your work on top of it...
error: Untracked working tree file 'LayoutTests/plugins/mouse-move-over-plugin-in-frame-expected.txt' would be overwritten by merge.
could not detach HEAD
rebase refs/remotes/trunk: command returned error: 1

Died at WebKitTools/Scripts/update-webkit line 129.

Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2

Full output: http://queues.webkit.org/results/4593014

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 71253 [details]:

http/tests/security/xssAuditor/script-tag-with-source-double-quote.html

Please file bugs against the tests.  The author(s) of the test(s) have been CCed on this bug.  The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 71253 [details]
Patch

Clearing flags on attachment: 71253

Committed r70169: <http://trac.webkit.org/changeset/70169>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Eric Seidel (no email)]

Committed r70171: <http://trac.webkit.org/changeset/70171>

[WebKit Review Bot]

http://trac.webkit.org/changeset/70169 might have broken GTK Linux 64-bit Debug
The following tests are not passing:
fast/backgrounds/repeat/negative-offset-repeat-transformed.html
fast/borders/border-image-rotate-transform.html
fast/borders/border-image-scale-transform.html
fast/transforms/scrollIntoView-transformed.html
transforms/2d/hindi-rotated.html

[WebKit Review Bot]

http://trac.webkit.org/changeset/70171 might have broken GTK Linux 64-bit Debug
The following tests are not passing:
fast/backgrounds/repeat/negative-offset-repeat-transformed.html
fast/borders/border-image-rotate-transform.html
fast/borders/border-image-scale-transform.html
fast/transforms/scrollIntoView-transformed.html
transforms/2d/hindi-rotated.html