47940 2010-10-19 15:38:46 -0700 webkit-patch doesn't get along with git rm 2010-10-20 14:41:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 35460 1 tonyg abarth abarth commit-queue eric tonyg webkit.review.bot oldest_to_newest 296470 0 tonyg 2010-10-19 15:38:46 -0700 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 296570 1 abarth 2010-10-19 17:58:29 -0700 Seems likely. Should be an easy fix in scm.py. Just add the --. 296620 2 eric 2010-10-19 20:35:01 -0700 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?) 296639 3 71249 abarth 2010-10-19 22:20:53 -0700 Created attachment 71249 Patch 296640 4 71249 eric 2010-10-19 22:22:36 -0700 Comment on attachment 71249 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? 296641 5 71250 abarth 2010-10-19 22:23:53 -0700 Created attachment 71250 Patch 296642 6 71250 eric 2010-10-19 22:24:29 -0700 Comment on attachment 71250 Patch Still no tests. And thus wrong. 296648 7 71253 abarth 2010-10-19 22:50:52 -0700 Created attachment 71253 Patch 296843 8 71253 eric 2010-10-20 09:39:48 -0700 Comment on attachment 71253 Patch Thank you! 296891 9 commit-queue 2010-10-20 11:52:51 -0700 The commit-queue encountered the following flaky tests while processing attachment 71253: Please file bugs against the tests. The commit-queue is continuing to process your patch. 296892 10 71253 commit-queue 2010-10-20 11:53:27 -0700 Comment on attachment 71253 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 296980 11 commit-queue 2010-10-20 13:35:48 -0700 The commit-queue encountered the following flaky tests while processing attachment 71253: 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. 296981 12 71253 commit-queue 2010-10-20 13:36:34 -0700 Comment on attachment 71253 Patch Clearing flags on attachment: 71253 Committed r70169: <http://trac.webkit.org/changeset/70169> 296982 13 commit-queue 2010-10-20 13:36:40 -0700 All reviewed patches have been landed. Closing bug. 296991 14 eric 2010-10-20 13:45:16 -0700 Committed r70171: <http://trac.webkit.org/changeset/70171> 297033 15 webkit.review.bot 2010-10-20 14:41:21 -0700 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 297035 16 webkit.review.bot 2010-10-20 14:41:39 -0700 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 71249 2010-10-19 22:20:53 -0700 2010-10-19 22:23:50 -0700 Patch bug-47940-20101019222051.patch text/plain 1431 abarth SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwMTI3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMTkgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICB3ZWJraXQtcGF0Y2ggZG9lc24ndCBnZXQgYWxvbmcgd2l0aCBnaXQgcm0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTQwCisKKyAgICAg ICAgVHVybnMgb3V0IHdlIG5lZWQgdG8gcGFzcyAiLS0iIHRvIHRlbGwgZ2l0IHRoaXMgaXMgYSBw YXRoLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5 OgorCiAyMDEwLTEwLTE5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQkocmV2aXNpb24gNzAxMjcpCisr KyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHkJKHdv cmtpbmcgY29weSkKQEAgLTY1Myw3ICs2NTMsNyBAQCBjbGFzcyBHaXQoU0NNKToKICAgICAgICAg cmV0dXJuIHNlbGYucmVtb3RlX21lcmdlX2Jhc2UoKQogCiAgICAgZGVmIGNoYW5nZWRfZmlsZXMo c2VsZiwgZ2l0X2NvbW1pdD1Ob25lKToKLSAgICAgICAgc3RhdHVzX2NvbW1hbmQgPSBbJ2dpdCcs ICdkaWZmJywgJy1yJywgJy0tbmFtZS1zdGF0dXMnLCAnLUMnLCAnLU0nLCAiLS1uby1leHQtZGlm ZiIsICItLWZ1bGwtaW5kZXgiLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCldCisgICAgICAg IHN0YXR1c19jb21tYW5kID0gWydnaXQnLCAnZGlmZicsICctcicsICctLW5hbWUtc3RhdHVzJywg Jy1DJywgJy1NJywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4IiwgIi0tIiwgc2VsZi5t ZXJnZV9iYXNlKGdpdF9jb21taXQpXQogICAgICAgICByZXR1cm4gc2VsZi5ydW5fc3RhdHVzX2Fu ZF9leHRyYWN0X2ZpbGVuYW1lcyhzdGF0dXNfY29tbWFuZCwgc2VsZi5fc3RhdHVzX3JlZ2V4cCgi QURNIikpCiAKICAgICBkZWYgX2NoYW5nZXNfZmlsZXNfZm9yX2NvbW1pdChzZWxmLCBnaXRfY29t bWl0KToK 71250 2010-10-19 22:23:53 -0700 2010-10-19 22:50:49 -0700 Patch bug-47940-20101019222352.patch text/plain 1485 abarth SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwMTI3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMTkgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICB3ZWJraXQtcGF0Y2ggZG9lc24ndCBnZXQgYWxvbmcgd2l0aCBnaXQgcm0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTQwCisKKyAgICAg ICAgVHVybnMgb3V0IHdlIG5lZWQgdG8gcGFzcyAiLS0iIHRvIHRlbGwgZ2l0IHRoaXMgaXMgYSBw YXRoLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5 OgorCiAyMDEwLTEwLTE5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQkocmV2aXNpb24gNzAxMjcpCisr KyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHkJKHdv cmtpbmcgY29weSkKQEAgLTY5NCw3ICs2OTQsNyBAQCBjbGFzcyBHaXQoU0NNKToKICAgICAgICAg UGF0Y2ggZmlsZXMgYXJlIGVmZmVjdGl2ZWx5IGJpbmFyeSBzaW5jZSB0aGV5IG1heSBjb250YWlu CiAgICAgICAgIGZpbGVzIG9mIG11bHRpcGxlIGRpZmZlcmVudCBlbmNvZGluZ3MuIiIiCiAgICAg ICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IHVzZSBjd2Q9c2VsZi5jaGVja291dF9y b290Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5Jywg Ii0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4IiwgIi1NIiwgc2VsZi5tZXJnZV9iYXNlKGdp dF9jb21taXQpXSArIGNoYW5nZWRfZmlsZXMsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCisgICAgICAg IHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRp ZmYiLCAiLS1mdWxsLWluZGV4IiwgIi1NIiwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21taXQpLCAi LS0iXSArIGNoYW5nZWRfZmlsZXMsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCiAKICAgICBAY2xhc3Nt ZXRob2QKICAgICBkZWYgZ2l0X2NvbW1pdF9mcm9tX3N2bl9yZXZpc2lvbihjbHMsIHJldmlzaW9u KToK 71253 2010-10-19 22:50:52 -0700 2010-10-20 13:36:34 -0700 Patch bug-47940-20101019225051.patch text/plain 2836 abarth SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwMTI3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMTkgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICB3ZWJraXQtcGF0Y2ggZG9lc24ndCBnZXQgYWxvbmcgd2l0aCBnaXQgcm0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTQwCisKKyAgICAg ICAgVHVybnMgb3V0IHdlIG5lZWQgdG8gcGFzcyAiLS0iIHRvIHRlbGwgZ2l0IHRoaXMgaXMgYSBw YXRoLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5 OgorCiAyMDEwLTEwLTE5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQkocmV2aXNpb24gNzAxMjcpCisr KyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHkJKHdv cmtpbmcgY29weSkKQEAgLTY5NCw3ICs2OTQsNyBAQCBjbGFzcyBHaXQoU0NNKToKICAgICAgICAg UGF0Y2ggZmlsZXMgYXJlIGVmZmVjdGl2ZWx5IGJpbmFyeSBzaW5jZSB0aGV5IG1heSBjb250YWlu CiAgICAgICAgIGZpbGVzIG9mIG11bHRpcGxlIGRpZmZlcmVudCBlbmNvZGluZ3MuIiIiCiAgICAg ICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IHVzZSBjd2Q9c2VsZi5jaGVja291dF9y b290Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5Jywg Ii0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4IiwgIi1NIiwgc2VsZi5tZXJnZV9iYXNlKGdp dF9jb21taXQpXSArIGNoYW5nZWRfZmlsZXMsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCisgICAgICAg IHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRp ZmYiLCAiLS1mdWxsLWluZGV4IiwgIi1NIiwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21taXQpLCAi LS0iXSArIGNoYW5nZWRfZmlsZXMsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCiAKICAgICBAY2xhc3Nt ZXRob2QKICAgICBkZWYgZ2l0X2NvbW1pdF9mcm9tX3N2bl9yZXZpc2lvbihjbHMsIHJldmlzaW9u KToKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkJKHJldmlzaW9uIDcwMTI3KQorKysgV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0xMDk4LDYgKzEwOTgsMjAgQEAgY2xhc3MgR2l0U1ZOVGVzdChT Q01UZXN0KToKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ3Rlc3RfZmlsZV9j b21taXQyJywgcGF0Y2gpKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocmUuc2VhcmNoKHIndGVz dF9maWxlX2NvbW1pdDEnLCBwYXRjaCkpCiAKKyAgICBkZWYgdGVzdF9jcmVhdGVfcGF0Y2hfd2l0 aF9jaGFuZ2VkX2ZpbGVzKHNlbGYpOgorICAgICAgICBzZWxmLl9vbmVfbG9jYWxfY29tbWl0X3Bs dXNfd29ya2luZ19jb3B5X2NoYW5nZXMoKQorICAgICAgICBzY20gPSBkZXRlY3Rfc2NtX3N5c3Rl bShzZWxmLmdpdF9jaGVja291dF9wYXRoKQorICAgICAgICBwYXRjaCA9IHNjbS5jcmVhdGVfcGF0 Y2goY2hhbmdlZF9maWxlcz1bJ3Rlc3RfZmlsZV9jb21taXQyJ10pCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShyZS5zZWFyY2gocid0ZXN0X2ZpbGVfY29tbWl0MicsIHBhdGNoKSkKKworICAgIGRl ZiB0ZXN0X2NyZWF0ZV9wYXRjaF93aXRoX3JtX2FuZF9jaGFuZ2VkX2ZpbGVzKHNlbGYpOgorICAg ICAgICBzZWxmLl9vbmVfbG9jYWxfY29tbWl0X3BsdXNfd29ya2luZ19jb3B5X2NoYW5nZXMoKQor ICAgICAgICBzY20gPSBkZXRlY3Rfc2NtX3N5c3RlbShzZWxmLmdpdF9jaGVja291dF9wYXRoKQor ICAgICAgICBvcy5yZW1vdmUoJ3Rlc3RfZmlsZV9jb21taXQxJykKKyAgICAgICAgcGF0Y2ggPSBz Y20uY3JlYXRlX3BhdGNoKCkKKyAgICAgICAgcGF0Y2hfd2l0aF9jaGFuZ2VkX2ZpbGVzID0gc2Nt LmNyZWF0ZV9wYXRjaChjaGFuZ2VkX2ZpbGVzPVsndGVzdF9maWxlX2NvbW1pdDEnLCAndGVzdF9m aWxlX2NvbW1pdDInXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocGF0Y2gsIHBhdGNoX3dp dGhfY2hhbmdlZF9maWxlcykKKwogICAgIGRlZiB0ZXN0X2NyZWF0ZV9wYXRjaF9naXRfY29tbWl0 KHNlbGYpOgogICAgICAgICBzZWxmLl90d29fbG9jYWxfY29tbWl0cygpCiAgICAgICAgIHNjbSA9 IGRldGVjdF9zY21fc3lzdGVtKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgpCg==