50424 2010-12-02 16:56:00 -0800 make webkit-patch command work when the git branch is not synced to the remote svn branch 2010-12-06 12:00:47 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth aroben eric evan oldest_to_newest 316524 0 ojan 2010-12-02 16:56:00 -0800 make webkit-patch command work when the git branch is not synced to the remote svn branch 316528 1 75436 ojan 2010-12-02 16:59:20 -0800 Created attachment 75436 Patch 316537 2 75436 abarth 2010-12-02 17:11:53 -0800 Comment on attachment 75436 Patch Looks plausible to me, but we might want a git ninja's opinion. 316538 3 75436 eric 2010-12-02 17:14:52 -0800 Comment on attachment 75436 Patch I don't really understand, but I believe you. 316540 4 eric 2010-12-02 17:15:29 -0800 Would be nice to hear from a git ninja, but I'm not sure they'll understand what this change does any better than I do. Do we need to test the case where the commit would fail due to lack of update? Or is that orthogonal to this change? 316600 5 ojan 2010-12-02 18:42:00 -0800 (In reply to comment #4) > Would be nice to hear from a git ninja, but I'm not sure they'll understand what this change does any better than I do. > > Do we need to test the case where the commit would fail due to lack of update? Or is that orthogonal to this change? That's what the three modified tests are. They used to verify that we'd throw a ScriptError in those cases. Now they verify we committed the right files and not other files. Good test coverage ftw! 317748 6 ojan 2010-12-06 11:33:28 -0800 Oh, I misread that...actually, you're right, we don't test the case where the commit would fail (e.g. because of a conflict). I'll add that test and commit. 317765 7 ojan 2010-12-06 12:00:47 -0800 Committed r73384: <http://trac.webkit.org/changeset/73384> 75436 2010-12-02 16:59:20 -0800 2010-12-02 17:14:52 -0800 Patch bug-50424-20101202165919.patch text/plain 4625 ojan ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiMjk1NTFkODBmYTY2NzRkYzNiNmY0Yjk5NGFkNzVmNzA2ZDI0MGUzLi5jYmI0NTk2 MDMyMjI3ZGFmNDBmZDllYjg5MGM3Mzg4ZTYwMjBlYjdlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMTItMDIgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtYWtlIHdlYmtpdC1wYXRjaCBj b21tYW5kIHdvcmsgd2hlbiB0aGUgZ2l0IGJyYW5jaCBpcyBub3Qgc3luY2VkIHRvIHRoZSByZW1v dGUgc3ZuIGJyYW5jaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTA0MjQKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21f dW5pdHRlc3QucHk6CisKIDIwMTAtMTItMDIgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzMxNjQuCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHkKaW5kZXgg ZDM5YjhiNDdjYzU0NTRiYmI3Y2FjNzAzZGIyNThmZmI4M2Y1NjIxZi4uZWUyYmI0MTJiYTA1NWNh YmQyMjIxYzZmMTViYjYzZjg5YjI3YTAxZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQpAQCAtNjQyLDEwICs2NDIsNiBAQCBj bGFzcyBHaXQoU0NNKToKICAgICBkZWYgZGVsZXRlKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1 cm4gc2VsZi5ydW4oWyJnaXQiLCAicm0iLCAiLWYiLCBwYXRoXSkKIAotICAgIGRlZiBfYXNzZXJ0 X3N5bmNlZChzZWxmKToKLSAgICAgICAgaWYgbGVuKHJ1bl9jb21tYW5kKFsnZ2l0JywgJ3Jldi1s aXN0JywgJy0tbWF4LWNvdW50PTEnLCBzZWxmLnJlbW90ZV9icmFuY2hfcmVmKCksICdeSEVBRCdd KSk6Ci0gICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSJOb3QgZnVsbHkgbWVy Z2VkL3JlYmFzZWQgdG8gJXMuIFRoaXMgYnJhbmNoIG5lZWRzIHRvIGJlIHN5bmNlZCBmaXJzdC4i ICUgc2VsZi5yZW1vdGVfYnJhbmNoX3JlZigpKQotCiAgICAgZGVmIG1lcmdlX2Jhc2Uoc2VsZiwg Z2l0X2NvbW1pdCk6CiAgICAgICAgIGlmIGdpdF9jb21taXQ6CiAgICAgICAgICAgICAjIFNwZWNp YWwtY2FzZSBIRUFELi4gdG8gbWVhbiB3b3JraW5nLWNvcHkgY2hhbmdlcyBvbmx5LgpAQCAtNjU2 LDcgKzY1Miw2IEBAIGNsYXNzIEdpdChTQ00pOgogICAgICAgICAgICAgICAgIGdpdF9jb21taXQg PSBnaXRfY29tbWl0ICsgIl4uLiIgKyBnaXRfY29tbWl0CiAgICAgICAgICAgICByZXR1cm4gZ2l0 X2NvbW1pdAogCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zeW5jZWQoKQogICAgICAgICByZXR1cm4g c2VsZi5yZW1vdGVfbWVyZ2VfYmFzZSgpCiAKICAgICBkZWYgY2hhbmdlZF9maWxlcyhzZWxmLCBn aXRfY29tbWl0PU5vbmUpOgpAQCAtNzg4LDggKzc4Myw3IEBAIGNsYXNzIEdpdChTQ00pOgogCiAg ICAgICAgIGlmIG5vdCBmb3JjZV9zcXVhc2g6CiAgICAgICAgICAgICBzZWxmLl9hc3NlcnRfY2Fu X3NxdWFzaCh3b3JraW5nX2RpcmVjdG9yeV9pc19jbGVhbikKLSAgICAgICAgc2VsZi5fYXNzZXJ0 X3N5bmNlZCgpCi0gICAgICAgIHNlbGYucnVuKFsnZ2l0JywgJ3Jlc2V0JywgJy0tc29mdCcsIHNl bGYucmVtb3RlX2JyYW5jaF9yZWYoKV0pCisgICAgICAgIHNlbGYucnVuKFsnZ2l0JywgJ3Jlc2V0 JywgJy0tc29mdCcsIHNlbGYucmVtb3RlX21lcmdlX2Jhc2UoKV0pCiAgICAgICAgIHNlbGYuY29t bWl0X2xvY2FsbHlfd2l0aF9tZXNzYWdlKG1lc3NhZ2UpCiAgICAgICAgIHJldHVybiBzZWxmLnB1 c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXIoKQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkKaW5k ZXggNDZhMmFjZjNjZDM1ZjIwOGVlYmQ4NDFiMmVlZGFjMzZhMjI2MzAzZi4uYTQzN2E0YWEzNzY5 NDc2YWE4NDkxMDM5NDBmNDJhOTc2YmRmY2I5OSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5weQpA QCAtMTA4Myw3ICsxMDgzLDE0IEBAIGNsYXNzIEdpdFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgICAg IHNlbGYuX3R3b19sb2NhbF9jb21taXRzKCkKICAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0 ZW0oc2VsZi5naXRfY2hlY2tvdXRfcGF0aCkKICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoQW1i aWd1b3VzQ29tbWl0RXJyb3IsIHNjbS5jb21taXRfd2l0aF9tZXNzYWdlLCAiYW5vdGhlciB0ZXN0 IGNvbW1pdCIpCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVycm9yLCBzY20uY29t bWl0X3dpdGhfbWVzc2FnZSwgImFub3RoZXIgdGVzdCBjb21taXQiLCBmb3JjZV9zcXVhc2g9VHJ1 ZSkKKyAgICAgICAgY29tbWl0X3RleHQgPSBzY20uY29tbWl0X3dpdGhfbWVzc2FnZSgiYW5vdGhl ciB0ZXN0IGNvbW1pdCIsIGZvcmNlX3NxdWFzaD1UcnVlKQorCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc2NtLnN2bl9yZXZpc2lvbl9mcm9tX2NvbW1pdF90ZXh0KGNvbW1pdF90ZXh0KSwgJzYn KQorCisgICAgICAgIHN2bl9sb2cgPSBydW5fY29tbWFuZChbJ2dpdCcsICdzdm4nLCAnbG9nJywg Jy0tbGltaXQ9JywgJy0tdmVyYm9zZSddKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHJlLnNl YXJjaChyJ3Rlc3RfZmlsZTInLCBzdm5fbG9nKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJl LnNlYXJjaChyJ3Rlc3RfZmlsZV9jb21taXQyJywgc3ZuX2xvZykpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShyZS5zZWFyY2gocid0ZXN0X2ZpbGVfY29tbWl0MScsIHN2bl9sb2cpKQogCiAgICAg ZGVmIHRlc3RfcmVtb3RlX2JyYW5jaF9yZWYoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoc2VsZi5zY20ucmVtb3RlX2JyYW5jaF9yZWYoKSwgJ3JlZnMvcmVtb3Rlcy90cnVuaycpCkBA IC0xMTU4LDcgKzExNjUsMTAgQEAgY2xhc3MgR2l0U1ZOVGVzdChTQ01UZXN0KToKICAgICAgICAg cnVuX2NvbW1hbmQoWydnaXQnLCAnY2hlY2tvdXQnLCAnLWInLCAnbXktYnJhbmNoJywgJ3RydW5r fjMnXSkKICAgICAgICAgc2VsZi5fdHdvX2xvY2FsX2NvbW1pdHMoKQogICAgICAgICBzY20gPSBk ZXRlY3Rfc2NtX3N5c3RlbShzZWxmLmdpdF9jaGVja291dF9wYXRoKQotICAgICAgICBzZWxmLmFz c2VydFJhaXNlcyhTY3JpcHRFcnJvciwgc2NtLmNyZWF0ZV9wYXRjaCkKKyAgICAgICAgcGF0Y2gg PSBzY20uY3JlYXRlX3BhdGNoKCkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShyZS5zZWFyY2go cid0ZXN0X2ZpbGUyJywgcGF0Y2gpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUocmUuc2VhcmNo KHIndGVzdF9maWxlX2NvbW1pdDInLCBwYXRjaCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShy ZS5zZWFyY2gocid0ZXN0X2ZpbGVfY29tbWl0MScsIHBhdGNoKSkKIAogICAgIGRlZiB0ZXN0X2Ny ZWF0ZV9iaW5hcnlfcGF0Y2goc2VsZik6CiAgICAgICAgICMgQ3JlYXRlIGEgZ2l0IGJpbmFyeSBw YXRjaCBhbmQgY2hlY2sgdGhlIGNvbnRlbnRzLgpAQCAtMTIyNiw3ICsxMjM2LDEwIEBAIGNsYXNz IEdpdFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgICAgIHJ1bl9jb21tYW5kKFsnZ2l0JywgJ2NoZWNr b3V0JywgJy1iJywgJ215LWJyYW5jaCcsICd0cnVua34zJ10pCiAgICAgICAgIHNlbGYuX3R3b19s b2NhbF9jb21taXRzKCkKICAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi5naXRf Y2hlY2tvdXRfcGF0aCkKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3IsIHNj bS5jaGFuZ2VkX2ZpbGVzKQorICAgICAgICBmaWxlcyA9IHNjbS5jaGFuZ2VkX2ZpbGVzKCkKKyAg ICAgICAgc2VsZi5hc3NlcnRGYWxzZSgndGVzdF9maWxlMicgaW4gZmlsZXMpCisgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZSgndGVzdF9maWxlX2NvbW1pdDInIGluIGZpbGVzKQorICAgICAgICBzZWxm LmFzc2VydFRydWUoJ3Rlc3RfZmlsZV9jb21taXQxJyBpbiBmaWxlcykKIAogICAgIGRlZiB0ZXN0 X2NoYW5nZWRfZmlsZXMoc2VsZik6CiAgICAgICAgIHNlbGYuX3NoYXJlZF90ZXN0X2NoYW5nZWRf ZmlsZXMoKQo=